Merge branch 'snowram/quad-rework' into 'master'

quadruped rewrite

See merge request veloren/veloren!1116

CHANGELOG.md

@@ -35,6 +35,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Zoomable Map
 - M2 attack for hammer
 - Spawnable training dummies
+- New quadruped_low body for reptile-likes
+- Added new animals
+- Better pathfinding
 
 ### Changed
 
@@ -53,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced `log` with `tracing` in all crates
 - Switch to a new network backend that will allow several improvements in the future
 - Connection screen fails after 4 minutes if it can't connect to the server instead of 80 minutes
+- Rebuilt quadruped_medium animation and assets
 
 ### Removed
 

assets/common/npc_names.json

@@ -251,22 +251,10 @@
                 "keyword": "sabertooth",
                 "generic": "Sabertooth Tiger"
             },
-            "viper": {
-                "keyword": "viper",
-                "generic": "Lizard"
-            },
             "tuskram": {
                 "keyword": "tuskram",
                 "generic": "Tusk Ram"
             },
-            "alligator": {
-                "keyword": "alligator",
-                "generic": "Alligator"
-            },
-            "monitor": {
-                "keyword": "monitor",
-                "generic": "Monitor Lizard"
-            },
             "lion": {
                 "keyword": "lion",
                 "generic": "Lion"
@@ -274,6 +262,22 @@
             "tarasque": {
                 "keyword": "tarasque",
                 "generic": "Tarasque"
+            },
+            "tiger": {
+                "keyword": "tiger",
+                "generic": "Tiger"
+            },
+            "wolf": {
+                "keyword": "wolf",
+                "generic": "Wolf"
+            },
+            "frostfang": {
+                "keyword": "frostfang",
+                "generic": "Frostfang"
+            },
+            "mouflon": {
+                "keyword": "mouflon",
+                "generic": "Mouflon"
             }
         }
     },
@@ -561,5 +565,47 @@
                 "generic": "Reddragon"
             }
         }
+    },
+    "quadruped_low": {
+        "body": {
+            "keyword": "quadruped_low",
+            "names": [
+                "Sobek"
+            ]
+        },
+        "species": {
+            "crocodile": {
+                "keyword": "crocodile",
+                "generic": "Crocodile"
+            },
+            "alligator": {
+                "keyword": "alligator",
+                "generic": "Alligator"
+            },
+            "salamander": {
+                "keyword": "salamander",
+                "generic": "Salamander"
+            },
+            "monitor": {
+                "keyword": "monitor",
+                "generic": "Monitor"
+            },
+            "asp": {
+                "keyword": "asp",
+                "generic": "Asp"
+            },
+            "tortoise": {
+                "keyword": "tortoise",
+                "generic": "Tortoise"
+            },
+            "rocksnapper": {
+                "keyword": "rocksnapper",
+                "generic": "Rock Snapper"
+            },
+            "pangolin": {
+                "keyword": "pangolin",
+                "generic": "Pangolin"
+            }
+        }
     }
 }

assets/voxygen/voxel/biped_large_center_manifest.ron

@@ -16,15 +16,15 @@
     (Ogre, Female): (
         head: (
             offset: (-8.0, -5.0, -6.0),
-            center: ("npc.ogre.female.head"),
+            center: ("npc.ogre.male.head"),
         ),
         torso_upper: (
             offset: (-8.0, -4.5, -5.0),
-            center: ("npc.ogre.female.torso_upper"),
+            center: ("npc.ogre.male.torso_upper"),
         ),
         torso_lower: (
             offset: (-5.0, -4.5, -4.5),
-            center: ("npc.ogre.female.torso_lower"),
+            center: ("npc.ogre.male.torso_lower"),
         )
     ),
     (Cyclops, Male): (
@@ -44,15 +44,15 @@
     (Cyclops, Female): (
         head: (
             offset: (-7.0, -7.0, -6.5),
-            center: ("npc.cyclops.female.head"),
+            center: ("npc.cyclops.male.head"),
         ),
         torso_upper: (
             offset: (-8.0, -6.0, -6.0),
-            center: ("npc.cyclops.female.torso_upper"),
+            center: ("npc.cyclops.male.torso_upper"),
         ),
         torso_lower: (
             offset: (-6.0, -5.5, -6.0),
-            center: ("npc.cyclops.female.torso_lower"),
+            center: ("npc.cyclops.male.torso_lower"),
         )
     ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -40,31 +40,31 @@
         ),
         shoulder_r: (
             offset: (-4.0, -5.5, -4.0),
-            lateral: ("npc.ogre.female.shoulder_r"),
+            lateral: ("npc.ogre.male.shoulder_r"),
         ),
         hand_l: (
             offset: (-2.5, -2.5, -11.0),
-            lateral: ("npc.ogre.female.hand_l"),
+            lateral: ("npc.ogre.male.hand_l"),
         ),
         hand_r: (
             offset: (-2.5, -2.5, -11.0),
-            lateral: ("npc.ogre.female.hand_r"),
+            lateral: ("npc.ogre.male.hand_r"),
         ),
         leg_l: (
             offset: (-6.0, -3.5, -7.0),
-            lateral: ("npc.ogre.female.leg_l"),
+            lateral: ("npc.ogre.male.leg_l"),
         ),
         leg_r: (
             offset: (0.0, -3.5, -7.0),
-            lateral: ("npc.ogre.female.leg_r"),
+            lateral: ("npc.ogre.male.leg_r"),
         ),
         foot_l: (
             offset: (-3.0, -5.0, -2.5),
-            lateral: ("npc.ogre.female.foot_l"),
+            lateral: ("npc.ogre.male.foot_l"),
         ),
         foot_r: (
             offset: (-3.0, -5.0, -2.5),
-            lateral: ("npc.ogre.female.foot_r"),
+            lateral: ("npc.ogre.male.foot_r"),
         )
     ),
     (Cyclops, Male): (
@@ -104,35 +104,35 @@
     (Cyclops, Female): (
         shoulder_l: (
             offset: (-3.0, -4.0, -5.0),
-            lateral: ("npc.cyclops.female.shoulder_l"),
+            lateral: ("npc.cyclops.male.shoulder_l"),
         ),
         shoulder_r: (
             offset: (-3.0, -4.0, -5.0),
-            lateral: ("npc.cyclops.female.shoulder_r"),
+            lateral: ("npc.cyclops.male.shoulder_r"),
         ),
         hand_l: (
             offset: (-3.5, -3.5, -14.0),
-            lateral: ("npc.cyclops.female.hand_l"),
+            lateral: ("npc.cyclops.male.hand_l"),
         ),
         hand_r: (
             offset: (-3.5, -3.5, -14.0),
-            lateral: ("npc.cyclops.female.hand_r"),
+            lateral: ("npc.cyclops.male.hand_r"),
         ),
         leg_l: (
             offset: (-6.0, -3.5, -7.0),
-            lateral: ("npc.cyclops.female.leg_l"),
+            lateral: ("npc.cyclops.male.leg_l"),
         ),
         leg_r: (
             offset: (0.0, -3.5, -7.0),
-            lateral: ("npc.cyclops.female.leg_r"),
+            lateral: ("npc.cyclops.male.leg_r"),
         ),
         foot_l: (
             offset: (-3.0, -5.0, -5.0),
-            lateral: ("npc.cyclops.female.foot_l"),
+            lateral: ("npc.cyclops.male.foot_l"),
         ),
         foot_r: (
             offset: (-3.0, -5.0, -5.0),
-            lateral: ("npc.cyclops.female.foot_r"),
+            lateral: ("npc.cyclops.male.foot_r"),
         )
     ),
 })

assets/voxygen/voxel/bird_medium_center_manifest.ron

@@ -72,15 +72,15 @@
     (Goose, Female): (
         head: (
             offset: (-2.0, -3.5, -2.5),
-            center: ("npc.goose.female.head"),
+            center: ("npc.goose.male.head"),
         ),
         torso: (
             offset: (-3.5, -4.5, -3.0),
-            center: ("npc.goose.female.torso"),
+            center: ("npc.goose.male.torso"),
         ),
         tail: (
             offset: (-2.0, -1.0, -3.5),
-            center: ("npc.goose.female.tail"),
+            center: ("npc.goose.male.tail"),
         )
     ),
     (Peacock, Male): (
@@ -128,15 +128,15 @@
     (Eagle, Female): (
         head: (
             offset: (-2.0, -2.0, -3.5),
-            center: ("npc.eagle.female.head"),
+            center: ("npc.eagle.male.head"),
         ),
         torso: (
             offset: (-3.0, -4.5, -4.5),
-            center: ("npc.eagle.female.torso"),
+            center: ("npc.eagle.male.torso"),
         ),
         tail: (
             offset: (-2.0, -3.5, -3.5),
-            center: ("npc.eagle.female.tail"),
+            center: ("npc.eagle.male.tail"),
         )
     ),
     (Snowyowl, Male): (
@@ -156,15 +156,15 @@
     (Snowyowl, Female): (
         head: (
             offset: (-3.5, -4.5, -4.0),
-            center: ("npc.snowyowl.female.head"),
+            center: ("npc.snowyowl.male.head"),
         ),
         torso: (
             offset: (-3.5, -5.0, -3.0),
-            center: ("npc.snowyowl.female.torso"),
+            center: ("npc.snowyowl.male.torso"),
         ),
         tail: (
             offset: (-2.5, -3.0, -2.0),
-            center: ("npc.snowyowl.female.tail"),
+            center: ("npc.snowyowl.male.tail"),
         )
     ),
     (Parrot, Male): (
@@ -184,15 +184,15 @@
     (Parrot, Female): (
         head: (
             offset: (-1.5, -1.5, -2.5),
-            center: ("npc.parrot.female.head"),
+            center: ("npc.parrot.male.head"),
         ),
         torso: (
             offset: (-1.5, -3.5, -3.5),
-            center: ("npc.parrot.female.torso"),
+            center: ("npc.parrot.male.torso"),
         ),
         tail: (
             offset: (-1.5, -4.5, -1.5),
-            center: ("npc.parrot.female.tail"),
+            center: ("npc.parrot.male.tail"),
         )
     ),
     (Cockatrice, Male): (
@@ -212,15 +212,15 @@
     (Cockatrice, Female): (
         head: (
             offset: (-2.5, -3.5, -8.0),
-            center: ("npc.cockatrice.female.head"),
+            center: ("npc.cockatrice.male.head"),
         ),
         torso: (
             offset: (-3.5, -6.5, -7.5),
-            center: ("npc.cockatrice.female.torso"),
+            center: ("npc.cockatrice.male.torso"),
         ),
         tail: (
             offset: (-1.5, -3.5, -4.0),
-            center: ("npc.cockatrice.female.tail"),
+            center: ("npc.cockatrice.male.tail"),
         )
     ),
 })

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -92,19 +92,19 @@
     (Goose, Female): (
         wing_l: (
             offset: (-0.5, -2.5, -4.0),
-            lateral: ("npc.goose.female.wing"),
+            lateral: ("npc.goose.male.wing"),
         ),
         wing_r: (
             offset: (-0.5, -2.5, -4.0),
-            lateral: ("npc.goose.female.wing"),
+            lateral: ("npc.goose.male.wing"),
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.goose.female.leg_l"),
+            lateral: ("npc.goose.male.leg_l"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.goose.female.leg_r"),
+            lateral: ("npc.goose.male.leg_r"),
         )
     ),
     (Peacock, Male): (
@@ -164,19 +164,19 @@
     (Eagle, Female): (
         wing_l: (
             offset: (-1.0, -3.5, -12.0),
-            lateral: ("npc.eagle.female.wing_l"),
+            lateral: ("npc.eagle.male.wing_l"),
         ),
         wing_r: (
             offset: (-1.0, -3.5, -12.0),
-            lateral: ("npc.eagle.female.wing_r"),
+            lateral: ("npc.eagle.male.wing_r"),
         ),
         foot_l: (
             offset: (-1.5, 0.0, -8.0),
-            lateral: ("npc.eagle.female.leg_l"),
+            lateral: ("npc.eagle.male.leg_l"),
         ),
         foot_r: (
             offset: (-1.5, 0.0, -8.0),
-            lateral: ("npc.eagle.female.leg_r"),
+            lateral: ("npc.eagle.male.leg_r"),
         )
     ),
     (Snowyowl, Male): (
@@ -200,55 +200,55 @@
     (Snowyowl, Female): (
         wing_l: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.snowyowl.female.wing_l"),
+            lateral: ("npc.snowyowl.male.wing_l"),
         ),
         wing_r: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.snowyowl.female.wing_r"),
+            lateral: ("npc.snowyowl.male.wing_r"),
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.snowyowl.female.leg_l"),
+            lateral: ("npc.snowyowl.male.leg_l"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.snowyowl.female.leg_r"),
+            lateral: ("npc.snowyowl.male.leg_r"),
         )
     ),
     (Parrot, Male): (
         wing_l: (
             offset: (-0.5, -2.5, -8.0),
-            lateral: ("npc.parrot.female.wing"),
+            lateral: ("npc.parrot.male.wing"),
         ),
         wing_r: (
             offset: (-0.5, -2.5, -8.0),
-            lateral: ("npc.parrot.female.wing"),
+            lateral: ("npc.parrot.male.wing"),
         ),
         foot_l: (
             offset: (-1.0, 0.0, -3.0),
-            lateral: ("npc.parrot.female.leg_l"),
+            lateral: ("npc.parrot.male.leg_l"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -3.0),
-            lateral: ("npc.parrot.female.leg_r"),
+            lateral: ("npc.parrot.male.leg_r"),
         )
     ),
     (Parrot, Female): (
         wing_l: (
             offset: (-0.5, -2.5, -8.0),
-            lateral: ("npc.parrot.female.wing"),
+            lateral: ("npc.parrot.male.wing"),
         ),
         wing_r: (
             offset: (-0.5, -2.5, -8.0),
-            lateral: ("npc.parrot.female.wing"),
+            lateral: ("npc.parrot.male.wing"),
         ),
         foot_l: (
             offset: (-1.0, 0.0, -3.0),
-            lateral: ("npc.parrot.female.leg_l"),
+            lateral: ("npc.parrot.male.leg_l"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -3.0),
-            lateral: ("npc.parrot.female.leg_r"),
+            lateral: ("npc.parrot.male.leg_r"),
         )
     ),
     (Cockatrice, Male): (
@@ -272,19 +272,19 @@
     (Cockatrice, Female): (
         wing_l: (
             offset: (-2.0, -3.0, -9.0),
-            lateral: ("npc.cockatrice.female.wing_l"),
+            lateral: ("npc.cockatrice.male.wing_l"),
         ),
         wing_r: (
             offset: (-2.0, -3.0, -9.0),
-            lateral: ("npc.cockatrice.female.wing_r"),
+            lateral: ("npc.cockatrice.male.wing_r"),
         ),
         foot_l: (
             offset: (-2.5, 0.0, -12.0),
-            lateral: ("npc.cockatrice.female.leg_l"),
+            lateral: ("npc.cockatrice.male.leg_l"),
         ),
         foot_r: (
             offset: (-2.5, 0.0, -12.0),
-            lateral: ("npc.cockatrice.female.leg_r"),
+            lateral: ("npc.cockatrice.male.leg_r"),
         )
     ),
 })

assets/voxygen/voxel/critter_center_manifest.ron

@@ -24,23 +24,23 @@
     (Rat, Female): (
         head: (
             offset: (-4.5, -4.0, -4.0),
-            center: ("npc.rat.female.head"),
+            center: ("npc.rat.male.head"),
         ),
         chest: (
             offset: (-4.5, -6.0, -4.0),
-            center: ("npc.rat.female.chest"),
+            center: ("npc.rat.male.chest"),
         ),
         feet_f: (
             offset: (-4.0, -1.5, -1.0),
-            center: ("npc.rat.female.feet_f"),
+            center: ("npc.rat.male.feet_f"),
         ),
         feet_b: (
             offset: (-4.0, -1.5, -1.0),
-            center: ("npc.rat.female.feet_b"),
+            center: ("npc.rat.male.feet_b"),
         ),
         tail: (
             offset: (-0.5, -4.0, -1.5),
-            center: ("npc.rat.female.tail"),
+            center: ("npc.rat.male.tail"),
         ),
     ),
     (Axolotl, Male): (
@@ -68,23 +68,23 @@
     (Axolotl, Female): (
         head: (
             offset: (-3.5, -4.0, -2.0),
-            center: ("npc.axolotl.female.head"),
+            center: ("npc.axolotl.male.head"),
         ),
         chest: (
             offset: (-2.5, -4.0, -1.5),
-            center: ("npc.axolotl.female.chest"),
+            center: ("npc.axolotl.male.chest"),
         ),
         feet_f: (
             offset: (-3.0, -0.5, -1.0),
-            center: ("npc.axolotl.female.feet_f"),
+            center: ("npc.axolotl.male.feet_f"),
         ),
         feet_b: (
             offset: (-3.0, -0.5, -1.0),
-            center: ("npc.axolotl.female.feet_b"),
+            center: ("npc.axolotl.male.feet_b"),
         ),
         tail: (
             offset: (-1.5, -2.5, -1.5),
-            center: ("npc.axolotl.female.tail"),
+            center: ("npc.axolotl.male.tail"),
         ),
     ),
     (Gecko, Male): (
@@ -112,23 +112,23 @@
     (Gecko, Female): (
         head: (
             offset: (-2.5, -3.0, -2.0),
-            center: ("npc.gecko.female.head"),
+            center: ("npc.gecko.male.head"),
         ),
         chest: (
             offset: (-1.5, -4.0, -1.5),
-            center: ("npc.gecko.female.chest"),
+            center: ("npc.gecko.male.chest"),
         ),
         feet_f: (
             offset: (-2.0, -0.5, -1.0),
-            center: ("npc.gecko.female.feet_f"),
+            center: ("npc.gecko.male.feet_f"),
         ),
         feet_b: (
             offset: (-2.0, -0.5, -1.0),
-            center: ("npc.gecko.female.feet_b"),
+            center: ("npc.gecko.male.feet_b"),
         ),
         tail: (
             offset: (-0.5, -2.5, -1.0),
-            center: ("npc.gecko.female.tail"),
+            center: ("npc.gecko.male.tail"),
         ),
     ),
     (Turtle, Male): (
@@ -156,23 +156,23 @@
     (Turtle, Female): (
         head: (
             offset: (-2.5, -2.5, -2.5),
-            center: ("npc.turtle.female.head"),
+            center: ("npc.turtle.male.head"),
         ),
         chest: (
             offset: (-6.0, -6.0, -4.0),
-            center: ("npc.turtle.female.chest"),
+            center: ("npc.turtle.male.chest"),
         ),
         feet_f: (
             offset: (-5.0, -0.5, -1.0),
-            center: ("npc.turtle.female.feet_f"),
+            center: ("npc.turtle.male.feet_f"),
         ),
         feet_b: (
             offset: (-5.0, -0.5, -1.0),
-            center: ("npc.turtle.female.feet_b"),
+            center: ("npc.turtle.male.feet_b"),
         ),
         tail: (
             offset: (-0.5, -2.0, -1.0),
-            center: ("npc.turtle.female.tail"),
+            center: ("npc.turtle.male.tail"),
         ),
     ),
     (Squirrel, Male): (
@@ -200,23 +200,23 @@
     (Squirrel, Female): (
         head: (
             offset: (-1.5, -2.0, -2.0),
-            center: ("npc.squirrel.female.head"),
+            center: ("npc.squirrel.male.head"),
         ),
         chest: (
             offset: (-1.5, -3.0, -1.5),
-            center: ("npc.squirrel.female.chest"),
+            center: ("npc.squirrel.male.chest"),
         ),
         feet_f: (
             offset: (-2.0, -0.5, -1.0),
-            center: ("npc.squirrel.female.feet_f"),
+            center: ("npc.squirrel.male.feet_f"),
         ),
         feet_b: (
             offset: (-2.0, -0.5, -1.0),
-            center: ("npc.squirrel.female.feet_b"),
+            center: ("npc.squirrel.male.feet_b"),
         ),
         tail: (
             offset: (-1.5, -1.5, -3.0),
-            center: ("npc.squirrel.female.tail"),
+            center: ("npc.squirrel.male.tail"),
         ),
     ),
     (Fungome, Male): (
@@ -244,23 +244,23 @@
     (Fungome, Female): (
         head: (
             offset: (-2.5, -1.5, -2.0),
-            center: ("npc.fungome.female.head"),
+            center: ("npc.fungome.male.head"),
         ),
         chest: (
             offset: (-6.0, -6.0, -4.0),
-            center: ("npc.fungome.female.chest"),
+            center: ("npc.fungome.male.chest"),
         ),
         feet_f: (
             offset: (-3.0, -0.5, -1.0),
-            center: ("npc.fungome.female.feet_f"),
+            center: ("npc.fungome.male.feet_f"),
         ),
         feet_b: (
             offset: (-3.0, -0.5, -1.0),
-            center: ("npc.fungome.female.feet_b"),
+            center: ("npc.fungome.male.feet_b"),
         ),
         tail: (
             offset: (-1.0, -0.5, -1.0),
-            center: ("npc.fungome.female.tail"),
+            center: ("npc.fungome.male.tail"),
         ),
     ),
 })

assets/voxygen/voxel/dragon_center_manifest.ron

@@ -32,31 +32,31 @@
     (Reddragon, Female): (
         upper: (
             offset: (-6.5, -2.0, -6.0),
-            center: ("npc.reddragon.female.head_upper"),
+            center: ("npc.reddragon.male.head_upper"),
         ),
         lower: (
             offset: (-2.5, -2.0, -5.0),
-            center: ("npc.reddragon.female.head_lower"),
+            center: ("npc.reddragon.male.head_lower"),
         ),
         jaw: (
             offset: (-3.5, -2.0, -1.5),
-            center: ("npc.reddragon.female.jaw"),
+            center: ("npc.reddragon.male.jaw"),
         ),
         chest_front: (
             offset: (-6.5, -6.0, -7.5),
-            center: ("npc.reddragon.female.chest_front"),
+            center: ("npc.reddragon.male.chest_front"),
         ),
         chest_rear: (
             offset: (-6.5, -7.0, -7.0),
-            center: ("npc.reddragon.female.chest_rear"),
+            center: ("npc.reddragon.male.chest_rear"),
         ),
         tail_front: (
             offset: (-2.5, -12.0, -3.5),
-            center: ("npc.reddragon.female.tail_front"),
+            center: ("npc.reddragon.male.tail_front"),
         ),
         tail_rear: (
             offset: (-3.5, -16.0, -3.0),
-            center: ("npc.reddragon.female.tail_rear"),
+            center: ("npc.reddragon.male.tail_rear"),
         )
     ),
 })

assets/voxygen/voxel/dragon_lateral_manifest.ron

@@ -36,35 +36,35 @@
     (Reddragon, Female): (
         wing_in_l: (
             offset: (-24.0, -3.0, 0.0),
-            lateral: ("npc.reddragon.female.wing_in_l"),
+            lateral: ("npc.reddragon.male.wing_in_l"),
         ),
         wing_in_r: (
             offset: (0.0, -3.0, 0.0),
-            lateral: ("npc.reddragon.female.wing_in_r"),
+            lateral: ("npc.reddragon.male.wing_in_r"),
         ),
         wing_out_l: (
             offset: (-29.0, -3.0, -4.0),
-            lateral: ("npc.reddragon.female.wing_out_l"),
+            lateral: ("npc.reddragon.male.wing_out_l"),
         ),
         wing_out_r: (
             offset: (0.0, -3.0, -4.0),
-            lateral: ("npc.reddragon.female.wing_out_r"),
+            lateral: ("npc.reddragon.male.wing_out_r"),
         ),
         foot_fl: (
             offset: (-5.5, -4.0, -1.5),
-            lateral: ("npc.reddragon.female.foot_fl"),
+            lateral: ("npc.reddragon.male.foot_fl"),
         ),
         foot_fr: (
             offset: (-5.5, -4.0, -1.5),
-            lateral: ("npc.reddragon.female.foot_fr"),
+            lateral: ("npc.reddragon.male.foot_fr"),
         ),
         foot_bl: (
             offset: (-5.5, -4.0, -3.0),
-            lateral: ("npc.reddragon.female.foot_bl"),
+            lateral: ("npc.reddragon.male.foot_bl"),
         ),
         foot_br: (
             offset: (-5.5, -4.0, -3.0),
-            lateral: ("npc.reddragon.female.foot_br"),
+            lateral: ("npc.reddragon.male.foot_br"),
         )
     ),
 })

assets/voxygen/voxel/golem_center_manifest.ron

@@ -12,11 +12,11 @@
     (StoneGolem, Female): (
         head: (
             offset: (-5.0, -5.5, -7.5),
-            center: ("npc.stonegolem.female.head"),
+            center: ("npc.stonegolem.male.head"),
         ),
         torso_upper: (
             offset: (-6.0, -3.5, -10.0),
-            center: ("npc.stonegolem.female.torso_upper"),
+            center: ("npc.stonegolem.male.torso_upper"),
         ),
     ),
 })

assets/voxygen/voxel/golem_lateral_manifest.ron

@@ -40,31 +40,31 @@
         ),
         shoulder_r: (
             offset: (-4.5, -4.0, -5.0),
-            lateral: ("npc.stonegolem.female.shoulder_r"),
+            lateral: ("npc.stonegolem.male.shoulder_r"),
         ),
         hand_l: (
             offset: (-3.0, -3.5, -14.0),
-            lateral: ("npc.stonegolem.female.hand_l"),
+            lateral: ("npc.stonegolem.male.hand_l"),
         ),
         hand_r: (
             offset: (-3.0, -3.5, -14.0),
-            lateral: ("npc.stonegolem.female.hand_r"),
+            lateral: ("npc.stonegolem.male.hand_r"),
         ),
         leg_l: (
             offset: (-2.5, -2.5, -6.0),
-            lateral: ("npc.stonegolem.female.leg_l"),
+            lateral: ("npc.stonegolem.male.leg_l"),
         ),
         leg_r: (
             offset: (-2.5, -2.5, -6.0),
-            lateral: ("npc.stonegolem.female.leg_r"),
+            lateral: ("npc.stonegolem.male.leg_r"),
         ),
         foot_l: (
             offset: (-3.0, -3.5, -10.5),
-            lateral: ("npc.stonegolem.female.foot_l"),
+            lateral: ("npc.stonegolem.male.foot_l"),
         ),
         foot_r: (
             offset: (-3.0, -3.5, -10.5),
-            lateral: ("npc.stonegolem.female.foot_r"),
+            lateral: ("npc.stonegolem.male.foot_r"),
         )
     ),
 })