summaryrefslogtreecommitdiff
path: root/npc-04_island-prison-update.patch
diff options
context:
space:
mode:
Diffstat (limited to 'npc-04_island-prison-update.patch')
-rw-r--r--npc-04_island-prison-update.patch71
1 files changed, 37 insertions, 34 deletions
diff --git a/npc-04_island-prison-update.patch b/npc-04_island-prison-update.patch
index 193df11..ecb316c 100644
--- a/npc-04_island-prison-update.patch
+++ b/npc-04_island-prison-update.patch
@@ -1587,7 +1587,7 @@
]
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
-@@ -733,31 +743,39 @@
+@@ -733,31 +743,42 @@
},
{
"type": "item_group",
@@ -1595,45 +1595,48 @@
- "//": "Police issue weapons of all types",
+ "id": "longguns_cop",
"items": [
-- { "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 },
-- { "item": "cx4", "prob": 20, "charges-min": 0, "charges-max": 15 },
-- { "item": "fn57", "prob": 20, "charges-min": 0, "charges-max": 20 },
-- { "item": "fn_p90", "prob": 5, "charges-min": 0, "charges-max": 50 },
-- { "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 },
-- { "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 },
-- { "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 },
-- { "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 },
-- { "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 },
-- { "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 },
-- { "item": "remington_870", "prob": 20, "charges-min": 0, "charges-max": 6 },
-- { "item": "sig_40", "prob": 20, "charges-min": 0, "charges-max": 12 },
-- { "item": "usp_45", "prob": 10, "charges-min": 0, "charges-max": 12 },
-- { "item": "usp_9mm", "prob": 10, "charges-min": 0, "charges-max": 15 },
-- { "item": "kp32", "prob": 1, "charges-min": 0, "charges-max": 7 },
-- { "item": "kp3at", "prob": 2, "charges-min": 0, "charges-max": 6 },
-- { "item": "rugerlcp", "prob": 2, "charges-min": 0, "charges-max": 6 },
-- { "item": "kpf9", "prob": 3, "charges-min": 0, "charges-max": 7 }
-+ { "item": "ar15", "prob": 20, "charges": [ 0, 30 ] },
-+ { "item": "mossberg_500", "prob": 10, "charges": [ 0, 6 ] },
-+ { "item": "remington_700", "prob": 5, "charges": [ 0, 4 ] },
-+ { "item": "remington_870", "prob": 10, "charges": [ 0, 5 ] }
+- { "group": "nested_ar15", "prob": 15 },
+- { "group": "nested_cx4", "prob": 20 },
+- { "group": "nested_fn57", "prob": 20 },
+- { "group": "nested_fn_p90", "prob": 5 },
+- { "group": "nested_glock_19", "prob": 15 },
+- { "group": "nested_glock_22", "prob": 20 },
+- { "group": "nested_hk_mp5", "prob": 10 },
+- { "group": "nested_m9", "prob": 5 },
+- { "group": "nested_mossberg_500", "prob": 15 },
+- { "group": "nested_remington_700", "prob": 5 },
+- { "group": "nested_remington_870", "prob": 20 },
+- { "group": "nested_sig_40", "prob": 20 },
+- { "group": "nested_usp_45", "prob": 10 },
+- { "group": "nested_usp_9mm", "prob": 10 },
+- { "group": "nested_kp32", "prob": 1 },
+- { "group": "nested_kp3at", "prob": 2 },
+- { "group": "nested_rugerlcp", "prob": 2 },
+- { "group": "nested_kpf9", "prob": 3 }
++ { "group": "nested_ar15", "prob": 15 },
++ { "group": "nested_mossberg_500", "prob": 15 },
++ { "group": "nested_remington_700", "prob": 5 },
++ { "group": "nested_remington_870", "prob": 20 }
]
},
{
"type": "item_group",
+ "id": "sidearms_cop",
+ "items": [
-+ { "item": "fn57", "prob": 20, "charges": [ 0, 20 ] },
-+ { "item": "glock_19", "prob": 15, "charges": [ 0, 15 ] },
-+ { "item": "glock_22", "prob": 20, "charges": [ 0, 15 ] },
-+ { "item": "m9", "prob": 5, "charges": [ 0, 15 ] },
-+ { "item": "sig_40", "prob": 20, "charges": [ 0, 12 ] },
-+ { "item": "usp_45", "prob": 10, "charges": [ 0, 12 ] },
-+ { "item": "usp_9mm", "prob": 10, "charges": [ 0, 15 ] },
-+ { "item": "kp32", "prob": 1, "charges": [ 0, 7 ] },
-+ { "item": "kp3at", "prob": 2, "charges": [ 0, 6 ] },
-+ { "item": "rugerlcp", "prob": 2, "charges": [ 0, 6 ] },
-+ { "item": "kpf9", "prob": 3, "charges": [ 0, 7 ] }
++ { "group": "nested_cx4", "prob": 20 },
++ { "group": "nested_fn57", "prob": 20 },
++ { "group": "nested_glock_19", "prob": 15 },
++ { "group": "nested_glock_22", "prob": 20 },
++ { "group": "nested_m9", "prob": 5 },
++ { "group": "nested_sig_40", "prob": 20 },
++ { "group": "nested_usp_9mm", "prob": 10 },
++ { "group": "nested_usp_45", "prob": 10 },
++ { "group": "nested_kp32", "prob": 1 },
++ { "group": "nested_kp3at", "prob": 2 },
++ { "group": "nested_rugerlcp", "prob": 2 },
++ { "group": "nested_kpf9", "prob": 3 },
++ { "group": "nested_hk_mp5", "prob": 10 },
++ { "group": "nested_fn_p90", "prob": 5 }
+ ]
+ },
+ {