More npcs work

assets/common/npc_names.ron

@@ -745,6 +745,10 @@
             hare: (
                 keyword: "hare",
                 generic: "Hare"
+            ),
+            dog: (
+                keyword: "dog",
+                generic: "Dog"
             )
         )
     ),
@@ -776,9 +780,9 @@
                 keyword: "eagle",
                 generic: "Eagle"
             ),
-            snowyowl: (
+            owl: (
-                keyword: "snowyowl",
+                keyword: "owl",
-                generic: "Snowy Owl"
+                generic: "Owl"
             ),
             parrot: (
                 keyword: "parrot",
@@ -837,6 +841,10 @@
             mindflayer: (
                 keyword: "mindflayer",
                 generic: "Mindflayer"
+            ),
+            minotaur: (
+                keyword: "minotaur",
+                generic: "Minotaur"
             )
         )
     ),
@@ -885,6 +893,10 @@
             raptor_wood: (
                 keyword: "raptor_wood",
                 generic: "Wood Raptor"
+            ),
+            sunlizard: (
+                keyword: "sunlizard",
+                generic: "Sun Lizard"
             )
         )
     ),
@@ -928,6 +940,18 @@
             adlet: (
                 keyword: "adlet",
                 generic: "Adlet"
+            ),
+            gnarling: (
+                keyword: "gnarling",
+                generic: "Gnarling"
+            ),
+            mandragora: (
+                keyword: "mandragora",
+                generic: "Mandragora"
+            ),
+            kappa: (
+                keyword: "kappa",
+                generic: "Kappa"
             )
         )
     ),
@@ -1021,6 +1045,10 @@
             lavadrake: (
                 keyword: "lavadrake",
                 generic: "Lava Drake"
+            ),
+            basilisk: (
+                keyword: "basilisk",
+                generic: "Basilisk"
             )
         )
     )

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -599,4 +599,64 @@
             central: ("weapon.staff.firestaff_mindflayer"),
         )
     ),
+    (Minotaur, Male): (
+        head: (
+            offset: (-6.5, 0.0, -8.0),
+            central: ("npc.minotaur.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.5, -8.0, -10.0),
+            central: ("npc.minotaur.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-5.5, -5.5, -14.0),
+            central: ("npc.minotaur.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-1.5, -17.0, -8.0),
+            central: ("npc.minotaur.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-5.5, -3.5, -4.0),
+            central: ("weapon.staff.firestaff_mindflayer"),
+        )
+    ),
+    (Minotaur, Female): (
+        head: (
+            offset: (-6.5, 0.0, -8.0),
+            central: ("npc.minotaur.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.5, -8.0, -10.0),
+            central: ("npc.minotaur.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-5.5, -5.5, -14.0),
+            central: ("npc.minotaur.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-1.5, -17.0, -8.0),
+            central: ("npc.minotaur.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-5.5, -3.5, -4.0),
+            central: ("weapon.staff.firestaff_mindflayer"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -679,4 +679,72 @@
             lateral: ("npc.mindflayer.male.foot_r"),
         )
     ),
+    (Minotaur, Male): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.minotaur.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.minotaur.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -4.5, -14.0),
+            lateral: ("npc.minotaur.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -4.5, -14.0),
+            lateral: ("npc.minotaur.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.minotaur.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.minotaur.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -9.0, -5.0),
+            lateral: ("npc.minotaur.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -9.0, -5.0),
+            lateral: ("npc.minotaur.male.foot_r"),
+        )
+    ),
+    (Minotaur, Female): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.minotaur.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.minotaur.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -4.5, -14.0),
+            lateral: ("npc.minotaur.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -4.5, -14.0),
+            lateral: ("npc.minotaur.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.minotaur.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -3.5),
+            lateral: ("npc.minotaur.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -9.0, -5.0),
+            lateral: ("npc.minotaur.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -9.0, -5.0),
+            lateral: ("npc.minotaur.male.foot_r"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_small_central_manifest.ron

@@ -131,4 +131,136 @@
             central: ("weapon.spear.adlet"),
         ),
     ),
+    (Gnarling, Male): (
+        head: (
+            offset: (-6.5, -5.5, -4.5),
+            central: ("npc.gnarling.male.head"),
+        ),
+        chest: (
+            offset: (-4.5, -3.5, -2.5),
+            central: ("npc.gnarling.male.chest"),
+        ),
+        shorts: (
+            offset: (-3.5, -3.0, -2.5),
+            central: ("npc.gnarling.male.shorts"),
+        ),
+        tail: (
+            offset: (-1.5, -13.0, -3.0),
+            central: ("npc.gnarling.male.tail"),
+        ),
+        main: (
+            offset: (-0.5, -7.5, -5.0),
+            central: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Gnarling, Female): (
+        head: (
+            offset: (-6.5, -5.5, -4.5),
+            central: ("npc.gnarling.male.head"),
+        ),
+        chest: (
+            offset: (-4.5, -3.5, -2.5),
+            central: ("npc.gnarling.male.chest"),
+        ),
+        shorts: (
+            offset: (-3.5, -3.0, -2.5),
+            central: ("npc.gnarling.male.shorts"),
+        ),
+        tail: (
+            offset: (-1.5, -13.0, -3.0),
+            central: ("npc.gnarling.male.tail"),
+        ),
+        main: (
+            offset: (-0.5, -7.5, -5.0),
+            central: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Mandragora, Male): (
+        head: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        chest: (
+            offset: (-11.0, -11.0, -6.5),
+            central: ("npc.mandragora.male.chest"),
+        ),
+        shorts: (
+            offset: (-3.0, -3.0, -1.0),
+            central: ("npc.mandragora.male.shorts"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-0.5, -7.5, -5.0),
+            central: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Mandragora, Female): (
+        head: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        chest: (
+            offset: (-11.0, -11.0, -6.5),
+            central: ("npc.mandragora.male.chest"),
+        ),
+        shorts: (
+            offset: (-3.0, -3.0, -1.0),
+            central: ("npc.mandragora.male.shorts"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-0.5, -7.5, -5.0),
+            central: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Kappa, Male): (
+        head: (
+            offset: (-4.5, -5.0, -4.5),
+            central: ("npc.kappa.male.head"),
+        ),
+        chest: (
+            offset: (-6.5, -8.0, -7.0),
+            central: ("npc.kappa.male.chest"),
+        ),
+        shorts: (
+            offset: (-3.5, -4.0, -1.5),
+            central: ("npc.kappa.male.shorts"),
+        ),
+        tail: (
+            offset: (-2.5, -10.0, -5.0),
+            central: ("npc.kappa.male.tail"),
+        ),
+        main: (
+            offset: (-0.5, -7.5, -5.0),
+            central: ("weapon.spear.adlet"),
+        ),
+    ),
+    (Kappa, Female): (
+        head: (
+            offset: (-4.5, -5.0, -4.5),
+            central: ("npc.kappa.male.head"),
+        ),
+        chest: (
+            offset: (-6.5, -8.0, -7.0),
+            central: ("npc.kappa.male.chest"),
+        ),
+        shorts: (
+            offset: (-3.5, -4.0, -1.5),
+            central: ("npc.kappa.male.shorts"),
+        ),
+        tail: (
+            offset: (-2.5, -10.0, -5.0),
+            central: ("npc.kappa.male.tail"),
+        ),
+        main: (
+            offset: (-0.5, -7.5, -5.0),
+            central: ("weapon.spear.adlet"),
+        ),
+    ),
 })

assets/voxygen/voxel/biped_small_lateral_manifest.ron

@@ -107,4 +107,112 @@
             lateral: ("npc.adlet.male.foot_r"),
         ),
     ),
+    (Gnarling, Male): (
+        hand_l: (
+            offset: (-1.5, -1.5, -7.0),
+            lateral: ("npc.gnarling.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-1.5, -1.5, -7.0),
+            lateral: ("npc.gnarling.male.hand_r"),
+        ),
+        foot_l: (
+            offset: (-1.0, -2.0, -5.0),
+            lateral: ("npc.gnarling.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -2.0, -5.0),
+            lateral: ("npc.gnarling.male.foot_r"),
+        ),
+    ),
+    (Gnarling, Female): (
+        hand_l: (
+            offset: (-1.5, -1.5, -7.0),
+            lateral: ("npc.gnarling.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-1.5, -1.5, -7.0),
+            lateral: ("npc.gnarling.male.hand_r"),
+        ),
+        foot_l: (
+            offset: (-1.0, -2.0, -5.0),
+            lateral: ("npc.gnarling.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -2.0, -5.0),
+            lateral: ("npc.gnarling.male.foot_r"),
+        ),
+    ),
+    (Mandragora, Male): (
+        hand_l: (
+            offset: (-2.0, -1.5, -7.0),
+            lateral: ("npc.mandragora.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -1.5, -7.0),
+            lateral: ("npc.mandragora.male.hand_r"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -4.0),
+            lateral: ("npc.mandragora.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -4.0),
+            lateral: ("npc.mandragora.male.foot_r"),
+        ),
+    ),
+    (Mandragora, Female): (
+        hand_l: (
+            offset: (-2.0, -1.5, -7.0),
+            lateral: ("npc.mandragora.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -1.5, -7.0),
+            lateral: ("npc.mandragora.male.hand_r"),
+        ),
+        foot_l: (
+            offset: (-1.0, -1.5, -4.0),
+            lateral: ("npc.mandragora.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-1.0, -1.5, -4.0),
+            lateral: ("npc.mandragora.male.foot_r"),
+        ),
+    ),
+    (Kappa, Male): (
+        hand_l: (
+            offset: (-3.0, -2.5, -10.0),
+            lateral: ("npc.kappa.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -2.5, -10.0),
+            lateral: ("npc.kappa.male.hand_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -3.0, -9.0),
+            lateral: ("npc.kappa.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -3.0, -9.0),
+            lateral: ("npc.kappa.male.foot_r"),
+        ),
+    ),
+    (Kappa, Female): (
+        hand_l: (
+            offset: (-3.0, -2.5, -10.0),
+            lateral: ("npc.kappa.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -2.5, -10.0),
+            lateral: ("npc.kappa.male.hand_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -3.0, -9.0),
+            lateral: ("npc.kappa.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -3.0, -9.0),
+            lateral: ("npc.kappa.male.foot_r"),
+        ),
+    ),
 })

assets/voxygen/voxel/bird_medium_central_manifest.ron

@@ -139,32 +139,32 @@
             central: ("npc.eagle.male.tail"),
         )
     ),
-    (Snowyowl, Male): (
+    (Owl, Male): (
         head: (
             offset: (-3.5, -4.5, -4.0),
-            central: ("npc.snowyowl.male.head"),
+            central: ("npc.owl.male.head"),
         ),
         torso: (
             offset: (-3.5, -5.0, -3.0),
-            central: ("npc.snowyowl.male.torso"),
+            central: ("npc.owl.male.torso"),
         ),
         tail: (
             offset: (-2.5, -3.0, -2.0),
-            central: ("npc.snowyowl.male.tail"),
+            central: ("npc.owl.male.tail"),
         )
     ),
-    (Snowyowl, Female): (
+    (Owl, Female): (
         head: (
-            offset: (-3.5, -4.5, -4.0),
+            offset: (-4.5, -4.5, -4.5),
-            central: ("npc.snowyowl.male.head"),
+            central: ("npc.owl.female.head"),
         ),
         torso: (
-            offset: (-3.5, -5.0, -3.0),
+            offset: (-3.5, -5.0, -3.5),
-            central: ("npc.snowyowl.male.torso"),
+            central: ("npc.owl.female.torso"),
         ),
         tail: (
             offset: (-2.5, -3.0, -2.0),
-            central: ("npc.snowyowl.male.tail"),
+            central: ("npc.owl.female.tail"),
         )
     ),
     (Parrot, Male): (

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -179,40 +179,40 @@
             lateral: ("npc.eagle.male.leg_r"),
         )
     ),
-    (Snowyowl, Male): (
+    (Owl, Male): (
         wing_l: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.snowyowl.male.wing_l"),
+            lateral: ("npc.owl.male.wing_l"),
         ),
         wing_r: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.snowyowl.male.wing_r"),
+            lateral: ("npc.owl.male.wing_r"),
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.snowyowl.male.leg_l"),
+            lateral: ("npc.owl.male.leg_l"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.snowyowl.male.leg_r"),
+            lateral: ("npc.owl.male.leg_r"),
         )
     ),
-    (Snowyowl, Female): (
+    (Owl, Female): (
         wing_l: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.snowyowl.male.wing_l"),
+            lateral: ("npc.owl.female.wing_l"),
         ),
         wing_r: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.snowyowl.male.wing_r"),
+            lateral: ("npc.owl.female.wing_r"),
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.snowyowl.male.leg_l"),
+            lateral: ("npc.owl.female.leg_l"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.snowyowl.male.leg_r"),
+            lateral: ("npc.owl.female.leg_r"),
         )
     ),
     (Parrot, Male): (

assets/voxygen/voxel/quadruped_low_central_manifest.ron

@@ -624,4 +624,56 @@
             central: ("npc.lavadrake.male.tail_front"),
         ),
     ),
+    (Basilisk, Male): (
+        upper: (
+            offset: (-5.5, 0.0, -11.0),
+            central: ("npc.basilisk.male.head_upper"),
+        ),
+        lower: (
+            offset: (-8.5, 0.0, -4.0),
+            central: ("npc.basilisk.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-2.5, 0.0, -15.0),
+            central: ("npc.basilisk.male.jaw"),
+        ),
+        chest: (
+            offset: (-6.5, -13.0, -12.5),
+            central: ("npc.basilisk.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-3.5, -20.0, -4.0),
+            central: ("npc.basilisk.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-4.5, -24.0, -7.0),
+            central: ("npc.basilisk.male.tail_front"),
+        ),
+    ),
+    (Basilisk, Female): (
+        upper: (
+            offset: (-5.5, 0.0, -11.0),
+            central: ("npc.basilisk.male.head_upper"),
+        ),
+        lower: (
+            offset: (-8.5, 0.0, -4.0),
+            central: ("npc.basilisk.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-2.5, 0.0, -15.0),
+            central: ("npc.basilisk.male.jaw"),
+        ),
+        chest: (
+            offset: (-6.5, -13.0, -12.5),
+            central: ("npc.basilisk.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-3.5, -20.0, -4.0),
+            central: ("npc.basilisk.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-4.5, -24.0, -7.0),
+            central: ("npc.basilisk.male.tail_front"),
+        ),
+    ),
 })

assets/voxygen/voxel/quadruped_low_lateral_manifest.ron

@@ -145,37 +145,37 @@
     ),
     (Asp, Male): (
         front_left: (
-            offset: (-11.0, 0.0, -7.0),
+            offset: (-17.0, 0.0, -14.0),
             lateral: ("npc.asp.male.foot_fl"),
         ),
         front_right: (
-            offset: (0.0, 0.0, -7.0),
+            offset: (0.0, 0.0, -14.0),
             lateral: ("npc.asp.male.foot_fr"),
         ),
         back_left: (
-            offset: (-9.0, 0.0, -7.0),
+            offset: (-7.5, 0.0, -6.5),
             lateral: ("npc.asp.male.foot_bl"),
         ),
         back_right: (
-            offset: (0.0, 0.0, -7.0),
+            offset: (0.0, 0.0, -6.5),
             lateral: ("npc.asp.male.foot_br"),
         ),
     ),
     (Asp, Female): (
         front_left: (
-            offset: (-11.0, 0.0, -7.0),
+            offset: (-17.0, 0.0, -14.0),
             lateral: ("npc.asp.male.foot_fl"),
         ),
         front_right: (
-            offset: (0.0, 0.0, -7.0),
+            offset: (0.0, 0.0, -14.0),
             lateral: ("npc.asp.male.foot_fr"),
         ),
         back_left: (
-            offset: (-9.0, 0.0, -7.0),
+            offset: (-7.5, 0.0, -6.5),
             lateral: ("npc.asp.male.foot_bl"),
         ),
         back_right: (
-            offset: (0.0, 0.0, -7.0),
+            offset: (0.0, 0.0, -6.5),
             lateral: ("npc.asp.male.foot_br"),
         ),
     ),
@@ -431,4 +431,40 @@
             lateral: ("npc.lavadrake.male.foot_br"),
         ),
     ),
+    (Basilisk, Male): (
+        front_left: (
+            offset: (-17.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_fl"),
+        ),
+        front_right: (
+            offset: (0.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_fr"),
+        ),
+        back_left: (
+            offset: (-15.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_bl"),
+        ),
+        back_right: (
+            offset: (0.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_br"),
+        ),
+    ),
+    (Basilisk, Female): (
+        front_left: (
+            offset: (-17.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_fl"),
+        ),
+        front_right: (
+            offset: (0.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_fr"),
+        ),
+        back_left: (
+            offset: (-15.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_bl"),
+        ),
+        back_right: (
+            offset: (0.0, 0.0, -9.0),
+            lateral: ("npc.basilisk.male.foot_br"),
+        ),
+    ),
 })

assets/voxygen/voxel/quadruped_small_central_manifest.ron

@@ -714,4 +714,32 @@
             central: ("npc.hare.female.tail"),
         ),
     ),
+    (Dog, Male):(
+        head: (
+            offset: (-3.5, 0.0, -4.0),
+            central: ("npc.dog.male.head"),
+        ),
+        chest: (
+            offset: (-2.5, -5.5, -3.5),
+            central: ("npc.dog.male.chest"),
+        ),
+        tail: (
+            offset: (-1.5, -7.0, -1.0),
+            central: ("npc.dog.male.tail"),
+        ),
+    ),
+    (Dog, Female):(
+        head: (
+            offset: (-3.5, 0.0, -4.0),
+            central: ("npc.dog.female.head"),
+        ),
+        chest: (
+            offset: (-2.5, -5.5, -3.5),
+            central: ("npc.dog.female.chest"),
+        ),
+        tail: (
+            offset: (-1.5, -7.0, -1.0),
+            central: ("npc.dog.female.tail"),
+        ),
+    ),
 })

assets/voxygen/voxel/quadruped_small_lateral_manifest.ron

@@ -917,4 +917,40 @@
             lateral: ("npc.hare.female.foot_br"),
         ),
     ),
+    (Dog, Male): (
+        left_front: (
+            offset: (-1.0, -1.5, -6.0),
+            lateral: ("npc.dog.male.foot_fl"),
+        ),
+        right_front: (
+            offset: (-1.0, -1.5, -6.0),
+            lateral: ("npc.dog.male.foot_fr"),
+        ),
+        left_back: (
+            offset: (-1.5, -2.0, -6.0),
+            lateral: ("npc.dog.male.foot_bl"),
+        ),
+        right_back: (
+            offset: (-1.5, -2.0, -6.0),
+            lateral: ("npc.dog.male.foot_br"),
+        ),
+    ),
+    (Dog, Female): (
+        left_front: (
+            offset: (-1.0, -1.5, -6.0),
+            lateral: ("npc.dog.female.foot_fl"),
+        ),
+        right_front: (
+            offset: (-1.0, -1.5, -6.0),
+            lateral: ("npc.dog.female.foot_fr"),
+        ),
+        left_back: (
+            offset: (-1.5, -2.0, -6.0),
+            lateral: ("npc.dog.female.foot_bl"),
+        ),
+        right_back: (
+            offset: (-1.5, -2.0, -6.0),
+            lateral: ("npc.dog.female.foot_br"),
+        ),
+    ),
 })

assets/voxygen/voxel/theropod_central_manifest.ron

@@ -299,4 +299,64 @@
             central: ("npc.raptor_wood.male.tail_back"),
         ),
     ),
+    (Sunlizard, Male): (
+        head: (
+            offset: (-12.5, -1.0, -12.5),
+            central: ("npc.sunlizard.male.head"),
+        ),
+        jaw: (
+            offset: (-2.5, 0.0, -1.0),
+            central: ("npc.sunlizard.male.jaw"),
+        ),
+        neck: (
+            offset: (-1.5, 0.0, -2.0),
+            central: ("npc.sunlizard.male.neck"),
+        ),
+        chest_front: (
+            offset: (-3.5, -3.0, -3.5),
+            central: ("npc.sunlizard.male.chest_front"),
+        ),
+        chest_back: (
+            offset: (-3.5, -10.0, -3.5),
+            central: ("npc.sunlizard.male.chest_back"),
+        ),
+        tail_front: (
+            offset: (-1.5, -11.0, -2.5),
+            central: ("npc.sunlizard.male.tail_front"),
+        ),
+        tail_back: (
+            offset: (-1.5, -30.0, -2.0),
+            central: ("npc.sunlizard.male.tail_back"),
+        ),
+    ),
+    (Sunlizard, Female): (
+        head: (
+            offset: (-12.5, -1.0, -12.5),
+            central: ("npc.sunlizard.male.head"),
+        ),
+        jaw: (
+            offset: (-2.5, 0.0, -1.0),
+            central: ("npc.sunlizard.male.jaw"),
+        ),
+        neck: (
+            offset: (-1.5, 0.0, -2.0),
+            central: ("npc.sunlizard.male.neck"),
+        ),
+        chest_front: (
+            offset: (-3.5, -3.0, -3.5),
+            central: ("npc.sunlizard.male.chest_front"),
+        ),
+        chest_back: (
+            offset: (-3.5, -10.0, -3.5),
+            central: ("npc.sunlizard.male.chest_back"),
+        ),
+        tail_front: (
+            offset: (-1.5, -11.0, -2.5),
+            central: ("npc.sunlizard.male.tail_front"),
+        ),
+        tail_back: (
+            offset: (-1.5, -30.0, -2.0),
+            central: ("npc.sunlizard.male.tail_back"),
+        ),
+    ),
 })

assets/voxygen/voxel/theropod_lateral_manifest.ron

@@ -259,4 +259,56 @@
             lateral: ("npc.raptor_wood.male.foot_r"),
         ),
     ),
+    (Sunlizard, Male): (
+        hand_l: (
+            offset: (-4.0, -1.5, -7.0),
+            lateral: ("npc.sunlizard.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (0.0, -1.5, -7.0),
+            lateral: ("npc.sunlizard.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-1.5, -2.5, -3.5),
+            lateral: ("npc.sunlizard.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -2.5, -3.5),
+            lateral: ("npc.sunlizard.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.0, -9.0),
+            lateral: ("npc.sunlizard.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.0, -9.0),
+            lateral: ("npc.sunlizard.male.foot_r"),
+        ),
+    ),
+    (Sunlizard, Female): (
+        hand_l: (
+            offset: (-4.0, -1.5, -7.0),
+            lateral: ("npc.sunlizard.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (0.0, -1.5, -7.0),
+            lateral: ("npc.sunlizard.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-1.5, -2.5, -3.5),
+            lateral: ("npc.sunlizard.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -2.5, -3.5),
+            lateral: ("npc.sunlizard.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.0, -9.0),
+            lateral: ("npc.sunlizard.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.0, -9.0),
+            lateral: ("npc.sunlizard.male.foot_r"),
+        ),
+    ),
 })

common/src/comp/body.rs

@@ -257,6 +257,7 @@ impl Body {
                 theropod::Species::Snowraptor => 2.6,
                 theropod::Species::Sandraptor => 2.6,
                 theropod::Species::Woodraptor => 2.6,
+                theropod::Species::Sunlizard => 2.5,
                 _ => 8.0,
             },
             Body::BirdMedium(body) => match body.species {

common/src/comp/body/biped_large.rs

@@ -44,6 +44,7 @@ make_case_elim!(
         Mightysaurok = 7,
         Slysaurok = 8,
         Mindflayer = 9,
+        Minotaur = 10,
     }
 );
 
@@ -62,6 +63,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub saurok_mighty: SpeciesMeta,
     pub saurok_sly: SpeciesMeta,
     pub mindflayer: SpeciesMeta,
+    pub minotaur: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -80,11 +82,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Mightysaurok => &self.saurok_mighty,
             Species::Slysaurok => &self.saurok_sly,
             Species::Mindflayer => &self.mindflayer,
+            Species::Minotaur => &self.minotaur,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 10] = [
+pub const ALL_SPECIES: [Species; 11] = [
     Species::Ogre,
     Species::Cyclops,
     Species::Wendigo,
@@ -95,6 +98,7 @@ pub const ALL_SPECIES: [Species; 10] = [
     Species::Mightysaurok,
     Species::Slysaurok,
     Species::Mindflayer,
+    Species::Minotaur,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/comp/body/biped_small.rs

@@ -37,6 +37,9 @@ make_case_elim!(
         Gnome = 0,
         Sahagin = 1,
         Adlet = 2,
+        Gnarling = 3,
+        Mandragora = 4,
+        Kappa = 5,
     }
 );
 
@@ -48,6 +51,9 @@ pub struct AllSpecies<SpeciesMeta> {
     pub gnome: SpeciesMeta,
     pub sahagin: SpeciesMeta,
     pub adlet: SpeciesMeta,
+    pub gnarling: SpeciesMeta,
+    pub mandragora: SpeciesMeta,
+    pub kappa: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -59,14 +65,20 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Gnome => &self.gnome,
             Species::Sahagin => &self.sahagin,
             Species::Adlet => &self.adlet,
+            Species::Gnarling => &self.gnarling,
+            Species::Mandragora => &self.mandragora,
+            Species::Kappa => &self.kappa,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 3] = [
+pub const ALL_SPECIES: [Species; 6] = [
     Species::Gnome,
     Species::Sahagin,
     Species::Adlet,
+    Species::Gnarling,
+    Species::Mandragora,
+    Species::Kappa,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/comp/body/bird_medium.rs

@@ -39,7 +39,7 @@ make_case_elim!(
         Goose = 2,
         Peacock = 3,
         Eagle = 4,
-        Snowyowl = 5,
+        Owl = 5,
         Parrot = 6,
         Cockatrice = 7,
     }
@@ -55,7 +55,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub goose: SpeciesMeta,
     pub peacock: SpeciesMeta,
     pub eagle: SpeciesMeta,
-    pub snowyowl: SpeciesMeta,
+    pub owl: SpeciesMeta,
     pub parrot: SpeciesMeta,
     pub cockatrice: SpeciesMeta,
 }
@@ -71,7 +71,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Goose => &self.goose,
             Species::Peacock => &self.peacock,
             Species::Eagle => &self.eagle,
-            Species::Snowyowl => &self.snowyowl,
+            Species::Owl => &self.owl,
             Species::Parrot => &self.parrot,
             Species::Cockatrice => &self.cockatrice,
         }
@@ -84,7 +84,7 @@ pub const ALL_SPECIES: [Species; 8] = [
     Species::Goose,
     Species::Peacock,
     Species::Eagle,
-    Species::Snowyowl,
+    Species::Owl,
     Species::Parrot,
     Species::Cockatrice,
 ];

common/src/comp/body/quadruped_low.rs

@@ -46,6 +46,7 @@ make_case_elim!(
         Sandshark = 9,
         Hakulaq = 10,
         Lavadrake = 11,
+        Basilisk = 12,
     }
 );
 
@@ -66,6 +67,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub sandshark: SpeciesMeta,
     pub hakulaq: SpeciesMeta,
     pub lavadrake: SpeciesMeta,
+    pub basilisk: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -86,11 +88,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Sandshark => &self.sandshark,
             Species::Hakulaq => &self.hakulaq,
             Species::Lavadrake => &self.lavadrake,
+            Species::Basilisk => &self.basilisk,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 12] = [
+pub const ALL_SPECIES: [Species; 13] = [
     Species::Crocodile,
     Species::Alligator,
     Species::Salamander,
@@ -103,6 +106,7 @@ pub const ALL_SPECIES: [Species; 12] = [
     Species::Sandshark,
     Species::Hakulaq,
     Species::Lavadrake,
+    Species::Basilisk,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/comp/body/quadruped_small.rs

@@ -57,6 +57,7 @@ pub enum Species {
     Porcupine = 22,
     Beaver = 23,
     Hare = 24,
+    Dog = 25,
 }
 
 /// Data representing per-species generic data.
@@ -89,6 +90,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub porcupine: SpeciesMeta,
     pub beaver: SpeciesMeta,
     pub hare: SpeciesMeta,
+    pub dog: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -122,11 +124,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Porcupine => &self.porcupine,
             Species::Beaver => &self.beaver,
             Species::Hare => &self.hare,
+            Species::Dog => &self.dog,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 25] = [
+pub const ALL_SPECIES: [Species; 26] = [
     Species::Pig,
     Species::Fox,
     Species::Sheep,
@@ -152,6 +155,7 @@ pub const ALL_SPECIES: [Species; 25] = [
     Species::Porcupine,
     Species::Beaver,
     Species::Hare,
+    Species::Dog,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/comp/body/theropod.rs

@@ -33,6 +33,7 @@ pub enum Species {
     Sandraptor = 2,
     Snowraptor = 3,
     Woodraptor = 4,
+    Sunlizard = 5,
 }
 
 /// Data representing per-species generic data.
@@ -43,6 +44,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub raptor_sand: SpeciesMeta,
     pub raptor_snow: SpeciesMeta,
     pub raptor_wood: SpeciesMeta,
+    pub sunlizard: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -56,16 +58,18 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Sandraptor => &self.raptor_sand,
             Species::Snowraptor => &self.raptor_snow,
             Species::Woodraptor => &self.raptor_wood,
+            Species::Sunlizard => &self.sunlizard,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 5] = [
+pub const ALL_SPECIES: [Species; 6] = [
     Species::Archaeos,
     Species::Odonto,
     Species::Sandraptor,
     Species::Snowraptor,
     Species::Woodraptor,
+    Species::Sunlizard,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/comp/inventory/loadout_builder.rs

@@ -231,6 +231,11 @@ impl LoadoutBuilder {
                             "common.items.npc_weapons.staff.mindflayer_staff",
                         ));
                     },
+                    (biped_large::Species::Minotaur, _) => {
+                        main_tool = Some(Item::new_from_asset_expect(
+                            "common.items.npc_weapons.sword.saurok_sword",
+                        ));
+                    },
                 },
                 Body::Object(object::Body::Crossbow) => {
                     main_tool = Some(Item::new_from_asset_expect(

common/src/states/utils.rs

@@ -90,6 +90,7 @@ impl Body {
                 quadruped_low::Species::Sandshark => 160.0,
                 quadruped_low::Species::Hakulaq => 140.0,
                 quadruped_low::Species::Lavadrake => 100.0,
+                quadruped_low::Species::Basilisk => 120.0,
             },
         }
     }