Updated to 2022-04-06-1910

Add patch to fix faction food supply calculations.
-The game still fails to track the size of the player faction, but at least this enables manual faction size editing to provide proper estimates.
Add patch to fix inconsistent monster references during npx mission combat encounters.

3 files changed, 62 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c940c17..0d12c77 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=202203230754
-_pkgver=2022-03-23-0754
-pkgrel=5
+pkgver=202204061910
+_pkgver=2022-04-06-1910
+pkgrel=3
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -49,6 +49,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "faction-01_more-factions.patch"
         #"faction-02_more-monster-factions.patch"
+        "faction-03_fix-food-supply-calculations.patch"
 
         "factioncamp-01_remove-legacy-recruiting-penalty.patch"
 
@@ -61,6 +62,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "meds-01_antibiotics-unhealthy.patch"
 
+        "mission-01_typos.patch"
+
         "monsters-01_medical-zombies-called-zombies.patch"
         #"monsters-02_power-leech-update.patch"
 
@@ -122,7 +125,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=('0015555f65237aaab18d25fdb9da59d87ffd03d8e217628bda27f89c5e03b7022c3533512f384594fd6e58d003a0f4709a37a68f91985421a99fb542c6dc754e'
+b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1d87ced948d91fe795f2deb41033ec16ef03f6fda602ed92b06879d6ac'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -140,6 +143,7 @@ b2sums=('0015555f65237aaab18d25fdb9da59d87ffd03d8e217628bda27f89c5e03b7022c35335
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad'
         '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
+        '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
         'c8c140527b4dd6ab4b5db09abd451628b12a2cdcfcf9e47c435dae9f30fbbf3e7499f7e1070c1fb08e25085696d103b4728191e8758f4fa05e769a5d7746abf2'
         '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
         'b3f3be15fb87b1cdb6230216328f648e66d06fd2eeee9a6a3ff3f6b8e94c5213af7a2a4643f1e59ca8801056325ad4be4b88d723c2ec52c4ecc6f8c356ff8c82'
@@ -147,6 +151,7 @@ b2sums=('0015555f65237aaab18d25fdb9da59d87ffd03d8e217628bda27f89c5e03b7022c35335
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
         '931ac85c657c1c504de1ea629205b19f79a11acdd7c62cf71b909323ec1588610b1f575bc58ab01c3fbcd334fca8fbc114316570732f55a3f7fb3dd2984cd442'
+        '536c59b274923d36fbfc6dc39ef373a0d1e497422dea6fcdc16cfacb6b9ba421f14c5d7c4db31bab083199d859ff57ae5b19842f95367cfa39059e7156e96093'
         'e466392190e0aa58c02acda287bc8ac6fef30160207d08805ca9acd42b7f024d0680c0a76fcb4f29a7d7ca884920bba3a6714b5ad40f64dd1b40bcf0e2621d26'
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
@@ -158,7 +163,7 @@ b2sums=('0015555f65237aaab18d25fdb9da59d87ffd03d8e217628bda27f89c5e03b7022c35335
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
         'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391'
-        'c9a630572db1953e35b16814fa6bf83aa2801cc0ff1aad4b160d802ee2ef2166b63d1420df53c16af28af0fcc4d2a41a5a2e6bfe8cc8538eabfc9835fadd8e71'
+        'c21ffa9f0dd9dc290fac733bbfbc341eee6c2b754d543108f9933c5e1746a8a102b616f01adf2318e7d21b9714ec5d4a99fea28a13d0535c51b1a510f1167806'
         '9f34e372124b23bbc0598f42a1331f5a37f6ca4bfa3117d8b83fc804446a0d55f7fe3f462ff924bfa563100127338713bf27241a4244b1a37d9cca9b5da79bca'
         '9bb382d203bfb6534b38ce54e53046f4a25a08b53620453f04b71b72b6994d55e9348306d9ea1186180dbce25811fdfce938f7b6e45286e523540fb3c22ab9bc'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
@@ -189,7 +194,7 @@ b2sums=('0015555f65237aaab18d25fdb9da59d87ffd03d8e217628bda27f89c5e03b7022c35335
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         '1de3fed057adb6c0d41c97bbb5af2b753147ea8f8ac7023759684054aead266100dc8c8e0cc261c7a5cf922e4194e8cabaf626fb5f7974c6036edc64f25cc8f9'
-        '712deee5e281498fac61b18537957db43338a54f3f6fe6a6c8d9367c0332d5c7db6c593696fa148b692bffc2e7635f0efd72276068854ff4ecb26cf66575e197'
+        'e5d38a8512620245d90409d35bb1b8462a74e3348e8ecef0225d631a7472ce58fdf1855610ebba077dbed552030dbdcb37aacfd02be71fd5d96e770fa26835fc'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ec8f713c6fae84f6659f76d4edc0f237766329080e33e65a5affc5d0c37cc7906b0daaaa1f275d89c8ddacb5db0ee16b69222956c9f2c402ce44b55aa040ead0'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -209,7 +214,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-03-23-0754|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-04-06-1910|' Makefile
 
 
   # # # Hotfixes
@@ -282,6 +287,9 @@ prepare() {
   # Backport the monster_factions.json updates from DDA
   #patch -Np1 -i "$srcdir"/faction-02_more-monster-factions.patch
 
+  # Fix faction food supply being calculated at 288 calories per person instead of 2500.
+  patch -Np1 -i "$srcdir"/faction-03_fix-food-supply-calculations.patch
+
   # # faction camp fixes
   echo "Applying faction camp fixes"
   # cur_level is set to -1 on all modern basecamps. Remove the recruiting penalty this legacy variable inadvertently induces.
@@ -314,13 +322,20 @@ prepare() {
   patch -Np1 -i "$srcdir"/itemgroups-03_fix-shelter-batteries.patch
 
 
-  # # monster fixes
+  # # medicine fixes
   echo "Applying medicine fixes"
   # Add -4 health to antibiotics:
   # weak are -2, strong are -10, this feels like a nice middle ground.
   patch -Np1 -i "$srcdir"/meds-01_antibiotics-unhealthy.patch
 
 
+  # # missions fixes
+  echo "Applying mission fixes"
+  # Fix Typos:
+  # Foraging encounter has inconsistent monster references. Change all to cougar.
+  patch -Np1 -i "$srcdir"/mission-01_typos.patch
+
+
   # # monster fixes
   echo "Applying monster fixes"
   # Prefix medical zombies with "zombie" like other zombies:
diff --git a/faction-03_fix-food-supply-calculations.patch b/faction-03_fix-food-supply-calculations.patch
new file mode 100644
index 0000000..54e62ae
--- /dev/null
+++ b/faction-03_fix-food-supply-calculations.patch
@@ -0,0 +1,20 @@
+--- a/src/faction.cpp
++++ b/src/faction.cpp
+@@ -292,7 +292,7 @@
+ std::string faction::food_supply_text()
+ {
+     //Convert to how many days you can support the population
+-    int val = food_supply / ( size * 288 );
++    int val = food_supply / ( size * 2500 );
+     if( val >= 30 ) {
+         return pgettext( "Faction food", "Overflowing" );
+     }
+@@ -310,7 +310,7 @@
+ 
+ nc_color faction::food_supply_color()
+ {
+-    int val = food_supply / ( size * 288 );
++    int val = food_supply / ( size * 2500 );
+     if( val >= 30 ) {
+         return c_green;
+     } else if( val >= 14 ) {
diff --git a/mission-01_typos.patch b/mission-01_typos.patch
new file mode 100644
index 0000000..2558467
--- /dev/null
+++ b/mission-01_typos.patch
@@ -0,0 +1,19 @@
+--- a/src/mission_companion.cpp
++++ b/src/mission_companion.cpp
+@@ -1448,14 +1448,14 @@
+             int monsters = rng( 0, 10 );
+             if( skill * rng_float( .80, 1.2 ) > monsters * rng_float( .8, 1.2 ) ) {
+                 if( one_in( 2 ) ) {
+-                    popup( _( "%s was able to scare off the bear after delivering a nasty "
++                    popup( _( "%s was able to scare off the cougar after delivering a nasty "
+                               "blow!" ), comp->name );
+                 } else {
+                     popup( _( "%s beat the cougar into a bloody pulp!" ), comp->name );
+                 }
+             } else {
+                 if( one_in( 2 ) ) {
+-                    popup( _( "%s was able to hold off the first wolf but the others that were "
++                    popup( _( "%s was able to hold off the first cougar but the others that were "
+                               "skulking in the tree line caught up…" ), comp->name );
+                     popup( _( "I'm sorry, there wasn't anything we could do…" ) );
+                 } else {