Bring back the rubbersplosion patch.

-It still ain't fixed upstream.

2 files changed, 26 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 570cf41..c028cbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202310040030
 _pkgver=2023-10-04-0030
-pkgrel=2
+pkgrel=4
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -139,7 +139,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "weapon-02_Fix-usp45-load-order.patch"
 
-        #"etc-01_fix-rubbersplosion.patch"
+        "etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
         "etc-03_fix-abstracts.patch"
 
@@ -187,7 +187,7 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         '19a91d07aff74b5718c239c50a559e17295cbca4b472bb75fd37b3569930c0454928e7f14f7e387eddf9d29a4e50d1fbed319e9e00338c50d40849ea0e2ee545'
         'ab128ffcdfed701761c927ea7a8a355b6a10991d124f1d4ee309b030f9825ad8631eee19dfc89f49b9e8af7892fb4cf68066f90498c39084aad067f9a0a953a6'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
-        'f0643d3588527dbbdb11ead32b64e0d7a3aaafd0d7ba594bf79fae2ce15de758178d0419b2cfd98e642c55579a50a128527c68ba8e1d216ba6dc2c4e5b8129fd'
+        'eed0a3489e58a497c5941c182a83fb16d92c708a702da6365b39c81428b6cec1bff8fe78749f9f510cb880166a6851d61195e3066b8c19e2d3d763dd6ef38cfa'
         '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
@@ -244,6 +244,7 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc
         '4a1724784d6b4f113e8c1954d399d07adc941a2e992e1c95ab38dbc5c31940e90ff4cec51d22da3bf971880817b4356e473747303146c2ab1be55ee4565aca41'
         '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0'
         'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5'
+        'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         'e6044d7238be1cba2a083b6eb17335e10be3c8116234c67f006c7b6e5a9e25e107412ae2f5a636b01efa70cb54032f5c3da46ec7f0e92917334e72a492f739f8'
         'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
@@ -661,8 +662,9 @@ prepare() {
 
   # # Uncategorized for now
   echo "Applying uncategorized fixes"
-  # Fix rubber items dismantling into 10x item volume of rubber.
-  #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-01_fix-rubbersplosion.patch
+  # Fix rubber items dismantling into 10x item volume of rubber:
+  # 2023-09-23-0910 attempts to address this, but does not fix a pair of rubber boots exploding into a 156L pile of rubber chunks.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-01_fix-rubbersplosion.patch
 
   # Add price_postapoc to a number of items that did not have one set.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/etc-02_add-missing-price-postapoc.patch
diff --git a/etc-01_fix-rubbersplosion.patch b/etc-01_fix-rubbersplosion.patch
new file mode 100644
index 0000000..ef06b41
--- /dev/null
+++ b/etc-01_fix-rubbersplosion.patch
@@ -0,0 +1,19 @@
+--- a/data/json/items/ammo.json
++++ b/data/json/items/ammo.json
+@@ -686,7 +686,7 @@
+     "count": 25
+   },
+   {
+-    "type": "AMMO",
++    "type": "TOOL",
+     "id": "chunk_rubber",
+     "category": "spare_parts",
+     "price": 75,
+@@ -697,7 +697,6 @@
+     "material": "rubber",
+     "volume": "250 ml",
+     "weight": "38 g",
+-    "ammo_type": "components",
+     "flags": [ "NO_SALVAGE" ]
+   },
+   {