From 1edf79d109a526308c5171938d844b87b20926cf Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 24 Mar 2021 14:42:37 -0400 Subject: [PATCH] Moved all legendaries to mindflayer loot table. --- assets/common/item_price_calculation.ron | 2 +- .../loot_tables/loot_table_cultists.ron | 6 ------ .../loot_tables/loot_table_mindflayer.ron | 19 ------------------- .../loot_tables/loot_table_miniboss.ron | 2 -- .../loot_tables/loot_table_weapon_rare.ron | 4 ---- assets/common/loot_tables/mindflayer.ron | 14 ++++++++++++++ common/src/bin/csv_export/main.rs | 1 + world/src/site/dungeon/mod.rs | 5 ++++- 8 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 assets/common/loot_tables/loot_table_mindflayer.ron create mode 100644 assets/common/loot_tables/mindflayer.ron diff --git a/assets/common/item_price_calculation.ron b/assets/common/item_price_calculation.ron index 19281c60e6..f3efc8bb03 100644 --- a/assets/common/item_price_calculation.ron +++ b/assets/common/item_price_calculation.ron @@ -18,7 +18,7 @@ loot_tables: [ (1,"common.loot_tables.loot_table_food"), (0.1,"common.loot_tables.loot_table_humanoids"), (1,"common.loot_tables.loot_table_maneater"), - (0.0001,"common.loot_tables.loot_table_mindflayer"), + (0.0001,"common.loot_tables.mindflayer"), (0.001,"common.loot_tables.loot_table_miniboss"), (0.05,"common.loot_tables.loot_table_raptor"), // loot_table_rocks is dropped by rock monsters, but is also the only source of stones to econsim until cave_scatter information is turned into a loot table diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index c838693584..9fed8ccc4c 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -13,7 +13,6 @@ // Misc (4, "common.items.crafting_ing.empty_vial"), (0.25, "common.items.armor.misc.neck.plain_1"), - (0.001, "common.items.glider.glider_purp"), (0.1, "common.items.glider.glider_blue"), (0.5, "common.items.utility.firework_purple"), (0.5, "common.items.utility.bomb"), @@ -198,12 +197,10 @@ (0.10, "common.items.weapons.sword.bloodsteel-0"), (0.10, "common.items.weapons.sword.bloodsteel-1"), (0.10, "common.items.weapons.sword.bloodsteel-2"), - (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), (0.20, "common.items.weapons.axe.bloodsteel_axe-2"), - (0.001, "common.items.weapons.axe.parashu"), // healing staff (0.25, "common.items.weapons.sceptre.staff_nature"), // staves @@ -212,13 +209,11 @@ (0.10, "common.items.weapons.staff.flamethrower_0"), (0.05, "common.items.weapons.staff.bent_fuse"), (0.05, "common.items.weapons.staff.orc_iron"), - (0.001, "common.items.weapons.staff.phoenix"), // hammers (0.01, "common.items.weapons.hammer.cobalt_hammer-0"), (0.01, "common.items.weapons.hammer.cobalt_hammer-1"), (0.01, "common.items.weapons.hammer.runic_hammer"), (0.1, "common.items.weapons.hammer.ramshead_hammer"), - (0.001, "common.items.weapons.hammer.mjolnir"), // bows (0.20, "common.items.weapons.bow.frostwood-0"), (0.20, "common.items.weapons.bow.frostwood-1"), @@ -226,5 +221,4 @@ (0.10, "common.items.weapons.bow.eldwood-0"), (0.10, "common.items.weapons.bow.eldwood-1"), (0.10, "common.items.weapons.bow.eldwood-2"), - (0.001, "common.items.weapons.bow.sagitta"), ] \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_mindflayer.ron b/assets/common/loot_tables/loot_table_mindflayer.ron deleted file mode 100644 index b5f4b266bc..0000000000 --- a/assets/common/loot_tables/loot_table_mindflayer.ron +++ /dev/null @@ -1,19 +0,0 @@ -[ - // armor - (1, "common.items.armor.cultist.belt"), - (1, "common.items.armor.cultist.chest"), - (1, "common.items.armor.cultist.foot"), - (1, "common.items.armor.cultist.hand"), - (1, "common.items.armor.cultist.pants"), - (1, "common.items.armor.cultist.shoulder"), - (1, "common.items.armor.misc.back.dungeon_purple"), - // weapons - (1, "common.items.weapons.staff.cultist_staff"), - (1, "common.items.weapons.hammer.cultist_purp_2h-0"), - (1, "common.items.weapons.sword.cultist"), - (0.25, "common.items.crafting_ing.mindflayer_bag_damaged"), - (0.2, "common.items.weapons.sceptre.root_evil"), - // misc - (1, "common.items.boss_drops.lantern"), - (0.25, "common.items.glider.glider_purp"), -] diff --git a/assets/common/loot_tables/loot_table_miniboss.ron b/assets/common/loot_tables/loot_table_miniboss.ron index 1d8f6555c9..8c926aca5b 100644 --- a/assets/common/loot_tables/loot_table_miniboss.ron +++ b/assets/common/loot_tables/loot_table_miniboss.ron @@ -12,6 +12,4 @@ (1, "common.items.weapons.staff.cultist_staff"), (1, "common.items.weapons.hammer.cultist_purp_2h-0"), (1, "common.items.weapons.sword.cultist"), - // misc - (0.25, "common.items.boss_drops.lantern"), ] diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index 89dc263dd1..2d2413e15d 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -7,7 +7,6 @@ (0.10, "common.items.weapons.sword.bloodsteel-0"), (0.10, "common.items.weapons.sword.bloodsteel-1"), (0.10, "common.items.weapons.sword.bloodsteel-2"), - (0.01, "common.items.weapons.sword.caladbolg"), // axes (0.20, "common.items.weapons.axe.bloodsteel_axe-0"), (0.20, "common.items.weapons.axe.bloodsteel_axe-1"), @@ -15,7 +14,6 @@ (0.30, "common.items.weapons.axe.cobalt_axe-0"), (0.30, "common.items.weapons.axe.cobalt_axe-1"), (0.10, "common.items.weapons.axe.malachite_axe-0"), - (0.01, "common.items.weapons.axe.parashu"), // healing staff (0.15, "common.items.weapons.sceptre.loops0"), (0.10, "common.items.weapons.sceptre.fork0"), @@ -30,7 +28,6 @@ (0.30, "common.items.weapons.hammer.cobalt_hammer-1"), (0.15, "common.items.weapons.hammer.runic_hammer"), (0.15, "common.items.weapons.hammer.ramshead_hammer"), - (0.01, "common.items.weapons.hammer.mjolnir"), // bows (0.20, "common.items.weapons.bow.frostwood-0"), (0.20, "common.items.weapons.bow.frostwood-1"), @@ -38,5 +35,4 @@ (0.10, "common.items.weapons.bow.eldwood-0"), (0.10, "common.items.weapons.bow.eldwood-1"), (0.10, "common.items.weapons.bow.eldwood-2"), - (0.01, "common.items.weapons.bow.sagitta"), ] \ No newline at end of file diff --git a/assets/common/loot_tables/mindflayer.ron b/assets/common/loot_tables/mindflayer.ron new file mode 100644 index 0000000000..8706a7efeb --- /dev/null +++ b/assets/common/loot_tables/mindflayer.ron @@ -0,0 +1,14 @@ +[ + // Crafting material + (2.0, "common.items.crafting_ing.mindflayer_bag_damaged"), + // Legendary weapons + (1.0, "common.items.weapons.sword.caladbolg"), + (1.0, "common.items.weapons.axe.parashu"), + (1.0, "common.items.weapons.hammer.mjolnir"), + (1.0, "common.items.weapons.bow.sagitta"), + (1.0, "common.items.weapons.staff.phoenix"), + (1.0, "common.items.weapons.sceptre.root_evil"), + // Rare misc items + (0.5, "common.items.boss_drops.lantern"), + (0.5, "common.items.glider.glider_purp"), +] \ No newline at end of file diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 090cb64453..4cccbc707d 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -150,6 +150,7 @@ fn get_tool_kind(kind: &ToolKind) -> String { ToolKind::Spear => "Spear".to_string(), ToolKind::Debug => "Debug".to_string(), ToolKind::Farming => "Farming".to_string(), + ToolKind::Pick => "Pick".to_string(), ToolKind::Unique(_) => "Unique".to_string(), ToolKind::Empty => "Empty".to_string(), } diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index 7af91c00d0..044cccb745 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -833,7 +833,10 @@ impl Floor { "common.loot_tables.loot_table_miniboss", ), 5 => Lottery::::load_expect( - "common.loot_tables.loot_table_mindflayer", + match dynamic_rng.gen_range(0..4) { + 0 => "common.loot_tables.mindflayer", + _ => "common.loot_tables.loot_table_cultists", + }, ), _ => Lottery::::load_expect( "common.loot_tables.loot_table_armor_misc",