Updated to 2023-08-03-1246

3 files changed, 6 insertions, 134 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 38bd3ea..01c8ece 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202307311155
-_pkgver=2023-07-31-1155
+pkgver=202308031246
+_pkgver=2023-08-03-1246
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -152,7 +152,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=('9a7925cdeab929c477056137520625d6363ef86c944125a3d3e7882e580547221d2d349865cdd18c54c0346fca5847abf3fd455299faca9f295fdeb29dc64928'
+b2sums=('4386e0c0834934eb1c02f4a8fb663ac4e42df51efa5975df4373a96e4cd54a2da02ea96b7f5a5d356ba3be86c0719cdb80b97938af177a43290adc31c628f2c4'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -164,11 +164,11 @@ b2sums=('9a7925cdeab929c477056137520625d6363ef86c944125a3d3e7882e580547221d2d349
         'ca7b1e96dbd399315b40ca789dad9b5c573a164231834a6a3b8448ab4d98787dc66264e9fc9cf230a06ab58ad4308520f8cadfd79ab8e8a6daf377d98a496490'
         'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543'
         '43d89f815f7c7d7e57463174ad3bfa304a21c93dd34659dfa95824582f482fb97ef70f6d4c83be29b2b10b22c27ff1d19ce4ea1e2a0653fce35d53cdb30fb897'
-        '07dca7e1c81f4eeb4c29f5489b9025f244c9500a336c4b6424b679bd0cee1567b8510ef0dc3e78d7df9263131f352eaa322daff42172d9cd12deb5d9e81883db'
+        'f5b86b4ec58cb1f5f7f8033656a8ee3db912738fbc68d059a260ee2d17256ab63651a488a0678a43a5757854fc489089cc69ea0ed23c9ef6113855d122e281d1'
         '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5'
         '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
         '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
-        'e79914e7c5388a9fba22b0853e16e1f625f908bcbb5094f3b59fd05ae0195429a4f596a44b782ac9966ebecab3f4135506c68176daca650ece170e350f7e5120'
+        'c7d0ed3da809a930896ccb1067b52d78defc0428ed6c1d4b72bea0f32ccc3590374f268b9a1763de0265ddf1c8cd011f4e910c0d6384251699103af48fe1bb3c'
         '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
@@ -283,7 +283,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-07-31-1155"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-03-1246"|' Makefile
 
 
   # # # Hotfixes
diff --git a/revert-09_undo-yet-more-ammo-balancing.patch b/revert-09_undo-yet-more-ammo-balancing.patch
index c7c7940..b8a7555 100644
--- a/revert-09_undo-yet-more-ammo-balancing.patch
+++ b/revert-09_undo-yet-more-ammo-balancing.patch
@@ -35,7 +35,6 @@ Doi
  data/json/obsoletion/recipes.json             | 10 ++++
  data/json/professions.json                    |  4 +-
  data/json/recipes/ammo/shot.json              |  4 +-
- .../blacklists/item_blacklist.json            |  1 -
  .../Generic_Guns/ammo/gg_ammo_migration.json  |  3 -
  .../Generic_Guns/recipes/recipe_obsolete.json |  7 +--
  data/mods/No_Rivtech_Guns/modinfo.json        |  1 -
@@ -623,18 +622,6 @@ index 80a7881ea64..27b7bb17832 100644
      "type": "recipe",
      "category": "CC_AMMO",
      "subcategory": "CSC_AMMO_SHOT",
-diff --git a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
-index b3c43dcce30..5f4a73db8fa 100644
---- a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
-+++ b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
-@@ -26,7 +26,6 @@
-       "8mm_bootleg",
-       "8mm_caseless",
-       "8mm_civilian",
--      "8mm_fmj",
-       "8mm_inc",
-       "8mm_jhp",
-       "8x40_10_mag",
 diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
 index 675f5ba932d..8e61d596190 100644
 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
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 2cef13b..9063fe3 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
@@ -22,15 +22,10 @@ since there's many 7.62mm calibre rounds with different lengths.
  data/mods/Aftershock/items/corpses.json              |  2 +-
  data/mods/Aftershock/items/inactiverobot.json        |  2 +-
  data/mods/Aftershock/mobs/robots.json                |  2 +-
- data/mods/EW_Pack/obsolete.json                      | 12 ++++++------
  data/mods/Modular_Turrets/corpses.json               |  4 ++--
  data/mods/Modular_Turrets/items.json                 |  6 +++---
  data/mods/Modular_Turrets/monster.json               |  4 ++--
- data/mods/Modular_Turrets/roboguns.json              |  2 +-
- data/mods/Salvaged_Robots/corpses.json               |  2 +-
- data/mods/Salvaged_Robots/items.json                 |  2 +-
  data/mods/Salvaged_Robots/monsters.json              |  2 +-
- .../blazemod/vehicleparts/blaze_turrets_vanilla.json |  4 ++--
  doc/GAME_BALANCE.md                                  |  4 ++--
  tests/ranged_burst_balance_test.cpp                  |  8 ++++----
  23 files changed, 49 insertions(+), 49 deletions(-)
@@ -278,55 +273,6 @@ index 29e3f463f74..df35663319b 100644
      "diff": 20,
      "melee_damage": [ { "damage_type": "electric", "amount": 6 } ],
      "starting_ammo": { "762_51": 1000 },
-diff --git a/data/mods/EW_Pack/obsolete.json b/data/mods/EW_Pack/obsolete.json
-index bbda9e0f7a0..41d98b843fa 100644
---- a/data/mods/EW_Pack/obsolete.json
-+++ b/data/mods/EW_Pack/obsolete.json
-@@ -2,12 +2,12 @@
-   {
-     "type": "GUNMOD",
-     "id": "retool_545",
--    "name": "5.45 caliber conversion kit",
-+    "name": "5.45x42mm caliber conversion kit",
-     "location": "bore",
-     "weight": "114 g",
-     "color": "green",
-     "price": 50000,
--    "description": "This kit is used to convert 6.54 rifle to the 5.45 caliber.  The conversion results in slight reductions to recoil.",
-+    "description": "This kit is used to convert 6.54x42mm rifle to the 5.45x39mm caliber.  The conversion results in slight reductions to recoil.",
-     "symbol": ":",
-     "material": [ "steel" ],
-     "volume": "500 ml",
-@@ -19,12 +19,12 @@
-   {
-     "type": "GUNMOD",
-     "id": "retool_654",
--    "name": "6.54 caliber conversion kit",
-+    "name": "6.54x42mm caliber conversion kit",
-     "location": "bore",
-     "weight": "114 g",
-     "color": "green",
-     "price": 50000,
--    "description": "This kit is used to convert 5.45 rifle to the 6.54 caliber.  The conversion results in increased recoil.",
-+    "description": "This kit is used to convert 5.45x39mm rifle to the 6.54x42mm caliber.  The conversion results in increased recoil.",
-     "symbol": ":",
-     "material": [ "steel" ],
-     "volume": "500 ml",
-@@ -36,12 +36,12 @@
-   {
-     "type": "GUNMOD",
-     "id": "retool_762",
--    "name": "7.62 caliber conversion kit",
-+    "name": "7.62x39mm caliber conversion kit",
-     "location": "bore",
-     "weight": "114 g",
-     "color": "green",
-     "price": 50000,
--    "description": "This kit is used to convert 6.54 rifle to the 7.62 caliber.  The conversion results in increased recoil.",
-+    "description": "This kit is used to convert 6.54x42mm rifle to the 7.62x39mm caliber.  The conversion results in increased recoil.",
-     "symbol": ":",
-     "material": [ "steel" ],
-     "volume": "500 ml",
 diff --git a/data/mods/Modular_Turrets/corpses.json b/data/mods/Modular_Turrets/corpses.json
 index 85812093300..aff9f781350 100644
 --- a/data/mods/Modular_Turrets/corpses.json
@@ -395,67 +341,6 @@ index 5dad0377169..a3678fd4127 100644
      "skill": "rifle",
      "ammo": "308",
      "clip_size": 100,
-diff --git a/data/mods/Salvaged_Robots/corpses.json b/data/mods/Salvaged_Robots/corpses.json
-index 920c4317c40..e1884e9efb4 100644
---- a/data/mods/Salvaged_Robots/corpses.json
-+++ b/data/mods/Salvaged_Robots/corpses.json
-@@ -375,7 +375,7 @@
-     "copy-from": "broken_milbot_disarmed",
-     "color": "light_gray",
-     "name": "broken military robot",
--    "description": "A broken military robot, shattered and inert.  This one is armed with an integrated 7.62mm firearm.  Could be stripped for parts."
-+    "description": "A broken military robot, shattered and inert.  This one is armed with an integrated 7.62x51mm firearm.  Could be stripped for parts."
-   },
-   {
-     "type": "GENERIC",
-diff --git a/data/mods/Salvaged_Robots/items.json b/data/mods/Salvaged_Robots/items.json
-index f393489d2c8..0179b65c561 100644
---- a/data/mods/Salvaged_Robots/items.json
-+++ b/data/mods/Salvaged_Robots/items.json
-@@ -720,7 +720,7 @@
-     "type": "TOOL",
-     "copy-from": "bot_milbot_base",
-     "name": "inactive military robot",
--    "description": "An unpowered military robot fitted with an integrated 7.62 firearm and electric prod.  Activate this item, with ammo in your inventory, to load and deploy the robot.",
-+    "description": "An unpowered military robot fitted with an integrated 7.62x51mm firearm and electric prod.  Activate this item, with ammo in your inventory, to load and deploy the robot.",
-     "color": "green",
-     "use_action": {
-       "type": "place_monster",
-diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json
-index 9e9cf18b476..2f62bec75cf 100644
---- a/data/mods/Salvaged_Robots/monsters.json
-+++ b/data/mods/Salvaged_Robots/monsters.json
-@@ -813,7 +813,7 @@
-     "type": "MONSTER",
-     "copy-from": "mon_milbot_base",
-     "name": "military robot",
--    "description": "A military robot still operating due to its internal power core.  This one is armed with an electric prod and an integrated 7.62mm firearm.",
-+    "description": "A military robot still operating due to its internal power core.  This one is armed with an electric prod and an integrated 7.62x51mm firearm.",
-     "diff": 20,
-     "melee_damage": [ { "damage_type": "electric", "amount": 6 } ],
-     "starting_ammo": { "762_51": 1000 },
-diff --git a/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json b/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json
-index 7a80bf31e28..6dce9cf0142 100644
---- a/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json
-+++ b/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json
-@@ -457,7 +457,7 @@
-     "id": "mounted_rifle_308",
-     "copy-from": "turret",
-     "type": "vehicle_part",
--    "name": { "str": "mounted .308 pipe rifle" },
-+    "name": { "str": "mounted 7.62x51mm pipe rifle" },
-     "item": "rifle_308",
-     "breaks_into": [ { "item": "rifle_308", "prob": 50 } ],
-     "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
-@@ -631,7 +631,7 @@
-     "id": "mounted_surv_carbine_223",
-     "copy-from": "turret",
-     "type": "vehicle_part",
--    "name": { "str": "mounted 223 carbine" },
-+    "name": { "str": "mounted 5.56x45mm carbine" },
-     "item": "surv_carbine_223",
-     "breaks_into": [ { "item": "surv_carbine_223", "prob": 50 } ],
-     "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
 diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md
 index 5a51a530d5c..2e7ef664f27 100644
 --- a/doc/GAME_BALANCE.md