Fix Evac3 Background trait being visisble

Fix rubber items dismantling into 10x volume of rubber

3 files changed, 45 insertions, 6 deletions

diff --git a/0022-fix-evac3-background-visible.patch b/0022-fix-evac3-background-visible.patch
new file mode 100644
index 0000000..7c61c9e
--- /dev/null
+++ b/0022-fix-evac3-background-visible.patch
@@ -0,0 +1,10 @@
+--- a/data/json/npcs/BG_traits.json
++++ b/data/json/npcs/BG_traits.json
+@@ -153,6 +153,7 @@
+     "name": { "str": "Survivor Story" },
+     "points": 0,
+     "description": "This NPC could tell you about how they survived the Cataclysm",
++    "player_display": false,
+     "valid": false,
+     "purifiable": false,
+     "types": [ "BACKGROUND_SURVIVAL_STORY" ],
diff --git a/0023-fix-rubbersplosion.patch b/0023-fix-rubbersplosion.patch
new file mode 100644
index 0000000..ef06b41
--- /dev/null
+++ b/0023-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" ]
+   },
+   {
diff --git a/PKGBUILD b/PKGBUILD
index e414150..8001b86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202107210710
-_pkgver=2021-07-21-0710
-pkgrel=1
+pkgver=202107242012
+_pkgver=2021-07-24-2012
+pkgrel=3
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -56,6 +56,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0019-derelict-shed-is-s.patch"
         "0020-hk46-is-milspec.patch"
         "0021-foldable-bottle-is-container.patch"
+        "0022-fix-evac3-background-visible.patch"
+        "0023-fix-rubbersplosion.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -72,7 +74,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=('a4b16f4502a3e6394f2d39a080ca6b11daf25d33a64684bf076a5a43cfd5f32145ad134e469407fc57aca9fbc7d7f1a9e731862daa972055a147376790efdac2'
+b2sums=('d48372e505f370558e2c7f48acb52db5419f42940c0e6ba9c8bb442556b9672f5c76cc8eabbb1bbac178c182173ed43199c0e4437ade15274fb9f32ba6448195'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -101,6 +103,8 @@ b2sums=('a4b16f4502a3e6394f2d39a080ca6b11daf25d33a64684bf076a5a43cfd5f32145ad134
         '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
+        'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
+        'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9'
         '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56'
@@ -111,7 +115,7 @@ b2sums=('a4b16f4502a3e6394f2d39a080ca6b11daf25d33a64684bf076a5a43cfd5f32145ad134
         '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42'
         '8ebe9659ecf69f449ef18857fdece2e814be98e426a925cc61e07ed382962f3ec17bdbccbcdada59571b5a0ce9bc4e5b438e9904db9b3af832e8c9468244081e'
         'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206'
-        '7efe8626da0a61d4d40eded2573c1a276f54baa10914c20e07645a83ccc7c2ccb1f0f49a88042fb6fdc36166d9c8bb5442d37bd7ccecf5e9388efda834ec61e5'
+        '2b506d69016b5eac7b72341d30900dded43b5c54471547db43968c7b8724d95aff622aa133afb161e200b1b8e470b47422966230458e7b41a112d47fdcdf27f0'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 prepare() {
@@ -129,7 +133,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-07-21-0710|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-07-24-2012|' Makefile
 
 
   # Backports from 0.F
@@ -211,6 +215,12 @@ prepare() {
   # Mark the foldable plastic bottle and steel water bottle as containers
   patch -Np1 -i "$srcdir"/0021-foldable-bottle-is-container.patch
 
+  # Fix Evacuee 3 background 3 being player visible
+  patch -Np1 -i "$srcdir"/0022-fix-evac3-background-visible.patch
+
+  # Fix rubber items dismantling into 10x item volume of rubber
+  patch -Np1 -i "$srcdir"/0023-fix-rubbersplosion.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two