Fixed crash related to martial arts

YukariMindGap · Apr 5, 2020 · 7281041 · 7281041
1 parent 2636e07
commit 7281041
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/nec_martialarts.json b/nec_martialarts.json
@@ -13,8 +13,8 @@
         "name": "Kung fu breath",
         "description": "You can always keep calm by a unique breathing method. Bonus for avoidance and blow",
         "unarmed_allowed": true,
-        "mult_bonuses": [ [ "damage", "bash", 1.1 ] ],
-        "flat_bonuses": [ [ "dodge", 1.0 ] ]
+        "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.1 } ],
+        "flat_bonuses": [ { "stat": "dodge", "scale": 1.0 } ]
       }
     ],
     "onmove_buffs": [
@@ -26,7 +26,7 @@
         "melee_allowed": true,
         "min_unarmed": 1,
         "buff_duration": 2,
-        "mult_bonuses": [ [ "dodge", 2.0 ], [ "hit", 2.0 ] ]
+        "mult_bonuses": [ { "stat": "dodge", "scale": 2.0 }, { "stat": "hit", "scale": 2.0 } ]
       }
     ],
     "ondodge_buffs": [
@@ -39,7 +39,7 @@
         "min_unarmed": 1,
         "buff_duration": 2,
         "max_stacks": 3,
-        "mult_bonuses": [ [ "dodge", 2.0 ], [ "damage", "bash", 1.3 ] ]
+        "mult_bonuses": [ { "stat": "dodge", "scale": 2.0 }, { "stat": "damage", "type": "bash", "scale": 1.3 } ]
       }
     ],
     "techniques": [ "tec_nec_hakkei", "tec_nec_senpukyaku", "tec_nec_tetsuzanko" ]

diff --git a/nec_monsters.json b/nec_monsters.json
@@ -55,7 +55,7 @@
     "species": "ZOMBIE",
     "default_faction": "zombie",
     "symbol": "Q",
-    "color": "dkgray",
+    "color": "dark_gray",
     "size": "MEDIUM",
     "hp": 200,
     "speed": 90,
@@ -104,7 +104,7 @@
     "speed": 80,
     "material": [ "flesh" ],
     "symbol": "b",
-    "color": "dkgray",
+    "color": "dark_gray",
     "aggression": 10,
     "morale": 100,
     "melee_skill": 4,
@@ -176,7 +176,7 @@
     "speed": 105,
     "material": [ "flesh" ],
     "symbol": "V",
-    "color": "dkgray_red",
+    "color": "dark_gray_red",
     "aggression": 100,
     "morale": 100,
     "melee_skill": 6,
@@ -208,7 +208,7 @@
     "speed": 75,
     "material": [ "flesh" ],
     "symbol": "H",
-    "color": "ltgreen",
+    "color": "green",
     "aggression": 100,
     "morale": 100,
     "melee_skill": 4,

diff --git a/nec_techniques.json b/nec_techniques.json
@@ -19,7 +19,7 @@
     "crit_tec": true,
     "knockback_dist": 2,
     "messages": [ "You attack %s powerfully.", "<npcname> attacks %s powerfully" ],
-    "mult_bonuses": [ [ "damage", "bash", 1.2 ] ]
+    "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.2 } ]
   },
   {
     "type": "technique",
@@ -32,7 +32,7 @@
     "knockback_dist": 2,
     "messages": [ "You whirlwind kick %s.", "<npcname> whirlwind kicks %s." ],
     "aoe": "spin",
-    "mult_bonuses": [ [ "damage", "bash", 1.5 ] ]
+    "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.5 } ]
   },
   {
     "type": "technique",
@@ -45,6 +45,6 @@
     "down_dur": 2,
     "knockback_dist": 3,
     "messages": [ "You blow away %s with Iron Mine.", "<npcname> blows away %s with Iron Mine." ],
-    "mult_bonuses": [ [ "damage", "bash", 2.0 ] ]
+    "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 2.0 } ]
   }
 ]