Updated to 2023-07-14-0912

-Fix 4570_bp not being reversible.

2 files changed, 22 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 996c373..29eb189 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=202307030554
-_pkgver=2023-07-03-0554
+pkgver=202307140912
+_pkgver=2023-07-14-0912
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -53,6 +53,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
+        "ammo-04_4570-can-be-dismantled.patch"
         "ammo-05_22-casings-can-stack.patch"
         "ammo-06_fix-bp-scrap-not-being-bp.patch"
         "ammo-10_ammo-order-fix.patch"
@@ -150,7 +151,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=('6c427b0ce443e2e3f4b24f38974886a630b2704c7e7d4361b60ecec91c76c7b46e707980c05063e6d38a967f6caacd964ba5da1047d7e6decefb3b464f159348'
+b2sums=('bdc7619b76a002fb0c03f0a32045dd31914eaf5d019f1ad2e5fbafe84f16ce358931f29f6a6de6e5846668e25f5d7c801b54a63fe2643b253dee9ba86e221e5f'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -172,6 +173,7 @@ b2sums=('6c427b0ce443e2e3f4b24f38974886a630b2704c7e7d4361b60ecec91c76c7b46e70798
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
+        '376d0750c18f4218f8df74c5c311b17d7ff6181829831ddc51edf5b318ac3fa149c3d6b9b6ed0b39d34904974e8ae2d3588258844b4831198d4116397c60b14d'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
         '2ebc9d61438ef1439a3dcfae7e56f2f4cb1d4410faadd2e018359b6c4711abdcd474f2eeb2d23e531a523caea19ec40d820b60c0b8cdaf04223ca9eed1119ec7'
         '3ac6e8027230400c1e86466b2143ab1bde4455a8381862a6e6d35c5deefee3369021312a3e070bbc5978bdf78fee691096bad3084e4303d3ffa642d14fbdb2f6'
@@ -183,7 +185,7 @@ b2sums=('6c427b0ce443e2e3f4b24f38974886a630b2704c7e7d4361b60ecec91c76c7b46e70798
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
         '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
         'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7'
-        'e8caa14c3fdd1c8a6388287811c2df7cb6a0f88c52d6bf21526352decbf1c80a3d143e01ffd04eca9fa31e612d15346157df0ec5242f80b5d601230e4b85d153'
+        '1666b768d139753acf10539d992774dadfe0d57e587232c983a972c9f5b85f865c823bf4c9f3f240b4755bcd753c7a3b9ee452d480a49d240989479aefd13054'
         '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
         '7da2d555f4b21da6704675400dc97367ff3e6bb60213d86c972b6740f074bcef98482ad7f759ddbee09f67d0ee8687c26c425d697ab586a784385971aec72bb0'
         'c3b8dcce2fe41c8d9dab2d35d56304f426e06f9a6a220fcb2f413ac4aa32c7f466e2001cc7bf0bbf6127aeef55c837bb344f08afbb392f202c4ad8ce83a592a9'
@@ -243,7 +245,7 @@ b2sums=('6c427b0ce443e2e3f4b24f38974886a630b2704c7e7d4361b60ecec91c76c7b46e70798
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         '7d747ca4aff9a6fea8bf4cc5ea9b6c4be65271ee3d3f9dd2ae5ac1b0cf382e252b2f26948adcfa5357fffacd7f96a3adbd914559efb6313a1374704a15f53fa7'
-        '21ad3a1995bd3fa8b5483d92855c6c7b10d2296fc181ccad555343db7e39bf0262ae11d61d6073dffa2b45cb7fdbf616ec204b817bf47789c9a1b8b9e0db2513'
+        '547b8a4c377d56743ea034b49d11354741847c2968ddc4eb8af59098365a9671a0c093f20de71a57638a85d0abdddbb08409a45dafde9ca6c9e78846f545d904'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'f032ed44a6bc7f5b8dd7a545706c7733c4043ded755c12c622314c3b1f206363d27358f2d765a774f6f32abbdd8c31994b1e075c5307dcf65fc4e7a77081a5c7'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -279,7 +281,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-03-0554"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-07-14-0912"|' Makefile
 
 
   # # # Hotfixes
@@ -355,6 +357,10 @@ prepare() {
   # The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-03_fix-reloaded-50bmg.patch
 
+  # Fix 4570_bp not being reverisble:
+  # Easier to fix here than futher the mess of revert patches.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-04_4570-can-be-dismantled.patch
+
   # Fix .22 casings not stacking when every other casing stacks.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/ammo-05_22-casings-can-stack.patch
 
diff --git a/ammo-04_4570-can-be-dismantled.patch b/ammo-04_4570-can-be-dismantled.patch
new file mode 100644
index 0000000..4224e2c
--- /dev/null
+++ b/ammo-04_4570-can-be-dismantled.patch
@@ -0,0 +1,10 @@
+--- a/data/json/recipes/ammo/rifle.json
++++ b/data/json/recipes/ammo/rifle.json
+@@ -34,6 +34,7 @@
+     "batch_time_factors": [ 60, 5 ],
+     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
+     "charges": 1,
++    "reversible": true,
+     "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ],
+     "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 12 ] ] ]
+   },