From ae22a9816731b9084ff60c47abee11ae667ca742 Mon Sep 17 00:00:00 2001
From: Scott Williams <swilliamsgames@gmail.com>
Date: Sun, 7 Feb 2021 19:04:20 +0000
Subject: [PATCH] Added a miniboss loot table for the stonework defender, made
 damaged bag, glider, and root of evil mindflayer exclusive drops.

---
 CHANGELOG.md                                    |  1 +
 .../common/loot_tables/loot_table_cultists.ron  |  8 --------
 ...ist-leader.ron => loot_table_mindflayer.ron} |  0
 .../common/loot_tables/loot_table_miniboss.ron  | 17 +++++++++++++++++
 world/src/site/dungeon/mod.rs                   |  6 +++---
 5 files changed, 21 insertions(+), 11 deletions(-)
 rename assets/common/loot_tables/{loot_table_boss_cultist-leader.ron => loot_table_mindflayer.ron} (100%)
 create mode 100644 assets/common/loot_tables/loot_table_miniboss.ron

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8072e017dd..c2afc16d3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adjusted most NPCs hitboxes to better fit their models.
 - Changed crafting recipes involving shiny gems to use diamonds instead.
 - Cave scatter now includes all 6 gems.
+- Adjusted Stonework Defender loot table to remove mindflayer drops (bag, staff, glider).
 
 ### Removed
 
diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron
index f6d17a68ce..49308df576 100644
--- a/assets/common/loot_tables/loot_table_cultists.ron
+++ b/assets/common/loot_tables/loot_table_cultists.ron
@@ -203,12 +203,4 @@
     (0.6, "common.items.weapons.bow.horn_longbow-0"),
     (0.2, "common.items.weapons.bow.iron_longbow-0"),
     (0.10, "common.items.weapons.bow.rare_longbow"),
-    // cultist set
-    (0.1, "common.items.armor.belt.cultist_belt"),
-    (0.01, "common.items.armor.chest.cultist_chest_purple"),
-    (0.01, "common.items.armor.foot.cultist_boots"),
-    (0.01, "common.items.armor.hand.cultist_hands_purple"),
-    (0.01, "common.items.armor.pants.cultist_legs_purple"),
-    (0.01, "common.items.armor.shoulder.cultist_shoulder_purple"),
-    (0.005, "common.items.armor.back.dungeon_purple-0"),
 ]
diff --git a/assets/common/loot_tables/loot_table_boss_cultist-leader.ron b/assets/common/loot_tables/loot_table_mindflayer.ron
similarity index 100%
rename from assets/common/loot_tables/loot_table_boss_cultist-leader.ron
rename to assets/common/loot_tables/loot_table_mindflayer.ron
diff --git a/assets/common/loot_tables/loot_table_miniboss.ron b/assets/common/loot_tables/loot_table_miniboss.ron
new file mode 100644
index 0000000000..e44409bf28
--- /dev/null
+++ b/assets/common/loot_tables/loot_table_miniboss.ron
@@ -0,0 +1,17 @@
+[
+    // armor
+    (1, "common.items.armor.belt.cultist_belt"),
+    (1, "common.items.armor.chest.cultist_chest_purple"),
+    (1, "common.items.armor.foot.cultist_boots"),
+    (1, "common.items.armor.hand.cultist_hands_purple"),
+    (1, "common.items.armor.pants.cultist_legs_purple"),
+    (1, "common.items.armor.shoulder.cultist_shoulder_purple"),
+    (1, "common.items.armor.back.dungeon_purple-0"),
+    (1, "common.items.armor.ring.ring_purp_high_0"),
+    // weapons
+    (1, "common.items.weapons.staff.cultist_staff"),
+    (1, "common.items.weapons.hammer.cultist_purp_2h-0"),
+    (1, "common.items.weapons.sword.cultist_purp_2h-0"),
+    // misc    
+    (0.25, "common.items.boss_drops.lantern"),
+]
diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs
index 1891365a55..19f5263128 100644
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@@ -755,10 +755,10 @@ impl Floor {
                                     "common.loot_tables.loot_table_weapon_rare",
                                 ),
                                 4 => Lottery::<String>::load_expect(
-                                    "common.loot_tables.loot_table_boss_cultist-leader",
+                                    "common.loot_tables.loot_table_miniboss",
                                 ),
                                 5 => Lottery::<String>::load_expect(
-                                    "common.loot_tables.loot_table_boss_cultist-leader",
+                                    "common.loot_tables.loot_table_mindflayer",
                                 ),
                                 _ => Lottery::<String>::load_expect(
                                     "common.loot_tables.loot_table_armor_misc",
@@ -950,7 +950,7 @@ impl Floor {
                                     "common.loot_tables.loot_table_weapon_rare",
                                 ),
                                 5 => Lottery::<String>::load_expect(
-                                    "common.loot_tables.loot_table_boss_cultist-leader",
+                                    "common.loot_tables.loot_table_miniboss",
                                 ),
                                 _ => Lottery::<String>::load_expect(
                                     "common.loot_tables.loot_table_armor_misc",