Merge pull request #33510 from Hymore246/rebalance-karate

Martial Arts Rebalance for Karate
CleverRaven · Aug 27, 2019 · 1f09a1c · 1f09a1c
2 parents d2e35e5 + 738d65a
commit 1f09a1c
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 16 deletions.
diff --git a/data/json/martialarts.json b/data/json/martialarts.json
@@ -522,20 +522,30 @@
     "initiate": [ "You adopt a classic karate stance.", "%s adopts a classic karate stance." ],
     "learn_difficulty": 5,
     "arm_block": 2,
-    "leg_block": 99,
-    "onhit_buffs": [
+    "static_buffs": [
       {
-        "id": "karate_hit_buff",
-        "name": "Karate Hit",
+        "id": "buff_karate_static",
+        "name": "Karate Stance",
+        "description": "Your no nonsense stance allows you hit more accurately.\n\n+2 Accuracy.",
         "unarmed_allowed": true,
         "min_unarmed": 0,
-        "buff_duration": 3,
-        "description": "+1 Dodges, +2 Blocks",
+        "flat_bonuses": [ [ "hit", 2.0 ] ]
+      }
+    ],
+    "onhit_buffs": [
+      {
+        "id": "buff_karate_onhit",
+        "name": "Karate Strike",
+        "description": "Landing a hit allows you to perfectly position yourself for maximum defense against multiple opponents.\n\n+2 Block attempts, +1 Dodges attempts, blocked damge reduced by 50%% of Strength.\nLasts 2 turns.",
+        "min_unarmed": 3,
+        "unarmed_allowed": true,
+        "buff_duration": 2,
+        "bonus_blocks": 2,
         "bonus_dodges": 1,
-        "bonus_blocks": 2
+        "flat_bonuses": [ [ "block", "str", 0.5 ] ]
       }
     ],
-    "techniques": [ "tec_karate_rapid", "tec_karate_precise" ]
+    "techniques": [ "tec_karate_rapid", "tec_karate_precise", "tec_karate_roundhouse", "tec_karate_counter" ]
   },
   {
     "type": "martial_art",

diff --git a/data/json/techniques.json b/data/json/techniques.json
@@ -817,22 +817,43 @@
   },
   {
     "type": "technique",
-    "id": "tec_karate_rapid",
-    "name": "quick punch",
-    "min_unarmed": 0,
+    "id": "tec_karate_counter",
+    "name": "Karate Counter",
+    "messages": [ "You counterattack %s", "<npcname> counterattacks %s" ],
+    "min_unarmed": 5,
     "unarmed_allowed": true,
-    "messages": [ "You quickly punch %s", "<npcname> quickly punches %s" ],
-    "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]
+    "block_counter": true,
+    "crit_ok": true,
+    "mult_bonuses": [ [ "movecost", 0.0 ] ]
   },
   {
     "type": "technique",
     "id": "tec_karate_precise",
-    "name": "karate chop",
+    "name": "Knifehand Strike",
+    "messages": [ "You hit %s with a knifehand strike", "<npcname> hits %s with a knifehand strike" ],
     "min_unarmed": 4,
     "unarmed_allowed": true,
     "crit_tec": true,
-    "messages": [ "You karate chop %s", "<npcname> karate chops %s" ],
-    "stun_dur": 2
+    "stun_dur": 1,
+    "mult_bonuses": [ [ "damage", "bash", 1.33 ] ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_karate_rapid",
+    "name": "Backfist Strike",
+    "messages": [ "You quickly strike %s with the back of your fist", "<npcname> quickly strikes %s with the back of their fist" ],
+    "min_unarmed": 1,
+    "unarmed_allowed": true,
+    "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_karate_roundhouse",
+    "name": "Roundhouse Kick",
+    "messages": [ "You roundhouse kick %s", "<npcname> roundhouse kicks %s" ],
+    "min_unarmed": 0,
+    "unarmed_allowed": true,
+    "mult_bonuses": [ [ "damage", "bash", 1.2 ] ]
   },
   {
     "type": "technique",