Fix medieval pole weapons.

Convert the bonus damage attack when stationary into a damage debuff when moving.

3 files changed, 32 insertions, 19 deletions

diff --git a/martialarts/medievalpole.json b/martialarts/medievalpole.json
index 800db92..e133ac3 100644
--- a/martialarts/medievalpole.json
+++ b/martialarts/medievalpole.json
@@ -25,13 +25,18 @@
       {
         "id": "buff_medievalpole_onmove",
         "name": "Tactical Retreat",
-        "description": "You moved and nullified the effects of Stand Your Ground!\n\n-1 Block attempts, +1.0 Dodge skill, blocked damaged increased by 250% of Strength.\nPrevents \"High Round Strike and Hook\" technique.\nLasts 2 turns.",
+        "description": "You moved and nullified the effects of Stand Your Ground!\n\n-1 Block attempts, +1.0 Dodge skill, blocked damaged increased by 250% of Strength.\nDamage reduced by 10%\nLasts 2 turns.",
         "melee_allowed": true,
         "buff_duration": 2,
         "bonus_blocks": -1,
         "flat_bonuses": [
           { "stat": "block", "scaling-stat": "str", "scale": -2.5 },
           { "stat": "dodge", "scale": 1.0 }
+        ],
+        "mult_bonuses": [
+          { "stat": "damage", "type": "bash", "scale": 0.9 },
+          { "stat": "damage", "type": "cut", "scale": 0.9 },
+          { "stat": "damage", "type": "stab", "scale": 0.9 }
         ]
       }
     ],
@@ -65,6 +70,27 @@
       "tec_medievalpole_execute",
       "tec_medievalpole_break"
     ],
-    "weapon_category": [ "HOOKING_WEAPONRY" ]
+    "weapons": [
+      "ax",
+      "battleaxe",
+      "battleaxe_fake",
+      "battleaxe_inferior",
+      "copper_ax",
+      "fire_ax",
+      "glaive",
+      "halberd",
+      "halberd_fake",
+      "hammer_sledge",
+      "hammer_sledge_short",
+      "hockey_stick",
+      "hoe",
+      "ji",
+      "lobotomizer",
+      "lucern_hammer",
+      "lucern_hammerfake",
+      "makeshift_halberd",
+      "pickaxe",
+      "primitive_axe"
+    ]
   }
 ]
diff --git a/readme b/readme
index f05a073..0294562 100644
--- a/readme
+++ b/readme
@@ -10,6 +10,7 @@ Give Fencing, Medieval Swordsmandship and Fior Di Battaglia more historically co
 Styles updated so far-
 Brawling
 Fencing
+Fior Di Battaglia
 Krav Maga
 Sōjutsu
 Swordsmanship
@@ -20,5 +21,5 @@ Caveats-
 BN lacks the ability to specify weapon group types, so legacy weapon additions are still required.
 BN lacks the block_effectiveness stat. Use block scaling with a stat appropriate to the art. block_effectiveness 2 -> block dex 2.
 BN lacks support for buffing critical hit chance. Reverted to bonus damage at twice the crit chance value. +5% crit -> +10% damage.
-BN lacks support for disabling buffs and techniques when certain buffs are active.
+BN lacks support for forbidden_buffs_all to disable buffs and techniques when certain buffs are active.
 BN uses the req_buffs field to specify active buff requirements instead of DDA's required_buffs_all.
diff --git a/techniques/medievalpole.json b/techniques/medievalpole.json
index 041efc6..22a58e9 100644
--- a/techniques/medievalpole.json
+++ b/techniques/medievalpole.json
@@ -6,7 +6,7 @@
     "messages": [ "You parry and hook %s down", "<npcname> parries and hooks %s down" ],
     "skill_requirements": [ { "name": "melee", "level": 4 } ],
     "melee_allowed": true,
-    "required_buffs_all": [ "buff_medievalpole_onblock" ],
+    "req_buffs": [ "buff_medievalpole_onblock" ],
     "crit_ok": true,
     "weighting": 2,
     "down_dur": 2,
@@ -19,20 +19,6 @@
   },
   {
     "type": "technique",
-    "id": "tec_medievalpole_highround",
-    "name": "High Round Strike",
-    "messages": [ "You swing high and strike at %s", "<npcname> swings high and strikes %s" ],
-    "skill_requirements": [ { "name": "melee", "level": 2 } ],
-    "melee_allowed": true,
-    "forbidden_buffs_all": [ "buff_medievalpole_onmove" ],
-    "mult_bonuses": [
-      { "stat": "damage", "type": "bash", "scale": 1.1 },
-      { "stat": "damage", "type": "cut", "scale": 1.1 },
-      { "stat": "damage", "type": "stab", "scale": 1.1 }
-    ]
-  },
-  {
-    "type": "technique",
     "id": "tec_medievalpole_feint",
     "name": "High Round Feint",
     "messages": [ "You fake a high round strike at %s", "<npcname> feints at %s" ],
@@ -59,7 +45,7 @@
     "messages": [ "You hook and drag %s down", "<npcname> hooks and drags %s down" ],
     "skill_requirements": [ { "name": "melee", "level": 3 } ],
     "melee_allowed": true,
-    "required_buffs_all": "buff_medievalpole_onmiss",
+    "req_buffs": "buff_medievalpole_onmiss",
     "crit_ok": true,
     "weighting": 2,
     "down_dur": 2,