aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-07-15 00:46:14 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-07-15 00:46:14 -0700
commit44d37e7de9a050c62d1f2e8ec423856ea46a23ee (patch)
treec085fcb2060992c662abf7fa967a066e9ad7b28d
parentReduce the vorpal kitchen knife melee requirement to 8 (diff)
downloadcataclysm-dda-mod_battle-maid-redone-44d37e7de9a050c62d1f2e8ec423856ea46a23ee.tar.xz
Add rapiers and broadswords to the maid martial art
Adjust maid ma buff names Remove move cost from maid ma counters
-rw-r--r--martialarts.json11
-rw-r--r--techniques.json6
2 files changed, 10 insertions, 7 deletions
diff --git a/martialarts.json b/martialarts.json
index 3a7f76d..179b854 100644
--- a/martialarts.json
+++ b/martialarts.json
@@ -48,8 +48,8 @@
"onpause_buffs": [
{
"id": "maid_pause_bonus",
- "name": "Collected Miscellany",
- "description": "A moment to compose yourself is all you need.\n\nEnables certain techniques. Lasts one turn",
+ "name": "Repose",
+ "description": "A moment to focus yourself is all you need.\n\nEnables certain techniques. Lasts one turn",
"unarmed_allowed": true,
"melee_allowed": true,
"skill_requirements": [ { "name": "unarmed", "level": 0 } ],
@@ -122,7 +122,12 @@
"pan",
"steel_pan",
"copper_pan",
- "slaying_pan"
+ "slaying_pan",
+ "rapier",
+ "rapier_fake",
+ "broadsword",
+ "broadsword_inferior",
+ "broadsword_fake"
]
}
]
diff --git a/techniques.json b/techniques.json
index 6a97143..f600a85 100644
--- a/techniques.json
+++ b/techniques.json
@@ -31,8 +31,7 @@
{ "stat": "damage", "type": "bash", "scale": 0.25 },
{ "stat": "damage", "type": "cut", "scale": 0.25 },
{ "stat": "damage", "type": "stab", "scale": 0.25 }
- ],
- "flat_bonuses": [ { "stat": "movecost", "scale": 50 } ]
+ ]
},
{
"type": "technique",
@@ -44,8 +43,7 @@
"melee_allowed": true,
"down_dur": 1,
"messages": [ "You whirl away and strike %s", "<npcname> strikes with a malice that surprises you" ],
- "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 } ],
- "flat_bonuses": [ { "stat": "movecost", "scale": 50 } ]
+ "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 } ]
},
{
"type": "technique",