aboutsummaryrefslogtreecommitdiff
path: root/martialarts.json
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-06-04 05:11:42 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-06-04 05:11:42 -0700
commit341501301327c4c4cc42d929e7b4d71cdcfb9c2a (patch)
tree90223c6d8cde8e4bd9512252b80d918cf7a79867 /martialarts.json
parentFix maid tools recipe (diff)
downloadcataclysm-dda-mod_battle-maid-redone-341501301327c4c4cc42d929e7b4d71cdcfb9c2a.tar.xz
Add new weapons to martial art
Fix volumes and crafting times for 0.E Fix drop tables for 0.E
Diffstat (limited to 'martialarts.json')
-rw-r--r--martialarts.json44
1 files changed, 35 insertions, 9 deletions
diff --git a/martialarts.json b/martialarts.json
index 32b958b..1a1b7e5 100644
--- a/martialarts.json
+++ b/martialarts.json
@@ -59,25 +59,51 @@
"tec_maid_kyusyu"
],
"weapons": [
+ "mop",
"battle_mop",
+ "bagh_nakha",
"maid_claw",
- "shikomi_stick_draw",
+ "bokken_fake",
+ "bokken_inferior",
+ "bokken",
+ "katana_fake",
+ "katana_inferior",
+ "katana",
+ "tanto_fake",
+ "tanto_inferior",
+ "tanto"
"shikomi_stick",
- "shikomi_kasa_draw",
+ "shikomi_stick_draw",
+ "umbrella",
"shikomi_kasa",
+ "shikomi_kasa_draw",
+ "bullwhip",
"spiked_whip",
- "brutal_broom",
- "slaying_pan",
- "vorpal_kitchen_knife",
"broom",
- "mop",
+ "brutal_broom",
"knife_butter",
"knife_steak",
+ "knife_butcher",
+ "knife_paring",
+ "knife_chef",
+ "knife_carving",
+ "knife_bread",
+ "knife_vegetable_cleaver",
+ "knife_meat_cleaver",
+ "vorpal_kitchen_knife",
"spoon",
"fork",
- "pan"
-
-
+ "carving_fork",
+ "spork",
+ "foon",
+ "chopsticks",
+ "ladle"
+ "destruction_otama",
+ "rolling_pin",
+ "pan",
+ "steel_pan",
+ "copper_pan",
+ "slaying_pan"
]
}
]