Merge branch 'swilliams/mindflayer-loot-table' into 'master'

Made Mindflayer drops exclusive to the Mindflayer.

See merge request veloren/veloren!1762

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
 

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"),
 ]

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"),
+]

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",