From 3a6c3ac669c1990a56a4c0f4aa83c6ad5205e8dc Mon Sep 17 00:00:00 2001 From: Michal Sroczynski Date: Fri, 11 Aug 2023 14:09:31 +0200 Subject: [PATCH] Small adjustments --- .../loot_tables/creature/biped_large/dullahan.ron | 12 ++++++------ assets/common/loot_tables/dungeon/adlet/elder.ron | 2 ++ .../common/loot_tables/dungeon/adlet/elder_extra.ron | 4 ++-- assets/common/loot_tables/dungeon/adlet/yeti.ron | 3 +-- .../loot_tables/dungeon/cultist/mindflayer.ron | 4 +--- .../loot_tables/dungeon/gnarling/chieftain.ron | 4 ++-- common/src/comp/inventory/trade_pricing.rs | 6 ------ 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/assets/common/loot_tables/creature/biped_large/dullahan.ron b/assets/common/loot_tables/creature/biped_large/dullahan.ron index ffc32ed74e..cae38edd1b 100644 --- a/assets/common/loot_tables/creature/biped_large/dullahan.ron +++ b/assets/common/loot_tables/creature/biped_large/dullahan.ron @@ -1,9 +1,9 @@ [ - (1.9, All([ - MultiDrop(Item("common.items.utility.coins"), 200, 500), - MultiDrop(Item("common.items.mineral.ingot.bloodsteel"), 2, 4), - MultiDrop(Item("common.items.mineral.ingot.silver"), 0, 2), - ], - )), + (1.8, All([ + MultiDrop(Item("common.items.utility.coins"), 200, 500), + MultiDrop(Item("common.items.mineral.ingot.bloodsteel"), 2, 4), + MultiDrop(Item("common.items.mineral.ingot.silver"), 0, 2), + ])), + (0.1, Item("common.items.glider.morpho")), (0.1, Item("common.items.weapons.sword.caladbolg")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/adlet/elder.ron b/assets/common/loot_tables/dungeon/adlet/elder.ron index 02b7d94323..8959606c3e 100644 --- a/assets/common/loot_tables/dungeon/adlet/elder.ron +++ b/assets/common/loot_tables/dungeon/adlet/elder.ron @@ -1,6 +1,8 @@ [ (1, All([ Item("common.items.keys.bone_key"), + MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.leather.thick_leather"), 1, 2), LootTable("common.loot_tables.dungeon.adlet.elder_extra"), ], )), diff --git a/assets/common/loot_tables/dungeon/adlet/elder_extra.ron b/assets/common/loot_tables/dungeon/adlet/elder_extra.ron index 414283ba42..45bb3d8942 100644 --- a/assets/common/loot_tables/dungeon/adlet/elder_extra.ron +++ b/assets/common/loot_tables/dungeon/adlet/elder_extra.ron @@ -1,8 +1,8 @@ [ // Weapons - (4.0, LootTable("common.loot_tables.weapons.tier-2")), + (4.0, LootTable("common.loot_tables.weapons.tier-3")), // Armor - (4.0, LootTable("common.loot_tables.armor.tier-2")), + (4.0, LootTable("common.loot_tables.armor.tier-3")), // Misc (2.0, Item("common.items.armor.misc.neck.pendant_of_protection")), (0.5, Item("common.items.tool.instruments.wildskin_drum")), diff --git a/assets/common/loot_tables/dungeon/adlet/yeti.ron b/assets/common/loot_tables/dungeon/adlet/yeti.ron index a057cf4a1e..3ae8ef7b75 100644 --- a/assets/common/loot_tables/dungeon/adlet/yeti.ron +++ b/assets/common/loot_tables/dungeon/adlet/yeti.ron @@ -1,11 +1,10 @@ [ - (1.5, All([ + (1.6, All([ MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 6), MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 3), MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2, 4), MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 6), ])), - (0.1, Item("common.items.glider.morpho")), (0.2, Item("common.items.armor.misc.head.bear_bonnet")), (0.2, Item("common.items.armor.misc.head.howl_cowl")), ] diff --git a/assets/common/loot_tables/dungeon/cultist/mindflayer.ron b/assets/common/loot_tables/dungeon/cultist/mindflayer.ron index c2049e64c2..5bc962d7e9 100644 --- a/assets/common/loot_tables/dungeon/cultist/mindflayer.ron +++ b/assets/common/loot_tables/dungeon/cultist/mindflayer.ron @@ -1,12 +1,10 @@ [ - // TODO: Make this loot table less cluttered - // tier equipment (technically worse than other weapons here until modular weapons) (5.0, LootTable("common.loot_tables.weapons.cultist")), (10.0, LootTable("common.loot_tables.armor.cultist")), // Rare misc items (1.0, Item("common.items.boss_drops.lantern")), (1.0, Item("common.items.glider.skullgrin")), - (0.01, Item("common.items.armor.misc.neck.ankh_of_life")), + (0.5, Item("common.items.armor.misc.neck.ankh_of_life")), // Legendary weapons (1.0, Item("common.items.weapons.staff.laevateinn")), // Crafting material diff --git a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron index 7d61aa5139..caf63bbec6 100644 --- a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron +++ b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron @@ -1,8 +1,8 @@ [ // Weapons - (5.0, LootTable("common.loot_tables.weapons.tier-1")), + (5.0, LootTable("common.loot_tables.weapons.tier-2")), // Armor - (5.0, LootTable("common.loot_tables.armor.tier-1")), + (5.0, LootTable("common.loot_tables.armor.tier-2")), // Misc (3.0, Item("common.items.armor.misc.neck.scratched")), (2.0, Item("common.items.armor.misc.head.wanderers_hat")), diff --git a/common/src/comp/inventory/trade_pricing.rs b/common/src/comp/inventory/trade_pricing.rs index a982860c8f..29c55cb3d3 100644 --- a/common/src/comp/inventory/trade_pricing.rs +++ b/common/src/comp/inventory/trade_pricing.rs @@ -1170,12 +1170,6 @@ mod tests { let lootsum3 = loot3.iter().fold(0.0, |s, i| s + i.0); //tracing::trace!("{:?} {}", loot3, lootsum3); assert!((lootsum3 - 1.0).abs() < 1e-5); - - // includes tier-5 modular weapons - let loot4 = expand_loot_table("common.loot_tables.dungeon.myrmidon.minotaur"); - let lootsum4 = loot4.iter().fold(0.0, |s, i| s + i.0); - //tracing::trace!("{:?} {}", loot4, lootsum4); - assert!((lootsum4 - 1.0).abs() < 1e-5); } #[test]