Medieval Swordsmanship Rewrite

data/json/items/book/martial.json

@@ -266,7 +266,7 @@
     "type": "BOOK",
     "name": { "str_sp": "Historic European Swordfighting" },
     "price_postapoc": 3000,
-    "description": "A complete guide to medieval swordsmanship.  Compares the German and Italian traditions for longsword and side sword, in and out of armor, with and without shield.",
+    "description": "A complete guide to medieval swordsmanship.  Compares the German and Italian traditions for a variety of swords, in and out of armor, with and without shield.",
     "martial_art": "style_swordsmanship"
   }
 ]

data/json/martialarts.json

@@ -749,7 +749,7 @@
     "type": "martial_art",
     "id": "style_swordsmanship",
     "name": { "str": "Medieval Swordsmanship" },
-    "description": "The art of the longsword and sword & shield, preceding the later development of fencing.  Designed for combat both unarmored and in armor, it includes grappling as well as defensive and offensive sword techniques.  This treatise compares the Italian and German traditions of medieval combat with detailed step-by-step pictures.",
+    "description": "The art of the longsword and sword & buckler, preceding the later development of fencing.  Designed for combat both unarmored and in armor, it includes grappling as well as defensive and offensive sword techniques.  This treatise compares the Italian and German traditions of medieval combat with detailed step-by-step pictures.",
     "initiate": [ "You take on a knightly stance.", "%s takes on a knightly stance." ],
     "strictly_melee": true,
     "learn_difficulty": 6,
@@ -758,38 +758,39 @@
       {
         "id": "buff_swordsmanship_static",
         "name": "Swordsman's Stance",
-        "description": "Through chivalry and vigilance, your defense with a blade has increased.\n\n+1 Dodge attempts, blocked damage decreased by 50% of Strength.",
+        "description": "Through chivalry and vigilance, your defense with a blade has increased.\n\n+1 Block attempts; blocked damage decreased by 50% of Strength.",
         "melee_allowed": true,
-        "bonus_dodges": 1,
+        "bonus_blocks": 1,
         "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 } ]
       }
     ],
-    "onblock_buffs": [
-      {
-        "id": "buff_swordsmanship_onblock",
-        "name": "Deflection",
-        "description": "You deflected your enemy's attack and now they are open to a counterattack!\nEnables \"Sweeping Strike\" and \"Deathblow\" techniques.\nLasts 1 turn.",
-        "skill_requirements": [ { "name": "melee", "level": 1 } ],
-        "melee_allowed": true,
-        "buff_duration": 1
-      }
-    ],
-    "oncrit_buffs": [
+	"onhit_buffs": [
+	  {
+		"id": "buff_swordsmanship_onhit",
+		"name": "Conserve Momentum",
+		"description": "You maintain the momentum from your last strike to move more quickly",
+		"melee_allowed": true,
+		"skill_requirements": [ { "name": "melee", "level": 2 } ],
+		"buff_duration": 1,
+		"mult_bonuses": [ { "stat": "movecost", "scale": 0.8 } ]
+	  }
+	],	
+    "onpause_buffs": [
       {
-        "id": "buff_swordsmanship_oncrit",
-        "name": "Manslayer",
-        "description": "Your powerful attack has given you the chance to end this fight right now!\nEnables \"Vicious Strike\" techniques.\nLasts 1 turn.",
-        "skill_requirements": [ { "name": "melee", "level": 5 } ],
+        "id": "buff_swordsmanship_onpause",
+        "name": "Half Swording",
+        "description": "You grip the blade part way down for greater control. \n\n Blocked damage decreased an additional 50% of Strength, -1 Accuracy,\nEnables Grab, Mordhau and Lethal Strike",
+        "skill_requirements": [ { "name": "melee", "level": 3 } ],
         "melee_allowed": true,
-        "buff_duration": 1
+        "buff_duration": 3,
+        "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "hit", "scale": -1.0 } ]
       }
     ],
     "techniques": [
-      "tec_swordsmanship_grab",
-      "tec_swordsmanship_break",
-      "tec_swordsmanship_zornhau",
-      "tec_swordsmanship_unterhau",
-      "tec_swordsmanship_mordhau"
+      "tec_swordsmanship_mastercut",
+      "tec_swordsmanship_feint",
+      "tec_swordsmanship_lethal",
+      "tec_swordsmanship_ringen"
     ],
     "weapons": [
       "arming_sword",
@@ -810,7 +811,12 @@
       "sword_wood",
       "zweihander",
       "zweihander_inferior",
-      "zweihander_fake"
+      "zweihander_fake",
+      "cutlass",
+      "cutlass_fake",
+      "cutlass_inferior",
+      "cavalry_sabre",
+      "cavalry_sabre_fake"
     ]
   },
   {

data/json/techniques.json

@@ -1010,73 +1010,53 @@
   },
   {
     "type": "technique",
-    "id": "tec_swordsmanship_grab",
-    "name": "Pommel Strike",
-    "messages": [ "You dodge, grab, and pommel strike %s", "<npcname> dodges, grabs, and pommel strikes %s" ],
-    "skill_requirements": [ { "name": "melee", "level": 4 } ],
-    "melee_allowed": true,
-    "crit_ok": true,
-    "dodge_counter": true,
-    "down_dur": 1,
-    "mult_bonuses": [ { "stat": "damage", "type": "cut", "scale": 0 }, { "stat": "damage", "type": "stab", "scale": 0 } ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_swordsmanship_break",
-    "name": "Grab Break",
-    "messages": [ "The %s tries to grab you, but you evade its grab!", "The %s tries to grab <npcname>, but they evade its grab!" ],
+    "id": "tec_swordsmanship_ringen",
+    "name": "Grab",
+    "messages": [ "You wrestle %s to the ground", "<npcname> wrestles %s to the ground" ],
     "skill_requirements": [ { "name": "melee", "level": 3 } ],
-    "unarmed_allowed": true,
-    "melee_allowed": true,
-    "defensive": true,
-    "grab_break": true
-  },
-  {
-    "type": "technique",
-    "id": "tec_swordsmanship_unterhau",
-    "name": "Sweeping Strike",
-    "messages": [ "You trip %s with a sweeping strike", "<npcname> trips %s with a sweeping strike" ],
-    "skill_requirements": [ { "name": "melee", "level": 1 } ],
     "melee_allowed": true,
-    "req_buffs": [ "buff_swordsmanship_onblock" ],
+    "req_buffs": [ "buff_swordsmanship_onpause" ],
     "crit_tec": true,
     "down_dur": 2
   },
   {
     "type": "technique",
-    "id": "tec_swordsmanship_zornhau",
-    "name": "Vicious Strike",
-    "messages": [ "You hack at %s with a vicious strike", "<npcname> hack at %s with a vicious strike" ],
-    "skill_requirements": [ { "name": "melee", "level": 5 } ],
+    "id": "tec_swordsmanship_lethal",
+    "name": "Lethal Strike",
+    "messages": [ "You drive the point of your blade into %s", "<npcname> drives their blade into %s" ],
+    "skill_requirements": [ { "name": "melee", "level": 4 } ],
     "melee_allowed": true,
-    "req_buffs": [ "buff_swordsmanship_oncrit" ],
-    "crit_tec": true,
-    "stun_dur": 1,
-    "mult_bonuses": [
-      { "stat": "damage", "type": "bash", "scale": 1.5 },
-      { "stat": "damage", "type": "cut", "scale": 1.5 },
-      { "stat": "damage", "type": "stab", "scale": 1.5 }
+    "req_buffs": [ "buff_swordsmanship_onpause" ],
+    "crit_ok": true,
+    "flat_bonuses": [
+      { "stat": "arpen", "type": "cut", "scaling-stat": "dex", "scale": 1 },
+      { "stat": "arpen", "type": "stab", "scaling-stat": "dex", "scale": 1 },
+      { "stat": "arpen", "type": "bash", "scaling-stat": "dex", "scale": 1 }
     ]
   },
   {
     "type": "technique",
-    "id": "tec_swordsmanship_mordhau",
-    "name": "Mordhau",
+    "id": "tec_swordsmanship_feint",
+    "name": "Flow Drills",
     "messages": [
-      "You flip your weapon around and deliver a mordhau to %s",
-      "<npcname> flips their weapon around and smashes down on %s"
+      "With practiced movements, you transition from a failed strike into another strike",
+      "With practiced movements, <npcname> transitions from a failed strike into another strike"
     ],
-    "skill_requirements": [ { "name": "melee", "level": 4 } ],
+    "skill_requirements": [ { "name": "melee", "level": 1 } ],
     "melee_allowed": true,
-    "req_buffs": [ "buff_swordsmanship_onblock" ],
-    "crit_tec": true,
-    "stun_dur": 2,
-    "mult_bonuses": [
-      { "stat": "movecost", "scale": 1.5 },
-      { "stat": "damage", "type": "bash", "scale": 3 },
-      { "stat": "damage", "type": "cut", "scale": 0 },
-      { "stat": "damage", "type": "stab", "scale": 0 }
-    ]
+    "defensive": true,
+    "miss_recovery": true
+  },
+  {
+    "type": "technique",
+    "id": "tec_swordsmanship_mastercut",
+    "name": "Master Cut",
+    "messages": [ "You parry and strike %s in one movement", "<npcname> parries and strikes %s in one movement" ],
+    "skill_requirements": [ { "name": "melee", "level": 5 } ],
+    "melee_allowed": true,
+    "crit_ok": true,
+    "block_counter": true,
+    "mult_bonuses": [ { "stat": "movecost", "scale": 0.5 } ]
   },
   {
     "type": "technique",