diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index 71d3b1cecd5d6..57b09db2767bf 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -1197,6 +1197,67 @@
     ],
     "techniques": [ "tec_snake_rapid", "tec_snake_feint", "tec_snake_break", "tec_snake_precise" ]
   },
+  {
+    "type": "martial_art",
+    "id": "style_sojutsu",
+    "name": "Sōjutsu",
+    "description": "Sōjutsu, \"The Way of the Spear\", is the Japanese martial art of fighting with a spear.  Sōjutsu focuses on keeping opponents at a distance in order to maintain advantage in combat.  Standing still gives you an extra block attempt but moving will briefly increase your damage.",
+    "initiate": [ "You prepare to defend against all that approach you.", "%s assumes a wide, defensive stance." ],
+    "learn_difficulty": 7,
+    "primary_skill": "stabbing",
+    "strictly_melee": true,
+    "static_buffs": [
+      {
+        "id": "buff_sojutsu_static",
+        "name": "Sōjutsu Stance",
+        "description": "Your training grants better defense while using a polearm.\n\n+1 Block attempt.",
+        "min_melee": 0,
+        "melee_allowed": true,
+        "bonus_blocks": 1
+      }
+    ],
+    "onmove_buffs": [
+      {
+        "id": "buff_sojutsu_onmove",
+        "name": "Superior Positioning",
+        "description": "You have given up your defenses for a moment to increase the damage of your attacks.\n\n+10%% damage, -1 Block attempts.\nLasts 1 turn.",
+        "min_melee": 0,
+        "melee_allowed": true,
+        "buff_duration": 1,
+        "bonus_blocks": -1,
+        "mult_bonuses": [ [ "damage", "bash", 1.1 ], [ "damage", "cut", 1.1 ], [ "damage", "stab", 1.1 ] ]
+      }
+    ],
+    "techniques": [ "tec_sojutsu_push", "tec_sojutsu_shove", "tec_sojutsu_trip" ],
+    "weapons": [
+      "glaive",
+      "halberd",
+      "halberd_fake",
+      "ji",
+      "naginata",
+      "naginata_inferior",
+      "naginata_fake",
+      "long_pole",
+      "makeshift_halberd",
+      "pike",
+      "pike_inferior",
+      "pike_fake",
+      "pitchfork",
+      "qiang",
+      "spear_copper",
+      "spear_dory",
+      "spear_forked",
+      "spear_homemade_halfpike",
+      "spear_pipe",
+      "spear_knife",
+      "spear_knife_superior",
+      "spear_spike",
+      "spear_rebar",
+      "spear_steel",
+      "spear_survivor",
+      "spear_wood"
+    ]
+  },
   {
     "type": "martial_art",
     "id": "style_tai_chi",
@@ -1372,66 +1433,6 @@
     ],
     "techniques": [ "tec_debug_slow", "tec_debug_arpen" ]
   },
-  {
-    "type": "martial_art",
-    "id": "style_sojutsu",
-    "name": "Sōjutsu",
-    "description": "Sōjutsu, \"The Way of the Spear\", is the Japanese martial art of fighting with a spear.  Sōjutsu focuses on keeping opponents at a distance in order to maintain advantage in combat.",
-    "initiate": [ "You prepare to defend against all that approach you.", "%s assumes a wide, defensive stance." ],
-    "learn_difficulty": 7,
-    "primary_skill": "stabbing",
-    "arm_block": 99,
-    "leg_block": 99,
-    "strictly_melee": true,
-    "static_buffs": [
-      {
-        "id": "sojutsu_static",
-        "name": "Sōjutsu Stance",
-        "description": "Bonus block with reach weapons while standing still",
-        "unarmed_allowed": false,
-        "bonus_blocks": 1
-      }
-    ],
-    "onmove_buffs": [
-      {
-        "id": "sojutsu_damage_buff",
-        "name": "Sōjutsu Rush",
-        "description": "Increased damage when moving but no bonus block",
-        "unarmed_allowed": false,
-        "min_melee": 0,
-        "buff_duration": 2,
-        "max_stacks": 1,
-        "bonus_blocks": -1,
-        "mult_bonuses": [ [ "damage", "cut", 1.1 ], [ "damage", "stab", 1.1 ] ]
-      }
-    ],
-    "techniques": [ "tec_sojutsu_push", "tec_sojutsu_trip", "tec_sojutsu_skewer" ],
-    "weapons": [
-      "glaive",
-      "halberd",
-      "halberd_fake",
-      "naginata",
-      "naginata_inferior",
-      "naginata_fake",
-      "makeshift_halberd",
-      "pike",
-      "pike_inferior",
-      "pike_fake",
-      "pitchfork",
-      "qiang",
-      "spear_copper",
-      "spear_forked",
-      "spear_homemade_halfpike",
-      "spear_pipe",
-      "spear_knife",
-      "spear_knife_superior",
-      "spear_spike",
-      "spear_rebar",
-      "spear_steel",
-      "spear_survivor",
-      "spear_wood"
-    ]
-  },
   {
     "type": "martial_art",
     "id": "style_wingchun",
diff --git a/data/json/techniques.json b/data/json/techniques.json
index c80b577cc40c8..997d8616a94fd 100644
--- a/data/json/techniques.json
+++ b/data/json/techniques.json
@@ -1319,6 +1319,38 @@
     "stun_dur": 1,
     "mult_bonuses": [ [ "damage", "bash", 1.5 ] ]
   },
+  {
+    "type": "technique",
+    "id": "tec_sojutsu_push",
+    "name": "Push",
+    "messages": [ "You push %s away", "<npcname> pushes %s away" ],
+    "min_melee": 1,
+    "melee_allowed": true,
+    "block_counter": true,
+    "crit_ok": true,
+    "knockback_dist": 1,
+    "mult_bonuses": [ [ "movecost", 0.0 ], [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.5 ], [ "damage", "stab", 0.5 ] ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_sojutsu_shove",
+    "name": "Shove",
+    "messages": [ "You shove %s back", "<npcname> shoves %s back" ],
+    "min_melee": 2,
+    "melee_allowed": true,
+    "knockback_dist": 1,
+    "mult_bonuses": [ [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.5 ], [ "damage", "stab", 0.5 ] ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_sojutsu_trip",
+    "name": "Trip",
+    "messages": [ "You deftly trip %s", "<npcname> deftly trips %s" ],
+    "min_melee": 3,
+    "melee_allowed": true,
+    "down_dur": 1,
+    "mult_bonuses": [ [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.5 ], [ "damage", "stab", 0.5 ] ]
+  },
   {
     "type": "technique",
     "id": "tec_taichi_disarm",
@@ -1420,39 +1452,6 @@
     "crit_tec": true,
     "messages": [ "You phase-strike %s", "<npcname> phase-strikes %s" ]
   },
-  {
-    "type": "technique",
-    "id": "tec_sojutsu_push",
-    "name": "Push",
-    "min_melee": 1,
-    "mult_bonuses": [ [ "movecost", 0.0 ], [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.5 ], [ "damage", "stab", 0.5 ] ],
-    "melee_allowed": true,
-    "block_counter": true,
-    "crit_ok": true,
-    "knockback_dist": 1,
-    "messages": [ "You push %s away", "<npcname> pushes %s away" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_sojutsu_trip",
-    "name": "Trip",
-    "min_melee": 2,
-    "melee_allowed": true,
-    "down_dur": 2,
-    "messages": [ "You deftly trip %s", "<npcname> deftly trips %s" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_sojutsu_skewer",
-    "name": "Skewer",
-    "min_melee": 4,
-    "mult_bonuses": [ [ "damage", "bash", 0.0 ], [ "damage", "cut", 1.5 ], [ "damage", "stab", 1.5 ] ],
-    "melee_allowed": true,
-    "crit_tec": true,
-    "knockback_dist": 1,
-    "stun_dur": 2,
-    "messages": [ "You brutally skewer %s", "<npcname> brutally skewers %s" ]
-  },
   {
     "type": "technique",
     "id": "tec_wingchun_chainpunch",