Merge branch 'qsto/bosses_loot_overhaul' into 'master'

Made sagitta and orange monarch obtainable again

See merge request veloren/veloren!4104

assets/common/entity/dungeon/adlet/elder.ron

@@ -3,7 +3,7 @@
     name: Automatic,
     body: RandomWith("adlet_elder"),
     alignment: Alignment(Enemy),
-    loot: MultiDrop(LootTable("common.loot_tables.dungeon.adlet.elder"), 2, 2),
+    loot: LootTable("common.loot_tables.dungeon.adlet.elder"),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/dungeon/myrmidon/cyclops.ron

@@ -3,7 +3,12 @@
     name: Automatic,
     body: RandomWith("cyclops"),
     alignment: Alignment(Enemy),
-    loot: LootTable("common.loot_tables.creature.biped_large.cyclops"),
+    loot: All([
+        // Hat, wood and lantern, has a lower chance of dropping
+        LootTable("common.loot_tables.dungeon.myrmidon.miniboss"),
+        // Materials, always dropped
+        LootTable("common.loot_tables.dungeon.myrmidon.miniboss_extra"),
+    ]),
     inventory: (
         loadout: FromBody,
     ),

assets/common/entity/wild/peaceful/phoenix.ron

@@ -3,7 +3,12 @@
     name: Automatic,
     body: RandomWith("phoenix"),
     alignment: Alignment(Wild),
-    loot: LootTable("common.loot_tables.creature.bird_large.phoenix"),
+    loot: All([
+        // Bow and glider, has a lower chance of dropping
+        LootTable("common.loot_tables.creature.bird_large.phoenix"),
+        // Phoenix feathers and food, always dropped
+        LootTable("common.loot_tables.creature.bird_large.phoenix_extra")
+    ]),
     inventory: (
         loadout: FromBody,
     ),

assets/common/loot_tables/creature/bird_large/phoenix.ron

@@ -1,7 +1,5 @@
 [
-  (1.8, All([
-            MultiDrop(Item("common.items.food.meat.bird_large_raw"), 3, 4),
-            MultiDrop(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1, 3),
-        ],
-   )),
+  (1.2, Nothing),
+  (0.4, Item("common.items.glider.monarch")),
+  (0.4, Item("common.items.weapons.bow.sagitta")),
 ]

assets/common/loot_tables/creature/bird_large/phoenix_extra.ron

@@ -0,0 +1,7 @@
+[
+    // Extra materials dropped by phoenix
+    (1.0, All([
+        MultiDrop(Item("common.items.food.meat.bird_large_raw"), 3, 4),
+        MultiDrop(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1, 3),
+    ])),
+]

assets/common/loot_tables/dungeon/dwarven_quarry/cyclops.ron

@@ -1,13 +1,8 @@
 [
-  (1.9, All([
+  (1.0, All([
         Item("common.items.keys.quarry_keys.cyclops_eye"),
         MultiDrop(Item("common.items.utility.coins"), 200, 500),
         MultiDrop(Item("common.items.mineral.ingot.iron"), 5, 10),
         ],
    )),
-  (0.1, All([
-        Item("common.items.keys.quarry_keys.cyclops_eye"),
-        Item("common.items.weapons.hammer.mjolnir"),
-        ],
-   )),
 ]

assets/common/loot_tables/dungeon/myrmidon/miniboss.ron

@@ -1,14 +1,9 @@
 [
-    // Armor
-    (2.0, LootTable("common.loot_tables.weapons.tier-5")),
-    (2.0, LootTable("common.loot_tables.armor.tier-5")),
-    // Consumables
-    (5.0, MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8)),
-    // lantern
-    (1.0, Item("common.items.lantern.blue_0")),
-    // Gear
-    (2.0, Item("common.items.armor.misc.head.mitre")),
-    // Crafting material
-    // Allow for Eldwood to drop till entity droppers are implemented
-    (1.0, MultiDrop(Item("common.items.log.eldwood"), 2, 4)),
+    (1.05, Nothing),
+    // Lantern drop
+    (0.15, Item("common.items.lantern.blue_0")),
+    // Hat drop
+    (0.3, Item("common.items.armor.misc.head.mitre")),
+    // Allow for Eldwood to drop until entity droppers are implemented
+    (0.5, Item("common.items.log.eldwood")),
 ]

assets/common/loot_tables/dungeon/myrmidon/miniboss_extra.ron

@@ -0,0 +1,8 @@
+[
+    // Mats, always dropped
+    (1.0, All([
+        MultiDrop(Item("common.items.utility.coins"), 200, 500),
+        MultiDrop(Item("common.items.mineral.ingot.iron"), 5, 10),
+        MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8),
+    ])),
+]