Merge pull request #34574 from Hymore246/rebalance-snake

Martial Arts Rebalance for Snake Kung Fu
CleverRaven · Oct 11, 2019 · 88372d8 · 88372d8
2 parents b915f8b + cf5a2b9
commit 88372d8
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 59 deletions.
diff --git a/data/json/martialarts.json b/data/json/martialarts.json
@@ -1165,6 +1165,38 @@
       "l-stick_on"
     ]
   },
+  {
+    "type": "martial_art",
+    "id": "style_snake",
+    "name": "Snake Kung Fu",
+    "description": "One of the five Shaolin animal styles.  The Snake focuses on sinuous movement and precision strikes.  Perception determines your Accuracy, rather than Dexterity.  Standing still will increases your accuracy and damage of your next attack.",
+    "initiate": [ "You adopt a fluid stance, ready to strike like a snake.", "%s assumes a snake-like stance." ],
+    "learn_difficulty": 10,
+    "arm_block": 2,
+    "static_buffs": [
+      {
+        "id": "buff_snake_static",
+        "name": "Snake's Sight",
+        "description": "You are patient and know where to hit your opponent for the best results.\n\nPerception increases Accuracy instead of Dexterity.  Accuracy increased by 25%% of Perception but decreased by 25%% of Dexterity.",
+        "min_unarmed": 0,
+        "unarmed_allowed": true,
+        "flat_bonuses": [ [ "hit", "per", 0.25 ], [ "hit", "dex", -0.25 ] ]
+      }
+    ],
+    "onpause_buffs": [
+      {
+        "id": "buff_snake_onpause",
+        "name": "Snake's Coil",
+        "description": "Every snake wait for the perfect moment to strike.  Aim as your opponents approve and attack their weakness without mercy!\n\n+1 Accuracy, gain armor penetration equal to 50%% of Perceptions.\nLasts 1 turn.  Stacks 3 times.",
+        "min_unarmed": 1,
+        "unarmed_allowed": true,
+        "buff_duration": 1,
+        "max_stacks": 3,
+        "flat_bonuses": [ [ "hit", 1.0 ], [ "arpen", "bash", "per", 0.5 ], [ "arpen", "cut", "per", 0.5 ], [ "arpen", "stab", "per", 0.5 ] ]
+      }
+    ],
+    "techniques": [ "tec_snake_rapid", "tec_snake_feint", "tec_snake_break", "tec_snake_precise" ]
+  },
   {
     "type": "martial_art",
     "id": "style_tai_chi",
@@ -1281,26 +1313,6 @@
     ],
     "techniques": [ "tec_tiger_grab" ]
   },
-  {
-    "type": "martial_art",
-    "id": "style_snake",
-    "name": "Snake Kung Fu",
-    "description": "One of the five Shaolin animal styles.  The Snake focuses on sinuous movement and precision strikes.  Your Perception improves your damage.",
-    "initiate": [ "You adopt a fluid stance, ready to strike like a snake.", "%s assumes a snake-like stance." ],
-    "learn_difficulty": 10,
-    "arm_block": 99,
-    "leg_block": 99,
-    "static_buffs": [
-      {
-        "id": "snake_static",
-        "name": "Snake Sight",
-        "description": "Perception provides a bonus to damage.",
-        "unarmed_allowed": true,
-        "flat_bonuses": [ [ "damage", "bash", "per", 0.8 ] ]
-      }
-    ],
-    "techniques": [ "tec_snake_rapid", "tec_snake_feint", "tec_snake_break", "tec_snake_precise" ]
-  },
   {
     "type": "martial_art",
     "id": "style_debug",

diff --git a/data/json/techniques.json b/data/json/techniques.json
@@ -1279,6 +1279,46 @@
     "weighting": 2,
     "mult_bonuses": [ [ "damage", "bash", 1.33 ], [ "damage", "cut", 1.33 ], [ "damage", "stab", 1.33 ] ]
   },
+  {
+    "type": "technique",
+    "id": "tec_snake_rapid",
+    "name": "Snake Snap",
+    "messages": [ "You swiftly jab %s", "<npcname> swiftly jabs %s" ],
+    "min_unarmed": 0,
+    "unarmed_allowed": true,
+    "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_snake_feint",
+    "name": "Snake Slide",
+    "messages": [ "You make serpentine hand motions at %s", "<npcname> makes serpentine hand motions at %s" ],
+    "min_unarmed": 3,
+    "unarmed_allowed": true,
+    "defensive": true,
+    "miss_recovery": true
+  },
+  {
+    "type": "technique",
+    "id": "tec_snake_break",
+    "name": "Snake Slither",
+    "messages": [ "The %s tries to grab you, but you slither free!", "The %s tries to grab <npcname>, but they slither free!" ],
+    "min_unarmed": 4,
+    "unarmed_allowed": true,
+    "defensive": true,
+    "grab_break": true
+  },
+  {
+    "type": "technique",
+    "id": "tec_snake_precise",
+    "name": "Snake Strike",
+    "messages": [ "You lash out at %s with a vicious Snake Strike", "<npcname> lashes out at %s with a vicious Snake Strike" ],
+    "min_unarmed": 5,
+    "unarmed_allowed": true,
+    "crit_tec": true,
+    "stun_dur": 1,
+    "mult_bonuses": [ [ "damage", "bash", 1.5 ] ]
+  },
   {
     "type": "technique",
     "id": "tec_taichi_disarm",
@@ -1357,45 +1397,6 @@
     "down_dur": 1,
     "messages": [ "You grab and ground %s", "<npcname> grabs and grounds %s" ]
   },
-  {
-    "type": "technique",
-    "id": "tec_snake_rapid",
-    "name": "Snake Snap",
-    "min_unarmed": 2,
-    "unarmed_allowed": true,
-    "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ],
-    "messages": [ "You swiftly jab %s", "<npcname> swiftly jabs %s" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_snake_feint",
-    "name": "Snake Slide",
-    "min_unarmed": 3,
-    "unarmed_allowed": true,
-    "defensive": true,
-    "miss_recovery": true,
-    "messages": [ "You make serpentine hand motions at %s", "<npcname> makes serpentine hand motions at %s" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_snake_break",
-    "name": "Snake Slither",
-    "min_unarmed": 4,
-    "unarmed_allowed": true,
-    "defensive": true,
-    "grab_break": true,
-    "messages": [ "The %s tries to grab you, but you slither free!", "The %s tries to grab <npcname>, but they slither free!" ]
-  },
-  {
-    "type": "technique",
-    "id": "tec_snake_precise",
-    "name": "Snake Strike",
-    "min_unarmed": 4,
-    "unarmed_allowed": true,
-    "crit_tec": true,
-    "messages": [ "You strike out at %s", "<npcname> strikes out at %s" ],
-    "stun_dur": 2
-  },
   {
     "type": "technique",
     "id": "tec_debug_slow",