Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-loottables' into 'master'

Browse Source 
Hotfix loottables

See merge request veloren/veloren!1431
This commit is contained in:
Monty Marz 2020-10-11 16:25:35 +00:00
commit 8bd1f763e0
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/loot_tables/loot_table_armor_misc.ron
View File

@ -7,5 +7,5 @@
// necks
(0.25, "common.items.armor.neck.neck_0"),
// misc
(0.1, "common.items.glider.glider_blue"),
(0.05, "common.items.glider.glider_blue"),
]

2
assets/common/loot_tables/loot_table_boss_cultist-leader.ron
View File

@ -13,5 +13,5 @@
(1, "common.items.weapons.sword.cultist_purp_2h-0"),
// misc
(1, "common.items.boss_drops.lantern"),
(0.05, "common.items.glider.glider_purp"),
(0.1, "common.items.glider.glider_purp"),
]

3
assets/common/loot_tables/loot_table_cave_large.ron
View File

@ -3,8 +3,7 @@
(0.25, "common.items.armor.neck.neck_1"),
(0.2, "common.items.crafting_ing.cloth_scraps"),
(1.0, "common.items.crafting_ing.empty_vial"),
(0.1, "common.items.glider.glider_blue"),
(1, "common.items.crafting_ing.cloth_scraps"),
(0.1, "common.items.glider.glider_blue"),
// swords
(0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),
(0.07, "common.items.weapons.sword.greatsword_2h_fine-2"),

1
assets/common/loot_tables/loot_table_crafting.ron
View File

@ -1,6 +1,7 @@
[
// crafting ingredients
(2, "common.items.crafting_ing.leather_scraps"),
(2, "common.items.crafting_ing.cloth_scraps"),
(1, "common.items.crafting_ing.empty_vial"),
(0.10, "common.items.crafting_ing.shiny_gem"),

4
assets/common/loot_tables/loot_table_cultists.ron
View File

@ -5,7 +5,7 @@
(3, "common.items.food.apple"),
(3, "common.items.food.mushroom"),
(3, "common.items.food.coconut"),
(4, "common.items.crafting_ing.cloth_scraps"),
(3, "common.items.crafting_ing.cloth_scraps"),
// crafted
(0.5, "common.items.food.apple_mushroom_curry"),
(0.5, "common.items.food.apple_stick"),
@ -14,7 +14,7 @@
(4, "common.items.crafting_ing.empty_vial"),
(0.25, "common.items.armor.neck.neck_1"),
(0.001, "common.items.glider.glider_purp"),
(0.5, "common.items.glider.glider_blue"),
(0.1, "common.items.glider.glider_blue"),
(0.5, "common.items.utility.firework_purple"),
(0.5, "common.items.utility.bomb"),
// Heavy Armour

4
assets/common/loot_tables/loot_table_food.ron
View File

@ -7,7 +7,5 @@
// crafted
(0.05, "common.items.food.apple_mushroom_curry"),
(0.10, "common.items.food.apple_stick"),
(0.10, "common.items.food.mushroom_stick"),
// misc
(3, "common.items.crafting_ing.cloth_scraps"),
(0.10, "common.items.food.mushroom_stick"),
]

2
assets/common/loot_tables/loot_table_villager.ron
View File

@ -2,7 +2,7 @@
// Crafting Ingredients
(1, "common.items.crafting_ing.empty_vial"),
(0.10, "common.items.crafting_ing.shiny_gem"),
(5, "common.items.crafting_ing.cloth_scraps"),
(1, "common.items.crafting_ing.cloth_scraps"),
// Consumables
(0.2, "common.items.consumable.potion_minor"),
// Armour

5
common/src/comp/inventory/item/mod.rs
View File

@ -327,7 +327,10 @@ impl Item {
chosen.choose()
},
SpriteKind::Crate => {
chosen = Lottery::<String>::load_expect("common.loot_tables.loot_table_food");
chosen = Lottery::<String>::load_expect(match rng.gen_range(0, 4) {
0 => "common.loot_tables.loot_table_crafting",
_ => "common.loot_tables.loot_table_food",
});
chosen.choose()
},
SpriteKind::Beehive => "common.items.crafting_ing.honey",