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

3 files changed, 8 insertions, 91 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 186f5a6..ff26595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202308281640
-_pkgver=2023-08-28-1640
+pkgver=202309090205
+_pkgver=2023-09-09-0205
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -154,7 +154,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('9f6de7733c6956ded2f5780517eb27e1bb5dc292146c3e30d8e3f41e59677d0bae4b2e0ee11852553d455b85d3fcbf92fc9ed0361860f70cf5899c08c3d9e842'
+b2sums=('4f0fffc78819a4fdeb8849687957debc474d6f8c8a404a0a1ed4bb0e69c15eb3b89467a865a6aa7c3bf92cc7c2dae534b8a9fc2a666565ff15e0c35be3eaba8c'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -170,7 +170,7 @@ b2sums=('9f6de7733c6956ded2f5780517eb27e1bb5dc292146c3e30d8e3f41e59677d0bae4b2e0
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
-        'c7d0ed3da809a930896ccb1067b52d78defc0428ed6c1d4b72bea0f32ccc3590374f268b9a1763de0265ddf1c8cd011f4e910c0d6384251699103af48fe1bb3c'
+        '63718656a6b1cd6e0d9dbff81190ac1b6113b08afd919d0015c708406a7a549718af6c3f9f8239514aedfe1ccf5c8a69207c43a675644fc990c713e8e31d007c'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
         '02b3ff03cd2f6b74e65c31874a0ed91918cab1bb7272516c7565f7f68f0a96a9a3a837f19f2431470da455084dea6d481875258f01a45e9249aafac879007746'
@@ -207,7 +207,7 @@ b2sums=('9f6de7733c6956ded2f5780517eb27e1bb5dc292146c3e30d8e3f41e59677d0bae4b2e0
         '75877d9c6090a4e75529b1840f875ef04941a643c2c3b0c2e2a605c0d43d6b7ac23abf7f0316885441b8310f8a39339f2e12c7763b2d9875ee772949e6dcfcaa'
         '761938b9d05430a72ff1102671d963e44d647ddb63b9a6e78979f365c6cd1e98b6a3763a4b9667ca75fbf23ee3812b4f09838061e8ba101d89d6f4dbd1104dc0'
         'bc5e233c9c5b7f799a126d51d672ad510ff4f6f75a573ea8b8e994d6be07375c0b4997acef16dacad555a7f36907a361f6cc4076b97d66c4c567dc9e707bc37e'
-        '4b3c42cfb05c7d57644341366cc801282ebabfad6d9818f0012d433c9ba4b2b8499b20ed52486d9ee323b344bf5f6bc9c8c6a4a6c5d0a855c3022a7718d6c38d'
+        '07d181c9814348b2a985a574c8b9498d894f9283529c9bca2a1da7d6ef6333b46894e627fb0c7282e630e3d4c8671039f52ad29fe82a44dfbd27287226d19b51'
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '93be2ff64a3217f92b369c067121683083859c7e939535e55f11818dc346d4862a50faa371315ad28ab54c9778c749d7684e8a7d68a18f774be3c2fe7891bd62'
         '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a'
@@ -286,7 +286,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-28-1640"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-09-09-0205"|' Makefile
 
 
   # # # Hotfixes
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 @@
diff --git a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
index 9063fe3..b4de191 100644
--- a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
+++ b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
@@ -341,21 +341,6 @@ index 5dad0377169..a3678fd4127 100644
      "skill": "rifle",
      "ammo": "308",
      "clip_size": 100,
-diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md
-index 5a51a530d5c..2e7ef664f27 100644
---- a/doc/GAME_BALANCE.md
-+++ b/doc/GAME_BALANCE.md
-@@ -253,8 +253,8 @@ Ammo ID            | Description                 | Energy, J | Dmg | Base Brl |
- ,300BLK subsonic   | 220gr OTM                   | 675       | 26  | 16in     |  subsonic
- 7.62x54mmR         | 150gr FMJ bullet            | 3629      | 60  | 28in     |                              |
- .308 Winchester    | 168gr hollow point bullet   | 3570      | 60  | 24in     |                              |
--7.62 NATO M80      | 147gr FMJ bullet            | 3304      | 57  | 24in     |                              |
--7.62 NATO M62      | 142gr tracer bullet         | 3232      | 57  | 24in     |  Belt with 1/5 tracer rounds |
-+7.62x51mm NATO M80 | 147gr FMJ bullet            | 3304      | 57  | 24in     |                              |
-+7.62x51mm NATO M62 | 142gr tracer bullet         | 3232      | 57  | 24in     |  Belt with 1/5 tracer rounds |
- .270 Winchester    | 130gr soft point bullet     | 3663      | 61  | 24in     |                              |
- .30-06 Springfield | 165gr soft point bullet     | 3894      | 62  | 24in     |        damage increased by 4 |
- .30-06 M2          | 165.7gr AP bullet           | 3676      | 60  | 24in     |         damage reduced by 10 |
 diff --git a/tests/ranged_burst_balance_test.cpp b/tests/ranged_burst_balance_test.cpp
 index ec61fad0613..de55646f92d 100644
 --- a/tests/ranged_burst_balance_test.cpp