Update PKGUILD

1 files changed, 22 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3d7fdb4..fad26f4 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=202201182023
-_pkgver=2022-01-18-2023
-pkgrel=6
+pkgver=202201220831
+_pkgver=2022-01-22-0831
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -60,6 +60,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "npc-01_isherwood-update.patch"
         "npc-02_tacoma-update.patch"
         "npc-03_godco-update.patch"
+        #"npc-04_refugee.patch"
+        #"npc-05_robofac.patch"
         "npc-04_dialogue-fixes.patch"
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
@@ -93,6 +95,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "jc_restore-removed-traits.patch"
         "jc_more-military-base-overmap.patch"
         "jc_npc-eat-from-further-camp.patch"
+        "jc_reduced-kcal-during-sleep.patch"
         
         "vampirism.patch"
 
@@ -101,7 +104,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=('c2ba9f8cf1dd9448dfc5f918d0459ae4145ade15821a3024d446b506c5f7da72bab104331e614a93a3ab6954e4ff9afbbf57ec5a6ea7a7661db75fbccb321f63'
+b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b0474855c05edfaeb004ca18b3d3b88a355704d4736167dcb42699dceb'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -154,7 +157,8 @@ b2sums=('c2ba9f8cf1dd9448dfc5f918d0459ae4145ade15821a3024d446b506c5f7da72bab1043
         '1919a87a97a1cc625a8a0f5f6a3affb45b0c9630768b42718c5a3df563127cc0436845d01a354b24a16080a89f53df0515a9b62dc14f5292a951057386e9d5d6'
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
-        '816103c2772b50fcbfa86ecb238a54781c4d176e0c858e4a7f307f640a8444e1951b404359bd2bfb492f9e8aeb5b99a9e0f15dec0c0b6b8a130d351a07c0df67'
+        'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
+        'ea653de84d9c918aa93236559f6555f560ba7edb2c0b301a7af84352a940e178f9738b6b05c1a32733491f3d3824cfbb6bbea22bfe5c344bee916eb591673d12'
         'a0a7758d0834deefa92f2a2c5db1cf65334dae9e4e244803f65f09265bf4a8bc4da40464f5a98fb3f2b7de5a2912359e38adc0ca2146d96a5930e1151b99027d'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '9d0e17552338c9d92ff696f1834a5d99c29d5dfbab6903b620410f62527a0ba60720c9ceec8e203b737f784ade8a53dbaca428ac7cc439f3f4f765aac7f1170f'
@@ -175,7 +179,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-01-18-2023|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-01-22-0831|' Makefile
 
 
   # # # Hotfixes
@@ -289,6 +293,12 @@ prepare() {
   # Port over updates to New England Church Community
   patch -Np1 -i "$srcdir"/npc-03_godco-update.patch
 
+  # Port over updates to Free Merchant Center
+  #patch -Np1 -i "$srcdir"/npc-04_refugee.patch
+
+  # Port over updates to Hub 01
+  #patch -Np1 -i "$srcdir"/npc-05_robofac.patch
+
   # Assorted typos in NPC dialogue.
   # Fix Jack Isherwood mission listing 10 jars, when it is actually 20.
   patch -Np1 -i "$srcdir"/npc-04_dialogue-fixes.patch
@@ -399,9 +409,14 @@ prepare() {
   # Expand the overmap tiles for the miltiary base to be less MMMM
   patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch
 
-  # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from. 
+  # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from:
+  # Should allow bases larger than 3x3 to have less food micromanagment for NPCs.
   patch -Np1 -i "$srcdir"/jc_npc-eat-from-further-camp.patch
 
+  # Revert removal of half calorie consumption while sleeping:
+  # Managing the food supply of more than a few NPCs in BN is extremely difficult compared to DDA.
+  patch -Np1 -i "$srcdir"/jc_reduced-kcal-during-sleep.patch
+
 
   # # # Additional changes
   echo "Applying vampirism patch"