diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json
index fe241ac5f3..ebfc47948a 100644
--- a/assets/common/npc_names.json
+++ b/assets/common/npc_names.json
@@ -273,7 +273,7 @@
},
"frostfang": {
"keyword": "frostfang",
- "generic": "Frost Fang"
+ "generic": "Frostfang"
},
"mouflon": {
"keyword": "mouflon",
diff --git a/assets/voxygen/voxel/biped_large_center_manifest.ron b/assets/voxygen/voxel/biped_large_center_manifest.ron
index 9a799a37c2..bd6ec60904 100644
--- a/assets/voxygen/voxel/biped_large_center_manifest.ron
+++ b/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"),
)
),
})
diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron
index a74c9306b1..32a3a55245 100644
--- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron
+++ b/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"),
)
),
})
diff --git a/assets/voxygen/voxel/bird_medium_center_manifest.ron b/assets/voxygen/voxel/bird_medium_center_manifest.ron
index 3669a810e7..7f79179c51 100644
--- a/assets/voxygen/voxel/bird_medium_center_manifest.ron
+++ b/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"),
)
),
})
\ No newline at end of file
diff --git a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
index a2ae6f8b6d..35116121e2 100644
--- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
+++ b/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"),
)
),
})
\ No newline at end of file
diff --git a/assets/voxygen/voxel/critter_center_manifest.ron b/assets/voxygen/voxel/critter_center_manifest.ron
index 6c2ee8a5b7..038fcfc611 100644
--- a/assets/voxygen/voxel/critter_center_manifest.ron
+++ b/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"),
),
),
})
diff --git a/assets/voxygen/voxel/dragon_center_manifest.ron b/assets/voxygen/voxel/dragon_center_manifest.ron
index 3414c90782..953e6bf35a 100644
--- a/assets/voxygen/voxel/dragon_center_manifest.ron
+++ b/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"),
)
),
})
diff --git a/assets/voxygen/voxel/dragon_lateral_manifest.ron b/assets/voxygen/voxel/dragon_lateral_manifest.ron
index 26a48652e1..d7d7319368 100644
--- a/assets/voxygen/voxel/dragon_lateral_manifest.ron
+++ b/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"),
)
),
})
\ No newline at end of file
diff --git a/assets/voxygen/voxel/golem_center_manifest.ron b/assets/voxygen/voxel/golem_center_manifest.ron
index 1a810d86d2..2fe084ca44 100644
--- a/assets/voxygen/voxel/golem_center_manifest.ron
+++ b/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"),
),
),
})
diff --git a/assets/voxygen/voxel/golem_lateral_manifest.ron b/assets/voxygen/voxel/golem_lateral_manifest.ron
index f0204e2d68..5945b66c37 100644
--- a/assets/voxygen/voxel/golem_lateral_manifest.ron
+++ b/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"),
)
),
})
diff --git a/assets/voxygen/voxel/npc/alligator/female/chest.vox b/assets/voxygen/voxel/npc/alligator/female/chest.vox
deleted file mode 100644
index 98149f48cc..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_bl.vox b/assets/voxygen/voxel/npc/alligator/female/foot_bl.vox
deleted file mode 100644
index 5a4bf21425..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_br.vox b/assets/voxygen/voxel/npc/alligator/female/foot_br.vox
deleted file mode 100644
index 8a154a3400..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_fl.vox b/assets/voxygen/voxel/npc/alligator/female/foot_fl.vox
deleted file mode 100644
index 2477f25a74..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_fr.vox b/assets/voxygen/voxel/npc/alligator/female/foot_fr.vox
deleted file mode 100644
index 2b83989fe8..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox b/assets/voxygen/voxel/npc/alligator/female/head_lower.vox
deleted file mode 100644
index 968d538976..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox b/assets/voxygen/voxel/npc/alligator/female/head_upper.vox
deleted file mode 100644
index 6362ebce90..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/jaw.vox b/assets/voxygen/voxel/npc/alligator/female/jaw.vox
deleted file mode 100644
index 1c87c49e8e..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/tail_front.vox b/assets/voxygen/voxel/npc/alligator/female/tail_front.vox
deleted file mode 100644
index 38226f9fc9..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/alligator/female/tail_rear.vox b/assets/voxygen/voxel/npc/alligator/female/tail_rear.vox
deleted file mode 100644
index 66a171e4ef..0000000000
Binary files a/assets/voxygen/voxel/npc/alligator/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/chest.vox b/assets/voxygen/voxel/npc/asp/female/chest.vox
deleted file mode 100644
index 6ed1375ddc..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/foot_bl.vox b/assets/voxygen/voxel/npc/asp/female/foot_bl.vox
deleted file mode 100644
index 53ed1cfe43..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/foot_br.vox b/assets/voxygen/voxel/npc/asp/female/foot_br.vox
deleted file mode 100644
index 82b0dac80a..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/foot_fl.vox b/assets/voxygen/voxel/npc/asp/female/foot_fl.vox
deleted file mode 100644
index 2731fa2b6c..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/foot_fr.vox b/assets/voxygen/voxel/npc/asp/female/foot_fr.vox
deleted file mode 100644
index 33cf92df8e..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/head_lower.vox b/assets/voxygen/voxel/npc/asp/female/head_lower.vox
deleted file mode 100644
index 9d035e3c00..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/head_upper.vox b/assets/voxygen/voxel/npc/asp/female/head_upper.vox
deleted file mode 100644
index 7a5388844f..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/jaw.vox b/assets/voxygen/voxel/npc/asp/female/jaw.vox
deleted file mode 100644
index 74a71d6aa3..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/tail_front.vox b/assets/voxygen/voxel/npc/asp/female/tail_front.vox
deleted file mode 100644
index ce1a0256da..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/asp/female/tail_rear.vox b/assets/voxygen/voxel/npc/asp/female/tail_rear.vox
deleted file mode 100644
index ad2381b649..0000000000
Binary files a/assets/voxygen/voxel/npc/asp/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/axolotl/female/chest.vox b/assets/voxygen/voxel/npc/axolotl/female/chest.vox
deleted file mode 100644
index 2e0b0fe9bc..0000000000
Binary files a/assets/voxygen/voxel/npc/axolotl/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/axolotl/female/feet_b.vox b/assets/voxygen/voxel/npc/axolotl/female/feet_b.vox
deleted file mode 100644
index c84f6a9074..0000000000
Binary files a/assets/voxygen/voxel/npc/axolotl/female/feet_b.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/axolotl/female/feet_f.vox b/assets/voxygen/voxel/npc/axolotl/female/feet_f.vox
deleted file mode 100644
index c84f6a9074..0000000000
Binary files a/assets/voxygen/voxel/npc/axolotl/female/feet_f.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/axolotl/female/head.vox b/assets/voxygen/voxel/npc/axolotl/female/head.vox
deleted file mode 100644
index 1ea36d6936..0000000000
Binary files a/assets/voxygen/voxel/npc/axolotl/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/axolotl/female/tail.vox b/assets/voxygen/voxel/npc/axolotl/female/tail.vox
deleted file mode 100644
index c5905e954a..0000000000
Binary files a/assets/voxygen/voxel/npc/axolotl/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/batfox/female/chest.vox b/assets/voxygen/voxel/npc/batfox/female/chest.vox
deleted file mode 100644
index 145317c485..0000000000
Binary files a/assets/voxygen/voxel/npc/batfox/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/batfox/female/foot_bl.vox b/assets/voxygen/voxel/npc/batfox/female/foot_bl.vox
deleted file mode 100644
index 5be01ac394..0000000000
Binary files a/assets/voxygen/voxel/npc/batfox/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/batfox/female/foot_br.vox b/assets/voxygen/voxel/npc/batfox/female/foot_br.vox
deleted file mode 100644
index 6b5eb31b6b..0000000000
Binary files a/assets/voxygen/voxel/npc/batfox/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/batfox/female/foot_fl.vox b/assets/voxygen/voxel/npc/batfox/female/foot_fl.vox
deleted file mode 100644
index 91c9bc7a31..0000000000
Binary files a/assets/voxygen/voxel/npc/batfox/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/batfox/female/foot_fr.vox b/assets/voxygen/voxel/npc/batfox/female/foot_fr.vox
deleted file mode 100644
index d88a433c45..0000000000
Binary files a/assets/voxygen/voxel/npc/batfox/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/batfox/female/head.vox b/assets/voxygen/voxel/npc/batfox/female/head.vox
deleted file mode 100644
index bac4ba0bd1..0000000000
Binary files a/assets/voxygen/voxel/npc/batfox/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/head.vox b/assets/voxygen/voxel/npc/cockatrice/female/head.vox
deleted file mode 100644
index 461f5c4ead..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/leg_l.vox b/assets/voxygen/voxel/npc/cockatrice/female/leg_l.vox
deleted file mode 100644
index b58652d567..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/leg_r.vox b/assets/voxygen/voxel/npc/cockatrice/female/leg_r.vox
deleted file mode 100644
index 22e834e267..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/tail.vox b/assets/voxygen/voxel/npc/cockatrice/female/tail.vox
deleted file mode 100644
index 1a61e7fa5e..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/torso.vox b/assets/voxygen/voxel/npc/cockatrice/female/torso.vox
deleted file mode 100644
index 3255cdd817..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/torso.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/wing_l.vox b/assets/voxygen/voxel/npc/cockatrice/female/wing_l.vox
deleted file mode 100644
index fc5d940beb..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/wing_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cockatrice/female/wing_r.vox b/assets/voxygen/voxel/npc/cockatrice/female/wing_r.vox
deleted file mode 100644
index c3bfe8b7ee..0000000000
Binary files a/assets/voxygen/voxel/npc/cockatrice/female/wing_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/chest.vox b/assets/voxygen/voxel/npc/crocodile/female/chest.vox
deleted file mode 100644
index 43d12dd52b..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/foot_bl.vox b/assets/voxygen/voxel/npc/crocodile/female/foot_bl.vox
deleted file mode 100644
index beb8ae93ad..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/foot_br.vox b/assets/voxygen/voxel/npc/crocodile/female/foot_br.vox
deleted file mode 100644
index 54608b9177..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/foot_fl.vox b/assets/voxygen/voxel/npc/crocodile/female/foot_fl.vox
deleted file mode 100644
index 552169ea08..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/foot_fr.vox b/assets/voxygen/voxel/npc/crocodile/female/foot_fr.vox
deleted file mode 100644
index 1cc6ed8d86..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/head_lower.vox b/assets/voxygen/voxel/npc/crocodile/female/head_lower.vox
deleted file mode 100644
index b20c51b90b..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/head_upper.vox b/assets/voxygen/voxel/npc/crocodile/female/head_upper.vox
deleted file mode 100644
index 723c1707ff..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/jaw.vox b/assets/voxygen/voxel/npc/crocodile/female/jaw.vox
deleted file mode 100644
index 61c4076bbf..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/tail_front.vox b/assets/voxygen/voxel/npc/crocodile/female/tail_front.vox
deleted file mode 100644
index 5afafad6fa..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/crocodile/female/tail_rear.vox b/assets/voxygen/voxel/npc/crocodile/female/tail_rear.vox
deleted file mode 100644
index c6b1827324..0000000000
Binary files a/assets/voxygen/voxel/npc/crocodile/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/foot_l.vox b/assets/voxygen/voxel/npc/cyclops/female/foot_l.vox
deleted file mode 100644
index ee30f10196..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/foot_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/foot_r.vox b/assets/voxygen/voxel/npc/cyclops/female/foot_r.vox
deleted file mode 100644
index 0f18c3bc0b..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/foot_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/hammer.vox b/assets/voxygen/voxel/npc/cyclops/female/hammer.vox
deleted file mode 100644
index 92a065b5c7..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/hammer.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/hand_l.vox b/assets/voxygen/voxel/npc/cyclops/female/hand_l.vox
deleted file mode 100644
index 62632a41c8..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/hand_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/hand_r.vox b/assets/voxygen/voxel/npc/cyclops/female/hand_r.vox
deleted file mode 100644
index 380f7c4ea7..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/hand_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/head.vox b/assets/voxygen/voxel/npc/cyclops/female/head.vox
deleted file mode 100644
index aa24a00041..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/leg_l.vox b/assets/voxygen/voxel/npc/cyclops/female/leg_l.vox
deleted file mode 100644
index df825f26f3..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/leg_r.vox b/assets/voxygen/voxel/npc/cyclops/female/leg_r.vox
deleted file mode 100644
index 54334f674e..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/shoulder_l.vox b/assets/voxygen/voxel/npc/cyclops/female/shoulder_l.vox
deleted file mode 100644
index d496380b24..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/shoulder_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/shoulder_r.vox b/assets/voxygen/voxel/npc/cyclops/female/shoulder_r.vox
deleted file mode 100644
index 863a1a89f5..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/shoulder_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/torso_lower.vox b/assets/voxygen/voxel/npc/cyclops/female/torso_lower.vox
deleted file mode 100644
index 148c1aea31..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/torso_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/cyclops/female/torso_upper.vox b/assets/voxygen/voxel/npc/cyclops/female/torso_upper.vox
deleted file mode 100644
index 1d25b5ea8a..0000000000
Binary files a/assets/voxygen/voxel/npc/cyclops/female/torso_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/dodarock/female/chest.vox b/assets/voxygen/voxel/npc/dodarock/female/chest.vox
deleted file mode 100644
index 1bf8d8c1d5..0000000000
Binary files a/assets/voxygen/voxel/npc/dodarock/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/dodarock/female/foot_bl.vox b/assets/voxygen/voxel/npc/dodarock/female/foot_bl.vox
deleted file mode 100644
index f361911e2f..0000000000
Binary files a/assets/voxygen/voxel/npc/dodarock/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/dodarock/female/foot_br.vox b/assets/voxygen/voxel/npc/dodarock/female/foot_br.vox
deleted file mode 100644
index 1abbfcc40f..0000000000
Binary files a/assets/voxygen/voxel/npc/dodarock/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/dodarock/female/foot_fl.vox b/assets/voxygen/voxel/npc/dodarock/female/foot_fl.vox
deleted file mode 100644
index 5e5b2a8e71..0000000000
Binary files a/assets/voxygen/voxel/npc/dodarock/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/dodarock/female/foot_fr.vox b/assets/voxygen/voxel/npc/dodarock/female/foot_fr.vox
deleted file mode 100644
index 21b2252428..0000000000
Binary files a/assets/voxygen/voxel/npc/dodarock/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/dodarock/female/head.vox b/assets/voxygen/voxel/npc/dodarock/female/head.vox
deleted file mode 100644
index 3efb0cc31a..0000000000
Binary files a/assets/voxygen/voxel/npc/dodarock/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/head.vox b/assets/voxygen/voxel/npc/eagle/female/head.vox
deleted file mode 100644
index 6fc6ec19c3..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox
deleted file mode 100644
index 1962b95931..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox
deleted file mode 100644
index cd3c138268..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox
deleted file mode 100644
index 53a6d611c6..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox
deleted file mode 100644
index 63ce50a1cc..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/torso.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox
deleted file mode 100644
index 31a595b3e6..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox
deleted file mode 100644
index 7caf51920f..0000000000
Binary files a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/ears.vox b/assets/voxygen/voxel/npc/frostfang/female/ears.vox
deleted file mode 100644
index f70d4c7ec4..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/foot_bl.vox b/assets/voxygen/voxel/npc/frostfang/female/foot_bl.vox
deleted file mode 100644
index fce0504bd7..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/foot_br.vox b/assets/voxygen/voxel/npc/frostfang/female/foot_br.vox
deleted file mode 100644
index d4c87997cc..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/foot_fl.vox b/assets/voxygen/voxel/npc/frostfang/female/foot_fl.vox
deleted file mode 100644
index 8df57cb155..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/foot_fr.vox b/assets/voxygen/voxel/npc/frostfang/female/foot_fr.vox
deleted file mode 100644
index 0f30f5cff4..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/head_lower.vox b/assets/voxygen/voxel/npc/frostfang/female/head_lower.vox
deleted file mode 100644
index 59f940234d..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/head_upper.vox b/assets/voxygen/voxel/npc/frostfang/female/head_upper.vox
deleted file mode 100644
index 27962953e2..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/jaw.vox b/assets/voxygen/voxel/npc/frostfang/female/jaw.vox
deleted file mode 100644
index 61a50187f8..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/leg_bl.vox b/assets/voxygen/voxel/npc/frostfang/female/leg_bl.vox
deleted file mode 100644
index e4120ae4a7..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/leg_br.vox b/assets/voxygen/voxel/npc/frostfang/female/leg_br.vox
deleted file mode 100644
index 1d5acb7f47..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/leg_fl.vox b/assets/voxygen/voxel/npc/frostfang/female/leg_fl.vox
deleted file mode 100644
index 7d648739d1..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/leg_fr.vox b/assets/voxygen/voxel/npc/frostfang/female/leg_fr.vox
deleted file mode 100644
index 0908066515..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/tail.vox b/assets/voxygen/voxel/npc/frostfang/female/tail.vox
deleted file mode 100644
index 815bb1c37d..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/torso_back.vox b/assets/voxygen/voxel/npc/frostfang/female/torso_back.vox
deleted file mode 100644
index eb0a830420..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/frostfang/female/torso_front.vox b/assets/voxygen/voxel/npc/frostfang/female/torso_front.vox
deleted file mode 100644
index 80537e8e66..0000000000
Binary files a/assets/voxygen/voxel/npc/frostfang/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/fungome/female/chest.vox b/assets/voxygen/voxel/npc/fungome/female/chest.vox
deleted file mode 100644
index 7aabed0842..0000000000
Binary files a/assets/voxygen/voxel/npc/fungome/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/fungome/female/feet_b.vox b/assets/voxygen/voxel/npc/fungome/female/feet_b.vox
deleted file mode 100644
index 5ce88d2a13..0000000000
Binary files a/assets/voxygen/voxel/npc/fungome/female/feet_b.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/fungome/female/feet_f.vox b/assets/voxygen/voxel/npc/fungome/female/feet_f.vox
deleted file mode 100644
index 5ce88d2a13..0000000000
Binary files a/assets/voxygen/voxel/npc/fungome/female/feet_f.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/fungome/female/head.vox b/assets/voxygen/voxel/npc/fungome/female/head.vox
deleted file mode 100644
index a594f85e5a..0000000000
Binary files a/assets/voxygen/voxel/npc/fungome/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/fungome/female/tail.vox b/assets/voxygen/voxel/npc/fungome/female/tail.vox
deleted file mode 100644
index 6941b0f880..0000000000
Binary files a/assets/voxygen/voxel/npc/fungome/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/gecko/female/chest.vox b/assets/voxygen/voxel/npc/gecko/female/chest.vox
deleted file mode 100644
index dab811c342..0000000000
Binary files a/assets/voxygen/voxel/npc/gecko/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/gecko/female/feet_b.vox b/assets/voxygen/voxel/npc/gecko/female/feet_b.vox
deleted file mode 100644
index 64048592f9..0000000000
Binary files a/assets/voxygen/voxel/npc/gecko/female/feet_b.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/gecko/female/feet_f.vox b/assets/voxygen/voxel/npc/gecko/female/feet_f.vox
deleted file mode 100644
index e401798b56..0000000000
Binary files a/assets/voxygen/voxel/npc/gecko/female/feet_f.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/gecko/female/head.vox b/assets/voxygen/voxel/npc/gecko/female/head.vox
deleted file mode 100644
index 916d9989e6..0000000000
Binary files a/assets/voxygen/voxel/npc/gecko/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/gecko/female/tail.vox b/assets/voxygen/voxel/npc/gecko/female/tail.vox
deleted file mode 100644
index e6be1ce75d..0000000000
Binary files a/assets/voxygen/voxel/npc/gecko/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/goose/female/head.vox b/assets/voxygen/voxel/npc/goose/female/head.vox
deleted file mode 100644
index 0783df653f..0000000000
Binary files a/assets/voxygen/voxel/npc/goose/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/goose/female/leg_l.vox b/assets/voxygen/voxel/npc/goose/female/leg_l.vox
deleted file mode 100644
index f7aa3eb686..0000000000
Binary files a/assets/voxygen/voxel/npc/goose/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/goose/female/leg_r.vox b/assets/voxygen/voxel/npc/goose/female/leg_r.vox
deleted file mode 100644
index 464f4543ca..0000000000
Binary files a/assets/voxygen/voxel/npc/goose/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/goose/female/tail.vox b/assets/voxygen/voxel/npc/goose/female/tail.vox
deleted file mode 100644
index 6b724d7d2e..0000000000
Binary files a/assets/voxygen/voxel/npc/goose/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/goose/female/torso.vox b/assets/voxygen/voxel/npc/goose/female/torso.vox
deleted file mode 100644
index 262c2d1aac..0000000000
Binary files a/assets/voxygen/voxel/npc/goose/female/torso.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/goose/female/wing.vox b/assets/voxygen/voxel/npc/goose/female/wing.vox
deleted file mode 100644
index 6b22e84eb1..0000000000
Binary files a/assets/voxygen/voxel/npc/goose/female/wing.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/ears.vox b/assets/voxygen/voxel/npc/grolgar/female/ears.vox
deleted file mode 100644
index 1261db601e..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox
deleted file mode 100644
index 0d73b9b1b7..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox
deleted file mode 100644
index 950b33e69b..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox
deleted file mode 100644
index c68529471f..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox
deleted file mode 100644
index b438522f4a..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/head_lower.vox b/assets/voxygen/voxel/npc/grolgar/female/head_lower.vox
deleted file mode 100644
index 983084c14e..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox
deleted file mode 100644
index 257215a5b4..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/jaw.vox b/assets/voxygen/voxel/npc/grolgar/female/jaw.vox
deleted file mode 100644
index a4145dfd74..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/leg_bl.vox b/assets/voxygen/voxel/npc/grolgar/female/leg_bl.vox
deleted file mode 100644
index a3e85d4508..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/leg_br.vox b/assets/voxygen/voxel/npc/grolgar/female/leg_br.vox
deleted file mode 100644
index c26d7422b3..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/leg_fl.vox b/assets/voxygen/voxel/npc/grolgar/female/leg_fl.vox
deleted file mode 100644
index c014543d87..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/leg_fr.vox b/assets/voxygen/voxel/npc/grolgar/female/leg_fr.vox
deleted file mode 100644
index ccf10306b3..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/tail.vox b/assets/voxygen/voxel/npc/grolgar/female/tail.vox
deleted file mode 100644
index bd94288755..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/torso_back.vox b/assets/voxygen/voxel/npc/grolgar/female/torso_back.vox
deleted file mode 100644
index 1f3672ac83..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/grolgar/female/torso_front.vox b/assets/voxygen/voxel/npc/grolgar/female/torso_front.vox
deleted file mode 100644
index 3c5ba4e941..0000000000
Binary files a/assets/voxygen/voxel/npc/grolgar/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/holladon/female/chest.vox b/assets/voxygen/voxel/npc/holladon/female/chest.vox
deleted file mode 100644
index d769351717..0000000000
Binary files a/assets/voxygen/voxel/npc/holladon/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/holladon/female/foot_bl.vox b/assets/voxygen/voxel/npc/holladon/female/foot_bl.vox
deleted file mode 100644
index 8931c7f7e4..0000000000
Binary files a/assets/voxygen/voxel/npc/holladon/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/holladon/female/foot_br.vox b/assets/voxygen/voxel/npc/holladon/female/foot_br.vox
deleted file mode 100644
index fa4d76e048..0000000000
Binary files a/assets/voxygen/voxel/npc/holladon/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/holladon/female/foot_fl.vox b/assets/voxygen/voxel/npc/holladon/female/foot_fl.vox
deleted file mode 100644
index 03a98d9725..0000000000
Binary files a/assets/voxygen/voxel/npc/holladon/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/holladon/female/foot_fr.vox b/assets/voxygen/voxel/npc/holladon/female/foot_fr.vox
deleted file mode 100644
index eb73f553ec..0000000000
Binary files a/assets/voxygen/voxel/npc/holladon/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/holladon/female/head.vox b/assets/voxygen/voxel/npc/holladon/female/head.vox
deleted file mode 100644
index cd03898bcc..0000000000
Binary files a/assets/voxygen/voxel/npc/holladon/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/chest.vox b/assets/voxygen/voxel/npc/hyena/female/chest.vox
deleted file mode 100644
index 9c061b66cb..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox b/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox
deleted file mode 100644
index 8693abaf04..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_br.vox b/assets/voxygen/voxel/npc/hyena/female/foot_br.vox
deleted file mode 100644
index bac562c25e..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox b/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox
deleted file mode 100644
index b168ce0b45..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox b/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox
deleted file mode 100644
index 6654181cf4..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/head.vox b/assets/voxygen/voxel/npc/hyena/female/head.vox
deleted file mode 100644
index 9f22a35ed3..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/hyena/female/tail.vox b/assets/voxygen/voxel/npc/hyena/female/tail.vox
deleted file mode 100644
index db934266b5..0000000000
Binary files a/assets/voxygen/voxel/npc/hyena/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/jackalope/female/chest.vox b/assets/voxygen/voxel/npc/jackalope/female/chest.vox
deleted file mode 100644
index 457c92394b..0000000000
Binary files a/assets/voxygen/voxel/npc/jackalope/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/jackalope/female/foot_bl.vox b/assets/voxygen/voxel/npc/jackalope/female/foot_bl.vox
deleted file mode 100644
index c6ed33b70f..0000000000
Binary files a/assets/voxygen/voxel/npc/jackalope/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/jackalope/female/foot_br.vox b/assets/voxygen/voxel/npc/jackalope/female/foot_br.vox
deleted file mode 100644
index d4cb724b7a..0000000000
Binary files a/assets/voxygen/voxel/npc/jackalope/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/jackalope/female/foot_fl.vox b/assets/voxygen/voxel/npc/jackalope/female/foot_fl.vox
deleted file mode 100644
index c1209ceb39..0000000000
Binary files a/assets/voxygen/voxel/npc/jackalope/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/jackalope/female/foot_fr.vox b/assets/voxygen/voxel/npc/jackalope/female/foot_fr.vox
deleted file mode 100644
index ae67fea977..0000000000
Binary files a/assets/voxygen/voxel/npc/jackalope/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/jackalope/female/head.vox b/assets/voxygen/voxel/npc/jackalope/female/head.vox
deleted file mode 100644
index d37dabe9a2..0000000000
Binary files a/assets/voxygen/voxel/npc/jackalope/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/ears.vox b/assets/voxygen/voxel/npc/lion/female/ears.vox
deleted file mode 100644
index ef0bbc750b..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/foot_bl.vox b/assets/voxygen/voxel/npc/lion/female/foot_bl.vox
deleted file mode 100644
index 111c15fea5..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/foot_br.vox b/assets/voxygen/voxel/npc/lion/female/foot_br.vox
deleted file mode 100644
index d0c02b7eb1..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/foot_fl.vox b/assets/voxygen/voxel/npc/lion/female/foot_fl.vox
deleted file mode 100644
index bbb281ac94..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/foot_fr.vox b/assets/voxygen/voxel/npc/lion/female/foot_fr.vox
deleted file mode 100644
index 312dde3f5b..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/head_lower.vox b/assets/voxygen/voxel/npc/lion/female/head_lower.vox
deleted file mode 100644
index c8e412dc96..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/head_upper.vox b/assets/voxygen/voxel/npc/lion/female/head_upper.vox
deleted file mode 100644
index d845411a27..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/jaw.vox b/assets/voxygen/voxel/npc/lion/female/jaw.vox
deleted file mode 100644
index 8c4041c52c..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/leg_bl.vox b/assets/voxygen/voxel/npc/lion/female/leg_bl.vox
deleted file mode 100644
index 1f02772c67..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/leg_br.vox b/assets/voxygen/voxel/npc/lion/female/leg_br.vox
deleted file mode 100644
index 791de7c1e3..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/leg_fl.vox b/assets/voxygen/voxel/npc/lion/female/leg_fl.vox
deleted file mode 100644
index 1a5d8d51e3..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/leg_fr.vox b/assets/voxygen/voxel/npc/lion/female/leg_fr.vox
deleted file mode 100644
index 6a46112e8c..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/tail.vox b/assets/voxygen/voxel/npc/lion/female/tail.vox
deleted file mode 100644
index 3f2fd02839..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/torso_back.vox b/assets/voxygen/voxel/npc/lion/female/torso_back.vox
deleted file mode 100644
index 647960513c..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/lion/female/torso_front.vox b/assets/voxygen/voxel/npc/lion/female/torso_front.vox
deleted file mode 100644
index 3a8021c753..0000000000
Binary files a/assets/voxygen/voxel/npc/lion/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/chest.vox b/assets/voxygen/voxel/npc/monitor/female/chest.vox
deleted file mode 100644
index b5e2ca846d..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_bl.vox b/assets/voxygen/voxel/npc/monitor/female/foot_bl.vox
deleted file mode 100644
index 59df0ce436..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_br.vox b/assets/voxygen/voxel/npc/monitor/female/foot_br.vox
deleted file mode 100644
index 270cee5a0f..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_fl.vox b/assets/voxygen/voxel/npc/monitor/female/foot_fl.vox
deleted file mode 100644
index 9474880dbf..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox b/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox
deleted file mode 100644
index 39b89c8fbb..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox
deleted file mode 100644
index 2645662611..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox b/assets/voxygen/voxel/npc/monitor/female/head_upper.vox
deleted file mode 100644
index 90948f46a8..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/jaw.vox b/assets/voxygen/voxel/npc/monitor/female/jaw.vox
deleted file mode 100644
index 3188b076db..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/tail_front.vox b/assets/voxygen/voxel/npc/monitor/female/tail_front.vox
deleted file mode 100644
index 989985b730..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/female/tail_rear.vox b/assets/voxygen/voxel/npc/monitor/female/tail_rear.vox
deleted file mode 100644
index f6b94ba17c..0000000000
Binary files a/assets/voxygen/voxel/npc/monitor/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox b/assets/voxygen/voxel/npc/monitor/male/head_upper.vox
index 90948f46a8..61810de9fa 100644
Binary files a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox and b/assets/voxygen/voxel/npc/monitor/male/head_upper.vox differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/foot_bl.vox b/assets/voxygen/voxel/npc/mouflon/female/foot_bl.vox
deleted file mode 100644
index d587cc76bf..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/foot_br.vox b/assets/voxygen/voxel/npc/mouflon/female/foot_br.vox
deleted file mode 100644
index d587cc76bf..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/foot_fl.vox b/assets/voxygen/voxel/npc/mouflon/female/foot_fl.vox
deleted file mode 100644
index 82bb02c9ee..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/foot_fr.vox b/assets/voxygen/voxel/npc/mouflon/female/foot_fr.vox
deleted file mode 100644
index 82bb02c9ee..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/head_lower.vox b/assets/voxygen/voxel/npc/mouflon/female/head_lower.vox
deleted file mode 100644
index fdfc0d1234..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/head_upper.vox b/assets/voxygen/voxel/npc/mouflon/female/head_upper.vox
deleted file mode 100644
index ab4d003b34..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/jaw.vox b/assets/voxygen/voxel/npc/mouflon/female/jaw.vox
deleted file mode 100644
index 396c2b9949..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/leg_bl.vox b/assets/voxygen/voxel/npc/mouflon/female/leg_bl.vox
deleted file mode 100644
index c966f94287..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/leg_br.vox b/assets/voxygen/voxel/npc/mouflon/female/leg_br.vox
deleted file mode 100644
index e90a7268b4..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/leg_fl.vox b/assets/voxygen/voxel/npc/mouflon/female/leg_fl.vox
deleted file mode 100644
index 70b227efce..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/leg_fr.vox b/assets/voxygen/voxel/npc/mouflon/female/leg_fr.vox
deleted file mode 100644
index 6643bd1745..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/tail.vox b/assets/voxygen/voxel/npc/mouflon/female/tail.vox
deleted file mode 100644
index fabd112e56..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/torso_back.vox b/assets/voxygen/voxel/npc/mouflon/female/torso_back.vox
deleted file mode 100644
index 177647d304..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/mouflon/female/torso_front.vox b/assets/voxygen/voxel/npc/mouflon/female/torso_front.vox
deleted file mode 100644
index 03174c9bda..0000000000
Binary files a/assets/voxygen/voxel/npc/mouflon/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/club_l.vox b/assets/voxygen/voxel/npc/ogre/female/club_l.vox
deleted file mode 100644
index 88cfd64d35..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/club_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/club_r.vox b/assets/voxygen/voxel/npc/ogre/female/club_r.vox
deleted file mode 100644
index b2fc77d27c..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/club_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/foot_l.vox b/assets/voxygen/voxel/npc/ogre/female/foot_l.vox
deleted file mode 100644
index bb97d9fb06..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/foot_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/foot_r.vox b/assets/voxygen/voxel/npc/ogre/female/foot_r.vox
deleted file mode 100644
index c23067d22a..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/foot_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/hand_l.vox b/assets/voxygen/voxel/npc/ogre/female/hand_l.vox
deleted file mode 100644
index 460328af90..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/hand_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/hand_r.vox b/assets/voxygen/voxel/npc/ogre/female/hand_r.vox
deleted file mode 100644
index a12741bbbf..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/hand_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/head.vox b/assets/voxygen/voxel/npc/ogre/female/head.vox
deleted file mode 100644
index 484ba5fb53..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/leg_l.vox b/assets/voxygen/voxel/npc/ogre/female/leg_l.vox
deleted file mode 100644
index 20c84204aa..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/leg_r.vox b/assets/voxygen/voxel/npc/ogre/female/leg_r.vox
deleted file mode 100644
index b9a5eeeebc..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/shoulder_l.vox b/assets/voxygen/voxel/npc/ogre/female/shoulder_l.vox
deleted file mode 100644
index 5eda2f9a69..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/shoulder_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/shoulder_r.vox b/assets/voxygen/voxel/npc/ogre/female/shoulder_r.vox
deleted file mode 100644
index 6feced59b5..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/shoulder_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/torso_lower.vox b/assets/voxygen/voxel/npc/ogre/female/torso_lower.vox
deleted file mode 100644
index 7fde668e1a..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/torso_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/ogre/female/torso_upper.vox b/assets/voxygen/voxel/npc/ogre/female/torso_upper.vox
deleted file mode 100644
index 48775c9886..0000000000
Binary files a/assets/voxygen/voxel/npc/ogre/female/torso_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/chest.vox b/assets/voxygen/voxel/npc/pangolin/female/chest.vox
deleted file mode 100644
index 87776d111f..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/foot_bl.vox b/assets/voxygen/voxel/npc/pangolin/female/foot_bl.vox
deleted file mode 100644
index 404e6b168b..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/foot_br.vox b/assets/voxygen/voxel/npc/pangolin/female/foot_br.vox
deleted file mode 100644
index 3c55b61964..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/foot_fl.vox b/assets/voxygen/voxel/npc/pangolin/female/foot_fl.vox
deleted file mode 100644
index c3393fc6fb..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/foot_fr.vox b/assets/voxygen/voxel/npc/pangolin/female/foot_fr.vox
deleted file mode 100644
index 4b44a016c4..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/head_upper.vox b/assets/voxygen/voxel/npc/pangolin/female/head_upper.vox
deleted file mode 100644
index b267753ce1..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/tail_front.vox b/assets/voxygen/voxel/npc/pangolin/female/tail_front.vox
deleted file mode 100644
index b0bde66c1a..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/pangolin/female/tail_rear.vox b/assets/voxygen/voxel/npc/pangolin/female/tail_rear.vox
deleted file mode 100644
index bd583c11cb..0000000000
Binary files a/assets/voxygen/voxel/npc/pangolin/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/parrot/female/head.vox b/assets/voxygen/voxel/npc/parrot/female/head.vox
deleted file mode 100644
index 1df613f6f3..0000000000
Binary files a/assets/voxygen/voxel/npc/parrot/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_l.vox b/assets/voxygen/voxel/npc/parrot/female/leg_l.vox
deleted file mode 100644
index a785b52604..0000000000
Binary files a/assets/voxygen/voxel/npc/parrot/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox
deleted file mode 100644
index f856c99013..0000000000
Binary files a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/parrot/female/tail.vox b/assets/voxygen/voxel/npc/parrot/female/tail.vox
deleted file mode 100644
index 1f18d0fa11..0000000000
Binary files a/assets/voxygen/voxel/npc/parrot/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/parrot/female/torso.vox b/assets/voxygen/voxel/npc/parrot/female/torso.vox
deleted file mode 100644
index 124b392f53..0000000000
Binary files a/assets/voxygen/voxel/npc/parrot/female/torso.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/parrot/female/wing.vox b/assets/voxygen/voxel/npc/parrot/female/wing.vox
deleted file mode 100644
index 56d39ea50c..0000000000
Binary files a/assets/voxygen/voxel/npc/parrot/female/wing.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/quokka/female/chest.vox b/assets/voxygen/voxel/npc/quokka/female/chest.vox
deleted file mode 100644
index d2a3155fc1..0000000000
Binary files a/assets/voxygen/voxel/npc/quokka/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/quokka/female/foot_bl.vox b/assets/voxygen/voxel/npc/quokka/female/foot_bl.vox
deleted file mode 100644
index 8c27bcf693..0000000000
Binary files a/assets/voxygen/voxel/npc/quokka/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/quokka/female/foot_br.vox b/assets/voxygen/voxel/npc/quokka/female/foot_br.vox
deleted file mode 100644
index 0602b4db24..0000000000
Binary files a/assets/voxygen/voxel/npc/quokka/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/quokka/female/foot_fl.vox b/assets/voxygen/voxel/npc/quokka/female/foot_fl.vox
deleted file mode 100644
index 1886c280ea..0000000000
Binary files a/assets/voxygen/voxel/npc/quokka/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/quokka/female/foot_fr.vox b/assets/voxygen/voxel/npc/quokka/female/foot_fr.vox
deleted file mode 100644
index 182c368bc0..0000000000
Binary files a/assets/voxygen/voxel/npc/quokka/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/quokka/female/head.vox b/assets/voxygen/voxel/npc/quokka/female/head.vox
deleted file mode 100644
index c3e7fa5f69..0000000000
Binary files a/assets/voxygen/voxel/npc/quokka/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/chest.vox b/assets/voxygen/voxel/npc/raccoon/female/chest.vox
deleted file mode 100644
index 952c155124..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/foot_bl.vox b/assets/voxygen/voxel/npc/raccoon/female/foot_bl.vox
deleted file mode 100644
index edf4bfe554..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/foot_br.vox b/assets/voxygen/voxel/npc/raccoon/female/foot_br.vox
deleted file mode 100644
index 614e96f7fe..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/foot_fl.vox b/assets/voxygen/voxel/npc/raccoon/female/foot_fl.vox
deleted file mode 100644
index 0d1ed561cc..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/foot_fr.vox b/assets/voxygen/voxel/npc/raccoon/female/foot_fr.vox
deleted file mode 100644
index 0d1ed561cc..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/head.vox b/assets/voxygen/voxel/npc/raccoon/female/head.vox
deleted file mode 100644
index 6ae54ecd17..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/raccoon/female/tail.vox b/assets/voxygen/voxel/npc/raccoon/female/tail.vox
deleted file mode 100644
index 46931b0f81..0000000000
Binary files a/assets/voxygen/voxel/npc/raccoon/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rat/female/chest.vox b/assets/voxygen/voxel/npc/rat/female/chest.vox
deleted file mode 100644
index 7b7dfbe310..0000000000
Binary files a/assets/voxygen/voxel/npc/rat/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rat/female/feet_b.vox b/assets/voxygen/voxel/npc/rat/female/feet_b.vox
deleted file mode 100644
index 3b1c60b692..0000000000
Binary files a/assets/voxygen/voxel/npc/rat/female/feet_b.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rat/female/feet_f.vox b/assets/voxygen/voxel/npc/rat/female/feet_f.vox
deleted file mode 100644
index 3b1c60b692..0000000000
Binary files a/assets/voxygen/voxel/npc/rat/female/feet_f.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rat/female/head.vox b/assets/voxygen/voxel/npc/rat/female/head.vox
deleted file mode 100644
index 44abdf5d46..0000000000
Binary files a/assets/voxygen/voxel/npc/rat/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rat/female/tail.vox b/assets/voxygen/voxel/npc/rat/female/tail.vox
deleted file mode 100644
index 310c3afd6f..0000000000
Binary files a/assets/voxygen/voxel/npc/rat/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/chest_front.vox b/assets/voxygen/voxel/npc/reddragon/female/chest_front.vox
deleted file mode 100644
index 1adaa0b3da..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/chest_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/chest_rear.vox b/assets/voxygen/voxel/npc/reddragon/female/chest_rear.vox
deleted file mode 100644
index cc013a9bcb..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/chest_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/foot_bl.vox b/assets/voxygen/voxel/npc/reddragon/female/foot_bl.vox
deleted file mode 100644
index 019dc0ef26..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/foot_br.vox b/assets/voxygen/voxel/npc/reddragon/female/foot_br.vox
deleted file mode 100644
index 86be0d6765..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/foot_fl.vox b/assets/voxygen/voxel/npc/reddragon/female/foot_fl.vox
deleted file mode 100644
index 5b4d8fd38e..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/foot_fr.vox b/assets/voxygen/voxel/npc/reddragon/female/foot_fr.vox
deleted file mode 100644
index f108563d0c..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/head_lower.vox b/assets/voxygen/voxel/npc/reddragon/female/head_lower.vox
deleted file mode 100644
index 1eeec8571b..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/head_upper.vox b/assets/voxygen/voxel/npc/reddragon/female/head_upper.vox
deleted file mode 100644
index c317ef3006..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/jaw.vox b/assets/voxygen/voxel/npc/reddragon/female/jaw.vox
deleted file mode 100644
index e0c7da0d9a..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/tail_front.vox b/assets/voxygen/voxel/npc/reddragon/female/tail_front.vox
deleted file mode 100644
index 873f65df01..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/tail_rear.vox b/assets/voxygen/voxel/npc/reddragon/female/tail_rear.vox
deleted file mode 100644
index 9c1972d2e9..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/wing_in_l.vox b/assets/voxygen/voxel/npc/reddragon/female/wing_in_l.vox
deleted file mode 100644
index 1263cc91ca..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/wing_in_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/wing_in_r.vox b/assets/voxygen/voxel/npc/reddragon/female/wing_in_r.vox
deleted file mode 100644
index 30c4c14f38..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/wing_in_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/wing_out_l.vox b/assets/voxygen/voxel/npc/reddragon/female/wing_out_l.vox
deleted file mode 100644
index dcca02bfd5..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/wing_out_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/reddragon/female/wing_out_r.vox b/assets/voxygen/voxel/npc/reddragon/female/wing_out_r.vox
deleted file mode 100644
index 00e1574616..0000000000
Binary files a/assets/voxygen/voxel/npc/reddragon/female/wing_out_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/chest.vox b/assets/voxygen/voxel/npc/rocksnapper/female/chest.vox
deleted file mode 100644
index 4527c0dbaa..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox
deleted file mode 100644
index c96f36bdcf..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox
deleted file mode 100644
index 0d307e92dd..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox
deleted file mode 100644
index 0aa14f0820..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox
deleted file mode 100644
index 6f6c230dba..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox b/assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox
deleted file mode 100644
index 90971df576..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox b/assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox
deleted file mode 100644
index 4dce04ac00..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox b/assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox
deleted file mode 100644
index 45012a2467..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox b/assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox
deleted file mode 100644
index 6579ed703d..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox b/assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox
deleted file mode 100644
index 00daca59a5..0000000000
Binary files a/assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/ears.vox b/assets/voxygen/voxel/npc/saber/female/ears.vox
deleted file mode 100644
index d2965b2ac2..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/foot_bl.vox b/assets/voxygen/voxel/npc/saber/female/foot_bl.vox
deleted file mode 100644
index 4a8afb34fc..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/foot_br.vox b/assets/voxygen/voxel/npc/saber/female/foot_br.vox
deleted file mode 100644
index 8da0b066c8..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/foot_fl.vox b/assets/voxygen/voxel/npc/saber/female/foot_fl.vox
deleted file mode 100644
index a39967ebc8..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/foot_fr.vox b/assets/voxygen/voxel/npc/saber/female/foot_fr.vox
deleted file mode 100644
index fe051cfda1..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/head_lower.vox b/assets/voxygen/voxel/npc/saber/female/head_lower.vox
deleted file mode 100644
index 494459a85f..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/head_upper.vox b/assets/voxygen/voxel/npc/saber/female/head_upper.vox
deleted file mode 100644
index 963af2426a..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/jaw.vox b/assets/voxygen/voxel/npc/saber/female/jaw.vox
deleted file mode 100644
index 496e99bbfa..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/leg_bl.vox b/assets/voxygen/voxel/npc/saber/female/leg_bl.vox
deleted file mode 100644
index 4e7cb872cf..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/leg_br.vox b/assets/voxygen/voxel/npc/saber/female/leg_br.vox
deleted file mode 100644
index 8720949361..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/leg_fl.vox b/assets/voxygen/voxel/npc/saber/female/leg_fl.vox
deleted file mode 100644
index 78d448acce..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/leg_fr.vox b/assets/voxygen/voxel/npc/saber/female/leg_fr.vox
deleted file mode 100644
index abd2a22285..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/tail.vox b/assets/voxygen/voxel/npc/saber/female/tail.vox
deleted file mode 100644
index 0734c0aad2..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/torso_back.vox b/assets/voxygen/voxel/npc/saber/female/torso_back.vox
deleted file mode 100644
index f65aeab483..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/saber/female/torso_front.vox b/assets/voxygen/voxel/npc/saber/female/torso_front.vox
deleted file mode 100644
index 45c4a480e5..0000000000
Binary files a/assets/voxygen/voxel/npc/saber/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/chest.vox b/assets/voxygen/voxel/npc/salamander/female/chest.vox
deleted file mode 100644
index 0f812c5e90..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_bl.vox b/assets/voxygen/voxel/npc/salamander/female/foot_bl.vox
deleted file mode 100644
index 7290806bc8..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_br.vox b/assets/voxygen/voxel/npc/salamander/female/foot_br.vox
deleted file mode 100644
index 7f134c0d0a..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_fl.vox b/assets/voxygen/voxel/npc/salamander/female/foot_fl.vox
deleted file mode 100644
index 02ca8d1d9a..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox b/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox
deleted file mode 100644
index 4b9ddbc888..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox
deleted file mode 100644
index 8f806473ee..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/head_upper.vox b/assets/voxygen/voxel/npc/salamander/female/head_upper.vox
deleted file mode 100644
index 10a5daca1b..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/jaw.vox b/assets/voxygen/voxel/npc/salamander/female/jaw.vox
deleted file mode 100644
index 10663a321d..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/tail_front.vox b/assets/voxygen/voxel/npc/salamander/female/tail_front.vox
deleted file mode 100644
index 40326f9dd6..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox b/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox
deleted file mode 100644
index 46f6dd9cdb..0000000000
Binary files a/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/chest.vox b/assets/voxygen/voxel/npc/skunk/female/chest.vox
deleted file mode 100644
index 449c291a50..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/foot_bl.vox b/assets/voxygen/voxel/npc/skunk/female/foot_bl.vox
deleted file mode 100644
index 392c8e7527..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/foot_br.vox b/assets/voxygen/voxel/npc/skunk/female/foot_br.vox
deleted file mode 100644
index 392c8e7527..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/foot_fl.vox b/assets/voxygen/voxel/npc/skunk/female/foot_fl.vox
deleted file mode 100644
index d50d9d4d0d..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/foot_fr.vox b/assets/voxygen/voxel/npc/skunk/female/foot_fr.vox
deleted file mode 100644
index 0125ea7473..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/head.vox b/assets/voxygen/voxel/npc/skunk/female/head.vox
deleted file mode 100644
index c1a7b537f6..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/skunk/female/tail.vox b/assets/voxygen/voxel/npc/skunk/female/tail.vox
deleted file mode 100644
index 50ab915399..0000000000
Binary files a/assets/voxygen/voxel/npc/skunk/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/head.vox b/assets/voxygen/voxel/npc/snowyowl/female/head.vox
deleted file mode 100644
index fe546fc12d..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox b/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox
deleted file mode 100644
index f44665c7a1..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox b/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox
deleted file mode 100644
index 2b515a4be7..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/tail.vox b/assets/voxygen/voxel/npc/snowyowl/female/tail.vox
deleted file mode 100644
index 21210a16e8..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/torso.vox b/assets/voxygen/voxel/npc/snowyowl/female/torso.vox
deleted file mode 100644
index 17a583d3c0..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/torso.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox b/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox
deleted file mode 100644
index 4716787ed8..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox b/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox
deleted file mode 100644
index 0303ca626d..0000000000
Binary files a/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/squirrel/female/chest.vox b/assets/voxygen/voxel/npc/squirrel/female/chest.vox
deleted file mode 100644
index 76bdafaa5c..0000000000
Binary files a/assets/voxygen/voxel/npc/squirrel/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/squirrel/female/feet_b.vox b/assets/voxygen/voxel/npc/squirrel/female/feet_b.vox
deleted file mode 100644
index c0dbbe7dea..0000000000
Binary files a/assets/voxygen/voxel/npc/squirrel/female/feet_b.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/squirrel/female/feet_f.vox b/assets/voxygen/voxel/npc/squirrel/female/feet_f.vox
deleted file mode 100644
index c0dbbe7dea..0000000000
Binary files a/assets/voxygen/voxel/npc/squirrel/female/feet_f.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/squirrel/female/head.vox b/assets/voxygen/voxel/npc/squirrel/female/head.vox
deleted file mode 100644
index d7eed6248f..0000000000
Binary files a/assets/voxygen/voxel/npc/squirrel/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/squirrel/female/tail.vox b/assets/voxygen/voxel/npc/squirrel/female/tail.vox
deleted file mode 100644
index dd2a53444b..0000000000
Binary files a/assets/voxygen/voxel/npc/squirrel/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/foot_l.vox b/assets/voxygen/voxel/npc/stonegolem/female/foot_l.vox
deleted file mode 100644
index 40ebfc452a..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/foot_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/foot_r.vox b/assets/voxygen/voxel/npc/stonegolem/female/foot_r.vox
deleted file mode 100644
index d12454e283..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/foot_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/hand_l.vox b/assets/voxygen/voxel/npc/stonegolem/female/hand_l.vox
deleted file mode 100644
index 42c0d3c5a8..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/hand_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/hand_r.vox b/assets/voxygen/voxel/npc/stonegolem/female/hand_r.vox
deleted file mode 100644
index 66157bb40c..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/hand_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/head.vox b/assets/voxygen/voxel/npc/stonegolem/female/head.vox
deleted file mode 100644
index 133e43f5d8..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/leg_l.vox b/assets/voxygen/voxel/npc/stonegolem/female/leg_l.vox
deleted file mode 100644
index 63483b743e..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/leg_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/leg_r.vox b/assets/voxygen/voxel/npc/stonegolem/female/leg_r.vox
deleted file mode 100644
index c525185215..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/leg_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/shoulder_l.vox b/assets/voxygen/voxel/npc/stonegolem/female/shoulder_l.vox
deleted file mode 100644
index 6a7591e7d2..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/shoulder_l.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/shoulder_r.vox b/assets/voxygen/voxel/npc/stonegolem/female/shoulder_r.vox
deleted file mode 100644
index 8b9b3a8caa..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/shoulder_r.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/stonegolem/female/torso_upper.vox b/assets/voxygen/voxel/npc/stonegolem/female/torso_upper.vox
deleted file mode 100644
index dc718dd2ac..0000000000
Binary files a/assets/voxygen/voxel/npc/stonegolem/female/torso_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/ears.vox b/assets/voxygen/voxel/npc/tarasque/female/ears.vox
deleted file mode 100644
index 9ecce1afd0..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/foot_bl.vox b/assets/voxygen/voxel/npc/tarasque/female/foot_bl.vox
deleted file mode 100644
index caa5390b0c..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/foot_br.vox b/assets/voxygen/voxel/npc/tarasque/female/foot_br.vox
deleted file mode 100644
index 9574407838..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/foot_fl.vox b/assets/voxygen/voxel/npc/tarasque/female/foot_fl.vox
deleted file mode 100644
index c02dd99a61..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/foot_fr.vox b/assets/voxygen/voxel/npc/tarasque/female/foot_fr.vox
deleted file mode 100644
index 03f2da135a..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/head_lower.vox b/assets/voxygen/voxel/npc/tarasque/female/head_lower.vox
deleted file mode 100644
index c498fb81eb..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox b/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox
deleted file mode 100644
index 0bbe6fe200..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/jaw.vox b/assets/voxygen/voxel/npc/tarasque/female/jaw.vox
deleted file mode 100644
index cde41851d3..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/leg_bl.vox b/assets/voxygen/voxel/npc/tarasque/female/leg_bl.vox
deleted file mode 100644
index de83509a07..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/leg_br.vox b/assets/voxygen/voxel/npc/tarasque/female/leg_br.vox
deleted file mode 100644
index 875d1ba12f..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/leg_fl.vox b/assets/voxygen/voxel/npc/tarasque/female/leg_fl.vox
deleted file mode 100644
index 38835efb4d..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/leg_fr.vox b/assets/voxygen/voxel/npc/tarasque/female/leg_fr.vox
deleted file mode 100644
index 3dcbe012b5..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/tail.vox b/assets/voxygen/voxel/npc/tarasque/female/tail.vox
deleted file mode 100644
index c603af7695..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/torso_back.vox b/assets/voxygen/voxel/npc/tarasque/female/torso_back.vox
deleted file mode 100644
index da1f32367d..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tarasque/female/torso_front.vox b/assets/voxygen/voxel/npc/tarasque/female/torso_front.vox
deleted file mode 100644
index 2f7a489199..0000000000
Binary files a/assets/voxygen/voxel/npc/tarasque/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/ears.vox b/assets/voxygen/voxel/npc/tiger/female/ears.vox
deleted file mode 100644
index f3110119b2..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/foot_bl.vox b/assets/voxygen/voxel/npc/tiger/female/foot_bl.vox
deleted file mode 100644
index 74c360990a..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/foot_br.vox b/assets/voxygen/voxel/npc/tiger/female/foot_br.vox
deleted file mode 100644
index e2626c1040..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/foot_fl.vox b/assets/voxygen/voxel/npc/tiger/female/foot_fl.vox
deleted file mode 100644
index 8f4b28db0d..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/foot_fr.vox b/assets/voxygen/voxel/npc/tiger/female/foot_fr.vox
deleted file mode 100644
index bc8d9e45bd..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/head_lower.vox b/assets/voxygen/voxel/npc/tiger/female/head_lower.vox
deleted file mode 100644
index cf3f3839f7..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/head_upper.vox b/assets/voxygen/voxel/npc/tiger/female/head_upper.vox
deleted file mode 100644
index f9f24b8458..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/jaw.vox b/assets/voxygen/voxel/npc/tiger/female/jaw.vox
deleted file mode 100644
index 7caa4357b0..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/leg_bl.vox b/assets/voxygen/voxel/npc/tiger/female/leg_bl.vox
deleted file mode 100644
index 3519108d86..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/leg_br.vox b/assets/voxygen/voxel/npc/tiger/female/leg_br.vox
deleted file mode 100644
index 94e6867f16..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/leg_fl.vox b/assets/voxygen/voxel/npc/tiger/female/leg_fl.vox
deleted file mode 100644
index 692358cb4c..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/leg_fr.vox b/assets/voxygen/voxel/npc/tiger/female/leg_fr.vox
deleted file mode 100644
index b3fdd48e3c..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/tail.vox b/assets/voxygen/voxel/npc/tiger/female/tail.vox
deleted file mode 100644
index ce9088c505..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/torso_back.vox b/assets/voxygen/voxel/npc/tiger/female/torso_back.vox
deleted file mode 100644
index 85708a6929..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tiger/female/torso_front.vox b/assets/voxygen/voxel/npc/tiger/female/torso_front.vox
deleted file mode 100644
index 9ed832769a..0000000000
Binary files a/assets/voxygen/voxel/npc/tiger/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/chest.vox b/assets/voxygen/voxel/npc/tortoise/female/chest.vox
deleted file mode 100644
index 6c5f10c5f7..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/foot_bl.vox b/assets/voxygen/voxel/npc/tortoise/female/foot_bl.vox
deleted file mode 100644
index b26692414a..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox b/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox
deleted file mode 100644
index ee2432708b..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/foot_fl.vox b/assets/voxygen/voxel/npc/tortoise/female/foot_fl.vox
deleted file mode 100644
index 3a88cca721..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox b/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox
deleted file mode 100644
index 78675fb337..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/head_lower.vox b/assets/voxygen/voxel/npc/tortoise/female/head_lower.vox
deleted file mode 100644
index 5f8d9dae4e..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/head_upper.vox b/assets/voxygen/voxel/npc/tortoise/female/head_upper.vox
deleted file mode 100644
index 1f7b9a9508..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/jaw.vox b/assets/voxygen/voxel/npc/tortoise/female/jaw.vox
deleted file mode 100644
index 4dfd85efde..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox b/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox
deleted file mode 100644
index b6845d2ab3..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tortoise/tail_rear.vox b/assets/voxygen/voxel/npc/tortoise/tail_rear.vox
deleted file mode 100644
index ee74a1b9c7..0000000000
Binary files a/assets/voxygen/voxel/npc/tortoise/tail_rear.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/turtle/female/chest.vox b/assets/voxygen/voxel/npc/turtle/female/chest.vox
deleted file mode 100644
index 6782d48f39..0000000000
Binary files a/assets/voxygen/voxel/npc/turtle/female/chest.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/turtle/female/feet_b.vox b/assets/voxygen/voxel/npc/turtle/female/feet_b.vox
deleted file mode 100644
index 87a904a820..0000000000
Binary files a/assets/voxygen/voxel/npc/turtle/female/feet_b.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/turtle/female/feet_f.vox b/assets/voxygen/voxel/npc/turtle/female/feet_f.vox
deleted file mode 100644
index 87a904a820..0000000000
Binary files a/assets/voxygen/voxel/npc/turtle/female/feet_f.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/turtle/female/head.vox b/assets/voxygen/voxel/npc/turtle/female/head.vox
deleted file mode 100644
index 2b9a82f3e8..0000000000
Binary files a/assets/voxygen/voxel/npc/turtle/female/head.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/turtle/female/tail.vox b/assets/voxygen/voxel/npc/turtle/female/tail.vox
deleted file mode 100644
index 593e3d138e..0000000000
Binary files a/assets/voxygen/voxel/npc/turtle/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox
deleted file mode 100644
index a0675eabfc..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox
deleted file mode 100644
index 2988cb31b1..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox
deleted file mode 100644
index 85dcd5043d..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox
deleted file mode 100644
index 2fc6b34a4b..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox b/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox
deleted file mode 100644
index 874b36148c..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox b/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox
deleted file mode 100644
index 3f3f3d58f0..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/jaw.vox b/assets/voxygen/voxel/npc/tuskram/female/jaw.vox
deleted file mode 100644
index 08487a2133..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox
deleted file mode 100644
index 128e7bd0eb..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_br.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_br.vox
deleted file mode 100644
index de20ec4be4..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox
deleted file mode 100644
index 63d3fc488b..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox
deleted file mode 100644
index 07c851adef..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/tail.vox b/assets/voxygen/voxel/npc/tuskram/female/tail.vox
deleted file mode 100644
index 2243b951fc..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox b/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox
deleted file mode 100644
index 37083a205b..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox b/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox
deleted file mode 100644
index 0381fd4a35..0000000000
Binary files a/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/ears.vox b/assets/voxygen/voxel/npc/wolf/female/ears.vox
deleted file mode 100644
index f75ce276ce..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/ears.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/foot_bl.vox b/assets/voxygen/voxel/npc/wolf/female/foot_bl.vox
deleted file mode 100644
index f547d166be..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/foot_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/foot_br.vox b/assets/voxygen/voxel/npc/wolf/female/foot_br.vox
deleted file mode 100644
index 8e0c3212f9..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/foot_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/foot_fl.vox b/assets/voxygen/voxel/npc/wolf/female/foot_fl.vox
deleted file mode 100644
index a31452a6d8..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/foot_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/foot_fr.vox b/assets/voxygen/voxel/npc/wolf/female/foot_fr.vox
deleted file mode 100644
index b2dcc437b0..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/foot_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/head_lower.vox b/assets/voxygen/voxel/npc/wolf/female/head_lower.vox
deleted file mode 100644
index 0745d1e414..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/head_lower.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/head_upper.vox b/assets/voxygen/voxel/npc/wolf/female/head_upper.vox
deleted file mode 100644
index 80866827b9..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/head_upper.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/jaw.vox b/assets/voxygen/voxel/npc/wolf/female/jaw.vox
deleted file mode 100644
index 003d65773c..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/jaw.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/leg_bl.vox b/assets/voxygen/voxel/npc/wolf/female/leg_bl.vox
deleted file mode 100644
index 3157b6bb88..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/leg_bl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/leg_br.vox b/assets/voxygen/voxel/npc/wolf/female/leg_br.vox
deleted file mode 100644
index fc5af2b137..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/leg_br.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/leg_fl.vox b/assets/voxygen/voxel/npc/wolf/female/leg_fl.vox
deleted file mode 100644
index 388e5bea2f..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/leg_fl.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/leg_fr.vox b/assets/voxygen/voxel/npc/wolf/female/leg_fr.vox
deleted file mode 100644
index 609d9e77bc..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/leg_fr.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/tail.vox b/assets/voxygen/voxel/npc/wolf/female/tail.vox
deleted file mode 100644
index 3d91af792f..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/tail.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/torso_back.vox b/assets/voxygen/voxel/npc/wolf/female/torso_back.vox
deleted file mode 100644
index 18748caa4e..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/torso_back.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/npc/wolf/female/torso_front.vox b/assets/voxygen/voxel/npc/wolf/female/torso_front.vox
deleted file mode 100644
index 08ebfd68b9..0000000000
Binary files a/assets/voxygen/voxel/npc/wolf/female/torso_front.vox and /dev/null differ
diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron
index 76eb8cd58d..b088cbda03 100644
--- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron
@@ -28,27 +28,27 @@
(Crocodile, Female): (
upper: (
offset: (-4.0, -8.5, -3.0),
- central: ("npc.crocodile.female.head_upper"),
+ central: ("npc.crocodile.male.head_upper"),
),
lower: (
offset: (-4.0, -4.0, -3.0),
- central: ("npc.crocodile.female.head_lower"),
+ central: ("npc.crocodile.male.head_lower"),
),
jaw: (
offset: (-4.0, 0.0, -1.5),
- central: ("npc.crocodile.female.jaw"),
+ central: ("npc.crocodile.male.jaw"),
),
chest: (
offset: (-5.0, -7.5, -3.0),
- central: ("npc.crocodile.female.chest"),
+ central: ("npc.crocodile.male.chest"),
),
tail_rear: (
offset: (-1.0, -9.0, -1.5),
- central: ("npc.crocodile.female.tail_rear"),
+ central: ("npc.crocodile.male.tail_rear"),
),
tail_front: (
offset: (-3.0, -13.0, -2.5),
- central: ("npc.crocodile.female.tail_front"),
+ central: ("npc.crocodile.male.tail_front"),
),
),
(Alligator, Male): (
@@ -80,27 +80,27 @@
(Alligator, Female): (
upper: (
offset: (-4.0, -0.0, -2.5),
- central: ("npc.alligator.female.head_upper"),
+ central: ("npc.alligator.male.head_upper"),
),
lower: (
offset: (-4.0, -4.0, -3.5),
- central: ("npc.alligator.female.head_lower"),
+ central: ("npc.alligator.male.head_lower"),
),
jaw: (
offset: (-4.0, 0.0, -2.5),
- central: ("npc.alligator.female.jaw"),
+ central: ("npc.alligator.male.jaw"),
),
chest: (
offset: (-6.0, -7.5, -3.5),
- central: ("npc.alligator.female.chest"),
+ central: ("npc.alligator.male.chest"),
),
tail_rear: (
offset: (-2.0, -9.0, -1.5),
- central: ("npc.alligator.female.tail_rear"),
+ central: ("npc.alligator.male.tail_rear"),
),
tail_front: (
offset: (-4.0, -13.0, -2.5),
- central: ("npc.alligator.female.tail_front"),
+ central: ("npc.alligator.male.tail_front"),
),
),
(Salamander, Male): (
@@ -132,27 +132,27 @@
(Salamander, Female): (
upper: (
offset: (-6.5, -6.0, -2.0),
- central: ("npc.salamander.female.head_upper"),
+ central: ("npc.salamander.male.head_upper"),
),
lower: (
offset: (-4.5, -1.5, -3.0),
- central: ("npc.salamander.female.head_lower"),
+ central: ("npc.salamander.male.head_lower"),
),
jaw: (
offset: (-6.5, 0.0, -3.0),
- central: ("npc.salamander.female.jaw"),
+ central: ("npc.salamander.male.jaw"),
),
chest: (
offset: (-6.5, -8.5, -3.0),
- central: ("npc.salamander.female.chest"),
+ central: ("npc.salamander.male.chest"),
),
tail_rear: (
offset: (-3.0, -13.0, -3.0),
- central: ("npc.salamander.female.tail_rear"),
+ central: ("npc.salamander.male.tail_rear"),
),
tail_front: (
offset: (-4.5, -9.0, -3.0),
- central: ("npc.salamander.female.tail_front"),
+ central: ("npc.salamander.male.tail_front"),
),
),
(Monitor, Male): (
@@ -185,27 +185,27 @@
(Monitor, Female): (
upper: (
offset: (-3.0, -5.5, -3.0),
- central: ("npc.monitor.female.head_upper"),
+ central: ("npc.monitor.male.head_upper"),
),
lower: (
offset: (-3.0, -3.5, -3.5),
- central: ("npc.monitor.female.head_lower"),
+ central: ("npc.monitor.male.head_lower"),
),
jaw: (
offset: (-3.0, 0.0, -1.0),
- central: ("npc.monitor.female.jaw"),
+ central: ("npc.monitor.male.jaw"),
),
chest: (
offset: (-4.0, -7.0, -3.0),
- central: ("npc.monitor.female.chest"),
+ central: ("npc.monitor.male.chest"),
),
tail_rear: (
offset: (-1.0, -11.0, -2.0),
- central: ("npc.monitor.female.tail_rear"),
+ central: ("npc.monitor.male.tail_rear"),
),
tail_front: (
offset: (-2.0, -13.0, -2.0),
- central: ("npc.monitor.female.tail_front"),
+ central: ("npc.monitor.male.tail_front"),
),
),
(Asp, Male): (
@@ -237,27 +237,27 @@
(Asp, Female): (
upper: (
offset: (-5.0, -5.0, -5.0),
- central: ("npc.asp.female.head_upper"),
+ central: ("npc.asp.male.head_upper"),
),
lower: (
offset: (-6.0, -3.0, -7.5),
- central: ("npc.asp.female.head_lower"),
+ central: ("npc.asp.male.head_lower"),
),
jaw: (
offset: (-2.0, 0.0, -1.0),
- central: ("npc.asp.female.jaw"),
+ central: ("npc.asp.male.jaw"),
),
chest: (
offset: (-5.0, -7.5, -5.0),
- central: ("npc.asp.female.chest"),
+ central: ("npc.asp.male.chest"),
),
tail_rear: (
offset: (-1.0, -14.0, -2.0),
- central: ("npc.asp.female.tail_rear"),
+ central: ("npc.asp.male.tail_rear"),
),
tail_front: (
offset: (-3.0, -14.0, -4.0),
- central: ("npc.asp.female.tail_front"),
+ central: ("npc.asp.male.tail_front"),
),
),
(Tortoise, Male): (
@@ -289,19 +289,19 @@
(Tortoise, Female): (
upper: (
offset: (-2.5, -4.0, -3.0),
- central: ("npc.tortoise.female.head_upper"),
+ central: ("npc.tortoise.male.head_upper"),
),
lower: (
offset: (-2.5, -3.5, -2.0),
- central: ("npc.tortoise.female.head_lower"),
+ central: ("npc.tortoise.male.head_lower"),
),
jaw: (
offset: (-1.5, 0.0, -1.0),
- central: ("npc.tortoise.female.jaw"),
+ central: ("npc.tortoise.male.jaw"),
),
chest: (
offset: (-10.5, -12.5, -7.0),
- central: ("npc.tortoise.female.chest"),
+ central: ("npc.tortoise.male.chest"),
),
tail_rear: (
offset: (0.0, 0.0, 0.0),
@@ -309,7 +309,7 @@
),
tail_front: (
offset: (-1.5, -7.0, -1.5),
- central: ("npc.tortoise.female.tail_front"),
+ central: ("npc.tortoise.male.tail_front"),
),
),
(Rocksnapper, Male): (
@@ -341,27 +341,27 @@
(Rocksnapper, Female): (
upper: (
offset: (-3.5, -4.5, -3.0),
- central: ("npc.rocksnapper.female.head_upper"),
+ central: ("npc.rocksnapper.male.head_upper"),
),
lower: (
offset: (-3.5, -5.0, -3.5),
- central: ("npc.rocksnapper.female.head_lower"),
+ central: ("npc.rocksnapper.male.head_lower"),
),
jaw: (
offset: (-6.5, 0.0, -2.5),
- central: ("npc.rocksnapper.female.jaw"),
+ central: ("npc.rocksnapper.male.jaw"),
),
chest: (
offset: (-15.5, -18.5, -13.5),
- central: ("npc.rocksnapper.female.chest"),
+ central: ("npc.rocksnapper.male.chest"),
),
tail_rear: (
offset: (-1.5, -11.0, -2.5),
- central: ("npc.rocksnapper.female.tail_rear"),
+ central: ("npc.rocksnapper.male.tail_rear"),
),
tail_front: (
offset: (-2.5, -15.0, -4.5),
- central: ("npc.rocksnapper.female.tail_front"),
+ central: ("npc.rocksnapper.male.tail_front"),
),
),
(Pangolin, Male): (
@@ -393,7 +393,7 @@
(Pangolin, Female): (
upper: (
offset: (-2.5, 0.0, -3.0),
- central: ("npc.pangolin.female.head_upper"),
+ central: ("npc.pangolin.male.head_upper"),
),
lower: (
offset: (0.0, 0.0, 0.0),
@@ -405,15 +405,15 @@
),
chest: (
offset: (-6.5, -8.0, -4.5),
- central: ("npc.pangolin.female.chest"),
+ central: ("npc.pangolin.male.chest"),
),
tail_rear: (
offset: (-3.5, -16.0, -1.5),
- central: ("npc.pangolin.female.tail_rear"),
+ central: ("npc.pangolin.male.tail_rear"),
),
tail_front: (
offset: (-4.5, -8.0, -4.0),
- central: ("npc.pangolin.female.tail_front"),
+ central: ("npc.pangolin.male.tail_front"),
),
),
})
diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron
index 9b0f104843..c02fc81839 100644
--- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron
@@ -20,19 +20,19 @@
(Crocodile, Female): (
front_left: (
offset: (-7.0, -0.0, -4.0),
- lateral: ("npc.crocodile.female.foot_fl"),
+ lateral: ("npc.crocodile.male.foot_fl"),
),
front_right: (
offset: (0.0, -0.0, -4.0),
- lateral: ("npc.crocodile.female.foot_fr"),
+ lateral: ("npc.crocodile.male.foot_fr"),
),
back_left: (
offset: (-8.0, -0.0, -4.0),
- lateral: ("npc.crocodile.female.foot_bl"),
+ lateral: ("npc.crocodile.male.foot_bl"),
),
back_right: (
offset: (0.0, -0.0, -4.0),
- lateral: ("npc.crocodile.female.foot_br"),
+ lateral: ("npc.crocodile.male.foot_br"),
),
),
(Alligator, Male): (
@@ -56,19 +56,19 @@
(Alligator, Female): (
front_left: (
offset: (-7.0, 0.0, -4.0),
- lateral: ("npc.alligator.female.foot_fl"),
+ lateral: ("npc.alligator.male.foot_fl"),
),
front_right: (
offset: (0.0, 0.0, -4.0),
- lateral: ("npc.alligator.female.foot_fr"),
+ lateral: ("npc.alligator.male.foot_fr"),
),
back_left: (
offset: (-8.0, 0.0, -4.0),
- lateral: ("npc.alligator.female.foot_bl"),
+ lateral: ("npc.alligator.male.foot_bl"),
),
back_right: (
offset: (0.0, 0.0, -4.0),
- lateral: ("npc.alligator.female.foot_br"),
+ lateral: ("npc.alligator.male.foot_br"),
),
),
(Salamander, Male): (
@@ -92,19 +92,19 @@
(Salamander, Female): (
front_left: (
offset: (-6.0, 0.0, -3.0),
- lateral: ("npc.salamander.female.foot_fl"),
+ lateral: ("npc.salamander.male.foot_fl"),
),
front_right: (
offset: (0.0, 0.0, -3.0),
- lateral: ("npc.salamander.female.foot_fr"),
+ lateral: ("npc.salamander.male.foot_fr"),
),
back_left: (
offset: (-7.0, 0.0, -3.0),
- lateral: ("npc.salamander.female.foot_bl"),
+ lateral: ("npc.salamander.male.foot_bl"),
),
back_right: (
offset: (0.0, 0.0, -3.0),
- lateral: ("npc.salamander.female.foot_br"),
+ lateral: ("npc.salamander.male.foot_br"),
),
),
(Monitor, Male): (
@@ -128,19 +128,19 @@
(Monitor, Female): (
front_left: (
offset: (-8.0, 0.0, -5.0),
- lateral: ("npc.monitor.female.foot_fl"),
+ lateral: ("npc.monitor.male.foot_fl"),
),
front_right: (
offset: (0.0, 0.0, -5.0),
- lateral: ("npc.monitor.female.foot_fr"),
+ lateral: ("npc.monitor.male.foot_fr"),
),
back_left: (
offset: (-7.0, 0.0, -5.0),
- lateral: ("npc.monitor.female.foot_bl"),
+ lateral: ("npc.monitor.male.foot_bl"),
),
back_right: (
offset: (0.0, 0.0, -5.0),
- lateral: ("npc.monitor.female.foot_br"),
+ lateral: ("npc.monitor.male.foot_br"),
),
),
(Asp, Male): (
@@ -164,19 +164,19 @@
(Asp, Female): (
front_left: (
offset: (-11.0, 0.0, -7.0),
- lateral: ("npc.asp.female.foot_fl"),
+ lateral: ("npc.asp.male.foot_fl"),
),
front_right: (
offset: (0.0, 0.0, -7.0),
- lateral: ("npc.asp.female.foot_fr"),
+ lateral: ("npc.asp.male.foot_fr"),
),
back_left: (
offset: (-9.0, 0.0, -7.0),
- lateral: ("npc.asp.female.foot_bl"),
+ lateral: ("npc.asp.male.foot_bl"),
),
back_right: (
offset: (0.0, 0.0, -7.0),
- lateral: ("npc.asp.female.foot_br"),
+ lateral: ("npc.asp.male.foot_br"),
),
),
(Tortoise, Male): (
@@ -200,19 +200,19 @@
(Tortoise, Female): (
front_left: (
offset: (-7.0, 0.0, -8.0),
- lateral: ("npc.tortoise.female.foot_fl"),
+ lateral: ("npc.tortoise.male.foot_fl"),
),
front_right: (
offset: (0.0, 0.0, -8.0),
- lateral: ("npc.tortoise.female.foot_fr"),
+ lateral: ("npc.tortoise.male.foot_fr"),
),
back_left: (
offset: (-7.0, 0.0, -8.0),
- lateral: ("npc.tortoise.female.foot_bl"),
+ lateral: ("npc.tortoise.male.foot_bl"),
),
back_right: (
offset: (0.0, 0.0, -8.0),
- lateral: ("npc.tortoise.female.foot_br"),
+ lateral: ("npc.tortoise.male.foot_br"),
),
),
(Rocksnapper, Male): (
@@ -236,19 +236,19 @@
(Rocksnapper, Female): (
front_left: (
offset: (-12.0, 0.0, -10.0),
- lateral: ("npc.rocksnapper.female.foot_fl"),
+ lateral: ("npc.rocksnapper.male.foot_fl"),
),
front_right: (
offset: (0.0, 0.0, -10.0),
- lateral: ("npc.rocksnapper.female.foot_fr"),
+ lateral: ("npc.rocksnapper.male.foot_fr"),
),
back_left: (
offset: (-11.0, -6.0, -9.0),//special case
- lateral: ("npc.rocksnapper.female.foot_bl"),
+ lateral: ("npc.rocksnapper.male.foot_bl"),
),
back_right: (
offset: (0.0, -6.0, -9.0),
- lateral: ("npc.rocksnapper.female.foot_br"),
+ lateral: ("npc.rocksnapper.male.foot_br"),
),
),
(Pangolin, Male): (
@@ -272,19 +272,19 @@
(Pangolin, Female): (
front_left: (
offset: (-1.5, 0.0, -6.0),
- lateral: ("npc.pangolin.female.foot_fl"),
+ lateral: ("npc.pangolin.male.foot_fl"),
),
front_right: (
offset: (-1.5, 0.0, -6.0),
- lateral: ("npc.pangolin.female.foot_fr"),
+ lateral: ("npc.pangolin.male.foot_fr"),
),
back_left: (
offset: (-1.5, 0.0, -6.0),//special case
- lateral: ("npc.pangolin.female.foot_bl"),
+ lateral: ("npc.pangolin.male.foot_bl"),
),
back_right: (
offset: (-1.5, 0.0, -6.0),
- lateral: ("npc.pangolin.female.foot_br"),
+ lateral: ("npc.pangolin.male.foot_br"),
),
),
})
diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
index 9da1996d96..3f3e4b3084 100644
--- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron
@@ -32,31 +32,31 @@
(Grolgar, Female): (
upper: (
offset: (-7.0, 0.0, -9.0),
- central: ("npc.grolgar.female.head_upper"),
+ central: ("npc.grolgar.male.head_upper"),
),
lower: (
offset: (-6.0, -2.0, -8.0),
- central: ("npc.grolgar.female.head_lower"),
+ central: ("npc.grolgar.male.head_lower"),
),
jaw: (
offset: (-2.0, 0.0, -1.5),
- central: ("npc.grolgar.female.jaw"),
+ central: ("npc.grolgar.male.jaw"),
),
torso_front: (
offset: (-7.0, -11.0, -8.0),
- central: ("npc.grolgar.female.torso_front"),
+ central: ("npc.grolgar.male.torso_front"),
),
torso_back: (
offset: (-5.0, -12.0, -5.5),
- central: ("npc.grolgar.female.torso_back"),
+ central: ("npc.grolgar.male.torso_back"),
),
ears: (
offset: (-4.0, -1.0, 0.0),
- central: ("npc.grolgar.female.ears"),
+ central: ("npc.grolgar.male.ears"),
),
tail: (
offset: (-2.0, -11.0, -10.0),
- central: ("npc.grolgar.female.tail"),
+ central: ("npc.grolgar.male.tail"),
),
),
(Saber, Male): (
@@ -92,31 +92,31 @@
(Saber, Female): (
upper: (
offset: (-5.5, 0.0, -6.5),
- central: ("npc.saber.female.head_upper"),
+ central: ("npc.saber.male.head_upper"),
),
lower: (
offset: (-4.0, -5.5, -4.0),
- central: ("npc.saber.female.head_lower"),
+ central: ("npc.saber.male.head_lower"),
),
jaw: (
offset: (-2.5, 0.0, -1.5),
- central: ("npc.saber.female.jaw"),
+ central: ("npc.saber.male.jaw"),
),
torso_front: (
offset: (-6.0, -14.0, -6.0),
- central: ("npc.saber.female.torso_front"),
+ central: ("npc.saber.male.torso_front"),
),
torso_back: (
offset: (-5.0, -12.0, -5.0),
- central: ("npc.saber.female.torso_back"),
+ central: ("npc.saber.male.torso_back"),
),
ears: (
offset: (-5.5, -1.0, 0.0),
- central: ("npc.saber.female.ears"),
+ central: ("npc.saber.male.ears"),
),
tail: (
offset: (-2.0, -8.0, -5.0),
- central: ("npc.saber.female.tail"),
+ central: ("npc.saber.male.tail"),
),
),
(Tuskram, Male): (
@@ -152,23 +152,23 @@
(Tuskram, Female): (
upper: (
offset: (-10.0, -6.0, -6.5),
- central: ("npc.tuskram.female.head_upper"),
+ central: ("npc.tuskram.male.head_upper"),
),
lower: (
offset: (-4.0, -4.0, -3.5),
- central: ("npc.tuskram.female.head_lower"),
+ central: ("npc.tuskram.male.head_lower"),
),
jaw: (
offset: (-2.0, 0.0, -1.5),
- central: ("npc.tuskram.female.jaw"),
+ central: ("npc.tuskram.male.jaw"),
),
torso_front: (
offset: (-6.0, -15.0, -6.5),
- central: ("npc.tuskram.female.torso_front"),
+ central: ("npc.tuskram.male.torso_front"),
),
torso_back: (
offset: (-4.0, -10.0, -4.5),
- central: ("npc.tuskram.female.torso_back"),
+ central: ("npc.tuskram.male.torso_back"),
),
ears: (
offset: (-0.5, -0.5, -0.0),
@@ -176,7 +176,7 @@
),
tail: (
offset: (-3.0, -7.0, -8.0),
- central: ("npc.tuskram.female.tail"),
+ central: ("npc.tuskram.male.tail"),
),
),
(Lion, Male): (
@@ -212,31 +212,31 @@
(Lion, Female): (
upper: (
offset: (-4.5, 0.0, -4.5),
- central: ("npc.lion.female.head_upper"),
+ central: ("npc.lion.male.head_upper"),
),
lower: (
offset: (-7.5, -5.5, -8.5),
- central: ("npc.lion.female.head_lower"),
+ central: ("npc.lion.male.head_lower"),
),
jaw: (
offset: (-2.5, 0.0, -1.0),
- central: ("npc.lion.female.jaw"),
+ central: ("npc.lion.male.jaw"),
),
torso_front: (
offset: (-5.5, -13.0, -6.0),
- central: ("npc.lion.female.torso_front"),
+ central: ("npc.lion.male.torso_front"),
),
torso_back: (
offset: (-5.5, -12.0, -5.0),
- central: ("npc.lion.female.torso_back"),
+ central: ("npc.lion.male.torso_back"),
),
ears: (
offset: (-4.5, -1.0, 0.0),
- central: ("npc.lion.female.ears"),
+ central: ("npc.lion.male.ears"),
),
tail: (
offset: (-1.5, -15.0, -10.0),
- central: ("npc.lion.female.tail"),
+ central: ("npc.lion.male.tail"),
),
),
(Tarasque, Male): (
@@ -272,31 +272,31 @@
(Tarasque, Female): (
upper: (
offset: (-10.0, 0.0, -10.0),
- central: ("npc.tarasque.female.head_upper"),
+ central: ("npc.tarasque.male.head_upper"),
),
lower: (
offset: (-5.0, -3.0, -4.5),
- central: ("npc.tarasque.female.head_lower"),
+ central: ("npc.tarasque.male.head_lower"),
),
jaw: (
offset: (-5.0, 0.0, -0.0),
- central: ("npc.tarasque.female.jaw"),
+ central: ("npc.tarasque.male.jaw"),
),
torso_front: (
offset: (-10.0, -17.0, -9.0),
- central: ("npc.tarasque.female.torso_front"),
+ central: ("npc.tarasque.male.torso_front"),
),
torso_back: (
offset: (-6.0, -13.0, -6.0),
- central: ("npc.tarasque.female.torso_back"),
+ central: ("npc.tarasque.male.torso_back"),
),
ears: (
offset: (-6.0, -1.0, 0.0),
- central: ("npc.tarasque.female.ears"),
+ central: ("npc.tarasque.male.ears"),
),
tail: (
offset: (-5.0, -19.0, -10.0),
- central: ("npc.tarasque.female.tail"),
+ central: ("npc.tarasque.male.tail"),
),
),
(Tiger, Male): (
@@ -332,31 +332,31 @@
(Tiger, Female): (
upper: (
offset: (-5.5, 0.0, -5.0),
- central: ("npc.tiger.female.head_upper"),
+ central: ("npc.tiger.male.head_upper"),
),
lower: (
offset: (-4.5, -2.0, -5.0),
- central: ("npc.tiger.female.head_lower"),
+ central: ("npc.tiger.male.head_lower"),
),
jaw: (
offset: (-2.5, 0.0, -1.0),
- central: ("npc.tiger.female.jaw"),
+ central: ("npc.tiger.male.jaw"),
),
torso_front: (
offset: (-5.5, -13.0, -6.5),
- central: ("npc.tiger.female.torso_front"),
+ central: ("npc.tiger.male.torso_front"),
),
torso_back: (
offset: (-5.5, -13.0, -5.0),
- central: ("npc.tiger.female.torso_back"),
+ central: ("npc.tiger.male.torso_back"),
),
ears: (
offset: (-4.5, -1.0, 0.0),
- central: ("npc.tiger.female.ears"),
+ central: ("npc.tiger.male.ears"),
),
tail: (
offset: (-1.5, -12.0, -1.0),
- central: ("npc.tiger.female.tail"),
+ central: ("npc.tiger.male.tail"),
),
),
(Wolf, Male): (
@@ -392,31 +392,31 @@
(Wolf, Female): (
upper: (
offset: (-5.0, 0.0, -3.5),
- central: ("npc.wolf.female.head_upper"),
+ central: ("npc.wolf.male.head_upper"),
),
lower: (
offset: (-5.0, -4.5, -5.0),
- central: ("npc.wolf.female.head_lower"),
+ central: ("npc.wolf.male.head_lower"),
),
jaw: (
offset: (-2.0, 0.0, -1.0),
- central: ("npc.wolf.female.jaw"),
+ central: ("npc.wolf.male.jaw"),
),
torso_front: (
offset: (-5.0, -13.0, -5.0),
- central: ("npc.wolf.female.torso_front"),
+ central: ("npc.wolf.male.torso_front"),
),
torso_back: (
offset: (-4.0, -11.0, -5.0),
- central: ("npc.wolf.female.torso_back"),
+ central: ("npc.wolf.male.torso_back"),
),
ears: (
offset: (-5.0, -1.0, 0.0),
- central: ("npc.wolf.female.ears"),
+ central: ("npc.wolf.male.ears"),
),
tail: (
offset: (-2.0, -13.0, -3.5),
- central: ("npc.wolf.female.tail"),
+ central: ("npc.wolf.male.tail"),
),
),
(Frostfang, Male): (
@@ -452,31 +452,31 @@
(Frostfang, Female): (
upper: (
offset: (-4.0, 0.0, -4.5),
- central: ("npc.frostfang.female.head_upper"),
+ central: ("npc.frostfang.male.head_upper"),
),
lower: (
offset: (-3.0, -2.0, -4.0),
- central: ("npc.frostfang.female.head_lower"),
+ central: ("npc.frostfang.male.head_lower"),
),
jaw: (
offset: (-2.0, 0.0, -3.5),
- central: ("npc.frostfang.female.jaw"),
+ central: ("npc.frostfang.male.jaw"),
),
torso_front: (
offset: (-5.0, -11.0, -8.5),
- central: ("npc.frostfang.female.torso_front"),
+ central: ("npc.frostfang.male.torso_front"),
),
torso_back: (
offset: (-3.0, -8.0, -4.5),
- central: ("npc.frostfang.female.torso_back"),
+ central: ("npc.frostfang.male.torso_back"),
),
ears: (
offset: (-4.0, -1.0, 0.0),
- central: ("npc.frostfang.female.ears"),
+ central: ("npc.frostfang.male.ears"),
),
tail: (
offset: (-2.0, -13.0, -5.0),
- central: ("npc.frostfang.female.tail"),
+ central: ("npc.frostfang.male.tail"),
),
),
(Mouflon, Male): (
@@ -512,23 +512,23 @@
(Mouflon, Female): (
upper: (
offset: (-7.0, 0.0, -4.5),
- central: ("npc.mouflon.female.head_upper"),
+ central: ("npc.mouflon.male.head_upper"),
),
lower: (
offset: (-4.0, -4.0, -4.5),
- central: ("npc.mouflon.female.head_lower"),
+ central: ("npc.mouflon.male.head_lower"),
),
jaw: (
offset: (-2.0, 0.0, -1.0),
- central: ("npc.mouflon.female.jaw"),
+ central: ("npc.mouflon.male.jaw"),
),
torso_front: (
offset: (-4.0, -9.0, -4.5),
- central: ("npc.mouflon.female.torso_front"),
+ central: ("npc.mouflon.male.torso_front"),
),
torso_back: (
offset: (-4.0, -11.0, -5.0),
- central: ("npc.mouflon.female.torso_back"),
+ central: ("npc.mouflon.male.torso_back"),
),
ears: (
offset: (0.0, 0.0, 0.0),
@@ -536,7 +536,7 @@
),
tail: (
offset: (-2.0, -1.5, -7.0),
- central: ("npc.mouflon.female.tail"),
+ central: ("npc.mouflon.male.tail"),
),
),
})
diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
index 052be53942..8184cef7c4 100644
--- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
@@ -36,35 +36,35 @@
(Grolgar, Female): (
leg_fl: (
offset: (-2.5, -12.0, -7.5),
- lateral: ("npc.grolgar.female.leg_fl"),
+ lateral: ("npc.grolgar.male.leg_fl"),
),
leg_fr: (
offset: (-2.5, -12.0, -7.5),
- lateral: ("npc.grolgar.female.leg_fr"),
+ lateral: ("npc.grolgar.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.5, -5.0),
- lateral: ("npc.grolgar.female.leg_bl"),
+ lateral: ("npc.grolgar.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -3.5, -5.0),
- lateral: ("npc.grolgar.female.leg_br"),
+ lateral: ("npc.grolgar.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -3.0, -6.0),
- lateral: ("npc.grolgar.female.foot_fl"),
+ lateral: ("npc.grolgar.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -3.0, -6.0),
- lateral: ("npc.grolgar.female.foot_fr"),
+ lateral: ("npc.grolgar.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -2.0, -4.0),
- lateral: ("npc.grolgar.female.foot_bl"),
+ lateral: ("npc.grolgar.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -2.0, -4.0),
- lateral: ("npc.grolgar.female.foot_br"),
+ lateral: ("npc.grolgar.male.foot_br"),
),
),
(Saber, Male): (
@@ -104,35 +104,35 @@
(Saber, Female): (
leg_fl: (
offset: (-2.0, -6.0, -4.5),
- lateral: ("npc.saber.female.leg_fl"),
+ lateral: ("npc.saber.male.leg_fl"),
),
leg_fr: (
offset: (-2.0, -6.0, -4.5),
- lateral: ("npc.saber.female.leg_fr"),
+ lateral: ("npc.saber.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.0, -4.0),
- lateral: ("npc.saber.female.leg_bl"),
+ lateral: ("npc.saber.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -3.0, -4.0),
- lateral: ("npc.saber.female.leg_br"),
+ lateral: ("npc.saber.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -2.5, -8.0),
- lateral: ("npc.saber.female.foot_fl"),
+ lateral: ("npc.saber.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -2.5, -8.0),
- lateral: ("npc.saber.female.foot_fr"),
+ lateral: ("npc.saber.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -2.0, -9.0),
- lateral: ("npc.saber.female.foot_bl"),
+ lateral: ("npc.saber.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -2.0, -9.0),
- lateral: ("npc.saber.female.foot_br"),
+ lateral: ("npc.saber.male.foot_br"),
),
),
(Tuskram, Male): (
@@ -172,35 +172,35 @@
(Tuskram, Female): (
leg_fl: (
offset: (-2.0, -2.5, -10.0),
- lateral: ("npc.tuskram.female.leg_fl"),
+ lateral: ("npc.tuskram.male.leg_fl"),
),
leg_fr: (
offset: (-2.0, -2.5, -10.0),
- lateral: ("npc.tuskram.female.leg_fr"),
+ lateral: ("npc.tuskram.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -2.5, -4.0),
- lateral: ("npc.tuskram.female.leg_bl"),
+ lateral: ("npc.tuskram.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -2.5, -4.0),
- lateral: ("npc.tuskram.female.leg_br"),
+ lateral: ("npc.tuskram.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -2.0, -5.0),
- lateral: ("npc.tuskram.female.foot_fl"),
+ lateral: ("npc.tuskram.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -2.0, -5.0),
- lateral: ("npc.tuskram.female.foot_fr"),
+ lateral: ("npc.tuskram.male.foot_fr"),
),
foot_bl: (
offset: (-1.5, -1.5, -6.0),
- lateral: ("npc.tuskram.female.foot_bl"),
+ lateral: ("npc.tuskram.male.foot_bl"),
),
foot_br: (
offset: (-1.5, -1.5, -6.0),
- lateral: ("npc.tuskram.female.foot_br"),
+ lateral: ("npc.tuskram.male.foot_br"),
),
),
(Lion, Male): (
@@ -240,35 +240,35 @@
(Lion, Female): (
leg_fl: (
offset: (-2.0, -2.5, -7.5),
- lateral: ("npc.lion.female.leg_fl"),
+ lateral: ("npc.lion.male.leg_fl"),
),
leg_fr: (
offset: (-2.0, -2.5, -7.5),
- lateral: ("npc.lion.female.leg_fr"),
+ lateral: ("npc.lion.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.0, -6.0),
- lateral: ("npc.lion.female.leg_bl"),
+ lateral: ("npc.lion.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -3.0, -6.0),
- lateral: ("npc.lion.female.leg_br"),
+ lateral: ("npc.lion.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -2.0, -5.0),
- lateral: ("npc.lion.female.foot_fl"),
+ lateral: ("npc.lion.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -2.0, -5.0),
- lateral: ("npc.lion.female.foot_fr"),
+ lateral: ("npc.lion.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -2.0, -6.0),
- lateral: ("npc.lion.female.foot_bl"),
+ lateral: ("npc.lion.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -2.0, -6.0),
- lateral: ("npc.lion.female.foot_br"),
+ lateral: ("npc.lion.male.foot_br"),
),
),
(Tarasque, Male): (
@@ -308,35 +308,35 @@
(Tarasque, Female): (
leg_fl: (
offset: (-3.0, -5.0, -4.0),
- lateral: ("npc.tarasque.female.leg_fl"),
+ lateral: ("npc.tarasque.male.leg_fl"),
),
leg_fr: (
offset: (-3.0, -5.0, -4.0),
- lateral: ("npc.tarasque.female.leg_fr"),
+ lateral: ("npc.tarasque.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.5, -3.5),
- lateral: ("npc.tarasque.female.leg_bl"),
+ lateral: ("npc.tarasque.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -3.5, -3.5),
- lateral: ("npc.tarasque.female.leg_br"),
+ lateral: ("npc.tarasque.male.leg_br"),
),
foot_fl: (
offset: (-4.0, -3.0, -9.0), //(1/4) Y dimension, (1/1) Z dimension
- lateral: ("npc.tarasque.female.foot_fl"),
+ lateral: ("npc.tarasque.male.foot_fl"),
),
foot_fr: (
offset: (-4.0, -3.0, -9.0), //(1/4) Y dimension, (1/1) Z dimension
- lateral: ("npc.tarasque.female.foot_fr"),
+ lateral: ("npc.tarasque.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -2.0, -8.0),
- lateral: ("npc.tarasque.female.foot_bl"),
+ lateral: ("npc.tarasque.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -2.0, -8.0),
- lateral: ("npc.tarasque.female.foot_br"),
+ lateral: ("npc.tarasque.male.foot_br"),
),
),
(Tiger, Male): (
@@ -376,35 +376,35 @@
(Tiger, Female): (
leg_fl: (
offset: (-2.0, -3.0, -5.0),
- lateral: ("npc.tiger.female.leg_fl"),
+ lateral: ("npc.tiger.male.leg_fl"),
),
leg_fr: (
offset: (-2.0, -3.0, -5.0),
- lateral: ("npc.tiger.female.leg_fr"),
+ lateral: ("npc.tiger.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -3.0, -5.0),
- lateral: ("npc.tiger.female.leg_bl"),
+ lateral: ("npc.tiger.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -3.0, -5.0),
- lateral: ("npc.tiger.female.leg_br"),
+ lateral: ("npc.tiger.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -2.0, -6.0),
- lateral: ("npc.tiger.female.foot_fl"),
+ lateral: ("npc.tiger.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -2.0, -6.0),
- lateral: ("npc.tiger.female.foot_fr"),
+ lateral: ("npc.tiger.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -2.0, -6.0),
- lateral: ("npc.tiger.female.foot_bl"),
+ lateral: ("npc.tiger.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -2.0, -6.0),
- lateral: ("npc.tiger.female.foot_br"),
+ lateral: ("npc.tiger.male.foot_br"),
),
),
(Wolf, Male): (
@@ -444,35 +444,35 @@
(Wolf, Female): (
leg_fl: (
offset: (-2.0, -3.5, -4.0),
- lateral: ("npc.wolf.female.leg_fl"),
+ lateral: ("npc.wolf.male.leg_fl"),
),
leg_fr: (
offset: (-2.0, -3.5, -4.0),
- lateral: ("npc.wolf.female.leg_fr"),
+ lateral: ("npc.wolf.male.leg_fr"),
),
leg_bl: (
offset: (-1.5, -3.5, -3.5),
- lateral: ("npc.wolf.female.leg_bl"),
+ lateral: ("npc.wolf.male.leg_bl"),
),
leg_br: (
offset: (-1.5, -3.5, -3.5),
- lateral: ("npc.wolf.female.leg_br"),
+ lateral: ("npc.wolf.male.leg_br"),
),
foot_fl: (
offset: (-1.5, -2.5, -10.0),
- lateral: ("npc.wolf.female.foot_fl"),
+ lateral: ("npc.wolf.male.foot_fl"),
),
foot_fr: (
offset: (-1.5, -2.5, -10.0),
- lateral: ("npc.wolf.female.foot_fr"),
+ lateral: ("npc.wolf.male.foot_fr"),
),
foot_bl: (
offset: (-1.5, -2.5, -10.0),
- lateral: ("npc.wolf.female.foot_bl"),
+ lateral: ("npc.wolf.male.foot_bl"),
),
foot_br: (
offset: (-1.5, -2.5, -10.0),
- lateral: ("npc.wolf.female.foot_br"),
+ lateral: ("npc.wolf.male.foot_br"),
),
),
(Frostfang, Male): (
@@ -512,35 +512,35 @@
(Frostfang, Female): (
leg_fl: (
offset: (-1.5, -3.5, -3.5),
- lateral: ("npc.frostfang.female.leg_fl"),
+ lateral: ("npc.frostfang.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -3.5, -3.5),
- lateral: ("npc.frostfang.female.leg_fr"),
+ lateral: ("npc.frostfang.male.leg_fr"),
),
leg_bl: (
offset: (-1.5, -3.5, -3.5),
- lateral: ("npc.frostfang.female.leg_bl"),
+ lateral: ("npc.frostfang.male.leg_bl"),
),
leg_br: (
offset: (-1.5, -3.5, -3.5),
- lateral: ("npc.frostfang.female.leg_br"),
+ lateral: ("npc.frostfang.male.leg_br"),
),
foot_fl: (
offset: (-2.5, -1.5, -6.0),
- lateral: ("npc.frostfang.female.foot_fl"),
+ lateral: ("npc.frostfang.male.foot_fl"),
),
foot_fr: (
offset: (-2.5, -1.5, -6.0),
- lateral: ("npc.frostfang.female.foot_fr"),
+ lateral: ("npc.frostfang.male.foot_fr"),
),
foot_bl: (
offset: (-2.5, -1.5, -6.0),
- lateral: ("npc.frostfang.female.foot_bl"),
+ lateral: ("npc.frostfang.male.foot_bl"),
),
foot_br: (
offset: (-2.5, -1.5, -6.0),
- lateral: ("npc.frostfang.female.foot_br"),
+ lateral: ("npc.frostfang.male.foot_br"),
),
),
(Mouflon, Male): (
@@ -580,35 +580,35 @@
(Mouflon, Female): (
leg_fl: (
offset: (-1.5, -2.5, -2.5),
- lateral: ("npc.mouflon.female.leg_fl"),
+ lateral: ("npc.mouflon.male.leg_fl"),
),
leg_fr: (
offset: (-1.5, -2.5, -2.5),
- lateral: ("npc.mouflon.female.leg_fr"),
+ lateral: ("npc.mouflon.male.leg_fr"),
),
leg_bl: (
offset: (-2.0, -2.5, -3.5),
- lateral: ("npc.mouflon.female.leg_bl"),
+ lateral: ("npc.mouflon.male.leg_bl"),
),
leg_br: (
offset: (-2.0, -2.5, -3.5),
- lateral: ("npc.mouflon.female.leg_br"),
+ lateral: ("npc.mouflon.male.leg_br"),
),
foot_fl: (
offset: (-1.0, -1.0, -7.0),
- lateral: ("npc.mouflon.female.foot_fl"),
+ lateral: ("npc.mouflon.male.foot_fl"),
),
foot_fr: (
offset: (-1.0, -1.0, -7.0),
- lateral: ("npc.mouflon.female.foot_fr"),
+ lateral: ("npc.mouflon.male.foot_fr"),
),
foot_bl: (
offset: (-1.0, -0.5, -6.0),
- lateral: ("npc.mouflon.female.foot_bl"),
+ lateral: ("npc.mouflon.male.foot_bl"),
),
foot_br: (
offset: (-1.0, -0.5, -6.0),
- lateral: ("npc.mouflon.female.foot_br"),
+ lateral: ("npc.mouflon.male.foot_br"),
),
),
})
diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron
index e8c6798c3b..d0ba503c35 100644
--- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron
@@ -132,11 +132,11 @@
(Jackalope, Female):(
head: (
offset: (-3.5, -4.5, -4.5),
- central: ("npc.jackalope.female.head"),
+ central: ("npc.jackalope.male.head"),
),
chest: (
offset: (-1.5, -7.5, -2.5),
- central: ("npc.jackalope.female.chest"),
+ central: ("npc.jackalope.male.chest"),
),
tail: (
offset: (-1.5, -7.5, -2.5),
@@ -160,15 +160,15 @@
(Skunk, Female):(
head: (
offset: (-2.0, -1.0, -2.0),
- central: ("npc.skunk.female.head"),
+ central: ("npc.skunk.male.head"),
),
chest: (
offset: (-3.0, -4.5, -2.5),
- central: ("npc.skunk.female.chest"),
+ central: ("npc.skunk.male.chest"),
),
tail: (
offset: (-3.0, -10.0, -4.5),
- central: ("npc.skunk.female.tail"),
+ central: ("npc.skunk.male.tail"),
),
),
(Cat, Male):(
@@ -217,11 +217,11 @@
(Batfox, Female):(
head: (
offset: (-9.5, -6.0, -4.0),
- central: ("npc.batfox.female.head"),
+ central: ("npc.batfox.male.head"),
),
chest: (
offset: (-1.5, -7.5, -2.5),
- central: ("npc.batfox.female.chest"),
+ central: ("npc.batfox.male.chest"),
),
tail: (
offset: (-1.5, -7.5, -2.5),
@@ -247,15 +247,15 @@
(Raccoon, Female):(
head: (
offset: (-4.0, -4.0, -3.5),
- central: ("npc.raccoon.female.head"),
+ central: ("npc.raccoon.male.head"),
),
chest: (
offset: (-3.0, -5.5, -3.0),
- central: ("npc.raccoon.female.chest"),
+ central: ("npc.raccoon.male.chest"),
),
tail: (
offset: (-1.0, -5.0, -1.5),
- central: ("npc.raccoon.female.tail"),
+ central: ("npc.raccoon.male.tail"),
),
),
@@ -277,11 +277,11 @@
(Quokka, Female):(
head: (
offset: (-4.5, -3.0, -4.0),
- central: ("npc.quokka.female.head"),
+ central: ("npc.quokka.male.head"),
),
chest: (
offset: (-5.0, -7.5, -4.0),
- central: ("npc.quokka.female.chest"),
+ central: ("npc.quokka.male.chest"),
),
tail: (
offset: (-1.5, -7.5, -2.5),
@@ -307,11 +307,11 @@
(Dodarock, Female):(
head: (
offset: (-5.0, -3.5, -4.5),
- central: ("npc.dodarock.female.head"),
+ central: ("npc.dodarock.male.head"),
),
chest: (
offset: (-5.0, -7.5, -4.5),
- central: ("npc.dodarock.female.chest"),
+ central: ("npc.dodarock.male.chest"),
),
tail: (
offset: (-1.5, -7.5, -2.5),
@@ -337,11 +337,11 @@
(Holladon, Female):(
head: (
offset: (-3.5, -3.5, -4.0),
- central: ("npc.holladon.female.head"),
+ central: ("npc.holladon.male.head"),
),
chest: (
offset: (-3.0, -7.5, -3.0),
- central: ("npc.holladon.female.chest"),
+ central: ("npc.holladon.male.chest"),
),
tail: (
offset: (-1.5, -7.5, -2.5),
@@ -367,15 +367,15 @@
(Hyena, Female):(
head: (
offset: (-3.0, -2.0, -4.0),
- central: ("npc.hyena.female.head"),
+ central: ("npc.hyena.male.head"),
),
chest: (
offset: (-3.0, -8.0, -4.0),
- central: ("npc.hyena.female.chest"),
+ central: ("npc.hyena.male.chest"),
),
tail: (
offset: (-1.0, -3.0, -6.0),
- central: ("npc.hyena.female.tail"),
+ central: ("npc.hyena.male.tail"),
),
),
})
\ No newline at end of file
diff --git a/common/src/path.rs b/common/src/path.rs
index 0179e8f332..c865dca6d2 100644
--- a/common/src/path.rs
+++ b/common/src/path.rs
@@ -277,7 +277,7 @@ where
)
};
let transition =
- |a: &Vec3<i32>, b: &Vec3<i32>| 1.0 + endf.distance((*b).map(|e| e as f32 + 0.5)) * 0.02;
+ |_a: &Vec3<i32>, b: &Vec3<i32>| 1.0 + endf.distance((*b).map(|e| e as f32 + 0.5)) * 0.02;
let satisfied = |pos: &Vec3<i32>| pos == &end;
let mut new_astar = match astar.take() {
diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs
index 9d9922d057..935c99609b 100644
--- a/common/src/sys/agent.rs
+++ b/common/src/sys/agent.rs
@@ -4,7 +4,7 @@ use crate::{
agent::Activity,
item::{tool::ToolKind, ItemKind},
Agent, Alignment, CharacterState, ChatMsg, ControlAction, Controller, Loadout, MountState,
- Ori, Pos, Scale, SpeechBubble, Stats, Vel,
+ Ori, Pos, Scale, Stats, Vel,
},
event::{EventBus, ServerEvent},
path::Chaser,
diff --git a/voxygen/src/anim/Cargo.toml b/voxygen/src/anim/Cargo.toml
index 92ce71acb0..ab4d0e2bfe 100644
--- a/voxygen/src/anim/Cargo.toml
+++ b/voxygen/src/anim/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
name = "voxygen_anim"
# Uncomment to use animation hot reloading
# Note: this breaks `cargo test`
-crate-type = ["lib", "cdylib"]
+# crate-type = ["lib", "cdylib"]
[features]
use-dyn-lib = ["libloading", "notify", "lazy_static", "tracing", "find_folder"]
diff --git a/voxygen/src/anim/src/character/run.rs b/voxygen/src/anim/src/character/run.rs
index a2877c1536..35bd0cacdd 100644
--- a/voxygen/src/anim/src/character/run.rs
+++ b/voxygen/src/anim/src/character/run.rs
@@ -12,6 +12,7 @@ type RunAnimationDependency = (
Vec3<f32>,
Vec3<f32>,
f64,
+ Vec3<f32>,
);
impl Animation for RunAnimation {
@@ -25,7 +26,7 @@ impl Animation for RunAnimation {
#[allow(clippy::useless_conversion)] // TODO: Pending review in #587
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
- (active_tool_kind, second_tool_kind, velocity, orientation, last_ori, global_time): Self::Dependency,
+ (active_tool_kind, second_tool_kind, velocity, orientation, last_ori, global_time, avg_vel): Self::Dependency,
anim_time: f64,
rate: &mut f32,
skeleton_attr: &SkeletonAttr,
@@ -34,6 +35,7 @@ impl Animation for RunAnimation {
let speed = Vec2::<f32>::from(velocity).magnitude();
*rate = 1.0;
+ let impact = (avg_vel.z * 3000.0).max(-8.0);
let walkintensity = if speed > 5.0 { 1.0 } else { 0.45 };
let walk = if speed > 5.0 { 1.0 } else { 0.5 };
@@ -124,7 +126,9 @@ impl Animation for RunAnimation {
);
next.chest.ori = Quaternion::rotation_z(short * 0.18 * walkintensity + tilt * -0.6)
* Quaternion::rotation_y(tilt * 1.6)
- * Quaternion::rotation_x(shortalter * 0.035 + wave_stop * speed * -0.07 + (tilt.abs()));
+ * Quaternion::rotation_x(
+ impact * 0.06 + shortalter * 0.035 + wave_stop * speed * -0.07 + (tilt.abs()),
+ );
next.chest.scale = Vec3::one();
next.belt.offset = Vec3::new(0.0, skeleton_attr.belt.0, skeleton_attr.belt.1);
diff --git a/voxygen/src/anim/src/character/stand.rs b/voxygen/src/anim/src/character/stand.rs
index eda90efb5c..a117e6c6b2 100644
--- a/voxygen/src/anim/src/character/stand.rs
+++ b/voxygen/src/anim/src/character/stand.rs
@@ -6,7 +6,7 @@ use vek::*;
pub struct StandAnimation;
impl Animation for StandAnimation {
- type Dependency = (Option<ToolKind>, Option<ToolKind>, f64);
+ type Dependency = (Option<ToolKind>, Option<ToolKind>, f64, Vec3<f32>);
type Skeleton = CharacterSkeleton;
#[cfg(feature = "use-dyn-lib")]
@@ -15,7 +15,7 @@ impl Animation for StandAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_stand")]
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
- (active_tool_kind, second_tool_kind, global_time): Self::Dependency,
+ (active_tool_kind, second_tool_kind, global_time, avg_vel): Self::Dependency,
anim_time: f64,
_rate: &mut f32,
skeleton_attr: &SkeletonAttr,
@@ -24,7 +24,7 @@ impl Animation for StandAnimation {
let slow = (anim_time as f32 * 1.0).sin();
let breathe = ((anim_time as f32 * 0.5).sin()).abs();
-
+ let impact = (avg_vel.z * 3000.0).max(-15.0);
let head_look = Vec2::new(
((global_time + anim_time) as f32 / 12.0)
.floor()
@@ -42,58 +42,71 @@ impl Animation for StandAnimation {
-3.0 + skeleton_attr.head.0,
skeleton_attr.head.1 + slow * 0.3 + breathe * -0.05,
);
- next.head.ori =
- Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x(head_look.y.abs());
+ next.head.ori = Quaternion::rotation_z(head_look.x)
+ * Quaternion::rotation_x(impact * -0.02 + head_look.y.abs());
next.head.scale = Vec3::one() * skeleton_attr.head_scale + breathe * -0.05;
next.chest.offset = Vec3::new(
0.0,
skeleton_attr.chest.0,
- skeleton_attr.chest.1 + slow * 0.3,
+ skeleton_attr.chest.1 + slow * 0.3 + impact * 0.2,
);
- next.chest.ori = Quaternion::rotation_z(head_look.x * 0.6);
+ next.chest.ori =
+ Quaternion::rotation_z(head_look.x * 0.6) * Quaternion::rotation_x(impact * 0.04);
next.chest.scale = Vec3::one() * 1.01 + breathe * 0.03;
- next.belt.offset = Vec3::new(0.0, skeleton_attr.belt.0, skeleton_attr.belt.1);
- next.belt.ori = Quaternion::rotation_z(head_look.x * -0.1);
+ next.belt.offset = Vec3::new(
+ 0.0,
+ skeleton_attr.belt.0 + impact * 0.005,
+ skeleton_attr.belt.1,
+ );
+ next.belt.ori =
+ Quaternion::rotation_z(head_look.x * -0.1) * Quaternion::rotation_x(impact * -0.03);
next.belt.scale = Vec3::one() + breathe * -0.03;
next.back.offset = Vec3::new(0.0, skeleton_attr.back.0, skeleton_attr.back.1);
next.back.scale = Vec3::one() * 1.02;
- next.shorts.offset = Vec3::new(0.0, skeleton_attr.shorts.0, skeleton_attr.shorts.1);
- next.shorts.ori = Quaternion::rotation_z(head_look.x * -0.2);
+ next.shorts.offset = Vec3::new(
+ 0.0,
+ skeleton_attr.shorts.0 + impact * -0.2,
+ skeleton_attr.shorts.1,
+ );
+ next.shorts.ori =
+ Quaternion::rotation_z(head_look.x * -0.2) * Quaternion::rotation_x(impact * -0.04);
next.shorts.scale = Vec3::one() + breathe * -0.03;
next.l_hand.offset = Vec3::new(
-skeleton_attr.hand.0,
- skeleton_attr.hand.1 + slow * 0.15,
- skeleton_attr.hand.2 + slow * 0.5,
+ skeleton_attr.hand.1 + slow * 0.15 - impact * 0.2,
+ skeleton_attr.hand.2 + slow * 0.5 + impact * -0.1,
);
- next.l_hand.ori = Quaternion::rotation_x(slow * -0.06);
+ next.l_hand.ori = Quaternion::rotation_x(slow * -0.06 + impact * -0.1);
next.l_hand.scale = Vec3::one();
next.r_hand.offset = Vec3::new(
skeleton_attr.hand.0,
- skeleton_attr.hand.1 + slow * 0.15,
- skeleton_attr.hand.2 + slow * 0.5,
+ skeleton_attr.hand.1 + slow * 0.15 - impact * 0.2,
+ skeleton_attr.hand.2 + slow * 0.5 + impact * -0.1,
);
- next.r_hand.ori = Quaternion::rotation_x(slow * -0.06);
+ next.r_hand.ori = Quaternion::rotation_x(slow * -0.06 + impact * -0.1);
next.r_hand.scale = Vec3::one();
next.l_foot.offset = Vec3::new(
-skeleton_attr.foot.0,
- skeleton_attr.foot.1,
+ skeleton_attr.foot.1 - impact * 0.15,
skeleton_attr.foot.2,
);
+ next.l_foot.ori = Quaternion::rotation_x(impact * 0.02);
next.l_foot.scale = Vec3::one();
next.r_foot.offset = Vec3::new(
skeleton_attr.foot.0,
- skeleton_attr.foot.1,
+ skeleton_attr.foot.1 + impact * 0.15,
skeleton_attr.foot.2,
);
+ next.r_foot.ori = Quaternion::rotation_x(impact * -0.02);
next.r_foot.scale = Vec3::one();
next.l_shoulder.offset = Vec3::new(
diff --git a/voxygen/src/anim/src/quadruped_low/alpha.rs b/voxygen/src/anim/src/quadruped_low/alpha.rs
new file mode 100644
index 0000000000..0e60916168
--- /dev/null
+++ b/voxygen/src/anim/src/quadruped_low/alpha.rs
@@ -0,0 +1,101 @@
+use super::{super::Animation, QuadrupedLowSkeleton, SkeletonAttr};
+use std::f32::consts::PI;
+use vek::*;
+
+pub struct AlphaAnimation;
+
+impl Animation for AlphaAnimation {
+ type Dependency = f64;
+ type Skeleton = QuadrupedLowSkeleton;
+
+ #[cfg(feature = "use-dyn-lib")]
+ const UPDATE_FN: &'static [u8] = b"quadruped_low_alpha\0";
+
+ #[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_low_alpha")]
+ fn update_skeleton_inner(
+ skeleton: &Self::Skeleton,
+ _global_time: Self::Dependency,
+ anim_time: f64,
+ _rate: &mut f32,
+ skeleton_attr: &SkeletonAttr,
+ ) -> Self::Skeleton {
+ let mut next = (*skeleton).clone();
+
+ let short = (((1.0)
+ / (0.1 + 0.9 * ((anim_time as f32 * 8.0 + PI * 2.5).sin()).powf(2.0 as f32)))
+ .sqrt())
+ * ((anim_time as f32 * 8.0 + PI * 2.5).sin());
+ let quick = (((1.0)
+ / (0.001 + 0.9999 * ((anim_time as f32 * 7.0 + PI * 0.0).sin()).powf(2.0 as f32)))
+ .sqrt())
+ * ((anim_time as f32 * 7.0 + PI * 0.0).sin());
+ next.head_upper.offset =
+ Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
+ next.head_upper.ori = Quaternion::rotation_z(short * 0.3) * Quaternion::rotation_x(0.0);
+ next.head_upper.scale = Vec3::one();
+
+ next.head_lower.offset =
+ Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
+ next.head_lower.ori =
+ Quaternion::rotation_z(short * 0.2) * Quaternion::rotation_y(short * -0.4);
+ next.head_lower.scale = Vec3::one();
+
+ next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1);
+ next.jaw.ori = Quaternion::rotation_x(-0.2 + quick * 0.3);
+ next.jaw.scale = Vec3::one() * 0.98;
+
+ next.chest.offset = Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1)
+ * skeleton_attr.scaler
+ / 11.0;
+ next.chest.ori = Quaternion::rotation_y(short * -0.07);
+ next.chest.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
+
+ next.tail_front.offset =
+ Vec3::new(0.0, skeleton_attr.tail_front.0, skeleton_attr.tail_front.1);
+ next.tail_front.ori = Quaternion::rotation_x(0.15)
+ * Quaternion::rotation_y(short * 0.2)
+ * Quaternion::rotation_z(short * 0.3);
+ next.tail_front.scale = Vec3::one() * 0.98;
+
+ next.tail_rear.offset =
+ Vec3::new(0.0, skeleton_attr.tail_rear.0, skeleton_attr.tail_rear.1);
+ next.tail_rear.ori = Quaternion::rotation_y(short * 0.5)
+ * Quaternion::rotation_x(-0.12)
+ * Quaternion::rotation_z(short * 0.3);
+ next.tail_rear.scale = Vec3::one() * 0.98;
+
+ next.foot_fl.offset = Vec3::new(
+ -skeleton_attr.feet_f.0,
+ skeleton_attr.feet_f.1,
+ skeleton_attr.feet_f.2,
+ );
+ next.foot_fl.ori = Quaternion::rotation_y(short * 0.12);
+ next.foot_fl.scale = Vec3::one();
+
+ next.foot_fr.offset = Vec3::new(
+ skeleton_attr.feet_f.0,
+ skeleton_attr.feet_f.1,
+ skeleton_attr.feet_f.2,
+ );
+ next.foot_fr.ori = Quaternion::rotation_y(short * 0.12);
+ next.foot_fr.scale = Vec3::one();
+
+ next.foot_bl.offset = Vec3::new(
+ -skeleton_attr.feet_b.0,
+ skeleton_attr.feet_b.1,
+ skeleton_attr.feet_b.2,
+ );
+ next.foot_bl.ori = Quaternion::rotation_y(short * 0.12);
+ next.foot_bl.scale = Vec3::one();
+
+ next.foot_br.offset = Vec3::new(
+ skeleton_attr.feet_b.0,
+ skeleton_attr.feet_b.1,
+ skeleton_attr.feet_b.2,
+ );
+ next.foot_br.ori = Quaternion::rotation_y(short * 0.12);
+ next.foot_br.scale = Vec3::one();
+
+ next
+ }
+}
diff --git a/voxygen/src/anim/src/quadruped_low/mod.rs b/voxygen/src/anim/src/quadruped_low/mod.rs
index 29fa9638f2..c450fad5eb 100644
--- a/voxygen/src/anim/src/quadruped_low/mod.rs
+++ b/voxygen/src/anim/src/quadruped_low/mod.rs
@@ -1,9 +1,12 @@
+pub mod alpha;
pub mod idle;
pub mod jump;
pub mod run;
// Reexports
-pub use self::{idle::IdleAnimation, jump::JumpAnimation, run::RunAnimation};
+pub use self::{
+ alpha::AlphaAnimation, idle::IdleAnimation, jump::JumpAnimation, run::RunAnimation,
+};
use super::{Bone, FigureBoneData, Skeleton};
use common::comp::{self};
@@ -132,9 +135,9 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
Self {
head_upper: match (body.species, body.body_type) {
(Crocodile, _) => (10.0, 2.0),
- (Alligator, _) => (0.5, 3.25),
- (Salamander, _) => (6.5, 2.0),
- (Monitor, _) => (3.5, 2.0),
+ (Alligator, _) => (0.5, 2.0),
+ (Salamander, _) => (6.5, 2.5),
+ (Monitor, _) => (4.5, 1.0),
(Asp, _) => (6.0, 5.5),
(Tortoise, _) => (5.0, 1.0),
(Rocksnapper, _) => (6.0, 0.5),
@@ -144,7 +147,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
(Crocodile, _) => (8.0, 0.0),
(Alligator, _) => (9.0, 0.25),
(Salamander, _) => (9.0, 0.0),
- (Monitor, _) => (10.0, 3.0),
+ (Monitor, _) => (10.0, 2.0),
(Asp, _) => (9.0, 2.5),
(Tortoise, _) => (12.0, -3.5),
(Rocksnapper, _) => (12.0, -9.0),
@@ -173,7 +176,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
tail_rear: match (body.species, body.body_type) {
(Crocodile, _) => (-12.5, -1.0),
(Alligator, _) => (-13.0, -1.0),
- (Salamander, _) => (-9.0, 0.0),
+ (Salamander, _) => (-8.0, 0.0),
(Monitor, _) => (-12.0, 0.0),
(Asp, _) => (-14.0, -2.0),
(Tortoise, _) => (-10.0, -1.5),
diff --git a/voxygen/src/anim/src/quadruped_low/run.rs b/voxygen/src/anim/src/quadruped_low/run.rs
index e3f0dddb1c..cf082f660a 100644
--- a/voxygen/src/anim/src/quadruped_low/run.rs
+++ b/voxygen/src/anim/src/quadruped_low/run.rs
@@ -5,7 +5,7 @@ use vek::*;
pub struct RunAnimation;
impl Animation for RunAnimation {
- type Dependency = (f32, Vec3<f32>, Vec3<f32>, f64);
+ type Dependency = (f32, Vec3<f32>, Vec3<f32>, f64, Vec3<f32>);
type Skeleton = QuadrupedLowSkeleton;
#[cfg(feature = "use-dyn-lib")]
@@ -14,7 +14,7 @@ impl Animation for RunAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_low_run")]
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
- (_velocity, orientation, last_ori, _global_time): Self::Dependency,
+ (_velocity, orientation, last_ori, _global_time, avg_vel): Self::Dependency,
anim_time: f64,
_rate: &mut f32,
skeleton_attr: &SkeletonAttr,
@@ -22,6 +22,7 @@ impl Animation for RunAnimation {
let mut next = (*skeleton).clone();
let lab = 0.7 * skeleton_attr.tempo;
+ let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude());
let short = (((1.0)
/ (0.72
@@ -50,7 +51,7 @@ impl Animation for RunAnimation {
* ((anim_time as f32 * 16.0 * lab as f32 + PI * 0.45).sin());
let footvertr = (anim_time as f32 * 16.0 * lab as f32 + PI).sin();
- //
+ //back feet
let foothorilb = (((1.0)
/ (0.4
+ (0.6)
@@ -124,7 +125,7 @@ impl Animation for RunAnimation {
/ 11.0;
next.chest.ori = Quaternion::rotation_z(short * 0.13 + tilt * -1.9)
* Quaternion::rotation_y(short * 0.12)
- * Quaternion::rotation_x(skeleton_attr.lean.0);
+ * Quaternion::rotation_x(x_tilt + skeleton_attr.lean.0);
next.chest.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
next.foot_fl.offset = Vec3::new(
diff --git a/voxygen/src/anim/src/quadruped_medium/alpha.rs b/voxygen/src/anim/src/quadruped_medium/alpha.rs
index f9e2a71bb7..37d43004b6 100644
--- a/voxygen/src/anim/src/quadruped_medium/alpha.rs
+++ b/voxygen/src/anim/src/quadruped_medium/alpha.rs
@@ -14,7 +14,7 @@ impl Animation for AlphaAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_medium_alpha")]
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
- global_time: Self::Dependency,
+ _global_time: Self::Dependency,
anim_time: f64,
_rate: &mut f32,
skeleton_attr: &SkeletonAttr,
@@ -22,38 +22,27 @@ impl Animation for AlphaAnimation {
let mut next = (*skeleton).clone();
let short = (((1.0)
- / (0.5 + 0.5 * ((anim_time as f32 * 2.0 + PI * 1.0).sin()).powf(2.0 as f32)))
+ / (0.1 + 0.9 * ((anim_time as f32 * 4.0 + PI * 2.5).sin()).powf(2.0 as f32)))
.sqrt())
- * ((anim_time as f32 * 2.0 + PI * 1.0).sin());
+ * ((anim_time as f32 * 4.0 + PI * 2.5).sin());
+ let quick = (((1.0)
+ / (0.001 + 0.9999 * ((anim_time as f32 * 4.0 + PI * 0.5).sin()).powf(2.0 as f32)))
+ .sqrt())
+ * ((anim_time as f32 * 4.0 + PI * 0.5).sin());
- let random = ((((2.0
- * ((global_time as f32 - anim_time as f32)
- - ((global_time as f32 - anim_time as f32).round())))
- .abs())
- * 10.0)
- .round())
- / 10.0;
-
- let switch = if random > 0.5 { 1.0 } else { -1.0 };
- next.head_upper.offset = Vec3::new(
- 0.0,
- skeleton_attr.head_upper.0 + 1.0 + short * 3.0,
- skeleton_attr.head_upper.1,
- );
- next.head_upper.ori = Quaternion::rotation_y(short * -0.2 * switch)
- * Quaternion::rotation_x(0.2 + short * 0.6);
+ next.head_upper.offset =
+ Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
+ next.head_upper.ori =
+ Quaternion::rotation_y(short * -0.2) * Quaternion::rotation_x(0.1 + short * 0.2);
next.head_upper.scale = Vec3::one();
- next.head_lower.offset = Vec3::new(
- 0.0,
- skeleton_attr.head_lower.0 + 2.0 + short * 3.0,
- skeleton_attr.head_lower.1,
- );
+ next.head_lower.offset =
+ Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
next.head_lower.ori = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.head_lower.scale = Vec3::one() * 1.02;
next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1);
- next.jaw.ori = Quaternion::rotation_x(0.5 + short * 1.0);
+ next.jaw.ori = Quaternion::rotation_x(-0.3 + quick * 0.4);
next.jaw.scale = Vec3::one() * 1.02;
next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1);
@@ -66,12 +55,12 @@ impl Animation for AlphaAnimation {
skeleton_attr.torso_front.1 + short * 1.0,
) * skeleton_attr.scaler
/ 11.0;
- next.torso_front.ori = Quaternion::rotation_y(short * -0.1 * switch);
+ next.torso_front.ori = Quaternion::rotation_y(short * -0.1);
next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
next.torso_back.offset =
Vec3::new(0.0, skeleton_attr.torso_back.0, skeleton_attr.torso_back.1);
- next.torso_back.ori = Quaternion::rotation_y(short * -0.1 * switch)
+ next.torso_back.ori = Quaternion::rotation_y(short * -0.1)
* Quaternion::rotation_z(0.0)
* Quaternion::rotation_x(0.0);
next.torso_back.scale = Vec3::one();
@@ -80,152 +69,77 @@ impl Animation for AlphaAnimation {
next.ears.ori = Quaternion::rotation_x(0.0);
next.ears.scale = Vec3::one() * 1.02;
- if random > 0.5 {
- next.leg_fl.offset = Vec3::new(
- -skeleton_attr.leg_f.0,
- skeleton_attr.leg_f.1,
- skeleton_attr.leg_f.2,
- );
+ next.leg_fl.offset = Vec3::new(
+ -skeleton_attr.leg_f.0,
+ skeleton_attr.leg_f.1,
+ skeleton_attr.leg_f.2,
+ );
- next.leg_fl.ori =
- Quaternion::rotation_x(short * -0.2) * Quaternion::rotation_y(short * 0.15);
- next.leg_fl.scale = Vec3::one();
+ next.leg_fl.ori =
+ Quaternion::rotation_x(short * -0.1) * Quaternion::rotation_y(short * 0.15);
+ next.leg_fl.scale = Vec3::one();
- next.leg_fr.offset = Vec3::new(
- skeleton_attr.leg_f.0,
- skeleton_attr.leg_f.1,
- skeleton_attr.leg_f.2 + 1.5,
- );
- next.leg_fr.ori = Quaternion::rotation_x(-0.1 + short * -0.2)
- * Quaternion::rotation_y(0.2 + short * 0.2);
- next.leg_fr.scale = Vec3::one();
+ next.leg_fr.offset = Vec3::new(
+ skeleton_attr.leg_f.0,
+ skeleton_attr.leg_f.1,
+ skeleton_attr.leg_f.2,
+ );
+ next.leg_fr.ori =
+ Quaternion::rotation_x(short * 0.3) * Quaternion::rotation_y(short * -0.2);
+ next.leg_fr.scale = Vec3::one();
- next.leg_bl.offset = Vec3::new(
- -skeleton_attr.leg_b.0,
- skeleton_attr.leg_b.1,
- skeleton_attr.leg_b.2 - 1.5,
- );
- next.leg_bl.ori =
- Quaternion::rotation_x(-0.1 + short * -0.2) * Quaternion::rotation_y(short * 0.2);
- next.leg_bl.scale = Vec3::one();
+ next.leg_bl.offset = Vec3::new(
+ -skeleton_attr.leg_b.0,
+ skeleton_attr.leg_b.1,
+ skeleton_attr.leg_b.2 + 1.0,
+ );
+ next.leg_bl.ori =
+ Quaternion::rotation_x(-0.1 + short * -0.2) * Quaternion::rotation_y(short * 0.2);
+ next.leg_bl.scale = Vec3::one();
- next.leg_br.offset = Vec3::new(
- skeleton_attr.leg_b.0,
- skeleton_attr.leg_b.1,
- skeleton_attr.leg_b.2 + 1.0,
- );
- next.leg_br.ori = Quaternion::rotation_x(-0.1 + short * -0.2)
- * Quaternion::rotation_y(0.1 + short * 0.2);
- next.leg_br.scale = Vec3::one();
+ next.leg_br.offset = Vec3::new(
+ skeleton_attr.leg_b.0,
+ skeleton_attr.leg_b.1,
+ skeleton_attr.leg_b.2 + 1.0,
+ );
+ next.leg_br.ori =
+ Quaternion::rotation_x(-0.1 + short * -0.2) * Quaternion::rotation_y(0.1 + short * 0.2);
+ next.leg_br.scale = Vec3::one();
- next.foot_fl.offset = Vec3::new(
- -skeleton_attr.feet_f.0,
- skeleton_attr.feet_f.1,
- skeleton_attr.feet_f.2 + short * -1.5,
- );
- next.foot_fl.ori = Quaternion::rotation_x(-0.5 + short * -0.1);
- next.foot_fl.scale = Vec3::one();
+ next.foot_fl.offset = Vec3::new(
+ -skeleton_attr.feet_f.0,
+ skeleton_attr.feet_f.1,
+ skeleton_attr.feet_f.2 + short * -0.2,
+ );
+ next.foot_fl.ori = Quaternion::rotation_x(short * -0.05);
+ next.foot_fl.scale = Vec3::one();
- next.foot_fr.offset = Vec3::new(
- skeleton_attr.feet_f.0,
- skeleton_attr.feet_f.1,
- skeleton_attr.feet_f.2 + short * -1.5,
- );
- next.foot_fr.ori =
- Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
- next.foot_fr.scale = Vec3::one();
+ next.foot_fr.offset = Vec3::new(
+ skeleton_attr.feet_f.0,
+ skeleton_attr.feet_f.1,
+ skeleton_attr.feet_f.2 + short * -1.5,
+ );
+ next.foot_fr.ori =
+ Quaternion::rotation_x(short * -0.2) * Quaternion::rotation_y(short * 0.15);
+ next.foot_fr.scale = Vec3::one();
- next.foot_bl.offset = Vec3::new(
- -skeleton_attr.feet_b.0,
- skeleton_attr.feet_b.1,
- skeleton_attr.feet_b.2 + short * -1.5,
- );
- next.foot_bl.ori =
- Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
- next.foot_bl.scale = Vec3::one();
+ next.foot_bl.offset = Vec3::new(
+ -skeleton_attr.feet_b.0,
+ skeleton_attr.feet_b.1,
+ skeleton_attr.feet_b.2 + short * -0.8,
+ );
+ next.foot_bl.ori =
+ Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
+ next.foot_bl.scale = Vec3::one();
- next.foot_br.offset = Vec3::new(
- skeleton_attr.feet_b.0,
- skeleton_attr.feet_b.1,
- skeleton_attr.feet_b.2 + short * -1.5,
- );
- next.foot_br.ori =
- Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
- next.foot_br.scale = Vec3::one();
- } else {
- next.leg_fl.offset = Vec3::new(
- -skeleton_attr.leg_f.0,
- skeleton_attr.leg_f.1,
- skeleton_attr.leg_f.2 + 1.5,
- );
-
- next.leg_fl.ori = Quaternion::rotation_x(-0.1 + short * -0.2)
- * Quaternion::rotation_y(0.2 + short * 0.2);
- next.leg_fl.scale = Vec3::one();
-
- next.leg_fr.offset = Vec3::new(
- skeleton_attr.leg_f.0,
- skeleton_attr.leg_f.1,
- skeleton_attr.leg_f.2,
- );
- next.leg_fr.ori =
- Quaternion::rotation_x(short * -0.2) * Quaternion::rotation_y(short * -0.15);
-
- next.leg_fr.scale = Vec3::one();
-
- next.leg_bl.offset = Vec3::new(
- -skeleton_attr.leg_b.0,
- skeleton_attr.leg_b.1,
- skeleton_attr.leg_b.2 + 1.0,
- );
- next.leg_bl.ori = Quaternion::rotation_x(-0.1 + short * -0.2)
- * Quaternion::rotation_y(0.1 + short * 0.2);
- next.leg_bl.scale = Vec3::one();
-
- next.leg_br.offset = Vec3::new(
- skeleton_attr.leg_b.0,
- skeleton_attr.leg_b.1,
- skeleton_attr.leg_b.2 - 1.5,
- );
- next.leg_br.ori =
- Quaternion::rotation_x(-0.1 + short * -0.2) * Quaternion::rotation_y(short * -0.2);
- next.leg_br.scale = Vec3::one();
-
- next.foot_fl.offset = Vec3::new(
- -skeleton_attr.feet_f.0,
- skeleton_attr.feet_f.1,
- skeleton_attr.feet_f.2 + short * -1.5,
- );
- next.foot_fl.ori =
- Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
- next.foot_fl.scale = Vec3::one();
-
- next.foot_fr.offset = Vec3::new(
- skeleton_attr.feet_f.0,
- skeleton_attr.feet_f.1,
- skeleton_attr.feet_f.2 + short * -1.5,
- );
- next.foot_fr.ori = Quaternion::rotation_x(-0.5 + short * -0.1);
- next.foot_fr.scale = Vec3::one();
-
- next.foot_bl.offset = Vec3::new(
- -skeleton_attr.feet_b.0,
- skeleton_attr.feet_b.1,
- skeleton_attr.feet_b.2 + short * -1.5,
- );
- next.foot_bl.ori =
- Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
- next.foot_bl.scale = Vec3::one();
-
- next.foot_br.offset = Vec3::new(
- skeleton_attr.feet_b.0,
- skeleton_attr.feet_b.1,
- skeleton_attr.feet_b.2 + short * -1.5,
- );
- next.foot_br.ori =
- Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
- next.foot_br.scale = Vec3::one();
- }
+ next.foot_br.offset = Vec3::new(
+ skeleton_attr.feet_b.0,
+ skeleton_attr.feet_b.1,
+ skeleton_attr.feet_b.2 + short * -1.5,
+ );
+ next.foot_br.ori =
+ Quaternion::rotation_x(-0.2 + short * 0.2) * Quaternion::rotation_y(short * 0.15);
+ next.foot_br.scale = Vec3::one();
next
}
}
diff --git a/voxygen/src/anim/src/quadruped_medium/idle.rs b/voxygen/src/anim/src/quadruped_medium/idle.rs
index f54dc50e77..bbccbe167b 100644
--- a/voxygen/src/anim/src/quadruped_medium/idle.rs
+++ b/voxygen/src/anim/src/quadruped_medium/idle.rs
@@ -140,7 +140,7 @@ impl Animation for IdleAnimation {
skeleton_attr.feet_f.2 + slower * -0.2,
);
next.foot_fl.ori = Quaternion::rotation_x(0.0);
- next.foot_fl.scale = Vec3::one() * 0.96;
+ next.foot_fl.scale = Vec3::one() * 0.94;
next.foot_fr.offset = Vec3::new(
skeleton_attr.feet_f.0,
@@ -148,7 +148,7 @@ impl Animation for IdleAnimation {
skeleton_attr.feet_f.2 + slower * -0.2,
);
next.foot_fr.ori = Quaternion::rotation_x(0.0);
- next.foot_fr.scale = Vec3::one();
+ next.foot_fr.scale = Vec3::one() * 0.94;
next.foot_bl.offset = Vec3::new(
-skeleton_attr.feet_b.0,
@@ -156,7 +156,7 @@ impl Animation for IdleAnimation {
skeleton_attr.feet_b.2 + slower * -0.2,
);
next.foot_bl.ori = Quaternion::rotation_x(0.0);
- next.foot_bl.scale = Vec3::one() * 0.96;
+ next.foot_bl.scale = Vec3::one() * 0.94;
next.foot_br.offset = Vec3::new(
skeleton_attr.feet_b.0,
@@ -164,7 +164,7 @@ impl Animation for IdleAnimation {
skeleton_attr.feet_b.2 + slower * -0.2,
);
next.foot_br.ori = Quaternion::rotation_x(0.0);
- next.foot_br.scale = Vec3::one() * 0.96;
+ next.foot_br.scale = Vec3::one() * 0.94;
next
}
diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs
index f7e2213825..7b861605d8 100644
--- a/voxygen/src/anim/src/quadruped_medium/mod.rs
+++ b/voxygen/src/anim/src/quadruped_medium/mod.rs
@@ -196,14 +196,14 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Mouflon, _) => (-1.0, 0.5),
},
jaw: match (body.species, body.body_type) {
- (Grolgar, _) => (8.5, 1.5),
- (Saber, _) => (3.5, -2.0),
+ (Grolgar, _) => (7.0, 1.5),
+ (Saber, _) => (2.5, -2.0),
(Tuskram, _) => (5.5, -4.0),
(Lion, _) => (3.5, -4.5),
(Tarasque, _) => (9.0, -10.0),
(Tiger, _) => (3.5, -4.0),
(Wolf, _) => (5.0, -3.0),
- (Frostfang, _) => (5.0, -3.0),
+ (Frostfang, _) => (4.0, -3.0),
(Mouflon, _) => (10.5, -4.0),
},
tail: match (body.species, body.body_type) {
@@ -212,7 +212,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tuskram, _) => (-9.0, 2.0),
(Lion, _) => (-11.0, 1.0),
(Tarasque, _) => (-11.0, 0.0),
- (Tiger, _) => (-12.5, -7.0),
+ (Tiger, _) => (-13.5, -7.0),
(Wolf, _) => (-11.0, 0.0),
(Frostfang, _) => (-7.0, -3.5),
(Mouflon, _) => (-10.5, 3.0),
@@ -232,7 +232,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Grolgar, _) => (-10.0, 1.5),
(Saber, _) => (-13.5, 0.0),
(Tuskram, _) => (-13.0, -2.0),
- (Lion, _) => (-13.0, -0.5),
+ (Lion, _) => (-12.0, -0.5),
(Tarasque, _) => (-14.0, -1.0),
(Tiger, _) => (-13.0, 0.0),
(Wolf, _) => (-12.5, 1.0),
@@ -254,9 +254,9 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Grolgar, _) => (-7.0, 4.0, 0.0),
(Saber, _) => (7.0, -4.0, -3.5),
(Tuskram, _) => (6.0, -6.5, -0.5),
- (Lion, _) => (6.5, -8.0, -2.0),
+ (Lion, _) => (6.5, -6.5, -2.0),
(Tarasque, _) => (7.0, -8.0, -6.0),
- (Tiger, _) => (7.0, -5.0, -3.0),
+ (Tiger, _) => (6.0, -5.0, -3.0),
(Wolf, _) => (4.5, -6.5, -1.0),
(Frostfang, _) => (5.5, -5.5, -2.0),
(Mouflon, _) => (5.0, -5.0, -5.0),
@@ -267,7 +267,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
(Tuskram, _) => (5.0, -5.5, -3.5),
(Lion, _) => (6.0, -6.0, -2.0),
(Tarasque, _) => (6.0, -6.5, -6.5),
- (Tiger, _) => (6.0, -8.0, -3.0),
+ (Tiger, _) => (6.0, -7.5, -3.0),
(Wolf, _) => (5.0, -6.5, -2.5),
(Frostfang, _) => (3.5, -4.5, -2.0),
(Mouflon, _) => (3.5, -6.0, -4.5),
diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs
index 237a30d37a..1312b4a088 100644
--- a/voxygen/src/anim/src/quadruped_medium/run.rs
+++ b/voxygen/src/anim/src/quadruped_medium/run.rs
@@ -41,6 +41,7 @@ impl Animation for RunAnimation {
//
let shortalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.5).sin();
+
let footvert = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.0).sin();
let footvertt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.4).sin();
let footvertalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.2).sin();
@@ -51,11 +52,6 @@ impl Animation for RunAnimation {
let footvertaltf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.5).sin();
let footverttaltf = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.9).sin();
- let footvertslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.0).sin();
- let footverttslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.4).sin();
- let footvertaltslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.2).sin();
- let footverttaltslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.6).sin();
-
let footvertfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.6).sin();
let footverttfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.0).sin();
let footvertaltfslow = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 1.8).sin();
@@ -74,6 +70,7 @@ impl Animation for RunAnimation {
} else {
0.0
} * 1.3;
+ let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude());
//let tilt = 0.0;
if speed < 8.0 {
//Trot
@@ -101,11 +98,12 @@ impl Animation for RunAnimation {
next.torso_front.offset = Vec3::new(
0.0,
skeleton_attr.torso_front.0,
- skeleton_attr.torso_front.1 + shortalt * 1.0,
+ skeleton_attr.torso_front.1 + shortalt * 1.0 + x_tilt,
) * skeleton_attr.scaler
/ 11.0;
- next.torso_front.ori =
- Quaternion::rotation_x(short * 0.03) * Quaternion::rotation_z(tilt * -1.5);
+ next.torso_front.ori = Quaternion::rotation_x(short * 0.03 + x_tilt)
+ * Quaternion::rotation_y(0.0)
+ * Quaternion::rotation_z(tilt * -1.5);
next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
next.torso_back.offset = Vec3::new(
@@ -132,20 +130,20 @@ impl Animation for RunAnimation {
next.leg_fr.offset = Vec3::new(
skeleton_attr.leg_f.0,
- skeleton_attr.leg_f.1 + footvertaltslow * -1.4,
- skeleton_attr.leg_f.2 + 1.0 + footverttaltslow * -0.3,
+ skeleton_attr.leg_f.1 + footvertalt * -1.4,
+ skeleton_attr.leg_f.2 + 1.0 + footverttalt * -0.3,
);
- next.leg_fr.ori = Quaternion::rotation_x(footverttaltslow * -0.35)
- * Quaternion::rotation_z(tilt * -0.5);
+ next.leg_fr.ori =
+ Quaternion::rotation_x(footverttalt * -0.35) * Quaternion::rotation_z(tilt * -0.5);
next.leg_fr.scale = Vec3::one() * 1.02;
next.leg_bl.offset = Vec3::new(
-skeleton_attr.leg_b.0,
- skeleton_attr.leg_b.1 + footvertaltslow * -1.0,
- skeleton_attr.leg_b.2 + 1.0 + footverttaltslow * -0.3,
+ skeleton_attr.leg_b.1 + footvertalt * -1.0,
+ skeleton_attr.leg_b.2 + 1.0 + footverttalt * -0.3,
);
- next.leg_bl.ori = Quaternion::rotation_x(footverttaltslow * -0.2)
- * Quaternion::rotation_z(tilt * -1.5);
+ next.leg_bl.ori =
+ Quaternion::rotation_x(footverttalt * -0.2) * Quaternion::rotation_z(tilt * -1.5);
next.leg_bl.scale = Vec3::one() * 1.02;
next.leg_br.offset = Vec3::new(
@@ -169,18 +167,18 @@ impl Animation for RunAnimation {
next.foot_fr.offset = Vec3::new(
skeleton_attr.feet_f.0,
skeleton_attr.feet_f.1,
- skeleton_attr.feet_f.2 + ((footvertslow * -1.0 * skeleton_attr.maximize).max(0.0)),
+ skeleton_attr.feet_f.2 + ((footvert * -1.0 * skeleton_attr.maximize).max(0.0)),
);
next.foot_fr.ori =
- Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttslow * 0.5);
+ Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footvertt * 0.5);
next.foot_fr.scale = Vec3::one() * 0.96;
next.foot_bl.offset = Vec3::new(
-skeleton_attr.feet_b.0,
skeleton_attr.feet_b.1,
- skeleton_attr.feet_b.2 + ((footvertslow * -1.8).max(0.0)),
+ skeleton_attr.feet_b.2 + ((footvert * -1.8).max(0.0)),
);
- next.foot_bl.ori = Quaternion::rotation_x(footverttslow * 0.5 - 0.2);
+ next.foot_bl.ori = Quaternion::rotation_x(footvertt * 0.5 - 0.2);
next.foot_bl.scale = Vec3::one() * 0.96;
next.foot_br.offset = Vec3::new(
@@ -196,14 +194,16 @@ impl Animation for RunAnimation {
//Gallop
next.head_upper.offset =
Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1);
- next.head_upper.ori =
- Quaternion::rotation_x(short * -0.03 - 0.1) * Quaternion::rotation_z(tilt * -1.2);
+ next.head_upper.ori = Quaternion::rotation_x(short * -0.03 - 0.1)
+ * Quaternion::rotation_z(tilt * -1.2)
+ * Quaternion::rotation_y(tilt * 0.8);
next.head_upper.scale = Vec3::one();
next.head_lower.offset =
Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1);
- next.head_lower.ori =
- Quaternion::rotation_z(tilt * -0.8) * Quaternion::rotation_x(short * -0.05);
+ next.head_lower.ori = Quaternion::rotation_z(tilt * -0.8)
+ * Quaternion::rotation_x(short * -0.05)
+ * Quaternion::rotation_y(tilt * 0.3);
next.head_lower.scale = Vec3::one() * 1.02;
next.jaw.offset = Vec3::new(0.0, skeleton_attr.jaw.0, skeleton_attr.jaw.1);
@@ -218,11 +218,11 @@ impl Animation for RunAnimation {
next.torso_front.offset = Vec3::new(
0.0,
skeleton_attr.torso_front.0,
- skeleton_attr.torso_front.1 + shortalt * 2.5,
+ skeleton_attr.torso_front.1 + shortalt * 2.5 + x_tilt * 10.0,
) * skeleton_attr.scaler
/ 11.0;
- next.torso_front.ori = Quaternion::rotation_x(x_tilt)
- * Quaternion::rotation_x(short * 0.13)
+ next.torso_front.ori = Quaternion::rotation_x(short * 0.13 + x_tilt)
+ * Quaternion::rotation_y(tilt * 0.8)
* Quaternion::rotation_z(tilt * -1.5);
next.torso_front.scale = Vec3::one() * skeleton_attr.scaler / 11.0;
@@ -231,8 +231,9 @@ impl Animation for RunAnimation {
skeleton_attr.torso_back.0,
skeleton_attr.torso_back.1 + shortalt * 0.2 - 0.2,
);
- next.torso_back.ori =
- Quaternion::rotation_x(short * 0.1) * Quaternion::rotation_z(tilt * 1.8);
+ next.torso_back.ori = Quaternion::rotation_x(short * 0.1)
+ * Quaternion::rotation_z(tilt * 1.8)
+ * Quaternion::rotation_y(tilt * 0.6);
next.torso_back.scale = Vec3::one();
next.ears.offset = Vec3::new(0.0, skeleton_attr.ears.0, skeleton_attr.ears.1);
@@ -244,8 +245,9 @@ impl Animation for RunAnimation {
skeleton_attr.leg_f.1 + footvertaltf * -1.3,
skeleton_attr.leg_f.2 + 1.0 + footverttaltf * -1.9,
);
- next.leg_fl.ori =
- Quaternion::rotation_x(footverttaltf * -0.65) * Quaternion::rotation_z(tilt * -0.5);
+ next.leg_fl.ori = Quaternion::rotation_x(footverttaltf * -0.65)
+ * Quaternion::rotation_z(tilt * -0.5)
+ * Quaternion::rotation_y(tilt * 1.5);
next.leg_fl.scale = Vec3::one() * 1.02;
next.leg_fr.offset = Vec3::new(
@@ -253,8 +255,9 @@ impl Animation for RunAnimation {
skeleton_attr.leg_f.1 + footvertalt * -1.3,
skeleton_attr.leg_f.2 + 1.0 + footverttalt * -1.9,
);
- next.leg_fr.ori =
- Quaternion::rotation_x(footverttalt * -0.65) * Quaternion::rotation_z(tilt * -0.5);
+ next.leg_fr.ori = Quaternion::rotation_x(footverttalt * -0.65)
+ * Quaternion::rotation_z(tilt * -0.5)
+ * Quaternion::rotation_y(tilt * 1.5);
next.leg_fr.scale = Vec3::one() * 1.02;
next.leg_bl.offset = Vec3::new(
@@ -263,6 +266,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_b.2 + 1.0 + footvertt * -1.5,
);
next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.4 - 0.2)
+ * Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_bl.scale = Vec3::one() * 1.02;
@@ -272,6 +276,7 @@ impl Animation for RunAnimation {
skeleton_attr.leg_b.2 + 1.0 + footverttf * -1.5,
);
next.leg_br.ori = Quaternion::rotation_x(footverttf * -0.4 - 0.2)
+ * Quaternion::rotation_y(tilt * 1.5)
* Quaternion::rotation_z(tilt * -1.5);
next.leg_br.scale = Vec3::one() * 1.02;
@@ -281,7 +286,8 @@ impl Animation for RunAnimation {
skeleton_attr.feet_f.2 + ((footvertf * -2.7 * skeleton_attr.maximize).max(0.0)),
);
next.foot_fl.ori =
- Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttf * 0.9);
+ Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footverttf * 0.9)
+ * Quaternion::rotation_y(tilt * -1.0);
next.foot_fl.scale = Vec3::one() * 0.96;
next.foot_fr.offset = Vec3::new(
@@ -290,7 +296,8 @@ impl Animation for RunAnimation {
skeleton_attr.feet_f.2 + ((footvert * -2.7 * skeleton_attr.maximize).max(0.0)),
);
next.foot_fr.ori =
- Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footvertt * 0.9);
+ Quaternion::rotation_x((1.0 - skeleton_attr.dampen) * -1.0 + footvertt * 0.9)
+ * Quaternion::rotation_y(tilt * -1.0);
next.foot_fr.scale = Vec3::one() * 0.96;
next.foot_bl.offset = Vec3::new(
@@ -298,7 +305,8 @@ impl Animation for RunAnimation {
skeleton_attr.feet_b.1,
skeleton_attr.feet_b.2 + ((footvert * 2.4).max(0.0)),
);
- next.foot_bl.ori = Quaternion::rotation_x(footvertt * -0.9 - 0.2);
+ next.foot_bl.ori = Quaternion::rotation_x(footvertt * -0.9 - 0.2)
+ * Quaternion::rotation_y(tilt * -1.0);
next.foot_bl.scale = Vec3::one() * 0.96;
next.foot_br.offset = Vec3::new(
@@ -306,7 +314,8 @@ impl Animation for RunAnimation {
skeleton_attr.feet_b.1,
skeleton_attr.feet_b.2 + ((footvertf * 2.4).max(-0.0)),
);
- next.foot_br.ori = Quaternion::rotation_x(footverttf * -0.9 - 0.2);
+ next.foot_br.ori = Quaternion::rotation_x(footverttf * -0.9 - 0.2)
+ * Quaternion::rotation_y(tilt * -1.0);
next.foot_br.scale = Vec3::one() * 0.96;
}
next
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index 51ddec5910..6796824b3b 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -579,7 +579,7 @@ impl FigureMgr {
// Standing
(true, false, _) => anim::character::StandAnimation::update_skeleton(
&CharacterSkeleton::new(),
- (active_tool_kind, second_tool_kind, time),
+ (active_tool_kind, second_tool_kind, time, state.avg_vel),
state.state_time,
&mut state_animation_rate,
skeleton_attr,
@@ -594,6 +594,7 @@ impl FigureMgr {
ori,
state.last_ori,
time,
+ state.avg_vel,
),
state.state_time,
&mut state_animation_rate,
@@ -1070,9 +1071,9 @@ impl FigureMgr {
)
},
// Running
- (true, true, false) => anim::quadruped_low::RunAnimation::update_skeleton(
+ (true, true, _) => anim::quadruped_low::RunAnimation::update_skeleton(
&QuadrupedLowSkeleton::new(),
- (vel.0.magnitude(), ori, state.last_ori, time),
+ (vel.0.magnitude(), ori, state.last_ori, time, state.avg_vel),
state.state_time,
&mut state_animation_rate,
skeleton_attr,
@@ -1085,12 +1086,29 @@ impl FigureMgr {
&mut state_animation_rate,
skeleton_attr,
),
-
+ _ => anim::quadruped_low::IdleAnimation::update_skeleton(
+ &QuadrupedLowSkeleton::new(),
+ time,
+ state.state_time,
+ &mut state_animation_rate,
+ skeleton_attr,
+ ),
+ };
+ let target_bones = match &character {
+ CharacterState::BasicMelee(_) => {
+ anim::quadruped_low::AlphaAnimation::update_skeleton(
+ &target_base,
+ time,
+ state.state_time,
+ &mut state_animation_rate,
+ skeleton_attr,
+ )
+ },
// TODO!
- _ => state.skeleton_mut().clone(),
+ _ => target_base,
};
- state.skeleton.interpolate(&target_base, dt);
+ state.skeleton.interpolate(&target_bones, dt);
state.update(
renderer,
pos.0,
@@ -1145,7 +1163,7 @@ impl FigureMgr {
skeleton_attr,
),
// Running
- (true, true, false) => anim::bird_medium::RunAnimation::update_skeleton(
+ (true, true, _) => anim::bird_medium::RunAnimation::update_skeleton(
&BirdMediumSkeleton::new(),
(vel.0.magnitude(), time),
state.state_time,