summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-06-16 14:17:26 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-06-16 14:17:26 -0700
commitfdf28e6e2fcac9bb486ad0ea2767a7b3fc56708d (patch)
treec8883c2be5f728953f7a4f23180a2836b71c2f91
parentSwitch category from balancing to items (diff)
downloadcataclysm-dda-mod_hk-loadout-fdf28e6e2fcac9bb486ad0ea2767a7b3fc56708d.tar.xz
Update kravmaga valid weapons (as I cannnot have two mods for a single style)
-rw-r--r--json/martialarts.json34
1 files changed, 32 insertions, 2 deletions
diff --git a/json/martialarts.json b/json/martialarts.json
index 8f689c2..e69961e 100644
--- a/json/martialarts.json
+++ b/json/martialarts.json
@@ -35,6 +35,8 @@
"diveknife",
"honey_scraper",
"knife_combat",
+ "knife_combat_mod",
+ "knife_folding",
"knife_hunting",
"knife_rambo",
"knife_rm42",
@@ -46,6 +48,9 @@
"switchblade",
"tonfa",
"tonfa_wood",
+ "af2011a1_38super",
+ "cz75",
+ "deagle_44",
"fn1910",
"fn57",
"glock_17",
@@ -53,9 +58,16 @@
"glock_19",
"glock_22",
"glock_31",
+ "hi_power_9mm",
+ "hi_power_40",
+ "hptjcp",
+ "hptjhp",
"m17",
"m1911",
+ "m1911_MEU",
"m1911a1_38super",
+ "m9",
+ "mk23",
"needlepistol",
"sw_22",
"p226_357sig",
@@ -68,19 +80,37 @@
"usp_40",
"usp_9mm",
"hk_ucp",
+ "walther_ccp",
+ "walther_p38",
"walther_ppk",
+ "walther_ppq_9mm",
+ "walther_ppq_40",
+ "walther_ppq_45",
+ "acr",
+ "acr_300blk",
+ "ak47",
+ "ak74",
+ "an94",
"ar10",
"ar15",
"ar15_retool_300blk",
"fn_fal",
- "scar_l",
+ "h&k416a5",
+ "hk417_13",
"hk_g3",
"hk_g36",
+ "iwi_tavor_x95_300blk",
+ "m1a",
+ "m110a1",
"m14ebr",
- "M24",
+ "m16a4",
"m27iar",
+ "m4a1",
"rm51_assault_rifle",
"rm88_battle_rifle",
+ "ruger_mini",
+ "scar_l",
+ "scar_h",
"sig552",
"sks",
"steyr_aug"