From dfc95935b14531bfc0675d3a364300b2ed915a97 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 4 Jan 2022 20:20:08 -0800
Subject: Convert krav maga additions to extend format instead of overwrite.

---
 json/martialarts.json | 109 ++++++--------------------------------------------
 1 file changed, 12 insertions(+), 97 deletions(-)

(limited to 'json')

diff --git a/json/martialarts.json b/json/martialarts.json
index 98a15cb..f3b3069 100644
--- a/json/martialarts.json
+++ b/json/martialarts.json
@@ -1,103 +1,18 @@
 [
- {
-    "type": "martial_art",
+  {
     "id": "style_krav_maga",
     "copy-from": "style_krav_maga",
+    "type": "martial_art",
     "name": { "str": "Krav Maga" },
-    "weapons": [
-      "baton-extended",
-      "butterfly_swords",
-      "copper_knife",
-      "cudgel",
-      "diveknife",
-      "honey_scraper",
-      "knife_combat",
-      "knife_combat_mod",
-      "knife_folding",
-      "knife_hunting",
-      "knife_rambo",
-      "knife_rm42",
-      "knife_trench",
-      "makeshift_knife",
-      "PR24-extended",
-      "shocktonfa_off",
-      "shocktonfa_on",
-      "switchblade",
-      "tonfa",
-      "tonfa_wood",
-      "af2011a1_38super",
-      "cz75",
-      "deagle_44",
-      "fn1910",
-      "fn57",
-      "glock_17",
-      "glock_18c",
-      "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",
-      "p320_357sig",
-      "sig_40",
-      "sig_p230",
-      "sig_mosquito",
-      "tokarev",
-      "usp_45",
-      "usp_9mm",
-      "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",
-      "h&k416a5",
-      "hk417_13",
-      "hk_g3",
-      "hk_g36",
-      "iwi_tavor_x95_300blk",
-      "m1a",
-      "m110a1",
-      "m14ebr",
-      "m16a4",
-      "m27iar",
-      "m4a1",
-      "rm51_assault_rifle",
-      "rm88_battle_rifle",
-      "ruger_mini",
-      "scar_l",
-      "scar_h",
-      "sig552",
-      "sks",
-      "steyr_aug",
-      "usp_40",
-      "hk_ucp",
-      "hk_mp5",
-      "hk_ump45",
-      "hk_mp7",
-      "hk_g11",
-      "v29",
-      "laser_rifle",
-      "laser_rifle_a7m"
-    ]
+    "extend": {
+      "weapons": [
+        "usp_40",
+        "hk_ucp",
+        "hk_mp5",
+        "hk_ump45",
+        "hk_mp7",
+        "hk_g11"
+      ]
+    }
   }
 ]
-- 
cgit v1.2.1