Rebuild for updated vampirism patch.

1 files changed, 11 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 94fe6d6..1e5be81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202201220831
 _pkgver=2022-01-22-0831
-pkgrel=5
+pkgrel=8
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -65,6 +65,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "npc-04_island-prison-update.patch"
         "npc-05_kindred-update.patch"
         "npc-06_lapin-update.patch"
+        "npc-07_lighthouse-family.patch"
         #"npc-nn_refugee.patch"
         #"npc-nn_robofac.patch"
         #"npc-nn_lighthouse-family.patch"
@@ -138,8 +139,9 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '4f98126afadd7ad3346e2a55c02a06e1f5709406984835ff4ee206c4b52ef7ce8c52eee3f581fa36799a59578e05375b5db884b88b35866fbc6bb1330b79fe83'
         '613a9d7a7a512cdf7dc1f1121ecaec7272efe740f5494ce425c3781d41a0ec92e044142d82a28c6445416e84699131745c6872c9b33cb5b93528d0197745455a'
         '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
-        'aa0d3cbb74e42a90c8fc5f61b28ca007904856efa70211d5ff644c7c658be4ca124cfc0589220e20935da42749eb148fea5e7b0c7ddd7b7546c4ea9780126662'
+        'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
+        'ed5b2c6ef223a253039d22f55f6ab6039b1caad33c7874ff1f67f7c2aaa7dd8552b81d578ba504a1aec66a81fb454269673dd9e782b2ba7b89e42c7744a94e32'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
@@ -161,15 +163,15 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
-        '44cf3ade15b127de13c7b7dbdc515fa6a04aeff5912a857e6aa72887aa893c4fb6888793646ccc879af536f057e2791177e04e2c19c544fc96401c795728d867'
+        'd006a51f306a1397c14111788a23029a894e223a196649cac476acab761479db543bf4537ed5a2f4173ec94af04874b521a1d598ed8e98406cc2cf526d8e0083'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        'f57a8918a92b4f74fd155573aba4299879932eb525f54f4465ffa6dd48703f1cd695b3f44cc919b83c5a0ba72b8a9f84327ab65ce7839bcb54327e54a6f9ea62'
-        'a0a7758d0834deefa92f2a2c5db1cf65334dae9e4e244803f65f09265bf4a8bc4da40464f5a98fb3f2b7de5a2912359e38adc0ca2146d96a5930e1151b99027d'
+        '6e1b942d0c9f013aba386cb39e99ec28154fc7a4224fbf8c821dbdc38cd156fa45b45a214ad94fa0b3c002f9f2a6579d82dd817b6046056250b86ffc478887a5'
+        'ea1ab36365d19be71bd6052e98082a8feb6bbdbe487e8e5795143ceb495059d157b034834bd532a80ccc5a16daa3c355dd56316a27936d441b7c9cc85e40f450'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '9d0e17552338c9d92ff696f1834a5d99c29d5dfbab6903b620410f62527a0ba60720c9ceec8e203b737f784ade8a53dbaca428ac7cc439f3f4f765aac7f1170f'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -320,6 +322,10 @@ prepare() {
   # Port the updates to Mr Lapin from DDA
   patch -Np1 -i "$srcdir"/npc-06_lapin-update.patch
 
+  # Port the lighthouse family from DDA
+  # Removed the repair lighthouse quest as it relies on new json functions :/
+  patch -Np1 -i "$srcdir"/npc-07_lighthouse-family.patch
+
   # Port the updates to Free Merchant Center from DDA
   # Relies on new json functions :/
   #patch -Np1 -i "$srcdir"/npc-nn_refugee.patch
@@ -328,10 +334,6 @@ prepare() {
   # Relies on new json functions :/
   #patch -Np1 -i "$srcdir"/npc-nn_robofac.patch
 
-  # Port the lighthouse family from DDA
-  # Relies on new json functions :/
-  #patch -Np1 -i "$srcdir"/npc-nn_lighthouse-family.patch
-
   # Assorted typos in NPC dialogue.
   # Fix Jack Isherwood mission listing 10 jars, when it is actually 20.
   patch -Np1 -i "$srcdir"/npc-10_dialogue-fixes.patch