Execute asset migration

assets/common/entity/calendar/christmas/aggressive/yeti.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Yeti"),
     body: RandomWith("yeti"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.calendar.christmas.yeti"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/fallback/boss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Crazy Sheep"),
     body: RandomWith("sheep"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.fallback"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/fallback/enemy.ron

@@ -1,16 +1,21 @@
+#![enable(implicit_some)]
 (
     name: Name("Yan Hus"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Hands(TwoHanded(Choice([
-        (1, Some(Item("common.items.weapons.tool.broom"))),
-        (1, Some(Item("common.items.weapons.tool.hoe"))),
-        (1, Some(Item("common.items.weapons.tool.pickaxe"))),
-        (1, Some(Item("common.items.weapons.tool.rake"))),
-        (1, Some(Item("common.items.weapons.tool.shovel-0"))),
-        (1, Some(Item("common.items.weapons.tool.shovel-1"))),
-        (1, Some(Item("common.items.weapons.bow.bone-1"))),
-    ]))),
     loot: LootTable("common.loot_tables.fallback"),
+    inventory: (
+        loadout: Inline((
+            active_hands: ([
+                (1, "common.items.weapons.tool.broom"),
+                (1, "common.items.weapons.tool.hoe"),
+                (1, "common.items.weapons.tool.pickaxe"),
+                (1, "common.items.weapons.tool.rake"),
+                (1, "common.items.weapons.tool.shovel-0"),
+                (1, "common.items.weapons.tool.shovel-1"),
+                (1, "common.items.weapons.bow.bone-1"),
+            ], None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/fallback/miniboss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Big Goose"),
     body: RandomWith("goose"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.fallback"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/gnarling/chieftain.ron

@@ -1,15 +1,17 @@
+// Done for health reasons
+#![enable(implicit_some)]
 (
     name: Name("Gnarling Chieftain"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain")),
-        base_asset: Loadout("common.loadout.dungeon.gnarling.chieftain"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-0.boss"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.gnarling.chieftain"),
+            active_hands: ("common.items.npc_weapons.biped_small.gnarling.chieftain", None),
+        )),
+    ),
     meta: [
-        // Done for health reasons
         SkillSetAsset("common.skillset.preset.rank5.fullskill"),
     ],
 )

assets/common/entity/dungeon/gnarling/harvester.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Harvester"),
     body: RandomWith("harvester"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-0.boss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/gnarling/logger.ron

@@ -1,12 +1,14 @@
+#![enable(implicit_some)]
 (
     name: Name("Gnarling Logger"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.logger")),
-        base_asset: Loadout("common.loadout.dungeon.gnarling.logger"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.gnarling.logger"),
+            active_hands: ("common.items.npc_weapons.biped_small.gnarling.logger", None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/gnarling/mandragora.ron

@@ -1,12 +1,14 @@
-EntityConfig (
+#![enable(implicit_some)]
+(
     name: Name("Mandragora"),
     body: RandomWith("mandragora"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.mandragora")),
-        base_asset: Loadout("common.loadout.dungeon.gnarling.mandragora"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.gnarling.mandragora"),
+            active_hands: ("common.items.npc_weapons.biped_small.mandragora", None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/gnarling/mugger.ron

@@ -1,12 +1,14 @@
+#![enable(implicit_some)]
 (
     name: Name("Gnarling Mugger"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.mugger")),
-        base_asset: Loadout("common.loadout.dungeon.gnarling.mugger"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.gnarling.mugger"),
+            active_hands: ("common.items.npc_weapons.biped_small.gnarling.mugger", None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/gnarling/stalker.ron

@@ -1,12 +1,14 @@
+#![enable(implicit_some)]
 (
     name: Name("Gnarling Stalker"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.stalker")),
-        base_asset: Loadout("common.loadout.dungeon.gnarling.stalker"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.gnarling.stalker"),
+            active_hands: ("common.items.npc_weapons.biped_small.gnarling.stalker", None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/gnarling/woodgolem.ron

@@ -1,8 +1,11 @@
-EntityConfig (
+#![enable(implicit_some)]
+(
     name: Name("Wooden Golem"),
     body: RandomWith("woodgolem"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-0.miniboss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-1/boss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Yeti"),
     body: RandomWith("yeti"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-1.boss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-1/hunter.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Adlet Hunter"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.hunter")),
-        base_asset: Loadout("common.loadout.dungeon.tier-1.hunter"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-1.hunter"),
+            active_hands: ("common.items.npc_weapons.biped_small.adlet.hunter", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],

assets/common/entity/dungeon/tier-1/icepicker.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Adlet Icepicker"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.icepicker")),
-        base_asset: Loadout("common.loadout.dungeon.tier-1.icepicker"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-1.icepicker"),
+            active_hands: ("common.items.npc_weapons.biped_small.adlet.icepicker", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],

assets/common/entity/dungeon/tier-1/rat.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Rat"),
     body: RandomWith("rat"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_small.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-1/tracker.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Adlet Tracker"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.tracker")),
-        base_asset: Loadout("common.loadout.dungeon.tier-1.tracker"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-1.tracker"),
+            active_hands: ("common.items.npc_weapons.biped_small.adlet.tracker", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],

assets/common/entity/dungeon/tier-2/boss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Tidal Warrior"),
     body: RandomWith("tidalwarrior"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-2.boss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-2/hakulaq.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Hakulaq"),
     body: RandomWith("hakulaq"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.fanged"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-2/sniper.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Sahagin Sniper"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.sniper")),
-        base_asset: Loadout("common.loadout.dungeon.tier-2.sniper"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-2.sniper"),
+            active_hands: ("common.items.npc_weapons.biped_small.sahagin.sniper", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank2.fullskill"),
     ],

assets/common/entity/dungeon/tier-2/sorcerer.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Sahagin Sorcerer"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.sorcerer")),
-        base_asset: Loadout("common.loadout.dungeon.tier-2.sorcerer"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-2.sorcerer"),
+            active_hands: ("common.items.npc_weapons.biped_small.sahagin.sorcerer", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank2.fullskill"),
     ],

assets/common/entity/dungeon/tier-2/spearman.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Sahagin Spearman"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.spearman")),
-        base_asset: Loadout("common.loadout.dungeon.tier-2.spearman"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-2.spearman"),
+            active_hands: ("common.items.npc_weapons.biped_small.sahagin.spearman", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank2.fullskill"),
     ],

assets/common/entity/dungeon/tier-3/archer.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Haniwa Archer"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.archer")),
-        base_asset: Loadout("common.loadout.dungeon.tier-3.archer"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-3.archer"),
+            active_hands: ("common.items.npc_weapons.biped_small.haniwa.archer", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/dungeon/tier-3/bonerattler.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Bonerattler"),
     body: RandomWith("bonerattler"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.carapace"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-3/boss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Clay Golem"),
     body: RandomWith("claygolem"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-3.boss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-3/guard.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Haniwa Guard"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.guard")),
-        base_asset: Loadout("common.loadout.dungeon.tier-3.guard"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-3.guard"),
+            active_hands: ("common.items.npc_weapons.biped_small.haniwa.guard", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/dungeon/tier-3/sentry.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Haniwa Sentry"),
     body: Exact(Object(HaniwaSentry)),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: Item("common.items.crafting_ing.stones"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-3/soldier.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Haniwa Soldier"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.soldier")),
-        base_asset: Loadout("common.loadout.dungeon.tier-3.soldier"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-3.soldier"),
+            active_hands: ("common.items.npc_weapons.biped_small.haniwa.soldier", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/dungeon/tier-4/boss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Minotaur"),
     body: RandomWith("minotaur"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-4.boss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-4/hoplite.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Myrmidon Hoplite"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.hoplite")),
-        base_asset: Loadout("common.loadout.dungeon.tier-4.hoplite"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-4.hoplite"),
+            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.hoplite", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank4.fullskill"),
     ],

assets/common/entity/dungeon/tier-4/marksman.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Myrmidon Marksman"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.marksman")),
-        base_asset: Loadout("common.loadout.dungeon.tier-4.marksman"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-4.marksman"),
+            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.marksman", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank4.fullskill"),
     ],

assets/common/entity/dungeon/tier-4/miniboss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Dullahan"),
     body: RandomWith("dullahan"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-4.miniboss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-4/strategian.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Myrmidon Strategian"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.strategian")),
-        base_asset: Loadout("common.loadout.dungeon.tier-4.strategian"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-4.strategian"),
+            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.strategian", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank4.fullskill"),
     ],

assets/common/entity/dungeon/tier-5/beastmaster.ron

@@ -1,17 +1,19 @@
+#![enable(implicit_some)]
 (
     name: Name("Beastmaster"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Choice([
-            (1, Some(Item("common.items.weapons.axe.malachite_axe-0"))),
-            (1, Some(Item("common.items.weapons.sword.bloodsteel-1"))),
-            (1, Some(Item("common.items.weapons.bow.velorite"))),
-        ])),
-        base_asset: Loadout("common.loadout.dungeon.tier-5.beastmaster"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-5.beastmaster"),
+            active_hands: ([
+                (1, "common.items.weapons.axe.malachite_axe-0"),
+                (1, "common.items.weapons.sword.bloodsteel-1"),
+                (1, "common.items.weapons.bow.velorite"),
+            ], None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank5.fullskill"),
     ],

assets/common/entity/dungeon/tier-5/boss.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Mindflayer"),
     body: RandomWith("mindflayer"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-5.boss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-5/cultist.ron

@@ -1,21 +1,23 @@
+#![enable(implicit_some)]
 (
     name: Name("Cultist"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Choice([
-            (2, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),
-            (4, Some(Item("common.items.weapons.sword.cultist"))),
-            (2, Some(Item("common.items.weapons.staff.cultist_staff"))),
-            (2, Some(Item("common.items.weapons.hammer.cultist_purp_2h-0"))),
-            (2, Some(Item("common.items.weapons.hammer_1h.orichalcum-0"))),
-            (2, Some(Item("common.items.weapons.bow.velorite"))),
-            (1, Some(Item("common.items.weapons.sceptre.sceptre_velorite_0"))),
-        ])),
-        base_asset: Loadout("common.loadout.dungeon.tier-5.cultist"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-5.cultist"),
+            active_hands: ([
+                (2, "common.items.weapons.axe_1h.orichalcum-0"),
+                (4, "common.items.weapons.sword.cultist"),
+                (2, "common.items.weapons.staff.cultist_staff"),
+                (2, "common.items.weapons.hammer.cultist_purp_2h-0"),
+                (2, "common.items.weapons.hammer_1h.orichalcum-0"),
+                (2, "common.items.weapons.bow.velorite"),
+                (1, "common.items.weapons.sceptre.sceptre_velorite_0"),
+            ], None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank5.fullskill"),
     ],

assets/common/entity/dungeon/tier-5/hound.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Tamed Darkhound"),
     body: RandomWith("darkhound"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-5.minion"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-5/husk.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Cultist Husk"),
     body: RandomWith("husk"),
     alignment: Alignment(Enemy),
-    loadout: Asset(Loadout("common.loadout.dungeon.tier-5.husk")),
     loot: LootTable("common.loot_tables.dungeon.tier-5.minion"),
+    inventory: (
+        loadout: Asset("common.loadout.dungeon.tier-5.husk"),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-5/husk_brute.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Husk Brute"),
     body: RandomWith("husk_brute"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-5/turret.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Possessed Turret"),
     body: Exact(Object(Crossbow)),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: Item("common.items.crafting_ing.twigs"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-5/warlock.ron

@@ -1,15 +1,17 @@
+#![enable(implicit_some)]
 (
     name: Name("Cultist Warlock"),
     body: RandomWith("cultist_warlock"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Choice([
-            (1.5, Some(Item("common.items.npc_weapons.staff.bipedlarge-cultist"))),
-            (1, Some(Item("common.items.npc_weapons.bow.bipedlarge-velorite"))),
-        ])),
-        base_asset: Loadout("common.loadout.dungeon.tier-5.warlock"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-5.warlock"),
+            active_hands: ([
+                (1, "common.items.npc_weapons.staff.bipedlarge-cultist"),
+                (1, "common.items.npc_weapons.bow.bipedlarge-velorite"),
+            ], None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/dungeon/tier-5/warlord.ron

@@ -1,15 +1,17 @@
+#![enable(implicit_some)]
 (
     name: Name("Cultist Warlord"),
     body: RandomWith("cultist_warlord"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Choice([
-            (1.5, Some(Item("common.items.npc_weapons.sword.bipedlarge-cultist"))),
-            (1, Some(Item("common.items.npc_weapons.hammer.bipedlarge-cultist"))),
-        ])),
-        base_asset: Loadout("common.loadout.dungeon.tier-5.warlord"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.dungeon.tier-5.warlord"),
+            active_hands: ([
+                (1, "common.items.npc_weapons.sword.bipedlarge-cultist"),
+                (1, "common.items.npc_weapons.hammer.bipedlarge-cultist"),
+            ], None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/spot/dwarf_grave_robber.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Grave Robber"),
     body: RandomWith("dwarf"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")),
-        base_asset: Loadout("common.loadout.spots.dwarf_graverobber"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.spots.bandit"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.spots.dwarf_graverobber"),
+            active_hands: ("common.items.weapons.hammer.steel_hammer-3", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/spot/gnome/spear.ron

@@ -1,12 +1,14 @@
+#![enable(implicit_some)]
 (
     name: Name("Gnome"),
     body: RandomWith("gnome"),
     alignment: Alignment(Wild),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.hoplite")),
-        base_asset: Loadout("common.loadout.spots.gnome"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.spots.gnome"),
+            active_hands: ("common.items.npc_weapons.biped_small.myrmidon.hoplite", None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/spot/grim_salvager.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Grim Salvager"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-0")),
-        base_asset: Loadout("common.loadout.spots.dwarf_graverobber"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.spots.bandit"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.spots.dwarf_graverobber"),
+            active_hands: ("common.items.weapons.hammer.steel_hammer-0", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],

assets/common/entity/spot/pirate.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Pirate"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: Paired(Item("common.items.weapons.sword_1h.iron-2")),
-        base_asset: Loadout("common.loadout.spots.pirate"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.spots.pirate"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.spots.pirate"),
+            active_hands: ("common.items.weapons.sword_1h.iron-2", "common.items.weapons.sword_1h.iron-2"),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank2.fullskill"),
     ],

assets/common/entity/spot/saurok.ron

@@ -1,8 +1,13 @@
+#![enable(implicit_some)]
 (
     name: Name("Saurok Bandit"),
     body: RandomWith("saurok_mighty"),
     alignment: Alignment(Enemy),
-    loadout: Hands(TwoHanded(Item("common.items.npc_weapons.bow.saurok_bow"))),
     loot: LootTable("common.loot_tables.creature.biped_large.saurok"),
+    inventory: (
+        loadout: Inline((
+            active_hands: ("common.items.npc_weapons.bow.saurok_bow", None),
+        )),
+    ),
     meta: [],
 )

assets/common/entity/spot/witch_dark.ron

@@ -1,13 +1,15 @@
+#![enable(implicit_some)]
 (
     name: Name("Witch"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")),
-        base_asset: Loadout("common.loadout.spots.witch"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.spots.witch"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.spots.witch"),
+            active_hands: ("common.items.weapons.sceptre.belzeshrub", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/template.ron

@@ -1,15 +1,17 @@
 /// Template file for EntityConfig, check documentation in code for more
 /// By the time of writing this comment it lives in common/src/generation.rs
+#![enable(implicit_some)]
 (
     name: Name("Paddy"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
-    loadout: Extended(
-        hands: TwoHanded(Item("common.items.weapons.sword.cultist")),
-        base_asset: Loadout("common.loadout.village.merchant"),
-        inventory: [],
-    ),
     loot: LootTable("common.loot_tables.creature.humanoid"),
+    inventory: (
+        loadout: Inline((
+            inherit: Asset("common.loadout.village.merchant"),
+            active_hands: ("common.items.weapons.sword.cultist", None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/village/alchemist.ron

@@ -1,23 +1,25 @@
+#![enable(implicit_some)]
 (
     name: Name("Alchemist"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-
+    loot: LootTable("common.loot_tables.creature.humanoid"),
-    loadout: Extended(
+    inventory: (
-        hands: TwoHanded(Choice([
+        loadout: Inline((
-            (1, Some(Item("common.items.weapons.tool.broom"))),
+            inherit: Asset("common.loadout.village.alchemist"),
-            (1, Some(Item("common.items.weapons.tool.hoe"))),
+            active_hands: ([
-            (1, Some(Item("common.items.weapons.tool.pickaxe"))),
+                (1, "common.items.weapons.tool.broom"),
-            (1, Some(Item("common.items.weapons.tool.rake"))),
+                (1, "common.items.weapons.tool.hoe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-0"))),
+                (1, "common.items.weapons.tool.pickaxe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-1"))),
+                (1, "common.items.weapons.tool.rake"),
-        ])),
+                (1, "common.items.weapons.tool.shovel-0"),
-        base_asset: Loadout("common.loadout.village.alchemist"),
+                (1, "common.items.weapons.tool.shovel-1"),
-        inventory: [
+            ], None),
+        )),
+        items: [
             (10, "common.items.consumable.potion_big"),
         ],
     ),
-    loot: LootTable("common.loot_tables.creature.humanoid"),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/village/blacksmith.ron

@@ -1,23 +1,25 @@
+#![enable(implicit_some)]
 (
     name: Name("Blacksmith"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-
+    loot: LootTable("common.loot_tables.creature.humanoid"),
-    loadout: Extended(
+    inventory: (
-        hands: TwoHanded(Choice([
+        loadout: Inline((
-            (1, Some(Item("common.items.weapons.tool.broom"))),
+            inherit: Asset("common.loadout.village.blacksmith"),
-            (1, Some(Item("common.items.weapons.tool.hoe"))),
+            active_hands: ([
-            (1, Some(Item("common.items.weapons.tool.pickaxe"))),
+                (1, "common.items.weapons.tool.broom"),
-            (1, Some(Item("common.items.weapons.tool.rake"))),
+                (1, "common.items.weapons.tool.hoe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-0"))),
+                (1, "common.items.weapons.tool.pickaxe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-1"))),
+                (1, "common.items.weapons.tool.rake"),
-        ])),
+                (1, "common.items.weapons.tool.shovel-0"),
-        base_asset: Loadout("common.loadout.village.blacksmith"),
+                (1, "common.items.weapons.tool.shovel-1"),
-        inventory: [
+            ], None),
+        )),
+        items: [
             (10, "common.items.consumable.potion_big"),
         ],
     ),
-    loot: LootTable("common.loot_tables.creature.humanoid"),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/village/chef.ron

@@ -1,23 +1,25 @@
+#![enable(implicit_some)]
 (
     name: Name("Chef"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-
+    loot: LootTable("common.loot_tables.creature.humanoid"),
-    loadout: Extended(
+    inventory: (
-        hands: TwoHanded(Choice([
+        loadout: Inline((
-            (1, Some(Item("common.items.weapons.tool.broom"))),
+            inherit: Asset("common.loadout.village.chef"),
-            (1, Some(Item("common.items.weapons.tool.hoe"))),
+            active_hands: ([
-            (1, Some(Item("common.items.weapons.tool.pickaxe"))),
+                (1, "common.items.weapons.tool.broom"),
-            (1, Some(Item("common.items.weapons.tool.rake"))),
+                (1, "common.items.weapons.tool.hoe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-0"))),
+                (1, "common.items.weapons.tool.pickaxe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-1"))),
+                (1, "common.items.weapons.tool.rake"),
-        ])),
+                (1, "common.items.weapons.tool.shovel-0"),
-        base_asset: Loadout("common.loadout.village.chef"),
+                (1, "common.items.weapons.tool.shovel-1"),
-        inventory: [
+            ], None),
+        )),
+        items: [
             (10, "common.items.consumable.potion_big"),
         ],
     ),
-    loot: LootTable("common.loot_tables.creature.humanoid"),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/village/dummy.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Name("Training Dummy"),
     body: Exact(Object(TrainingDummy)),
     alignment: Alignment(Passive),
-    loadout: FromBody,
     loot: Nothing,
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/village/guard.ron

@@ -1,21 +1,22 @@
+#![enable(implicit_some)]
 (
     name: Name("Guard"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-
+    loot: LootTable("common.loot_tables.creature.humanoid"),
-    loadout: Extended(
+    inventory: (
-        hands: TwoHanded(Choice([
+        loadout: Inline((
-            (1, Some(Item("common.items.weapons.sword.cobalt-0"))),
+            inherit: Asset("common.loadout.village.guard"),
-            (2, Some(Item("common.items.weapons.bow.metal-2"))),
+            active_hands: ([
-            (1, Some(Item("common.items.weapons.axe.cobalt_axe-0"))),
+                (1, "common.items.weapons.sword.cobalt-0"),
-        ])),
+                (2, "common.items.weapons.bow.metal-2"),
-        base_asset: Loadout("common.loadout.village.guard"),
+                (1, "common.items.weapons.axe.cobalt_axe-0"),
-        inventory: [
+            ], None),
+        )),
+        items: [
             (25, "common.items.consumable.potion_big"),
         ],
     ),
-
-    loot: LootTable("common.loot_tables.creature.humanoid"),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/village/merchant.ron

@@ -1,14 +1,19 @@
+#![enable(implicit_some)]
 (
     name: Name("Merchant"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-    loadout: Hands(TwoHanded(Choice([
-        (2, Some(Item("common.items.weapons.bow.eldwood-0"))),
-        (1, Some(Item("common.items.weapons.sword.steel-0"))),
-        (1, Some(Item("common.items.weapons.sword_1h.bloodsteel-0"))),
-        (2, Some(Item("common.items.weapons.staff.flamethrower_0"))),
-    ]))),
     loot: LootTable("common.loot_tables.creature.humanoid"),
+    inventory: (
+        loadout: Inline((
+            active_hands: ([
+                (2, "common.items.weapons.bow.eldwood-0"),
+                (1, "common.items.weapons.sword.steel-0"),
+                (1, "common.items.weapons.sword_1h.bloodsteel-0"),
+                (2, "common.items.weapons.staff.flamethrower_0"),
+            ], None),
+        )),
+    ),
     meta: [
         SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],

assets/common/entity/village/mountaineer.ron

@@ -1,22 +1,24 @@
+#![enable(implicit_some)]
 (
     name: Name("Mountaineer"),
     body: RandomWith("orc"),
     alignment: Alignment(Npc),
-
+    loot: LootTable("common.loot_tables.creature.humanoid"),
-    loadout: Extended(
+    inventory: (
-        hands: TwoHanded(Choice([
+        loadout: Inline((
-            (1, Some(Item("common.items.weapons.tool.broom"))),
+            inherit: Asset("common.loadout.village.mountaineer"),
-            (1, Some(Item("common.items.weapons.tool.hoe"))),
+            active_hands: ([
-            (1, Some(Item("common.items.weapons.tool.pickaxe"))),
+                (1, "common.items.weapons.tool.broom"),
-            (1, Some(Item("common.items.weapons.tool.rake"))),
+                (1, "common.items.weapons.tool.hoe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-0"))),
+                (1, "common.items.weapons.tool.pickaxe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-1"))),
+                (1, "common.items.weapons.tool.rake"),
-        ])),
+                (1, "common.items.weapons.tool.shovel-0"),
-        base_asset: Loadout("common.loadout.village.mountaineer"),
+                (1, "common.items.weapons.tool.shovel-1"),
-        inventory: [
+            ], None),
+        )),
+        items: [
             (10, "common.items.consumable.potion_big"),
         ],
     ),
-    loot: LootTable("common.loot_tables.creature.humanoid"),
     meta: [],
 )

assets/common/entity/village/villager.ron

@@ -1,23 +1,24 @@
+#![enable(implicit_some)]
 (
     name: Name("Villager"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
-
+    loot: LootTable("common.loot_tables.creature.humanoid"),
-    loadout: Extended(
+    inventory: (
-        hands: TwoHanded(Choice([
+        loadout: Inline((
-            (1, Some(Item("common.items.weapons.tool.broom"))),
+            inherit: Asset("common.loadout.village.villager"),
-            (1, Some(Item("common.items.weapons.tool.hoe"))),
+            active_hands: ([
-            (1, Some(Item("common.items.weapons.tool.pickaxe"))),
+                (1, "common.items.weapons.tool.broom"),
-            (1, Some(Item("common.items.weapons.tool.rake"))),
+                (1, "common.items.weapons.tool.hoe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-0"))),
+                (1, "common.items.weapons.tool.pickaxe"),
-            (1, Some(Item("common.items.weapons.tool.shovel-1"))),
+                (1, "common.items.weapons.tool.rake"),
-        ])),
+                (1, "common.items.weapons.tool.shovel-0"),
-        base_asset: Loadout("common.loadout.village.villager"),
+                (1, "common.items.weapons.tool.shovel-1"),
-        inventory: [
+            ], None),
+        )),
+        items: [
             (10, "common.items.consumable.potion_big"),
         ],
     ),
-
-    loot: LootTable("common.loot_tables.creature.humanoid"),
     meta: [],
 )

assets/common/entity/wild/aggressive/akhlut.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("akhlut"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/alligator.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("alligator"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/antlion.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("antlion"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.arthropod.carapace"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/archaeos.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("archaeos"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.theropod.plate"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/asp.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("asp"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.venemous"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/basilisk.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("basilisk"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.basilisk"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/batfox.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("batfox"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_small.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/bear.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("bear"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.fanged"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/black_widow.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("black_widow"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.arthropod.venom"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/blue_oni.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("oni_blue"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.default"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/bonerattler.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("bonerattler"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.carapace"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/cave_salamander.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("salamander"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.salamander"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/cave_spider.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("cave_spider"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.arthropod.web"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/cave_troll.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("troll_cave"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.troll"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/cockatrice.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("cockatrice"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.bird_large.cockatrice"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/crocodile.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("crocodile"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/cyclops.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("cyclops"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.default"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/deadwood.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("deadwood"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.deadwood"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/dodarock.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("dodarock"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_small.dodarock"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/dreadhorn.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("dreadhorn"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.dreadhorn"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/frostfang.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("frostfang"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/grolgar.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("grolgar"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.fanged"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/hakulaq.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("hakulaq"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.fanged"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/horn_beetle.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("horn_beetle"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.arthropod.carapace"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/hyena.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("hyena"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_small.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/icedrake.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("icedrake"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/icepike.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("icepike"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.fish"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/lavadrake.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("lavadrake"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.carapace"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/lion.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("lion"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.clawed"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/mammoth.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("mammoth"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.mammoth"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/maneater.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("maneater"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.maneater"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/mighty_saurok.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("saurok_mighty"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.saurok"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/monitor.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("monitor"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/mountain_troll.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("troll_mountain"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.troll"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/ngoubou.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("ngoubou"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.horned"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/ntouka.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("ntouka"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.theropod.plate"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/occult_saurok.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("saurok_occult"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.saurok"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/odonto.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("odonto"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.theropod.generic"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/ogre.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("ogre"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.default"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/red_oni.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("oni_red"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.biped_large.default"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/roc.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("roc"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.bird_large.roc"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/rocksnapper.ron

@@ -1,8 +1,11 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: RandomWith("rocksnapper"),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_low.carapace"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/roshwalr.ron

@@ -1,3 +1,4 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: Exact(QuadrupedMedium((
@@ -5,7 +6,9 @@
         body_type: Male,
     ))),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )

assets/common/entity/wild/aggressive/roshwalr_boss.ron

@@ -1,3 +1,4 @@
+#![enable(implicit_some)]
 (
     name: Automatic,
     body: Exact(QuadrupedMedium((
@@ -5,7 +6,9 @@
         body_type: Female,
     ))),
     alignment: Alignment(Enemy),
-    loadout: FromBody,
     loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
+    inventory: (
+        loadout: FromBody,
+    ),
     meta: [],
 )