Merge branch 'snowram/beast-animation' into 'master'

Snowram/beast animation

See merge request veloren/veloren!1297

assets/common/items/npc_weapons/bow/saurok_bow.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Saurok bow",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Bow("SaurokBow"),
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/hammer/cyclops_hammer.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Cyclops Hammer",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Hammer("CyclopsHammer"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/hammer/ogre_hammer.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Ogre Hammer",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Hammer("OgreHammer"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/hammer/troll_hammer.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Troll Hammer",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Hammer("TrollHammer"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/hammer/wendigo_hammer.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Wendigo Hammer",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Hammer("WendigoHammer"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/npcweapon/beast_claws.ron

@@ -0,0 +1,13 @@
+ItemDef(
+    name: "Beast Claws",
+    description: "Was attached to a beast.",
+    kind: Tool(
+        (
+            kind: NpcWeapon("BeastClaws"),
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/staff/ogre_staff.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Ogre Staff",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Staff("OgreStaff"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/staff/saurok_staff.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Saurok Staff",
+    description: "Placeholder",
+    kind: Tool(
+        (
+            kind: Staff("SaurokStaff"),
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/sword/dullahan_sword.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Dullahan Sword",
+    description: "Placehoder",
+    kind: Tool(
+        (
+            kind: Sword("DullahanSword"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/items/npc_weapons/sword/saurok_sword.ron

@@ -0,0 +1,14 @@
+ItemDef(
+    name: "Saurok Sword",
+    description: "Placehoder",
+    kind: Tool(
+        (
+            kind: Sword("SaurokSword"),    
+            stats: (
+                equip_time_millis: 500,
+                power: 1.00,
+            ),
+        )
+    ),
+    quality: Low,
+)

assets/common/npc_names.json

@@ -294,6 +294,10 @@
             "hirdrasil": {
                 "keyword": "hirdrasil",
                 "generic": "Hirdrasil"
+            },
+            "roshwalr": {
+                "keyword": "roshwalr",
+                "generic": "Roshwalr"
             }
         }
     },
@@ -550,7 +554,7 @@
         "body": {
             "keyword": "biped_large",
             "names": [
-                "Leroy Brown"
+                "Tobermory"
             ]
         },
         "species": {
@@ -573,6 +577,22 @@
             "dullahan": {
                 "keyword": "dullahan",
                 "generic": "Dullahan"
+            },
+            "werewolf": {
+                "keyword": "werewolf",
+                "generic": "Werewolf"
+            },
+            "saurok_occult": {
+                "keyword": "saurok_occult",
+                "generic": "Occult Saurok"
+            },
+            "saurok_mighty": {
+                "keyword": "saurok_mighty",
+                "generic": "Mighty Saurok"
+            },
+            "saurok_sly": {
+                "keyword": "saurok_sly",
+                "generic": "Sly Saurok"
             }
         }
     },
@@ -587,6 +607,10 @@
             "stonegolem": {
                 "keyword": "stonegolem",
                 "generic": "StoneGolem"
+            },
+            "treant": {
+                "keyword": "treant",
+                "generic": "Treant"
             }
         }
     },
@@ -605,6 +629,18 @@
             "odonto": {
                 "keyword": "odonto",
                 "generic": "Odonto"
+            },
+            "raptor_sand": {
+                "keyword": "raptor_sand",
+                "generic": "Sand Raptor"
+            },
+            "raptor_snow": {
+                "keyword": "raptor_snow",
+                "generic": "Snow Raptor"
+            },
+            "raptor_wood": {
+                "keyword": "raptor_wood",
+                "generic": "Wood Raptor"
             }
         }
     },

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -18,7 +18,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -26,7 +26,7 @@
         ),
         main: (
             offset: (-5.0, -5.5, -5.0),
-            central: ("npc.ogre.male.hammer"),
+            central: ("weapon.hammer.2hhammer_ogre"),
         )
     ),
     (Ogre, Female): (
@@ -48,7 +48,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -56,7 +56,7 @@
         ),
         main: (
             offset: (-2.5, -5.5, -5.0),
-            central: ("npc.ogre.female.main"),
+            central: ("weapon.staff.firestaff_ogre"),
         )
     ),
     (Cyclops, Male): (
@@ -78,7 +78,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -86,7 +86,7 @@
         ),
         main: (
             offset: (-5.0, -6.5, -4.0),
-            central: ("npc.cyclops.male.hammer"),
+            central: ("weapon.hammer.2hhammer_cyclops-0"),
         )
     ),
     (Cyclops, Female): (
@@ -108,7 +108,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -116,7 +116,7 @@
         ),
         main: (
             offset: (-5.0, -6.5, -4.0),
-            central: ("npc.cyclops.female.hammer"),
+            central: ("weapon.hammer.2hhammer_cyclops-0"),
         )
     ),
     (Wendigo, Male): (
@@ -138,15 +138,15 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
         ),
         main: (
-            offset: (-5.0, -6.5, -4.0),
-            central: ("npc.wendigo.male.hammer"),
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
         )
     ),
     (Wendigo, Female): (
@@ -168,15 +168,15 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
         ),
         main: (
-            offset: (-5.0, -6.5, -4.0),
-            central: ("npc.wendigo.male.hammer"),
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
         )
     ),
     (Troll, Male): (
@@ -198,7 +198,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -206,7 +206,7 @@
         ),
         main: (
             offset: (-5.0, -6.5, -4.0),
-            central: ("npc.troll.male.hammer"),
+            central: ("weapon.hammer.2hhammer_troll"),
         )
     ),
     (Troll, Female): (
@@ -228,7 +228,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -236,11 +236,9 @@
         ),
         main: (
             offset: (-5.0, -6.5, -4.0),
-            central: ("npc.troll.female.hammer"),
+            central: ("weapon.hammer.2hhammer_troll"),
         )
     ),
-
-
     (Dullahan, Male): (
         head: (
             offset: (-8.0, -5.0, -6.0),
@@ -260,7 +258,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -268,10 +266,9 @@
         ),
         main: (
             offset: (-5.0, -6.5, -4.0),
-            central: ("npc.cyclops.male.hammer"),
+            central: ("weapon.sword.greatsword_2h_dullahan"),
         )
     ),
-
     (Dullahan, Female): (
         head: (
             offset: (-8.0, -5.0, -6.0),
@@ -291,7 +288,7 @@
         ),
         tail: (
             offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),        
+            central: ("armor.empty"),
         ),
         second: (
             offset: (0.0, 0.0, 0.0),
@@ -299,7 +296,247 @@
         ),
         main: (
             offset: (-5.0, -6.5, -4.0),
-            central: ("npc.cyclops.male.hammer"),
+            central: ("weapon.sword.greatsword_2h_dullahan"),
         )
     ),
-})
+    (Werewolf, Male): (
+        head: (
+            offset: (-5.0, 0.0, -6.5),
+            central: ("npc.werewolf.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -12.5, -10.5),
+            central: ("npc.werewolf.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.werewolf.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.werewolf.male.jaw"),
+        ),
+        tail: (
+            offset: (-4.0, -27.0, -6.0),
+            central: ("npc.werewolf.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-1.5, -9.0, -10.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Werewolf, Female): (
+        head: (
+            offset: (-5.0, 0.0, -6.5),
+            central: ("npc.werewolf.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -12.5, -10.5),
+            central: ("npc.werewolf.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.werewolf.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.werewolf.male.jaw"),
+        ),
+        tail: (
+            offset: (-4.0, -27.0, -6.0),
+            central: ("npc.werewolf.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-1.5, -9.0, -10.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Occultsaurok, Male): (
+        head: (
+            offset: (-3.0, 0.0, -4.5),
+            central: ("npc.saurok_occult.male.head"),
+        ),
+        torso_upper: (
+            offset: (-5.0, -6.5, -7.0),
+            central: ("npc.saurok_occult.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.saurok_occult.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.saurok_occult.male.jaw"),
+        ),
+        tail: (
+            offset: (-2.0, -16.0, -1.0),
+            central: ("npc.saurok_occult.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-3.5, -3.0, -5.0),
+            central: ("weapon.staff.firestaff_saurok"),
+        )
+    ),
+    (Occultsaurok, Female): (
+        head: (
+            offset: (-3.0, 0.0, -4.5),
+            central: ("npc.saurok_occult.female.head"),
+        ),
+        torso_upper: (
+            offset: (-5.0, -6.5, -7.0),
+            central: ("npc.saurok_occult.female.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.saurok_occult.female.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.saurok_occult.female.jaw"),
+        ),
+        tail: (
+            offset: (-2.0, -16.0, -1.0),
+            central: ("npc.saurok_occult.female.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-3.5, -3.0, -5.0),
+            central: ("weapon.staff.firestaff_saurok"),
+        )
+    ),
+    (Mightysaurok, Male): (
+        head: (
+            offset: (-3.0, 0.0, -4.5),
+            central: ("npc.saurok_mighty.male.head"),
+        ),
+        torso_upper: (
+            offset: (-5.0, -6.5, -7.0),
+            central: ("npc.saurok_mighty.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.saurok_mighty.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.saurok_mighty.male.jaw"),
+        ),
+        tail: (
+            offset: (-2.0, -16.0, -1.0),
+            central: ("npc.saurok_mighty.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-1.5, -3.0, -5.0),
+            central: ("weapon.sword.long_2h_saurok"),
+        )
+    ),
+    (Mightysaurok, Female): (
+        head: (
+            offset: (-3.0, 0.0, -4.5),
+            central: ("npc.saurok_mighty.female.head"),
+        ),
+        torso_upper: (
+            offset: (-5.0, -6.5, -7.0),
+            central: ("npc.saurok_mighty.female.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.saurok_mighty.female.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.saurok_mighty.female.jaw"),
+        ),
+        tail: (
+            offset: (-2.0, -16.0, -1.0),
+            central: ("npc.saurok_mighty.female.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-1.5, -3.0, -5.0),
+            central: ("weapon.sword.long_2h_saurok"),
+        )
+    ),
+    (Slysaurok, Male): (
+        head: (
+            offset: (-3.0, 0.0, -4.5),
+            central: ("npc.saurok_sly.male.head"),
+        ),
+        torso_upper: (
+            offset: (-5.0, -6.5, -7.0),
+            central: ("npc.saurok_sly.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.saurok_sly.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.saurok_sly.male.jaw"),
+        ),
+        tail: (
+            offset: (-2.0, -16.0, -1.0),
+            central: ("npc.saurok_sly.male.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-2.5, -4.0, -7.0),
+            central: ("weapon.bow.longbow_saurok"),
+        )
+    ),
+    (Slysaurok, Female): (
+        head: (
+            offset: (-3.0, 0.0, -4.5),
+            central: ("npc.saurok_sly.female.head"),
+        ),
+        torso_upper: (
+            offset: (-5.0, -6.5, -7.0),
+            central: ("npc.saurok_sly.female.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -5.5, -8.0),
+            central: ("npc.saurok_sly.female.torso_lower"),
+        ),
+        jaw: (
+            offset: (-2.0, 0.0, -2.0),
+            central: ("npc.saurok_sly.female.jaw"),
+        ),
+        tail: (
+            offset: (-2.0, -16.0, -1.0),
+            central: ("npc.saurok_sly.female.tail"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        main: (
+            offset: (-2.5, -4.0, -7.0),
+            central: ("weapon.bow.longbow_saurok"),
+        )
+    ),
+})

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -339,4 +339,276 @@
             lateral: ("npc.dullahan.male.foot_r"),
         ),
     ),
-})
+    (Werewolf, Male): (
+        shoulder_l: (
+            offset: (-4.0, -6.0, -8.0),
+            lateral: ("npc.werewolf.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -6.0, -8.0),
+            lateral: ("npc.werewolf.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.0, -3.0, -13.0),
+            lateral: ("npc.werewolf.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -3.0, -13.0),
+            lateral: ("npc.werewolf.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -4.5),
+            lateral: ("npc.werewolf.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -4.5),
+            lateral: ("npc.werewolf.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("npc.werewolf.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("npc.werewolf.male.foot_r"),
+        ),
+    ),
+    (Werewolf, Female): (
+        shoulder_l: (
+            offset: (-4.0, -6.0, -8.0),
+            lateral: ("npc.werewolf.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -6.0, -8.0),
+            lateral: ("npc.werewolf.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.0, -3.0, -13.0),
+            lateral: ("npc.werewolf.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.0, -3.0, -13.0),
+            lateral: ("npc.werewolf.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.5, -4.0, -4.5),
+            lateral: ("npc.werewolf.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.5, -4.0, -4.5),
+            lateral: ("npc.werewolf.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("npc.werewolf.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -6.0, -9.0),
+            lateral: ("npc.werewolf.male.foot_r"),
+        ),
+    ),
+    (Occultsaurok, Male): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_occult.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_occult.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_occult.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_occult.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_occult.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_occult.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_occult.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_occult.male.foot_r"),
+        ),
+    ),
+    (Occultsaurok, Female): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_occult.female.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_occult.female.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_occult.female.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_occult.female.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_occult.female.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_occult.female.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_occult.female.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_occult.female.foot_r"),
+        ),
+    ),
+    (Mightysaurok, Male): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_mighty.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_mighty.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_mighty.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_mighty.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_mighty.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_mighty.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_mighty.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_mighty.male.foot_r"),
+        ),
+    ),
+    (Mightysaurok, Female): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_mighty.female.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_mighty.female.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_mighty.female.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_mighty.female.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_mighty.female.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_mighty.female.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_mighty.female.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_mighty.female.foot_r"),
+        ),
+    ),
+    (Slysaurok, Male): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_sly.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_sly.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_sly.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_sly.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_sly.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_sly.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_sly.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_sly.male.foot_r"),
+        ),
+    ),
+    (Slysaurok, Female): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_sly.female.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -4.5),
+            lateral: ("npc.saurok_sly.female.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_sly.female.hand_l"),
+        ),
+        hand_r: (
+            offset: (-2.0, -2.0, -10.0),
+            lateral: ("npc.saurok_sly.female.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_sly.female.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -3.0, -3.5),
+            lateral: ("npc.saurok_sly.female.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_sly.female.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.5, -5.0),
+            lateral: ("npc.saurok_sly.female.foot_r"),
+        ),
+    ),
+})

assets/voxygen/voxel/golem_central_manifest.ron

@@ -4,6 +4,10 @@
             offset: (-3.5, -4.0, -0.0),
             central: ("npc.stonegolem.male.head"),
         ),
+        jaw: (
+            offset: (-3.5, -4.0, -0.0),
+            central: ("armor.empty"),
+        ),
         torso_upper: (
             offset: (-10.5, -10.5, -10.5),
             central: ("npc.stonegolem.male.chest_upper"),
@@ -18,6 +22,10 @@
             offset: (-3.5, -4.0, -0.0),
             central: ("npc.stonegolem.male.head"),
         ),
+        jaw: (
+            offset: (-3.5, -4.0, -0.0),
+            central: ("armor.empty"),
+        ),
         torso_upper: (
             offset: (-10.5, -10.5, -10.5),
             central: ("npc.stonegolem.male.chest_upper"),
@@ -27,4 +35,40 @@
             central: ("npc.stonegolem.male.chest_lower"),
         ),
     ),
+    (Treant, Male): (
+        head: (
+            offset: (-6.0, -6.5, -0.0),
+            central: ("npc.treant.male.head"),
+        ),
+        jaw: (
+            offset: (-4.0, 0.0, -3.0),
+            central: ("npc.treant.male.jaw"),
+        ),
+        torso_upper: (
+            offset: (-18.0, -16.0, -15.5),
+            central: ("npc.treant.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-8.0, -9.0, -8.0),
+            central: ("npc.treant.male.chest_lower"),
+        ),
+    ),
+    (Treant, Female): (
+        head: (
+            offset: (-6.0, -6.5, -0.0),
+            central: ("npc.treant.male.head"),
+        ),
+        jaw: (
+            offset: (-4.0, 0.0, -3.0),
+            central: ("npc.treant.male.jaw"),
+        ),
+        torso_upper: (
+            offset: (-18.0, -16.0, -15.5),
+            central: ("npc.treant.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-8.0, -9.0, -8.0),
+            central: ("npc.treant.male.chest_lower"),
+        ),
+    ),
 })

assets/voxygen/voxel/golem_lateral_manifest.ron

@@ -67,4 +67,72 @@
             lateral: ("npc.stonegolem.male.foot_r"),
         )
     ),
+    (Treant, Male): (
+        shoulder_l: (
+            offset: (-16.0, -7.0, -8.5),
+            lateral: ("npc.treant.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (0.0, -7.0, -8.5),
+            lateral: ("npc.treant.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-5.5, -5.5, -17.0),
+            lateral: ("npc.treant.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-5.5, -5.5, -17.0),
+            lateral: ("npc.treant.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-6.0, -9.5, -9.0),
+            lateral: ("npc.treant.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -9.5, -9.0),
+            lateral: ("npc.treant.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-4.5, -4.5, -8.0),
+            lateral: ("npc.treant.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-4.5, -4.5, -8.0),
+            lateral: ("npc.treant.male.foot_r"),
+        )
+    ),
+    (Treant, Female): (
+        shoulder_l: (
+            offset: (-16.0, -7.0, -8.5),
+            lateral: ("npc.treant.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (0.0, -7.0, -8.5),
+            lateral: ("npc.treant.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-5.5, -5.5, -17.0),
+            lateral: ("npc.treant.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-5.5, -5.5, -17.0),
+            lateral: ("npc.treant.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-6.0, -9.5, -9.0),
+            lateral: ("npc.treant.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -9.5, -9.0),
+            lateral: ("npc.treant.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-4.5, -4.5, -8.0),
+            lateral: ("npc.treant.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-4.5, -4.5, -8.0),
+            lateral: ("npc.treant.male.foot_r"),
+        )
+    ),
 })