Merge pull request #181 from sanderfrenken/fix-halberd

Fix zpos for halberd animation
sanderfrenken · Aug 12, 2024 · 870e180 · 870e180
2 parents 094f74a + 74e3df9
commit 870e180
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/index.html b/index.html
@@ -61243,7 +61243,7 @@ <h3>Weapons</h3>
 </ul></li>
 <li data-required="male,female,muscular,pregnant" data-animations="spellcast,thrust,walk,slash,shoot,hurt,watering"><span class="condensed">Halberd</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
   <label for="weapon-Halberd_halberd">
-    <input type="radio" id="weapon-Halberd_halberd" name="weapon" parentName="Halberd" variant="halberd" matchBodyColor="false" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=8 data-layer_1_male="weapon/polearm/halberd/behind/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_2_zpos=140 data-layer_2_male="weapon/polearm/halberd/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_3_zpos=9 data-layer_3_custom_animation=thrust_oversize data-layer_3_male="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_4_zpos=105 data-layer_4_custom_animation=thrust_oversize data-layer_4_male="weapon/polearm/halberd/attack_thrust/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_5_zpos=8 data-layer_5_custom_animation=slash_oversize data-layer_5_male="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_6_zpos=150 data-layer_6_custom_animation=slash_oversize data-layer_6_male="weapon/polearm/halberd/attack_slash/halberd.png" data-layer_1_female="weapon/polearm/halberd/behind/halberd.png" data-layer_2_female="weapon/polearm/halberd/halberd.png" data-layer_3_female="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-layer_4_female="weapon/polearm/halberd/attack_thrust/halberd.png" data-layer_5_female="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-layer_6_female="weapon/polearm/halberd/attack_slash/halberd.png" data-layer_1_muscular="weapon/polearm/halberd/behind/halberd.png" data-layer_2_muscular="weapon/polearm/halberd/halberd.png" data-layer_3_muscular="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-layer_4_muscular="weapon/polearm/halberd/attack_thrust/halberd.png" data-layer_5_muscular="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-layer_6_muscular="weapon/polearm/halberd/attack_slash/halberd.png" data-layer_1_pregnant="weapon/polearm/halberd/behind/halberd.png" data-layer_2_pregnant="weapon/polearm/halberd/halberd.png" data-layer_3_pregnant="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-layer_4_pregnant="weapon/polearm/halberd/attack_thrust/halberd.png" data-layer_5_pregnant="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-layer_6_pregnant="weapon/polearm/halberd/attack_slash/halberd.png"  [CHECKED]>
+    <input type="radio" id="weapon-Halberd_halberd" name="weapon" parentName="Halberd" variant="halberd" matchBodyColor="false" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_1_zpos=8 data-layer_1_male="weapon/polearm/halberd/behind/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_2_zpos=140 data-layer_2_male="weapon/polearm/halberd/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_3_zpos=9 data-layer_3_custom_animation=thrust_oversize data-layer_3_male="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_4_zpos=150 data-layer_4_custom_animation=thrust_oversize data-layer_4_male="weapon/polearm/halberd/attack_thrust/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_5_zpos=8 data-layer_5_custom_animation=slash_oversize data-layer_5_male="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-preview_row=8 data-preview_column=0 data-preview_x_offset=0 data-preview_y_offset=0 data-layer_6_zpos=150 data-layer_6_custom_animation=slash_oversize data-layer_6_male="weapon/polearm/halberd/attack_slash/halberd.png" data-layer_1_female="weapon/polearm/halberd/behind/halberd.png" data-layer_2_female="weapon/polearm/halberd/halberd.png" data-layer_3_female="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-layer_4_female="weapon/polearm/halberd/attack_thrust/halberd.png" data-layer_5_female="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-layer_6_female="weapon/polearm/halberd/attack_slash/halberd.png" data-layer_1_muscular="weapon/polearm/halberd/behind/halberd.png" data-layer_2_muscular="weapon/polearm/halberd/halberd.png" data-layer_3_muscular="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-layer_4_muscular="weapon/polearm/halberd/attack_thrust/halberd.png" data-layer_5_muscular="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-layer_6_muscular="weapon/polearm/halberd/attack_slash/halberd.png" data-layer_1_pregnant="weapon/polearm/halberd/behind/halberd.png" data-layer_2_pregnant="weapon/polearm/halberd/halberd.png" data-layer_3_pregnant="weapon/polearm/halberd/attack_thrust/behind/halberd.png" data-layer_4_pregnant="weapon/polearm/halberd/attack_thrust/halberd.png" data-layer_5_pregnant="weapon/polearm/halberd/attack_slash/behind/halberd.png" data-layer_6_pregnant="weapon/polearm/halberd/attack_slash/halberd.png"  [CHECKED]>
     <span>halberd</span>
   </label>
 </li>

diff --git a/sheet_definitions/weapon_polearm_halberd.json b/sheet_definitions/weapon_polearm_halberd.json
@@ -27,7 +27,7 @@
   },
   "layer_4": {
     "custom_animation": "thrust_oversize",
-    "zPos": 105,
+    "zPos": 150,
     "male": "weapon/polearm/halberd/attack_thrust/",
     "muscular": "weapon/polearm/halberd/attack_thrust/",
     "female": "weapon/polearm/halberd/attack_thrust/",