Updated to 2021-08-27-1610

Fix vampire patch part 2 for 2021-08-27-1610

2 files changed, 6 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ed150ba..a18e43e 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=202108220722
-_pkgver=2021-08-22-0722
-pkgrel=2
+pkgver=202108271610
+_pkgver=2021-08-27-1610
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -75,7 +75,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=('ca059606bcb3e92ae9ad5ecd50bd2a6f0ef53f5ec9629db815b34df1cbad3797037a1bd68bcdc0c78f67de49afb7f8759c64f36c142baf63bdfc989d7bc482d9'
+b2sums=('f4d9b3d26e3d33893fa918086ba538ae4de0874908b18474a7930fabe761711e96406845d68432a99f4e8fb59ec184cf18ae4ae4574c4e27c6619b1b227b0583'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -114,7 +114,7 @@ b2sums=('ca059606bcb3e92ae9ad5ecd50bd2a6f0ef53f5ec9629db815b34df1cbad3797037a1bd
         'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9'
         '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755'
         '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42'
-        'e923c7c29e9301a1afe9a4679a96a1a58f0b6541e86181980e8283160347dfe166f63c53edb9b2a6d62be3713f74e7bb34bddb1798cafb88388922e22170cc96'
+        '4cd04fbb255bd47fba5c9df51bcc740fe893d6632e56de9676c0a8ccd472c12b783829e89c3ce71fda1ad25ceb1dac855de85483a17a7e0d4531e02dddc5fc03'
         '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104'
         'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206'
         '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820'
@@ -135,7 +135,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-08-22-0722|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2021-08-27-1610|' Makefile
 
 
   # Backports from 0.F
diff --git a/custom-2.patch b/custom-2.patch
index bb5916e..384786b 100644
--- a/custom-2.patch
+++ b/custom-2.patch
@@ -258,14 +258,6 @@
 
 --- a/src/morale_types.cpp
 +++ b/src/morale_types.cpp
-@@ -40,6 +40,7 @@
- 
-             morale_type( "morale_food_bad" ),
-             morale_type( "morale_cannibal" ),
-+            morale_type( "morale_vampire" ),
-             morale_type( "morale_vegetarian" ),
-             morale_type( "morale_meatarian" ),
-             morale_type( "morale_antifruit" ),
 @@ -138,6 +139,7 @@
  const morale_type MORALE_CRAVING_MARLOSS( "morale_craving_marloss" );
  const morale_type MORALE_FOOD_BAD( "morale_food_bad" );