Updated to 2022-01-18-2023

Update npc dialogue patch for a typo in Jack Isherwood quest 1.

2 files changed, 17 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ed7907..67b2447 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=202201141901
-_pkgver=2022-01-14-1901
-pkgrel=5
+pkgver=202201182023
+_pkgver=2022-01-18-2023
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -98,7 +98,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=('7433781fb70afc6af6e8cdee190db516d74858053fd770dc564a99f856c1fe85f2f84beb65f9e23289c77ac06dc94efb636a9265462be62fbb2045355499b5cc'
+b2sums=('c2ba9f8cf1dd9448dfc5f918d0459ae4145ade15821a3024d446b506c5f7da72bab104331e614a93a3ab6954e4ff9afbbf57ec5a6ea7a7661db75fbccb321f63'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -119,7 +119,7 @@ b2sums=('7433781fb70afc6af6e8cdee190db516d74858053fd770dc564a99f856c1fe85f2f84be
         '8bb71fbec3deece7bd0f9084e20ef5853812e71e2ebcd43011f7779499cbb99c7a8bc5c618d8ef9f55e5ce54c9fc4a5f4d3167bb63f9821a68889f9f3e1386f5'
         '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
-        '5e902df8e6af1d17a4fc9733b485982ce413cb30b751d7c437c6a25b55a1b857e67f16c31e7006a863feec21b78ab4eccb933b16de7e628db57a46af8543cf68'
+        'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '339e48c2ce8d98852445839a71217a62af47af541c9e7573f21112c8b0bd5409b676774d2efd8665fe7f4cb5e6251467f77b9d9fad43a4c1fd61b405ae5e9831'
         '71768899e631c5293d5fb8bcb237ca54f880913b6400d445c8a0322cb69801fe85b94b1293306e2f33fac6067cbd892c4665b9563bdc9ff4df5be245c7e7108f'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
@@ -149,7 +149,7 @@ b2sums=('7433781fb70afc6af6e8cdee190db516d74858053fd770dc564a99f856c1fe85f2f84be
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         '5948f8f328176aa51cb9e41c018231db5307d41ae69e1e4515be03ff6b5b2c368c9962f0f683184983cccca239acedc9a4d1f06c42d6140415a134ea0268a8ff'
-        '63f1ba6a8a31212f129bd6c87a7f8b3debb6e2976c7dd95a748c9b8a62a06dece8dd6cc0adb55a852d3aea8e1f83c9fccaffdbef4057935638aed51c74937c39'
+        'cef466fc4010f1507e9719078bdc9a1a6300c7961cdb596edd7e4098c2209ec2bf67a34a0693570ac40de65b37065a2323d488d823d1ef9c421652af6c784e3a'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '9d0e17552338c9d92ff696f1834a5d99c29d5dfbab6903b620410f62527a0ba60720c9ceec8e203b737f784ade8a53dbaca428ac7cc439f3f4f765aac7f1170f'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -169,7 +169,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-01-14-1901|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-01-18-2023|' Makefile
 
 
   # # # Hotfixes
@@ -268,6 +268,7 @@ prepare() {
   # # npc fixes
   echo "Applying NPC fixes"
   # Assorted typos in NPC dialogue.
+  # Fix Jack Isherwood mission listing 10 jars, when it is actually 20.
   patch -Np1 -i "$srcdir"/npc-01_dialogue-fixes.patch
 
   echo "Applying NPC fixes"
diff --git a/npc-01_dialogue-fixes.patch b/npc-01_dialogue-fixes.patch
index a7aaaa2..577fc60 100644
--- a/npc-01_dialogue-fixes.patch
+++ b/npc-01_dialogue-fixes.patch
@@ -21,3 +21,12 @@
      "responses": [
        { "text": "Your whole family survived?", "topic": "TALK_ISHERWOOD_JACK2" },
        { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JACK_TOPICS" },
+@@ -306,7 +306,7 @@
+   {
+     "id": "MISSION_ISHERWOOD_JACK_1",
+     "type": "mission_definition",
+-    "name": { "str": "Find 10 3L jars" },
++    "name": { "str": "Find 20 3L jars" },
+     "goal": "MGOAL_FIND_ITEM",
+     "difficulty": 3,
+     "value": 20000,