Fix more foods listed as incorrect materials.

Fix vampire patch to reject alcohol and foodplace foodstuff.
Fix vampire patch to properly reject 0 nutrition foods.

1 files changed, 11 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a2773d7..76e9673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202110041824
 _pkgver=2021-10-04-1824
-pkgrel=1
+pkgrel=4
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -59,8 +59,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0024-ammo-order-fix.patch"
         "0026-fix-brioche-cooking-time.patch"
         "0027-fix-missing-ammo-frag-effects.patch"
-        "0028-royal-jelly-is-honey.patch"
+        "0028-fix-food-materials.patch"
         "0029-fix-survivor-fingerless-gloves-warmth.patch"
+        "0031-vacutainer-is-not-a-weapon.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -109,8 +110,9 @@ b2sums=('52f0904513815f7ac55887dfe8d0b565b77edf2e52d11a1d4ba0faeed8a277b976a8eba
         'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962'
         '8eef73575981d10a6a8734afc0e284ec7125db24bf666ff943938a4df87dedbd9ac622ea51bb71b5aaff7b1cc75627258bcfdc8659b915c09c82d3561fde1f62'
         '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef'
-        'e9274d894e94606ba0f15e85c7d5e6dcfdd93922f5361dd988542e63e5f2d434971a5360600869184c490dc34f7104214a71620c577ee0fe217c9636e91b2076'
+        '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
         'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e'
+        'a45b2a53b6725dfd4780049a7522befe49c2a0c4efa4fb1dcb5cf53c7af18d329d2ba02aa6ac150342a3e66a46fd17f5e6e76a8db15c677a237edbb5cf4f5af7'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
@@ -118,7 +120,7 @@ b2sums=('52f0904513815f7ac55887dfe8d0b565b77edf2e52d11a1d4ba0faeed8a277b976a8eba
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
         '2aff3bb0804a1860bc95e25433b10f11c185bb954a2e9dc6fbee912d8d453498f9140d516ea4f31fc545861f266400db5d830092dbe21a48b22a07fd3d62a393'
-        'c01d5e593e4976b042380407d80cfffc154595b43ab3a475d183733a7f68d408c4c866f25da6afae0e41f48effeca8f3ee3dfc9aa8b5a615d9f5711736aff3a0'
+        'b01c79202a2ddc6e6e3e2b97f767f5535e29213bd675238fad20f5ac26b639a111424a3d2861fe2e760b73a1d3c1d909e0360390caf1f21a6fc169b0bee4d665'
         '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '9b1366ed5da56c77a60f9a174115a596e8466015e23dfc61ed3f4df27976dd0a35832b8fa454be9979b9ab6fdd3cf31cb35f446f8f0ef878b18c1f871f0d4ac0'
@@ -230,12 +232,15 @@ prepare() {
   # Fix ammo fragmentation and explosive effects that are missing.
   patch -Np1 -i "$srcdir"/0027-fix-missing-ammo-frag-effects.patch
 
-  # Fix royal jelly not being marked as honey.
-  patch -Np1 -i "$srcdir"/0028-royal-jelly-is-honey.patch
+  # Fix several foods not being marked as the correct material.
+  patch -Np1 -i "$srcdir"/0028-fix-food-materials.patch
 
   # Fix fingerless survivor gloves losing base warmth, as they lose warmth already from the lack of coverage.
   patch -Np1 -i "$srcdir"/0029-fix-survivor-fingerless-gloves-warmth.patch
 
+  # Fix blood draw kit being categorized as a weapon.
+  patch -Np1 -i "$srcdir"/0031-vacutainer-is-not-a-weapon.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two.