assets/manifests

assets/voxygen/voxel/golem_center_manifest.ron

@@ -1,22 +1,30 @@
 ({
     (StoneGolem, Male): (
         head: (
-            offset: (-5.0, -5.5, -7.5),
+            offset: (-3.5, -4.0, -0.0),
             center: ("npc.stonegolem.male.head"),
         ),
         torso_upper: (
-            offset: (-6.0, -3.5, -10.0),
-            center: ("npc.stonegolem.male.torso_upper"),
+            offset: (-10.5, -10.5, -10.5),
+            center: ("npc.stonegolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.5, -4.5, -7.0),
+            center: ("npc.stonegolem.male.chest_lower"),
         ),
     ),
     (StoneGolem, Female): (
         head: (
-            offset: (-5.0, -5.5, -7.5),
+            offset: (-3.5, -4.0, -0.0),
             center: ("npc.stonegolem.male.head"),
         ),
         torso_upper: (
-            offset: (-6.0, -3.5, -10.0),
-            center: ("npc.stonegolem.male.torso_upper"),
+            offset: (-10.5, -10.5, -10.5),
+            center: ("npc.stonegolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-4.5, -4.5, -7.0),
+            center: ("npc.stonegolem.male.chest_lower"),
         ),
     ),
 })

assets/voxygen/voxel/golem_lateral_manifest.ron

@@ -1,69 +1,69 @@
 ({
     (StoneGolem, Male): (
         shoulder_l: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (-18.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (0.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (-7.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (0.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_r"),
         ),
         foot_l: (
-            offset: (-3.0, -3.5, -9.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_l"),
         ),
         foot_r: (
-            offset: (-3.0, -3.5, -9.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_r"),
         )
     ),
     (StoneGolem, Female): (
         shoulder_l: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (-18.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-4.5, -4.0, -5.0),
+            offset: (0.0, -7.5, -7.0),
             lateral: ("npc.stonegolem.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.0, -3.5, -14.0),
+            offset: (-9.0, -11.5, -26.0),
             lateral: ("npc.stonegolem.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (-7.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.5, -2.5, -6.0),
+            offset: (0.0, -3.5, -9.0),
             lateral: ("npc.stonegolem.male.leg_r"),
         ),
         foot_l: (
-            offset: (-3.0, -3.5, -10.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_l"),
         ),
         foot_r: (
-            offset: (-3.0, -3.5, -10.5),
+            offset: (-4.5, -4.5, -11.0),
             lateral: ("npc.stonegolem.male.foot_r"),
         )
     ),

common/src/states/utils.rs

@@ -91,7 +91,7 @@ fn basic_move(data: &JoinData, update: &mut StateUpdate, efficiency: f32) {
 
 pub fn handle_orientation(data: &JoinData, update: &mut StateUpdate, rate: f32) {
     // Set direction based on move direction
-    let ori_dir = if update.character.is_attack() || update.character.is_block() {
+    let ori_dir = if update.character.is_block() {
         data.inputs.look_dir.xy()
     } else if !data.inputs.move_dir.is_approx_zero() {
         data.inputs.move_dir