Port to Bright Nights

Merge in new mod data (sans the erotic stuff)

1 files changed, 55 insertions, 29 deletions

diff --git a/martialarts.json b/martialarts.json
index 0a840b9..170f689 100644
--- a/martialarts.json
+++ b/martialarts.json
@@ -2,57 +2,83 @@
   {
     "type": "martial_art",
     "id": "style_maid",
-    "name": { "str": "Servant's fighting technique" },
-    "description": "A secret assassination technique taught to first-class servants. It gives you an elegant appearance, allowing you to dodge and counterattack with style.",
+    "name": { "str": "L'art du Nettoyage" },
+    "description": "It is the servant's duty to take out the trash. Pause to consider your offensive options.",
     "initiate": [ "You steady yourself, ready to strike with poise and grace.", "%s appears more steady and composed." ],
     "arm_block": 99,
-    "leg_block": 99,
     "static_buffs": [
       {
-        "id": "maid_evade",
-        "name": "Silent presence",
-        "description": "By staying still, you get +2 to dodging.",
+        "id": "maid_defense",
+        "name": "For Another",
+        "description": "A servant stands between their mistress and the world.\n\nBlocked damage reduced by 100% of Dexterity, +1 Block attempt",
         "unarmed_allowed": true,
         "melee_allowed": true,
-        "flat_bonuses": [ [ "dodge", 2.0 ] ]
+        "bonus_blocks": 1,
+        "flat_bonuses": [ { "stat": "block", "scaling-stat": "dex", "scale": 1.0 } ]
+      },
+      {
+        "id": "maid_defense_2",
+        "name": "Silent Presence",
+        "description": "A servant must carry out their duties with the appropriate poise and grace.\n\n+2 Dodge skill, +1 Dodge attempts.",
+        "skill_requirements": [ { "name": "melee", "level": 3 } ],
+        "bonus_dodges": 1,
+        "unarmed_allowed": true,
+        "melee_allowed": true,
+        "flat_bonuses": [ { "stat": "dodge", "scale": 2.0 } ]
       }
     ],
     "onmove_buffs": [
       {
         "id": "maid_moved",
-        "name": "Assault",
-        "description": "You receive a penalty to dodging when moving, but your chances of hitting and damage dealt are increased in accordance with your perception.",
+        "name": "Rush",
+        "description": "Somebody needs you. Steady yourself and hurry to their side.\n\n-1 to Hit, +2 Dodge skill, -30% damage\nLasts 1 turn",
         "unarmed_allowed": true,
         "melee_allowed": true,
-        "min_unarmed": 0,
-        "buff_duration": 2,
-        "flat_bonuses": [
-          [ "hit", "per", 1],
-          [ "damage", "bash", "per", 0.2 ],
-          [ "damage", "cut", "per", 0.2 ],
-          [ "damage", "stab", "per", 0.2 ],
-          [ "dodge", -4.0 ]
+        "skill_requirements": [ { "name": "unarmed", "level": 0 } ],
+        "buff_duration": 1,
+        "max_stacks": 1,
+        "flat_bonuses": [ { "stat": "hit", "scale": -1 }, { "stat": "dodge", "scale": 2.0 } ],
+        "mult_bonuses": [
+          { "stat": "damage", "type": "bash", "scale": 0.7 },
+          { "stat": "damage", "type": "cut", "scale": 0.7 },
+          { "stat": "damage", "type": "stab", "scale": 0.7 }
         ]
       }
     ],
-    "ondodge_buffs": [
+    "onpause_buffs": [
       {
-        "id": "maid_evaded_bonus",
-        "name": "Counterattack",
-        "description": "Avoided attacks with minimal movement. You have a chance of landing a counterattack.",
+        "id": "maid_pause_bonus",
+        "name": "Collected Miscellany",
+        "description": "A moment to compose yourself is all you need.\n\nEnables certain techniques. -2 Blocks, -1 Dodge. Lasts one turn",
         "unarmed_allowed": true,
         "melee_allowed": true,
-        "min_unarmed": 0,
-        "buff_duration": 2,
+        "skill_requirements": [ { "name": "unarmed", "level": 0 } ],
+        "buff_duration": 1,
         "max_stacks": 1,
-        "mult_bonuses": [
-          [ "damage", "bash", 1.2 ],
-          [ "damage", "cut", 1.2 ],
-          [ "damage", "stab", 1.2 ]
-        ]
+        "bonus_blocks": -2,
+        "bonus_dodges": -1
       }
     ],
-    "techniques": [ "tec_maid_precise", "tec_maid_counter", "tec_maid_meleecounter", "tec_maid_miyage", "tec_maid_kyusyu" ],
+    "ongethit_buffs": [
+      {
+        "id": "maid_gethit",
+        "name": "Flustered",
+        "description": "Ah! N-not there!\n\n-1 Dodge attempts, -2 Dodge skill.",
+        "unarmed_allowed": true,
+        "melee_allowed": true,
+        "buff_duration": 1,
+        "bonus_dodges": -1,
+        "flat_bonuses": [ { "stat": "dodge", "scale": -2.0 } ]
+      }
+    ],
+    "techniques": [
+      "tec_maid_precise",
+      "tec_maid_counter",
+      "tec_maid_meleecounter",
+      "tec_maid_miyage",
+      "tec_maid_kyusyu",
+      "tec_maid_grab"
+    ],
     "weapons": [
       "mop",
       "battle_mop",