diff --git a/CREDITS.csv b/CREDITS.csv
index 03d208ef8..61d993ab0 100644
--- a/CREDITS.csv
+++ b/CREDITS.csv
@@ -16443,6 +16443,17 @@ weapon/polearm/cane/female,,,,,,,,,,,,,,,,,,,
 weapon/polearm/cane/female/cane.png,,bluecarrot16,"CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-gentleman,,,,,,,,,,,,,,,OK
 weapon/polearm/cane/male,,,,,,,,,,,,,,,,,,,
 weapon/polearm/cane/male/cane.png,,bluecarrot16,"CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-gentleman,,,,,,,,,,,,,,,OK
+weapon/polearm/dragonspear,"original ""dragon spear"" by daneeklu and gr3yh47; adapted to opposite hand and split into layers by bluecarrot16","Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/thrust,,,,,,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/thrust/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/thrust/background/dragonspear.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
+weapon/polearm/dragonspear/thrust/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/thrust/foreground/dragonspear.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
+weapon/polearm/dragonspear/walk,,,,,,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/walk/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/walk/background/dragonspear.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
+weapon/polearm/dragonspear/walk/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/dragonspear/walk/foreground/dragonspear.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
 weapon/polearm/halberd,,,,,,,,,,,,,,,,,,,
 weapon/polearm/halberd/attack_slash,,,,,,,,,,,,,,,,,,,
 weapon/polearm/halberd/attack_slash/behind,,,,,,,,,,,,,,,,,,,
@@ -16453,8 +16464,19 @@ weapon/polearm/halberd/attack_thrust/behind,,,,,,,,,,,,,,,,,,,
 weapon/polearm/halberd/attack_thrust/behind/halberd.png,,"Benjamin K. Smith (BenCreating), bluecarrot16, Sander Frenken (castelonia)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-medieval-weapons,,,,,,,,,,,,,,,OK
 weapon/polearm/halberd/attack_thrust/halberd.png,,"Benjamin K. Smith (BenCreating), bluecarrot16, Sander Frenken (castelonia)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-medieval-weapons,,,,,,,,,,,,,,,OK
 weapon/polearm/halberd/behind,,,,,,,,,,,,,,,,,,,
-weapon/polearm/halberd/behind/halberd.png,,,,,,,,,,,,,,,,,,,BAD
+weapon/polearm/halberd/behind/halberd.png,,"Benjamin K. Smith (BenCreating), bluecarrot16, Sander Frenken (castelonia)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-medieval-weapons,,,,,,,,,,,,,,,OK
 weapon/polearm/halberd/halberd.png,,"Benjamin K. Smith (BenCreating), bluecarrot16, Sander Frenken (castelonia)","CC-BY-SA 3.0, GPL 3.0",https://opengameart.org/content/lpc-medieval-weapons,,,,,,,,,,,,,,,OK
+weapon/polearm/longspear,original by wulax from expansion_pack-0.04 walk animations adapted from those by pvigier; split into layers and tweaked for v3 character bases by bluecarrot16,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,
+weapon/polearm/longspear/thrust,,,,,,,,,,,,,,,,,,,
+weapon/polearm/longspear/thrust/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/longspear/thrust/background/longspear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,OK
+weapon/polearm/longspear/thrust/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/longspear/thrust/foreground/longspear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,OK
+weapon/polearm/longspear/walk,,,,,,,,,,,,,,,,,,,
+weapon/polearm/longspear/walk/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/longspear/walk/background/longspear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,OK
+weapon/polearm/longspear/walk/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/longspear/walk/foreground/longspear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,OK
 weapon/polearm/scythe,,,,,,,,,,,,,,,,,,,
 weapon/polearm/scythe/attack_slash,,,,,,,,,,,,,,,,,,,
 weapon/polearm/scythe/attack_slash/behind,,,,,,,,,,,,,,,,,,,
@@ -16463,19 +16485,27 @@ weapon/polearm/scythe/attack_slash/scythe.png,,bluecarrot16,CC-BY-SA 3.0,https:/
 weapon/polearm/scythe/scythe.png,,bluecarrot16,CC-BY-SA 3.0,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,,OK
 weapon/polearm/scythe/universal_behind,,,,,,,,,,,,,,,,,,,
 weapon/polearm/scythe/universal_behind/scythe.png,,bluecarrot16,CC-BY-SA 3.0,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,,OK
-weapon/polearm/spear,,,,,,,,,,,,,,,,,,,
-weapon/polearm/spear/female,,,,,,,,,,,,,,,,,,,
-weapon/polearm/spear/female/spear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/female/spear_black.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/female/spear_green.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/female/spear_metal.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/female/spear_purple.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/male,,,,,,,,,,,,,,,,,,,
-weapon/polearm/spear/male/spear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/male/spear_black.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/male/spear_green.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/male/spear_metal.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
-weapon/polearm/spear/male/spear_purple.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,,OK
+weapon/polearm/spear,original by wulax; walk animations redone by pvigier; split into layers and tweaked for v3 character bases by bluecarrot16,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,
+weapon/polearm/spear/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/spear/background/spear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,OK
+weapon/polearm/spear/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/spear/foreground/spear.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,https://opengameart.org/content/lpc-spear-and-shovel-reworked,,,,,,,,,,,,,,OK
+weapon/polearm/spear_off,original by wulax; walk animations redone by pvigier; split into layers and tweaked for v3 character bases by bluecarrot16,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,
+weapon/polearm/spear_off/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/spear_off/background/spear_off.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,OK
+weapon/polearm/spear_off/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/spear_off/foreground/spear_off.png,,"Pierre Vigier (pvigier), Johannes Sjölund (wulax), Inboxninja",CC-BY-SA 3.0,https://opengameart.org/content/lpc-medieval-fantasy-character-sprites,,,,,,,,,,,,,,,OK
+weapon/polearm/trident,"original ""trident"" by daneeklu and gr3yh47; adapted to opposite hand and split into layers by bluecarrot16","Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,
+weapon/polearm/trident/thrust,,,,,,,,,,,,,,,,,,,
+weapon/polearm/trident/thrust/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/trident/thrust/background/trident.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
+weapon/polearm/trident/thrust/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/trident/thrust/foreground/trident.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
+weapon/polearm/trident/walk,,,,,,,,,,,,,,,,,,,
+weapon/polearm/trident/walk/background,,,,,,,,,,,,,,,,,,,
+weapon/polearm/trident/walk/background/trident.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
+weapon/polearm/trident/walk/foreground,,,,,,,,,,,,,,,,,,,
+weapon/polearm/trident/walk/foreground/trident.png,,"Daniel Eddeland (daneeklu), gr3yh47, Johannes Sjölund (wulax)",CC-BY-SA 3.0,https://opengameart.org/content/lpc-weapons-two-bows-a-spear-and-a-trident,https://opengameart.org/content/lpc-extended-weapon-animations,,,,,,,,,,,,,,OK
 weapon/ranged,,,,,,,,,,,,,,,,,,,
 weapon/ranged/boomerang,,,,,,,,,,,,,,,,,,,
 weapon/ranged/boomerang/boomerang.png,,bluecarrot16,"OGA-BY 3.0+, GPL 3.0, CC-BY 4.0",https://opengameart.org/content/lpc-more-weapons,,,,,,,,,,,,,,,OK
diff --git a/index.html b/index.html
index b90c93c03..b96f4c944 100644
--- a/index.html
+++ b/index.html
@@ -36828,48 +36828,45 @@ <h3>Weapons</h3>
   </label>
 </li>
 </ul></li>
-<li data-required="male,female,muscular,pregnant"><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=17 data-layer_1_zpos=8 data-layer_1_male="weapon/polearm/halberd/behind/halberd.png" data-preview_row=17 data-layer_2_zpos=140 data-layer_2_male="weapon/polearm/halberd/halberd.png" data-preview_row=17 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=17 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=17 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=17 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>
-</ul></li>
-<li data-required="male,female,muscular,pregnant"><span class="condensed">Spear</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
+<li data-required="male,female,teen,muscular,pregnant"><span class="condensed">Spear</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
   <label for="weapon-Spear_spear">
-    <input type="radio" id="weapon-Spear_spear" name="weapon" parentName="Spear" variant="spear" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/spear/male/spear.png" data-layer_1_female="weapon/polearm/spear/female/spear.png" data-layer_1_muscular="weapon/polearm/spear/male/spear.png" data-layer_1_pregnant="weapon/polearm/spear/female/spear.png"  [CHECKED]>
+    <input type="radio" id="weapon-Spear_spear" name="weapon" parentName="Spear" variant="spear" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/spear/foreground/spear.png" data-preview_row=10 data-layer_2_zpos=9 data-layer_2_male="weapon/polearm/spear/background/spear.png" data-layer_1_female="weapon/polearm/spear/foreground/spear.png" data-layer_2_female="weapon/polearm/spear/background/spear.png" data-layer_1_teen="weapon/polearm/spear/foreground/spear.png" data-layer_2_teen="weapon/polearm/spear/background/spear.png" data-layer_1_muscular="weapon/polearm/spear/foreground/spear.png" data-layer_2_muscular="weapon/polearm/spear/background/spear.png" data-layer_1_pregnant="weapon/polearm/spear/foreground/spear.png" data-layer_2_pregnant="weapon/polearm/spear/background/spear.png"  [CHECKED]>
     <span>spear</span>
   </label>
 </li>
-<li>
-  <label for="weapon-Spear_spear_black">
-    <input type="radio" id="weapon-Spear_spear_black" name="weapon" parentName="Spear" variant="spear black" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/spear/male/spear_black.png" data-layer_1_female="weapon/polearm/spear/female/spear_black.png" data-layer_1_muscular="weapon/polearm/spear/male/spear_black.png" data-layer_1_pregnant="weapon/polearm/spear/female/spear_black.png"  [CHECKED]>
-    <span>spear black</span>
+</ul></li>
+<li data-required="male,female,muscular,pregnant"><span class="condensed">Scythe</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
+  <label for="weapon-Scythe_scythe">
+    <input type="radio" id="weapon-Scythe_scythe" name="weapon" parentName="Scythe" variant="scythe" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/scythe/scythe.png" data-preview_row=10 data-layer_2_zpos=9 data-layer_2_male="weapon/polearm/scythe/universal_behind/scythe.png" data-preview_row=10 data-layer_3_zpos=8 data-layer_3_custom_animation=slash_oversize data-layer_3_male="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-preview_row=10 data-layer_4_zpos=150 data-layer_4_custom_animation=slash_oversize data-layer_4_male="weapon/polearm/scythe/attack_slash/scythe.png" data-layer_1_female="weapon/polearm/scythe/scythe.png" data-layer_2_female="weapon/polearm/scythe/universal_behind/scythe.png" data-layer_3_female="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-layer_4_female="weapon/polearm/scythe/attack_slash/scythe.png" data-layer_1_muscular="weapon/polearm/scythe/scythe.png" data-layer_2_muscular="weapon/polearm/scythe/universal_behind/scythe.png" data-layer_3_muscular="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-layer_4_muscular="weapon/polearm/scythe/attack_slash/scythe.png" data-layer_1_pregnant="weapon/polearm/scythe/scythe.png" data-layer_2_pregnant="weapon/polearm/scythe/universal_behind/scythe.png" data-layer_3_pregnant="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-layer_4_pregnant="weapon/polearm/scythe/attack_slash/scythe.png"  [CHECKED]>
+    <span>scythe</span>
   </label>
 </li>
-<li>
-  <label for="weapon-Spear_spear_green">
-    <input type="radio" id="weapon-Spear_spear_green" name="weapon" parentName="Spear" variant="spear green" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/spear/male/spear_green.png" data-layer_1_female="weapon/polearm/spear/female/spear_green.png" data-layer_1_muscular="weapon/polearm/spear/male/spear_green.png" data-layer_1_pregnant="weapon/polearm/spear/female/spear_green.png"  [CHECKED]>
-    <span>spear green</span>
+</ul></li>
+<li data-required="male,female,muscular,pregnant"><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=17 data-layer_1_zpos=8 data-layer_1_male="weapon/polearm/halberd/behind/halberd.png" data-preview_row=17 data-layer_2_zpos=140 data-layer_2_male="weapon/polearm/halberd/halberd.png" data-preview_row=17 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=17 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=17 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=17 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>
-<li>
-  <label for="weapon-Spear_spear_metal">
-    <input type="radio" id="weapon-Spear_spear_metal" name="weapon" parentName="Spear" variant="spear metal" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/spear/male/spear_metal.png" data-layer_1_female="weapon/polearm/spear/female/spear_metal.png" data-layer_1_muscular="weapon/polearm/spear/male/spear_metal.png" data-layer_1_pregnant="weapon/polearm/spear/female/spear_metal.png"  [CHECKED]>
-    <span>spear metal</span>
+</ul></li>
+<li data-required="male,female,teen,muscular,pregnant"><span class="condensed">Long spear</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
+  <label for="weapon-Long_spear_longspear">
+    <input type="radio" id="weapon-Long_spear_longspear" name="weapon" parentName="Long spear" variant="longspear" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=walk_128 data-layer_1_male="weapon/polearm/longspear/walk/foreground/longspear.png" data-preview_row=10 data-layer_2_zpos=9 data-layer_2_custom_animation=walk_128 data-layer_2_male="weapon/polearm/longspear/walk/background/longspear.png" data-preview_row=10 data-layer_3_zpos=150 data-layer_3_custom_animation=thrust_oversize data-layer_3_male="weapon/polearm/longspear/thrust/foreground/longspear.png" data-preview_row=10 data-layer_4_zpos=-1 data-layer_4_custom_animation=thrust_oversize data-layer_4_male="weapon/polearm/longspear/thrust/background/longspear.png" data-layer_1_female="weapon/polearm/longspear/walk/foreground/longspear.png" data-layer_2_female="weapon/polearm/longspear/walk/background/longspear.png" data-layer_3_female="weapon/polearm/longspear/thrust/foreground/longspear.png" data-layer_4_female="weapon/polearm/longspear/thrust/background/longspear.png" data-layer_1_teen="weapon/polearm/longspear/walk/foreground/longspear.png" data-layer_2_teen="weapon/polearm/longspear/walk/background/longspear.png" data-layer_3_teen="weapon/polearm/longspear/thrust/foreground/longspear.png" data-layer_4_teen="weapon/polearm/longspear/thrust/background/longspear.png" data-layer_1_muscular="weapon/polearm/longspear/walk/foreground/longspear.png" data-layer_2_muscular="weapon/polearm/longspear/walk/background/longspear.png" data-layer_3_muscular="weapon/polearm/longspear/thrust/foreground/longspear.png" data-layer_4_muscular="weapon/polearm/longspear/thrust/background/longspear.png" data-layer_1_pregnant="weapon/polearm/longspear/walk/foreground/longspear.png" data-layer_2_pregnant="weapon/polearm/longspear/walk/background/longspear.png" data-layer_3_pregnant="weapon/polearm/longspear/thrust/foreground/longspear.png" data-layer_4_pregnant="weapon/polearm/longspear/thrust/background/longspear.png"  [CHECKED]>
+    <span>longspear</span>
   </label>
 </li>
-<li>
-  <label for="weapon-Spear_spear_purple">
-    <input type="radio" id="weapon-Spear_spear_purple" name="weapon" parentName="Spear" variant="spear purple" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/spear/male/spear_purple.png" data-layer_1_female="weapon/polearm/spear/female/spear_purple.png" data-layer_1_muscular="weapon/polearm/spear/male/spear_purple.png" data-layer_1_pregnant="weapon/polearm/spear/female/spear_purple.png"  [CHECKED]>
-    <span>spear purple</span>
+</ul></li>
+<li data-required="male,female,teen,muscular,pregnant"><span class="condensed">Dragon spear</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
+  <label for="weapon-Dragon_spear_dragonspear">
+    <input type="radio" id="weapon-Dragon_spear_dragonspear" name="weapon" parentName="Dragon spear" variant="dragonspear" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=walk_128 data-layer_1_male="weapon/polearm/dragonspear/walk/foreground/dragonspear.png" data-preview_row=10 data-layer_2_zpos=9 data-layer_2_custom_animation=walk_128 data-layer_2_male="weapon/polearm/dragonspear/walk/background/dragonspear.png" data-preview_row=10 data-layer_3_zpos=150 data-layer_3_custom_animation=thrust_oversize data-layer_3_male="weapon/polearm/dragonspear/thrust/foreground/dragonspear.png" data-preview_row=10 data-layer_4_zpos=-1 data-layer_4_custom_animation=thrust_oversize data-layer_4_male="weapon/polearm/dragonspear/thrust/background/dragonspear.png" data-layer_1_female="weapon/polearm/dragonspear/walk/foreground/dragonspear.png" data-layer_2_female="weapon/polearm/dragonspear/walk/background/dragonspear.png" data-layer_3_female="weapon/polearm/dragonspear/thrust/foreground/dragonspear.png" data-layer_4_female="weapon/polearm/dragonspear/thrust/background/dragonspear.png" data-layer_1_teen="weapon/polearm/dragonspear/walk/foreground/dragonspear.png" data-layer_2_teen="weapon/polearm/dragonspear/walk/background/dragonspear.png" data-layer_3_teen="weapon/polearm/dragonspear/thrust/foreground/dragonspear.png" data-layer_4_teen="weapon/polearm/dragonspear/thrust/background/dragonspear.png" data-layer_1_muscular="weapon/polearm/dragonspear/walk/foreground/dragonspear.png" data-layer_2_muscular="weapon/polearm/dragonspear/walk/background/dragonspear.png" data-layer_3_muscular="weapon/polearm/dragonspear/thrust/foreground/dragonspear.png" data-layer_4_muscular="weapon/polearm/dragonspear/thrust/background/dragonspear.png" data-layer_1_pregnant="weapon/polearm/dragonspear/walk/foreground/dragonspear.png" data-layer_2_pregnant="weapon/polearm/dragonspear/walk/background/dragonspear.png" data-layer_3_pregnant="weapon/polearm/dragonspear/thrust/foreground/dragonspear.png" data-layer_4_pregnant="weapon/polearm/dragonspear/thrust/background/dragonspear.png"  [CHECKED]>
+    <span>dragonspear</span>
   </label>
 </li>
 </ul></li>
-<li data-required="male,female,muscular,pregnant"><span class="condensed">Scythe</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
-  <label for="weapon-Scythe_scythe">
-    <input type="radio" id="weapon-Scythe_scythe" name="weapon" parentName="Scythe" variant="scythe" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_male="weapon/polearm/scythe/scythe.png" data-preview_row=10 data-layer_2_zpos=9 data-layer_2_male="weapon/polearm/scythe/universal_behind/scythe.png" data-preview_row=10 data-layer_3_zpos=8 data-layer_3_custom_animation=slash_oversize data-layer_3_male="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-preview_row=10 data-layer_4_zpos=150 data-layer_4_custom_animation=slash_oversize data-layer_4_male="weapon/polearm/scythe/attack_slash/scythe.png" data-layer_1_female="weapon/polearm/scythe/scythe.png" data-layer_2_female="weapon/polearm/scythe/universal_behind/scythe.png" data-layer_3_female="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-layer_4_female="weapon/polearm/scythe/attack_slash/scythe.png" data-layer_1_muscular="weapon/polearm/scythe/scythe.png" data-layer_2_muscular="weapon/polearm/scythe/universal_behind/scythe.png" data-layer_3_muscular="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-layer_4_muscular="weapon/polearm/scythe/attack_slash/scythe.png" data-layer_1_pregnant="weapon/polearm/scythe/scythe.png" data-layer_2_pregnant="weapon/polearm/scythe/universal_behind/scythe.png" data-layer_3_pregnant="weapon/polearm/scythe/attack_slash/behind/scythe.png" data-layer_4_pregnant="weapon/polearm/scythe/attack_slash/scythe.png"  [CHECKED]>
-    <span>scythe</span>
+<li data-required="male,female,teen,muscular,pregnant"><span class="condensed">Trident</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
+  <label for="weapon-Trident_trident">
+    <input type="radio" id="weapon-Trident_trident" name="weapon" parentName="Trident" variant="trident" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=walk_128 data-layer_1_male="weapon/polearm/trident/walk/foreground/trident.png" data-preview_row=10 data-layer_2_zpos=9 data-layer_2_custom_animation=walk_128 data-layer_2_male="weapon/polearm/trident/walk/background/trident.png" data-preview_row=10 data-layer_3_zpos=150 data-layer_3_custom_animation=thrust_oversize data-layer_3_male="weapon/polearm/trident/thrust/foreground/trident.png" data-preview_row=10 data-layer_4_zpos=-1 data-layer_4_custom_animation=thrust_oversize data-layer_4_male="weapon/polearm/trident/thrust/background/trident.png" data-layer_1_female="weapon/polearm/trident/walk/foreground/trident.png" data-layer_2_female="weapon/polearm/trident/walk/background/trident.png" data-layer_3_female="weapon/polearm/trident/thrust/foreground/trident.png" data-layer_4_female="weapon/polearm/trident/thrust/background/trident.png" data-layer_1_teen="weapon/polearm/trident/walk/foreground/trident.png" data-layer_2_teen="weapon/polearm/trident/walk/background/trident.png" data-layer_3_teen="weapon/polearm/trident/thrust/foreground/trident.png" data-layer_4_teen="weapon/polearm/trident/thrust/background/trident.png" data-layer_1_muscular="weapon/polearm/trident/walk/foreground/trident.png" data-layer_2_muscular="weapon/polearm/trident/walk/background/trident.png" data-layer_3_muscular="weapon/polearm/trident/thrust/foreground/trident.png" data-layer_4_muscular="weapon/polearm/trident/thrust/background/trident.png" data-layer_1_pregnant="weapon/polearm/trident/walk/foreground/trident.png" data-layer_2_pregnant="weapon/polearm/trident/walk/background/trident.png" data-layer_3_pregnant="weapon/polearm/trident/thrust/foreground/trident.png" data-layer_4_pregnant="weapon/polearm/trident/thrust/background/trident.png"  [CHECKED]>
+    <span>trident</span>
   </label>
 </li>
 </ul></li>
@@ -36952,49 +36949,6 @@ <h3>Weapons</h3>
 </ul></li>
 					</ul>
 				</li>
-<li data-required="male,female,muscular,pregnant"><span class="condensed">Misc</span><ul><li><input type="radio" id="weapon-none" name="weapon"> <label for="weapon-none">No weapon</label></li><li>
-  <label for="weapon-Misc_longspear">
-    <input type="radio" id="weapon-Misc_longspear" name="weapon" parentName="Misc" variant="longspear" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/longspear.png" data-layer_1_female="weapon/misc/female/longspear.png" data-layer_1_muscular="weapon/misc/male/longspear.png" data-layer_1_pregnant="weapon/misc/female/longspear.png"  [CHECKED]>
-    <span>longspear</span>
-  </label>
-</li>
-<li>
-  <label for="weapon-Misc_longspear_alt">
-    <input type="radio" id="weapon-Misc_longspear_alt" name="weapon" parentName="Misc" variant="longspear alt" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/longspear_alt.png" data-layer_1_female="weapon/misc/female/longspear_alt.png" data-layer_1_muscular="weapon/misc/male/longspear_alt.png" data-layer_1_pregnant="weapon/misc/female/longspear_alt.png"  [CHECKED]>
-    <span>longspear alt</span>
-  </label>
-</li>
-<li>
-  <label for="weapon-Misc_magic">
-    <input type="radio" id="weapon-Misc_magic" name="weapon" parentName="Misc" variant="magic" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/magic.png" data-layer_1_female="weapon/misc/female/magic.png" data-layer_1_muscular="weapon/misc/male/magic.png" data-layer_1_pregnant="weapon/misc/female/magic.png"  [CHECKED]>
-    <span>magic</span>
-  </label>
-</li>
-<li>
-  <label for="weapon-Misc_magic_on">
-    <input type="radio" id="weapon-Misc_magic_on" name="weapon" parentName="Misc" variant="magic on" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/magic_on.png" data-layer_1_female="weapon/misc/female/magic_on.png" data-layer_1_muscular="weapon/misc/male/magic_on.png" data-layer_1_pregnant="weapon/misc/female/magic_on.png"  [CHECKED]>
-    <span>magic on</span>
-  </label>
-</li>
-<li>
-  <label for="weapon-Misc_magic_alt">
-    <input type="radio" id="weapon-Misc_magic_alt" name="weapon" parentName="Misc" variant="magic alt" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/magic_alt.png" data-layer_1_female="weapon/misc/female/magic_alt.png" data-layer_1_muscular="weapon/misc/male/magic_alt.png" data-layer_1_pregnant="weapon/misc/female/magic_alt.png"  [CHECKED]>
-    <span>magic alt</span>
-  </label>
-</li>
-<li>
-  <label for="weapon-Misc_magic_alt_on">
-    <input type="radio" id="weapon-Misc_magic_alt_on" name="weapon" parentName="Misc" variant="magic alt on" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/magic_alt_on.png" data-layer_1_female="weapon/misc/female/magic_alt_on.png" data-layer_1_muscular="weapon/misc/male/magic_alt_on.png" data-layer_1_pregnant="weapon/misc/female/magic_alt_on.png"  [CHECKED]>
-    <span>magic alt on</span>
-  </label>
-</li>
-<li>
-  <label for="weapon-Misc_trident">
-    <input type="radio" id="weapon-Misc_trident" name="weapon" parentName="Misc" variant="trident" matchBodyColor="false" data-preview_row=10 data-layer_1_zpos=140 data-layer_1_custom_animation=thrust_oversize data-layer_1_male="weapon/misc/male/trident.png" data-layer_1_female="weapon/misc/female/trident.png" data-layer_1_muscular="weapon/misc/male/trident.png" data-layer_1_pregnant="weapon/misc/female/trident.png"  [CHECKED]>
-    <span>trident</span>
-  </label>
-</li>
-</ul></li>
 			</ul>
 		</section>
 	</form>
diff --git a/sheet_definitions/weapon_polearm_dragonspear.json b/sheet_definitions/weapon_polearm_dragonspear.json
new file mode 100644
index 000000000..d1e0ac534
--- /dev/null
+++ b/sheet_definitions/weapon_polearm_dragonspear.json
@@ -0,0 +1,43 @@
+{
+  "name": "Dragon spear",
+  "type_name": "weapon",
+  "layer_1": {
+    "zPos": 140,
+    "custom_animation": "walk_128",
+    "male": "weapon/polearm/dragonspear/walk/foreground/",
+    "muscular": "weapon/polearm/dragonspear/walk/foreground/",
+    "female": "weapon/polearm/dragonspear/walk/foreground/",
+    "teen": "weapon/polearm/dragonspear/walk/foreground/",
+    "pregnant": "weapon/polearm/dragonspear/walk/foreground/"
+  },
+  "layer_2": {
+    "zPos": 9,
+    "custom_animation": "walk_128",
+    "male": "weapon/polearm/dragonspear/walk/background/",
+    "muscular": "weapon/polearm/dragonspear/walk/background/",
+    "female": "weapon/polearm/dragonspear/walk/background/",
+    "teen": "weapon/polearm/dragonspear/walk/background/",
+    "pregnant": "weapon/polearm/dragonspear/walk/background/"
+  },
+  "layer_3": {
+    "custom_animation": "thrust_oversize",
+    "zPos": 150,
+    "male": "weapon/polearm/dragonspear/thrust/foreground/",
+    "muscular": "weapon/polearm/dragonspear/thrust/foreground/",
+    "female": "weapon/polearm/dragonspear/thrust/foreground/",
+    "teen": "weapon/polearm/dragonspear/thrust/foreground/",
+    "pregnant": "weapon/polearm/dragonspear/thrust/foreground/"
+  },
+  "layer_4": {
+    "custom_animation": "thrust_oversize",
+    "zPos": -1,
+    "male": "weapon/polearm/dragonspear/thrust/background/",
+    "muscular": "weapon/polearm/dragonspear/thrust/background/",
+    "female": "weapon/polearm/dragonspear/thrust/background/",
+    "teen": "weapon/polearm/dragonspear/thrust/background/",
+    "pregnant": "weapon/polearm/dragonspear/thrust/background/"
+  },
+  "variants": [
+    "dragonspear"
+  ]
+}
\ No newline at end of file
diff --git a/sheet_definitions/weapon_polearm_longspear.json b/sheet_definitions/weapon_polearm_longspear.json
new file mode 100644
index 000000000..90d1e2701
--- /dev/null
+++ b/sheet_definitions/weapon_polearm_longspear.json
@@ -0,0 +1,43 @@
+{
+  "name": "Long spear",
+  "type_name": "weapon",
+  "layer_1": {
+    "zPos": 140,
+    "custom_animation": "walk_128",
+    "male": "weapon/polearm/longspear/walk/foreground/",
+    "muscular": "weapon/polearm/longspear/walk/foreground/",
+    "female": "weapon/polearm/longspear/walk/foreground/",
+    "teen": "weapon/polearm/longspear/walk/foreground/",
+    "pregnant": "weapon/polearm/longspear/walk/foreground/"
+  },
+  "layer_2": {
+    "zPos": 9,
+    "custom_animation": "walk_128",
+    "male": "weapon/polearm/longspear/walk/background/",
+    "muscular": "weapon/polearm/longspear/walk/background/",
+    "female": "weapon/polearm/longspear/walk/background/",
+    "teen": "weapon/polearm/longspear/walk/background/",
+    "pregnant": "weapon/polearm/longspear/walk/background/"
+  },
+  "layer_3": {
+    "custom_animation": "thrust_oversize",
+    "zPos": 150,
+    "male": "weapon/polearm/longspear/thrust/foreground/",
+    "muscular": "weapon/polearm/longspear/thrust/foreground/",
+    "female": "weapon/polearm/longspear/thrust/foreground/",
+    "teen": "weapon/polearm/longspear/thrust/foreground/",
+    "pregnant": "weapon/polearm/longspear/thrust/foreground/"
+  },
+  "layer_4": {
+    "custom_animation": "thrust_oversize",
+    "zPos": -1,
+    "male": "weapon/polearm/longspear/thrust/background/",
+    "muscular": "weapon/polearm/longspear/thrust/background/",
+    "female": "weapon/polearm/longspear/thrust/background/",
+    "teen": "weapon/polearm/longspear/thrust/background/",
+    "pregnant": "weapon/polearm/longspear/thrust/background/"
+  },
+  "variants": [
+    "longspear"
+  ]
+}
\ No newline at end of file
diff --git a/sheet_definitions/weapon_polearm_spear.json b/sheet_definitions/weapon_polearm_spear.json
index 01db4832d..dc7de9b7e 100644
--- a/sheet_definitions/weapon_polearm_spear.json
+++ b/sheet_definitions/weapon_polearm_spear.json
@@ -3,16 +3,21 @@
   "type_name": "weapon",
   "layer_1": {
     "zPos": 140,
-    "male": "weapon/polearm/spear/male/",
-    "muscular": "weapon/polearm/spear/male/",
-    "female": "weapon/polearm/spear/female/",
-    "pregnant": "weapon/polearm/spear/female/"
+    "male": "weapon/polearm/spear/foreground/",
+    "muscular": "weapon/polearm/spear/foreground/",
+    "female": "weapon/polearm/spear/foreground/",
+    "teen": "weapon/polearm/spear/foreground/",
+    "pregnant": "weapon/polearm/spear/foreground/"
+  },
+  "layer_2": {
+    "zPos": 9,
+    "male": "weapon/polearm/spear/background/",
+    "muscular": "weapon/polearm/spear/background/",
+    "female": "weapon/polearm/spear/background/",
+    "teen": "weapon/polearm/spear/background/",
+    "pregnant": "weapon/polearm/spear/background/"
   },
   "variants": [
-    "spear",
-    "spear black",
-    "spear green",
-    "spear metal",
-    "spear purple"
+    "spear"
   ]
 }
\ No newline at end of file
diff --git a/sheet_definitions/weapon_polearm_trident.json b/sheet_definitions/weapon_polearm_trident.json
new file mode 100644
index 000000000..3c2b0ea35
--- /dev/null
+++ b/sheet_definitions/weapon_polearm_trident.json
@@ -0,0 +1,43 @@
+{
+  "name": "Trident",
+  "type_name": "weapon",
+  "layer_1": {
+    "zPos": 140,
+    "custom_animation": "walk_128",
+    "male": "weapon/polearm/trident/walk/foreground/",
+    "muscular": "weapon/polearm/trident/walk/foreground/",
+    "female": "weapon/polearm/trident/walk/foreground/",
+    "teen": "weapon/polearm/trident/walk/foreground/",
+    "pregnant": "weapon/polearm/trident/walk/foreground/"
+  },
+  "layer_2": {
+    "zPos": 9,
+    "custom_animation": "walk_128",
+    "male": "weapon/polearm/trident/walk/background/",
+    "muscular": "weapon/polearm/trident/walk/background/",
+    "female": "weapon/polearm/trident/walk/background/",
+    "teen": "weapon/polearm/trident/walk/background/",
+    "pregnant": "weapon/polearm/trident/walk/background/"
+  },
+  "layer_3": {
+    "custom_animation": "thrust_oversize",
+    "zPos": 150,
+    "male": "weapon/polearm/trident/thrust/foreground/",
+    "muscular": "weapon/polearm/trident/thrust/foreground/",
+    "female": "weapon/polearm/trident/thrust/foreground/",
+    "teen": "weapon/polearm/trident/thrust/foreground/",
+    "pregnant": "weapon/polearm/trident/thrust/foreground/"
+  },
+  "layer_4": {
+    "custom_animation": "thrust_oversize",
+    "zPos": -1,
+    "male": "weapon/polearm/trident/thrust/background/",
+    "muscular": "weapon/polearm/trident/thrust/background/",
+    "female": "weapon/polearm/trident/thrust/background/",
+    "teen": "weapon/polearm/trident/thrust/background/",
+    "pregnant": "weapon/polearm/trident/thrust/background/"
+  },
+  "variants": [
+    "trident"
+  ]
+}
\ No newline at end of file
diff --git a/source_index.html b/source_index.html
index 03866b616..e81b94582 100755
--- a/source_index.html
+++ b/source_index.html
@@ -731,9 +731,12 @@ <h3>Weapons</h3>
 					<span class="condensed">Polearm</span>
 					<ul>
 						div_sheet_weapon_polearm_cane
-						div_sheet_weapon_polearm_halberd
 						div_sheet_weapon_polearm_spear
 						div_sheet_weapon_polearm_scythe
+						div_sheet_weapon_polearm_halberd
+						div_sheet_weapon_polearm_longspear
+						div_sheet_weapon_polearm_dragonspear
+						div_sheet_weapon_polearm_trident
 					</ul>
 				</li>
 				<li>
@@ -747,7 +750,6 @@ <h3>Weapons</h3>
 						div_sheet_weapon_magic_crystal
 					</ul>
 				</li>
-				div_sheet_weapon_misc
 			</ul>
 		</section>
 	</form>
diff --git a/spritesheets/weapon/misc/female/longspear.png b/spritesheets/weapon/misc/female/longspear.png
deleted file mode 100755
index 818c6980b..000000000
Binary files a/spritesheets/weapon/misc/female/longspear.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/female/longspear_alt.png b/spritesheets/weapon/misc/female/longspear_alt.png
deleted file mode 100755
index 2b5ad5b64..000000000
Binary files a/spritesheets/weapon/misc/female/longspear_alt.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/female/magic.png b/spritesheets/weapon/misc/female/magic.png
deleted file mode 100755
index ab4beace2..000000000
Binary files a/spritesheets/weapon/misc/female/magic.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/female/magic_alt.png b/spritesheets/weapon/misc/female/magic_alt.png
deleted file mode 100755
index cae22bd36..000000000
Binary files a/spritesheets/weapon/misc/female/magic_alt.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/female/magic_alt_on.png b/spritesheets/weapon/misc/female/magic_alt_on.png
deleted file mode 100755
index a92312990..000000000
Binary files a/spritesheets/weapon/misc/female/magic_alt_on.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/female/magic_on.png b/spritesheets/weapon/misc/female/magic_on.png
deleted file mode 100755
index b01f52659..000000000
Binary files a/spritesheets/weapon/misc/female/magic_on.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/female/trident.png b/spritesheets/weapon/misc/female/trident.png
deleted file mode 100755
index 187a16376..000000000
Binary files a/spritesheets/weapon/misc/female/trident.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/longspear.png b/spritesheets/weapon/misc/male/longspear.png
deleted file mode 100755
index 4fb3505f4..000000000
Binary files a/spritesheets/weapon/misc/male/longspear.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/longspear_alt.png b/spritesheets/weapon/misc/male/longspear_alt.png
deleted file mode 100755
index dd84f531f..000000000
Binary files a/spritesheets/weapon/misc/male/longspear_alt.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/magic.png b/spritesheets/weapon/misc/male/magic.png
deleted file mode 100755
index 2ede76204..000000000
Binary files a/spritesheets/weapon/misc/male/magic.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/magic_alt.png b/spritesheets/weapon/misc/male/magic_alt.png
deleted file mode 100755
index 450557a9f..000000000
Binary files a/spritesheets/weapon/misc/male/magic_alt.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/magic_alt_on.png b/spritesheets/weapon/misc/male/magic_alt_on.png
deleted file mode 100755
index 47c0a9a04..000000000
Binary files a/spritesheets/weapon/misc/male/magic_alt_on.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/magic_on.png b/spritesheets/weapon/misc/male/magic_on.png
deleted file mode 100755
index 4e164027d..000000000
Binary files a/spritesheets/weapon/misc/male/magic_on.png and /dev/null differ
diff --git a/spritesheets/weapon/misc/male/trident.png b/spritesheets/weapon/misc/male/trident.png
deleted file mode 100755
index 4f8a5d10b..000000000
Binary files a/spritesheets/weapon/misc/male/trident.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/dragonspear/thrust/background/dragonspear.png b/spritesheets/weapon/polearm/dragonspear/thrust/background/dragonspear.png
new file mode 100644
index 000000000..2511ec0c7
Binary files /dev/null and b/spritesheets/weapon/polearm/dragonspear/thrust/background/dragonspear.png differ
diff --git a/spritesheets/weapon/polearm/dragonspear/thrust/foreground/dragonspear.png b/spritesheets/weapon/polearm/dragonspear/thrust/foreground/dragonspear.png
new file mode 100644
index 000000000..427ca040f
Binary files /dev/null and b/spritesheets/weapon/polearm/dragonspear/thrust/foreground/dragonspear.png differ
diff --git a/spritesheets/weapon/polearm/dragonspear/walk/background/dragonspear.png b/spritesheets/weapon/polearm/dragonspear/walk/background/dragonspear.png
new file mode 100644
index 000000000..2612e3c51
Binary files /dev/null and b/spritesheets/weapon/polearm/dragonspear/walk/background/dragonspear.png differ
diff --git a/spritesheets/weapon/polearm/dragonspear/walk/foreground/dragonspear.png b/spritesheets/weapon/polearm/dragonspear/walk/foreground/dragonspear.png
new file mode 100644
index 000000000..ef7e3d06d
Binary files /dev/null and b/spritesheets/weapon/polearm/dragonspear/walk/foreground/dragonspear.png differ
diff --git a/spritesheets/weapon/polearm/longspear/thrust/background/longspear.png b/spritesheets/weapon/polearm/longspear/thrust/background/longspear.png
new file mode 100644
index 000000000..14d5b83e1
Binary files /dev/null and b/spritesheets/weapon/polearm/longspear/thrust/background/longspear.png differ
diff --git a/spritesheets/weapon/polearm/longspear/thrust/foreground/longspear.png b/spritesheets/weapon/polearm/longspear/thrust/foreground/longspear.png
new file mode 100644
index 000000000..f12768113
Binary files /dev/null and b/spritesheets/weapon/polearm/longspear/thrust/foreground/longspear.png differ
diff --git a/spritesheets/weapon/polearm/longspear/walk/background/longspear.png b/spritesheets/weapon/polearm/longspear/walk/background/longspear.png
new file mode 100644
index 000000000..061797709
Binary files /dev/null and b/spritesheets/weapon/polearm/longspear/walk/background/longspear.png differ
diff --git a/spritesheets/weapon/polearm/longspear/walk/foreground/longspear.png b/spritesheets/weapon/polearm/longspear/walk/foreground/longspear.png
new file mode 100644
index 000000000..044ee2fd9
Binary files /dev/null and b/spritesheets/weapon/polearm/longspear/walk/foreground/longspear.png differ
diff --git a/spritesheets/weapon/polearm/spear/background/spear.png b/spritesheets/weapon/polearm/spear/background/spear.png
new file mode 100644
index 000000000..3cafc3d82
Binary files /dev/null and b/spritesheets/weapon/polearm/spear/background/spear.png differ
diff --git a/spritesheets/weapon/polearm/spear/female/spear.png b/spritesheets/weapon/polearm/spear/female/spear.png
deleted file mode 100644
index 8aaa0c4a9..000000000
Binary files a/spritesheets/weapon/polearm/spear/female/spear.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/female/spear_black.png b/spritesheets/weapon/polearm/spear/female/spear_black.png
deleted file mode 100644
index 94a267b6a..000000000
Binary files a/spritesheets/weapon/polearm/spear/female/spear_black.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/female/spear_green.png b/spritesheets/weapon/polearm/spear/female/spear_green.png
deleted file mode 100644
index fe1c811ae..000000000
Binary files a/spritesheets/weapon/polearm/spear/female/spear_green.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/female/spear_metal.png b/spritesheets/weapon/polearm/spear/female/spear_metal.png
deleted file mode 100644
index b1127d679..000000000
Binary files a/spritesheets/weapon/polearm/spear/female/spear_metal.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/female/spear_purple.png b/spritesheets/weapon/polearm/spear/female/spear_purple.png
deleted file mode 100644
index 7137f4813..000000000
Binary files a/spritesheets/weapon/polearm/spear/female/spear_purple.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/foreground/spear.png b/spritesheets/weapon/polearm/spear/foreground/spear.png
new file mode 100644
index 000000000..5d67feb70
Binary files /dev/null and b/spritesheets/weapon/polearm/spear/foreground/spear.png differ
diff --git a/spritesheets/weapon/polearm/spear/male/spear.png b/spritesheets/weapon/polearm/spear/male/spear.png
deleted file mode 100644
index 8aaa0c4a9..000000000
Binary files a/spritesheets/weapon/polearm/spear/male/spear.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/male/spear_black.png b/spritesheets/weapon/polearm/spear/male/spear_black.png
deleted file mode 100644
index 94a267b6a..000000000
Binary files a/spritesheets/weapon/polearm/spear/male/spear_black.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/male/spear_green.png b/spritesheets/weapon/polearm/spear/male/spear_green.png
deleted file mode 100644
index fe1c811ae..000000000
Binary files a/spritesheets/weapon/polearm/spear/male/spear_green.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/male/spear_metal.png b/spritesheets/weapon/polearm/spear/male/spear_metal.png
deleted file mode 100644
index b1127d679..000000000
Binary files a/spritesheets/weapon/polearm/spear/male/spear_metal.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear/male/spear_purple.png b/spritesheets/weapon/polearm/spear/male/spear_purple.png
deleted file mode 100644
index 7137f4813..000000000
Binary files a/spritesheets/weapon/polearm/spear/male/spear_purple.png and /dev/null differ
diff --git a/spritesheets/weapon/polearm/spear_off/background/spear_off.png b/spritesheets/weapon/polearm/spear_off/background/spear_off.png
new file mode 100644
index 000000000..399ea7d0b
Binary files /dev/null and b/spritesheets/weapon/polearm/spear_off/background/spear_off.png differ
diff --git a/spritesheets/weapon/polearm/spear_off/foreground/spear_off.png b/spritesheets/weapon/polearm/spear_off/foreground/spear_off.png
new file mode 100644
index 000000000..15fd4185f
Binary files /dev/null and b/spritesheets/weapon/polearm/spear_off/foreground/spear_off.png differ
diff --git a/spritesheets/weapon/polearm/trident/thrust/background/trident.png b/spritesheets/weapon/polearm/trident/thrust/background/trident.png
new file mode 100644
index 000000000..0ebf534f2
Binary files /dev/null and b/spritesheets/weapon/polearm/trident/thrust/background/trident.png differ
diff --git a/spritesheets/weapon/polearm/trident/thrust/foreground/trident.png b/spritesheets/weapon/polearm/trident/thrust/foreground/trident.png
new file mode 100644
index 000000000..6ddda9888
Binary files /dev/null and b/spritesheets/weapon/polearm/trident/thrust/foreground/trident.png differ
diff --git a/spritesheets/weapon/polearm/trident/walk/background/trident.png b/spritesheets/weapon/polearm/trident/walk/background/trident.png
new file mode 100644
index 000000000..0e22e691b
Binary files /dev/null and b/spritesheets/weapon/polearm/trident/walk/background/trident.png differ
diff --git a/spritesheets/weapon/polearm/trident/walk/foreground/trident.png b/spritesheets/weapon/polearm/trident/walk/foreground/trident.png
new file mode 100644
index 000000000..35c7ada84
Binary files /dev/null and b/spritesheets/weapon/polearm/trident/walk/foreground/trident.png differ