Updated to 2023-09-09-0205

Remove references to longguns_cop and sidearms_cop from prisoner island patch
-They were causing more trouble than they were worth

1 files changed, 2 insertions, 70 deletions

diff --git a/npc-04_island-prison-update.patch b/npc-04_island-prison-update.patch
index ecb316c..e8c3d5f 100644
--- a/npc-04_island-prison-update.patch
+++ b/npc-04_island-prison-update.patch
@@ -1,6 +1,6 @@
 --- a/data/json/npcs/island_prison/prisoners.json
 +++ b/data/json/npcs/island_prison/prisoners.json
-@@ -0,0 +1,634 @@
+@@ -0,0 +1,631 @@
 +[
 +  {
 +    "type": "npc",
@@ -110,10 +110,7 @@
 +      [ "knuckle_brass", 5 ],
 +      [ "switchblade", 5 ],
 +      [ "throwing_knife", 5 ],
-+      {
-+        "distribution": [ { "group": "longguns_cop", "prob": 50, "contents-item": "shoulder_strap" }, { "group": "sidearms_cop", "prob": 50 } ],
-+        "prob": 40
-+      }
++      { "group": "guns_cop", "prob": 50 }
 +    ]
 +  },
 +  {
@@ -1585,71 +1582,6 @@
 +    }
    }
  ]
---- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
-+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
-@@ -733,31 +743,42 @@
-   },
-   {
-     "type": "item_group",
--    "id": "guns_cop",
--    "//": "Police issue weapons of all types",
-+    "id": "longguns_cop",
-     "items": [
--      { "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": [
-+      { "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 }
-+    ]
-+  },
-+  {
-+    "type": "item_group",
-+    "id": "guns_cop",
-+    "//": "Police issue weapons of all types",
-+    "items": [ { "group": "longguns_cop", "prob": 50 }, { "group": "sidearms_cop", "prob": 50 } ]
-+  },
-+  {
-+    "type": "item_group",
-     "id": "guns_swat",
-     "//": "Guns issued to paramilitary forces in addition to standard police issue.",
-     "items": [
 --- a/data/json/overmap/overmap_special/specials.json
 +++ b/data/json/overmap/overmap_special/specials.json
 @@ -948,6 +982,67 @@