Merge branch 'juliancoffee/overworld_assetization' into 'master'

Wildlife assetization

See merge request veloren/veloren!2591

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Crazy Sheep"),
+    name: Name("Crazy Sheep"),
-    body: Some(RandomWith("sheep")),
+    body: RandomWith("sheep"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.fallback")),
+    loot: LootTable("common.loot_tables.fallback"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,10 +1,11 @@
 EntityConfig (
-    name: Some("Yan Hus"),
+    name: Name("Yan Hus"),
-    body: Some(RandomWith("humanoid")),
+    body: RandomWith("humanoid"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.fallback")),
+    loot: LootTable("common.loot_tables.fallback"),
 
-    main_tool: Some(Choice([
+    hands: TwoHanded(Choice([
         (1.0, Some(Item("common.items.weapons.tool.broom"))),
         (1.0, Some(Item("common.items.weapons.tool.hoe"))),
         (1.0, Some(Item("common.items.weapons.tool.pickaxe"))),
@@ -13,8 +14,6 @@ EntityConfig (
         (1.0, Some(Item("common.items.weapons.tool.shovel-1"))),
         (1.0, Some(Item("common.items.weapons.bow.bone-1"))),
     ])),
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Big Goose"),
+    name: Name("Big Goose"),
-    body: Some(RandomWith("goose")),
+    body: RandomWith("goose"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.fallback")),
+    loot: LootTable("common.loot_tables.fallback"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Harvester"),
+    name: Name("Harvester"),
-    body: Some(RandomWith("harvester")),
+    body: RandomWith("harvester"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.boss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.boss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

assets/common/entity/dungeon/tier-0/bow.ron

@@ -1,12 +1,14 @@
 EntityConfig (
-    name: Some("Gnarling Stalker"),
+    name: Name("Gnarling Stalker"),
-    body: Some(RandomWith("gnarling")),
+    body: RandomWith("gnarling"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-0.gnarling"),
+    meta: [
-    skillset_asset: Some("common.skillset.dungeon.tier-0.bow"),
+        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        SkillSetAsset("common.skillset.dungeon.tier-0.bow"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Deadwood"),
+    name: Name("Deadwood"),
-    body: Some(RandomWith("deadwood")),
+    body: RandomWith("deadwood"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.miniboss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.miniboss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

assets/common/entity/dungeon/tier-0/spear.ron

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Gnarling Mugger"),
+    name: Name("Gnarling Mugger"),
-    body: Some(RandomWith("gnarling")),
+    body: RandomWith("gnarling"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.wooden_spear")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.wooden_spear")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-0.gnarling"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+    ],
 )

assets/common/entity/dungeon/tier-0/staff.ron

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Gnarling Shaman"),
+    name: Name("Gnarling Shaman"),
-    body: Some(RandomWith("gnarling")),
+    body: RandomWith("gnarling"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.gnoll_staff")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.gnoll_staff")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-0.gnarling"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Yeti"),
+    name: Name("Yeti"),
-    body: Some(RandomWith("yeti")),
+    body: RandomWith("yeti"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.boss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-1.boss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,14 @@
 EntityConfig (
-    name: Some("Adlet Tracker"),
+    name: Name("Adlet Tracker"),
-    body: Some(RandomWith("adlet")),
+    body: RandomWith("adlet"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.adlet_bow")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.adlet_bow")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-1.adlet_bow"),
+    meta: [
-    skillset_asset: Some("common.skillset.dungeon.tier-1.bow"),
+        LoadoutAsset("common.loadout.dungeon.tier-1.adlet_bow"),
+        SkillSetAsset("common.skillset.dungeon.tier-1.bow"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Rat"),
+    name: Name("Rat"),
-    body: Some(RandomWith("rat")),
+    body: RandomWith("rat"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.creature.quad_small.generic")),
+    loot: LootTable("common.loot_tables.creature.quad_small.generic"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Adlet Hunter"),
+    name: Name("Adlet Hunter"),
-    body: Some(RandomWith("adlet")),
+    body: RandomWith("adlet"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.wooden_spear")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.wooden_spear")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-1.adlet_spear"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
+    ],
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Adlet Shaman"),
+    name: Name("Adlet Shaman"),
-    body: Some(RandomWith("adlet")),
+    body: RandomWith("adlet"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-1.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.gnoll_staff")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.adlet.gnoll_staff")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-1.adlet_spear"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Tidal Warrior"),
+    name: Name("Tidal Warrior"),
-    body: Some(RandomWith("tidalwarrior")),
+    body: RandomWith("tidalwarrior"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-2.boss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-2.boss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,14 @@
 EntityConfig (
-    name: Some("Sahagin Sniper"),
+    name: Name("Sahagin Sniper"),
-    body: Some(RandomWith("sahagin")),
+    body: RandomWith("sahagin"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-2.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.sahagin.adlet_bow")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.adlet_bow")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-2.sahagin"),
+    meta: [
-    skillset_asset: Some("common.skillset.dungeon.tier-2.bow"),
+        LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+        SkillSetAsset("common.skillset.dungeon.tier-2.bow"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Hakulaq"),
+    name: Name("Hakulaq"),
-    body: Some(RandomWith("hakulaq")),
+    body: RandomWith("hakulaq"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.creature.quad_low.fanged")),
+    loot: LootTable("common.loot_tables.creature.quad_low.fanged"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Sahagin Spearman"),
+    name: Name("Sahagin Spearman"),
-    body: Some(RandomWith("sahagin")),
+    body: RandomWith("sahagin"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-2.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.sahagin.wooden_spear")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.wooden_spear")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-2.sahagin"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+    ],
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Sahagin Sorcerer"),
+    name: Name("Sahagin Sorcerer"),
-    body: Some(RandomWith("sahagin")),
+    body: RandomWith("sahagin"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-2.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-2.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.sahagin.gnoll_staff")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.sahagin.gnoll_staff")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-2.sahagin"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Bonerattler"),
+    name: Name("Bonerattler"),
-    body: Some(RandomWith("bonerattler")),
+    body: RandomWith("bonerattler"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.creature.quad_medium.carapace")),
+    loot: LootTable("common.loot_tables.creature.quad_medium.carapace"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Clay Golem"),
+    name: Name("Clay Golem"),
-    body: Some(RandomWith("claygolem")),
+    body: RandomWith("claygolem"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-3.boss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-3.boss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,14 @@
 EntityConfig (
-    name: Some("Haniwa Archer"),
+    name: Name("Haniwa Archer"),
-    body: Some(RandomWith("haniwa")),
+    body: RandomWith("haniwa"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-3.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.haniwa.adlet_bow")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.adlet_bow")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-3.haniwa"),
+    meta: [
-    skillset_asset: Some("common.skillset.dungeon.tier-3.bow"),
+        LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+        SkillSetAsset("common.skillset.dungeon.tier-3.bow"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Haniwa Sentry"),
+    name: Name("Haniwa Sentry"),
-    body: None,
+    body: Exact(Object(HaniwaSentry)),
+    alignment: Alignment(Enemy),
 
-    loot: Some(Item("common.items.crafting_ing.stones")),
+    loot: Item("common.items.crafting_ing.stones"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Haniwa Guard"),
+    name: Name("Haniwa Guard"),
-    body: Some(RandomWith("haniwa")),
+    body: RandomWith("haniwa"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-3.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.haniwa.wooden_spear")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.wooden_spear")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-3.haniwa"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+    ],
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Haniwa Sorcerer"),
+    name: Name("Haniwa Sorcerer"),
-    body: Some(RandomWith("haniwa")),
+    body: RandomWith("haniwa"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-3.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-3.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.haniwa.gnoll_staff")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.haniwa.gnoll_staff")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-3.haniwa"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Minotaur"),
+    name: Name("Minotaur"),
-    body: Some(RandomWith("minotaur")),
+    body: RandomWith("minotaur"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-4.boss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-4.boss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,14 @@
 EntityConfig (
-    name: Some("Myrmidon Marksman"),
+    name: Name("Myrmidon Marksman"),
-    body: Some(RandomWith("myrmidon")),
+    body: RandomWith("myrmidon"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-4.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.myrmidon.adlet_bow")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.adlet_bow")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-4.myrmidon"),
+    meta: [
-    skillset_asset: Some("common.skillset.dungeon.tier-4.bow"),
+        LoadoutAsset("common.loadout.dungeon.tier-4.myrmidon"),
+        SkillSetAsset("common.skillset.dungeon.tier-4.bow"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Dullahan"),
+    name: Name("Dullahan"),
-    body: Some(RandomWith("dullahan")),
+    body: RandomWith("dullahan"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-4.miniboss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-4.miniboss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Myrmidon Hoplite"),
+    name: Name("Myrmidon Hoplite"),
-    body: Some(RandomWith("myrmidon")),
+    body: RandomWith("myrmidon"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-4.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.myrmidon.wooden_spear")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.wooden_spear")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-4.myrmidon"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-4.myrmidon"),
+    ],
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Myrmidon Wizard"),
+    name: Name("Myrmidon Wizard"),
-    body: Some(RandomWith("myrmidon")),
+    body: RandomWith("myrmidon"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-4.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-4.enemy"),
 
-    main_tool: Some(Item("common.items.npc_weapons.biped_small.myrmidon.gnoll_staff")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.myrmidon.gnoll_staff")),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-4.myrmidon"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-4.myrmidon"),
+    ],
 )

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

@@ -1,17 +1,19 @@
 EntityConfig (
-    name: Some("Beastmaster"),
+    name: Name("Beastmaster"),
-    body: Some(RandomWith("humanoid")),
+    body: RandomWith("humanoid"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.miniboss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
 
-    main_tool: Some(Choice([
+    hands: TwoHanded(Choice([
         (1.0, Some(Item("common.items.weapons.axe.malachite_axe-0"))),
         (1.0, Some(Item("common.items.weapons.sword.bloodsteel-1"))),
         (1.0, Some(Item("common.items.weapons.bow.velorite"))),
     ])),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-5.beastmaster"),
+    meta: [
-    // TODO: make own skillset for him?
+        LoadoutAsset("common.loadout.dungeon.tier-5.beastmaster"),
-    skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"),
+        // TODO: make own skillset for him?
+        SkillSetAsset("common.skillset.dungeon.tier-5.enemy"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Mindflayer"),
+    name: Name("Mindflayer"),
-    body: Some(RandomWith("mindflayer")),
+    body: RandomWith("mindflayer"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.boss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.boss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,10 +1,11 @@
 EntityConfig (
-    name: Some("Cultist"),
+    name: Name("Cultist"),
-    body: Some(RandomWith("humanoid")),
+    body: RandomWith("humanoid"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
 
-    main_tool: Some(Choice([
+    hands: TwoHanded(Choice([
         (1.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),
         (2.0, Some(Item("common.items.weapons.sword.cultist"))),
         (1.0, Some(Item("common.items.weapons.hammer.cultist_purp_2h-0"))),
@@ -12,8 +13,9 @@ EntityConfig (
         (1.0, Some(Item("common.items.weapons.bow.velorite"))),
         (1.0, Some(Item("common.items.weapons.sceptre.sceptre_velorite_0"))),
     ])),
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-5.cultist"),
+    meta: [
-    skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"),
+        LoadoutAsset("common.loadout.dungeon.tier-5.cultist"),
+        SkillSetAsset("common.skillset.dungeon.tier-5.enemy"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Tamed Darkhound"),
+    name: Name("Tamed Darkhound"),
-    body: Some(RandomWith("darkhound")),
+    body: RandomWith("darkhound"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.minion")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.minion"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,13 @@
 EntityConfig (
-    name: Some("Cultist Husk"),
+    name: Name("Cultist Husk"),
-    body: Some(RandomWith("husk")),
+    body: RandomWith("husk"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.minion")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.minion"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-5.husk"),
+    meta: [
-    skillset_asset: None,
+        LoadoutAsset("common.loadout.dungeon.tier-5.husk"),
+    ],
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Husk Brute"),
+    name: Name("Husk Brute"),
-    body: Some(RandomWith("husk_brute")),
+    body: RandomWith("husk_brute"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.miniboss")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.miniboss"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,12 +1,11 @@
 EntityConfig (
-    name: Some("Possessed Turret"),
+    name: Name("Possessed Turret"),
-    body: None,
+    body: Exact(Object(Crossbow)),
+    alignment: Alignment(Enemy),
 
-    loot: Some(Item("common.items.crafting_ing.twigs")),
+    loot: Item("common.items.crafting_ing.twigs"),
 
-    main_tool: None,
+    hands: Uninit,
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,15 +1,14 @@
 EntityConfig (
-    name: Some("Cultist Warlock"),
+    name: Name("Cultist Warlock"),
-    body: Some(RandomWith("cultist_warlock")),
+    body: RandomWith("cultist_warlock"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
 
-    main_tool: Some(Choice([
+    hands: TwoHanded(Choice([
         (1.5, Some(Item("common.items.npc_weapons.staff.bipedlarge-cultist"))),
         (1.0, Some(Item("common.items.npc_weapons.bow.bipedlarge-velorite"))),
     ])),
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -1,15 +1,14 @@
 EntityConfig (
-    name: Some("Cultist Warlord"),
+    name: Name("Cultist Warlord"),
-    body: Some(RandomWith("cultist_warlord")),
+    body: RandomWith("cultist_warlord"),
+    alignment: Alignment(Enemy),
 
-    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
+    loot: LootTable("common.loot_tables.dungeon.tier-5.enemy"),
 
-    main_tool: Some(Choice([
+    hands: TwoHanded(Choice([
         (1.5, Some(Item("common.items.npc_weapons.sword.bipedlarge-cultist"))),
         (1.0, Some(Item("common.items.npc_weapons.hammer.bipedlarge-cultist"))),
     ])),
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

assets/common/entity/template.ron

@@ -0,0 +1,42 @@
+EntityConfig (
+    /// Name of Entity
+    /// Can be Name(String) with given name
+    /// or Automatic which will call automatic name depend on Body
+    /// or Uninit (means it should be specified somewhere in code)
+    name: Name("Paddy"),
+
+    /// Body
+    /// Can be Exact (Body with all fields e.g BodyType, Species, Hair color and such)
+    /// or RandomWith (will generate random body or species)
+    /// or Uninit (means it should be specified somewhere in code)
+    body: RandomWith("humanoid"),
+
+    /// Alignment, can be Uninit
+    alignment: Alignment(Enemy),
+
+    /// Loot
+    /// Can be Item (with asset_specifier for item)
+    /// or LootTable (with asset_specifier for loot table)
+    /// or Uninit (means it should be specified something in the code)
+    loot: LootTable("common.loot_tables.humanoids"),
+
+    /// Hands:
+    /// - TwoHanded(ItemSpec) for one 2h or 1h weapon,
+    /// - Paired(ItemSpec) for two 1h weapons aka berserker mode,
+    /// - Mix {
+    ///     mainhand: ItemSpec,
+    ///     offhand: ItemSpec,
+    /// } for two different 1h weapons,
+    /// - Uninit which means that tool should be specified somewhere in code,
+    /// Where ItemSpec is taken from loadout_builder module
+    hands: TwoHanded(Item("common.items.weapons.sword.cultist")),
+
+    /// Meta Info
+    /// Possible fields:
+    /// LoadoutAsset(String) with asset_specifier for loadout
+    /// SkillSetAsset(String) with asset_specifier for skillset
+    meta: [
+        LoadoutAsset("common.loadout.village.merchant"),
+        SkillSetAsset("common.skillset.village.merchant"),
+    ],
+)

assets/common/entity/test.ron

@@ -1,30 +0,0 @@
-EntityConfig (
-    /// Name of Entity
-    name: Some("Paddy"),
-
-    /// Body
-    /// Can be Exact (Body with all fields e.g BodyType, Species, Hair color and such)
-    /// or RandomWith (will generate random body or species)
-    body: Some(RandomWith("humanoid")),
-
-    /// Main and second tools
-    /// Can be Option<Item> (with asset_specifier for item)
-    /// or Choice
-    /// (array of pairs with weight of choosing some item and Option<Item>)
-    main_tool: Some(Item("common.items.weapons.axe_1h.orichalcum-0")),
-    second_tool: None,
-
-    /// Loadout Config (with asset_specifier for loadout)
-    loadout_asset: Some("common.loadout.village.merchant"),
-
-    /// Skillset Config (with asset_specifier for skillset)
-    skillset_asset: Some("common.skillset.village.merchant"),
-
-    /// Loot
-    /// Can be Item (with asset_specifier for item)
-    /// or LootTable (with asset_specifier for loot table)
-    loot: Some(LootTable("common.loot_tables.humanoids")),
-
-    /// Meta Info (level, alignment, agency, etc)
-    // meta: {},
-)

assets/common/entity/village/dummy.ron

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("Training Dummy"),
+    body: Exact(Object(TrainingDummy)),
+    alignment: Alignment(Passive),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

assets/common/entity/village/guard.ron

@@ -1,13 +1,13 @@
 EntityConfig (
-    name: Some("Guard"),
+    name: Name("Guard"),
-    // body is specified outsite
+    body: RandomWith("humanoid"),
-    body: None,
+    alignment: Alignment(Npc),
 
-    loot: None,
+    loot: Uninit,
 
-    main_tool: Some(Item("common.items.weapons.sword.iron-4")),
+    hands: TwoHanded(Item("common.items.weapons.sword.iron-4")),
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [
-    skillset_asset: Some("common.skillset.village.guard"),
+        SkillSetAsset("common.skillset.village.guard"),
+    ],
 )

assets/common/entity/village/merchant.ron

@@ -1,14 +1,14 @@
 EntityConfig (
-    name: Some("Merchant"),
+    name: Name("Merchant"),
-    // body is specified outsite
+    body: RandomWith("humanoid"),
-    body: None,
+    alignment: Alignment(Npc),
 
     // considering giving some gold/gems/materials?
-    loot: None,
+    loot: Uninit,
 
-    main_tool: Some(Item("common.items.weapons.bow.eldwood-0")),
+    hands: TwoHanded(Item("common.items.weapons.bow.eldwood-0")),
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [
-    skillset_asset: Some("common.skillset.village.merchant"),
+        SkillSetAsset("common.skillset.village.merchant"),
+    ],
 )

assets/common/entity/village/villager.ron

@@ -1,11 +1,11 @@
 EntityConfig (
-    name: None,
+    name: Automatic,
-    // body is specified outsite
+    body: RandomWith("humanoid"),
-    body: None,
+    alignment: Alignment(Npc),
 
-    loot: None,
+    loot: Uninit,
 
-    main_tool: Some(Choice([
+    hands: TwoHanded(Choice([
         (1.0, Some(Item("common.items.weapons.tool.broom"))),
         (1.0, Some(Item("common.items.weapons.tool.hoe"))),
         (1.0, Some(Item("common.items.weapons.tool.pickaxe"))),
@@ -13,8 +13,6 @@ EntityConfig (
         (1.0, Some(Item("common.items.weapons.tool.shovel-0"))),
         (1.0, Some(Item("common.items.weapons.tool.shovel-1"))),
     ])),
-    second_tool: None,
 
-    loadout_asset: None,
+    meta: [],
-    skillset_asset: None,
 )

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("alligator"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("archaeos"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("asp"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("batfox"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("bear"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("bonerattler"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("cockatrice"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("crocodile"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("cyclops"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("deadwood"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("dodarock"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("dreadhorn"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("frostfang"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("grolgar"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("hakulaq"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("hyena"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("icepike"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("lavadrake"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("lion"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("mammoth"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("maneater"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("saurok_mighty"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("monitor"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("troll_mountain"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("ngoubou"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("ntouka"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("saurok_occult"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("odonto"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("ogre"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("rocksnapper"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,14 @@
+EntityConfig (
+    name: Automatic,
+    body: Exact(QuadrupedMedium(Body(
+        species: Roshwalr,
+        body_type: Male,
+    ))),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: Exact(QuadrupedMedium(Body(species: Roshwalr, body_type: Female))),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sabertooth"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("raptor_sand"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sandshark"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("saurok_sly"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("snowleopard"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("raptor_snow"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("sunlizard"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("troll_swamp"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("tarasque"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("tiger"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("wendigo"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("wolf"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("raptor_wood"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("yale"),
+    alignment: Alignment(Enemy),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("alpaca"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("antelope"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("Arctic Fox"),
+    body: Exact(QuadrupedSmall(Body(species: Fox, body_type: Female))),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Name("Arctic Hare"),
+    body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Female))),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("axolotl"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("beaver"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("boar"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("camel"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("catoblepas"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)

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

@@ -0,0 +1,11 @@
+EntityConfig (
+    name: Automatic,
+    body: RandomWith("cattle"),
+    alignment: Alignment(Wild),
+
+    loot: Uninit,
+
+    hands: Uninit,
+
+    meta: [],
+)