Add Automatic NameKind to EntityConfig

+ add animal entities for wildlife spawns

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Crazy Sheep"),
+    name: Name("Crazy Sheep"),
     body: RandomWith("sheep"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yan Hus"),
+    name: Name("Yan Hus"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Big Goose"),
+    name: Name("Big Goose"),
     body: RandomWith("goose"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Harvester"),
+    name: Name("Harvester"),
     body: RandomWith("harvester"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Gnarling Stalker"),
+    name: Name("Gnarling Stalker"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Deadwood"),
+    name: Name("Deadwood"),
     body: RandomWith("deadwood"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Gnarling Mugger"),
+    name: Name("Gnarling Mugger"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Gnarling Shaman"),
+    name: Name("Gnarling Shaman"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yeti"),
+    name: Name("Yeti"),
     body: RandomWith("yeti"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Adlet Tracker"),
+    name: Name("Adlet Tracker"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Rat"),
+    name: Name("Rat"),
     body: RandomWith("rat"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Adlet Hunter"),
+    name: Name("Adlet Hunter"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Adlet Shaman"),
+    name: Name("Adlet Shaman"),
     body: RandomWith("adlet"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Tidal Warrior"),
+    name: Name("Tidal Warrior"),
     body: RandomWith("tidalwarrior"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Sahagin Sniper"),
+    name: Name("Sahagin Sniper"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Hakulaq"),
+    name: Name("Hakulaq"),
     body: RandomWith("hakulaq"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Sahagin Spearman"),
+    name: Name("Sahagin Spearman"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Sahagin Sorcerer"),
+    name: Name("Sahagin Sorcerer"),
     body: RandomWith("sahagin"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Bonerattler"),
+    name: Name("Bonerattler"),
     body: RandomWith("bonerattler"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Clay Golem"),
+    name: Name("Clay Golem"),
     body: RandomWith("claygolem"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Archer"),
+    name: Name("Haniwa Archer"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Sentry"),
+    name: Name("Haniwa Sentry"),
     body: Exact(Object(HaniwaSentry)),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Guard"),
+    name: Name("Haniwa Guard"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Haniwa Sorcerer"),
+    name: Name("Haniwa Sorcerer"),
     body: RandomWith("haniwa"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Minotaur"),
+    name: Name("Minotaur"),
     body: RandomWith("minotaur"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Myrmidon Marksman"),
+    name: Name("Myrmidon Marksman"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Dullahan"),
+    name: Name("Dullahan"),
     body: RandomWith("dullahan"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Myrmidon Hoplite"),
+    name: Name("Myrmidon Hoplite"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Myrmidon Wizard"),
+    name: Name("Myrmidon Wizard"),
     body: RandomWith("myrmidon"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Beastmaster"),
+    name: Name("Beastmaster"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mindflayer"),
+    name: Name("Mindflayer"),
     body: RandomWith("mindflayer"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist"),
+    name: Name("Cultist"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Tamed Darkhound"),
+    name: Name("Tamed Darkhound"),
     body: RandomWith("darkhound"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist Husk"),
+    name: Name("Cultist Husk"),
     body: RandomWith("husk"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Husk Brute"),
+    name: Name("Husk Brute"),
     body: RandomWith("husk_brute"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Possessed Turret"),
+    name: Name("Possessed Turret"),
     body: Exact(Object(Crossbow)),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist Warlock"),
+    name: Name("Cultist Warlock"),
     body: RandomWith("cultist_warlock"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Cultist Warlord"),
+    name: Name("Cultist Warlord"),
     body: RandomWith("cultist_warlord"),
     alignment: Alignment(Enemy),
 

assets/common/entity/template.ron

@@ -1,6 +1,9 @@
 EntityConfig (
     /// Name of Entity
-    name: Some("Paddy"),
+    /// 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)
@@ -18,7 +21,7 @@ EntityConfig (
     loot: LootTable("common.loot_tables.humanoids"),
 
     /// Hands:
-    /// - TwoHanded(ItemSpec) for one weapon 2h or 1h,
+    /// - TwoHanded(ItemSpec) for one 2h or 1h weapon,
     /// - Paired(ItemSpec) for two 1h weapons aka berserker mode,
     /// - Mix {
     ///     mainhand: ItemSpec,

assets/common/entity/village/dummy.ron

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Training Dummy"),
+    name: Name("Training Dummy"),
     body: Exact(Object(TrainingDummy)),
     alignment: Alignment(Passive),
 

assets/common/entity/village/guard.ron

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Guard"),
+    name: Name("Guard"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
 

assets/common/entity/village/merchant.ron

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Merchant"),
+    name: Name("Merchant"),
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
 

assets/common/entity/village/villager.ron

@@ -1,6 +1,5 @@
 EntityConfig (
-    // name is specified outsite
+    name: Automatic,
-    name: None,
     body: RandomWith("humanoid"),
     alignment: Alignment(Npc),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Dreadhorn"),
+    name: Automatic,
     body: RandomWith("dreadhorn"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Frostfang"),
+    name: Automatic,
     body: RandomWith("frostfang"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Grolgar"),
+    name: Automatic,
     body: RandomWith("grolgar"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mammoth"),
+    name: Automatic,
     body: RandomWith("mammoth"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Mountain Troll"),
+    name: Automatic,
     body: RandomWith("troll_mountain"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Rock Snapper"),
+    name: Automatic,
     body: RandomWith("rocksnapper"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Roshwalr"),
+    name: Automatic,
     body: Exact(QuadrupedMedium(Body(
         species: Roshwalr,
         body_type: Male,

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Snow Leopard"),
+    name: Automatic,
     body: RandomWith("snowleopard"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Snow Raptor"),
+    name: Automatic,
     body: RandomWith("raptor_snow"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Wendigo"),
+    name: Automatic,
     body: RandomWith("wendigo"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Wolf"),
+    name: Automatic,
     body: RandomWith("wolf"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Yale"),
+    name: Automatic,
     body: RandomWith("yale"),
     alignment: Alignment(Enemy),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Alpaca"),
+    name: Automatic,
     body: RandomWith("alpaca"),
     alignment: Alignment(Wild),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Fox"),
+    name: Name("Arctic Fox"),
     body: Exact(QuadrupedSmall(Body(species: Fox, body_type: Female))),
     alignment: Alignment(Wild),
 

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

@@ -1,5 +1,5 @@
 EntityConfig (
-    name: Some("Hare"),
+    name: Name("Arctic Hare"),
     body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Female))),
     alignment: Alignment(Wild),
 

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

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

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