Port faction updates from DDA.

Port Island Prison updates from DDA.
Port Kindred updates from DDA.
Port Mr Lapin updates from DDA.

1 files changed, 46 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fb1d706..94fe6d6 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=3
+pkgrel=5
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -42,6 +42,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "bionics-01_npc-can-use-more-bionics.patch"
 
+        "faction-01_more-factions.patch"
+
         "foods-01_fix-food-materials.patch"
         "foods-02_fix-food-naming.patch"
 
@@ -60,9 +62,13 @@ 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"
+        "npc-04_island-prison-update.patch"
+        "npc-05_kindred-update.patch"
+        "npc-06_lapin-update.patch"
+        #"npc-nn_refugee.patch"
+        #"npc-nn_robofac.patch"
+        #"npc-nn_lighthouse-family.patch"
+        "npc-10_dialogue-fixes.patch"
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
 
@@ -117,6 +123,7 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad'
+        '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c'
         '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
         'b3f3be15fb87b1cdb6230216328f648e66d06fd2eeee9a6a3ff3f6b8e94c5213af7a2a4643f1e59ca8801056325ad4be4b88d723c2ec52c4ecc6f8c356ff8c82'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
@@ -130,6 +137,9 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '24c5f9ee5553b66ac937785b3312378adbca096888b05da8b0cdc9c0586ee51e9a3754615cc03a659cfe70ba2f48f7ce0359025c816c887c7691424c685f5f96'
         '4f98126afadd7ad3346e2a55c02a06e1f5709406984835ff4ee206c4b52ef7ce8c52eee3f581fa36799a59578e05375b5db884b88b35866fbc6bb1330b79fe83'
         '613a9d7a7a512cdf7dc1f1121ecaec7272efe740f5494ce425c3781d41a0ec92e044142d82a28c6445416e84699131745c6872c9b33cb5b93528d0197745455a'
+        '71bd229c0ee32703e3fc44021939f2909adca148035e6bfac44f35cb68cd8e03c01b477bfb29fe05f568728f27bd5b6311a267338d05cdbd5680af0900324c08'
+        'aa0d3cbb74e42a90c8fc5f61b28ca007904856efa70211d5ff644c7c658be4ca124cfc0589220e20935da42749eb148fea5e7b0c7ddd7b7546c4ea9780126662'
+        '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
@@ -192,7 +202,7 @@ prepare() {
   # Fix mulitple inconsistent ammuntion names and handloaded status.
   patch -Np1 -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch
 
-  # Set a fixed loudness of 20x66mm shotgun shells like that of other shotguns:
+  # Set a fixed loudness for 20x66mm shotgun shells like that of other shotguns:
   # Other shotguns have fixed loudness to work around how the short range factors causes them to be far quieter than one would otherwise expect.
   patch -Np1 -i "$srcdir"/ammo-02_fix-20x66mm-loudness.patch
 
@@ -229,6 +239,12 @@ prepare() {
   patch -Np1 -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch
 
 
+  # # faction fixes
+  echo "Applying faction fixes"
+  # Backport the factions.json updates from DDA
+  patch -Np1 -i "$srcdir"/faction-01_more-factions.patch
+
+
   # # food fixes
   echo "Applying food fixes"
   # Fix several foods not being marked as the correct material:
@@ -284,24 +300,41 @@ prepare() {
 
   # # npc fixes
   echo "Applying NPC fixes"
-  # Port over updates to Isherwood Farm
+  # Port the updates to Isherwood Farm from DDA
   patch -Np1 -i "$srcdir"/npc-01_isherwood-update.patch
 
-  # Port over updates to Tacoma Commune
+  # Port the updates to Tacoma Commune from DDA
   patch -Np1 -i "$srcdir"/npc-02_tacoma-update.patch
 
-  # Port over updates to New England Church Community
+  # Port the updates to New England Church Community from DDA
   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 the updates to prison and island prison from DDA
+  patch -Np1 -i "$srcdir"/npc-04_island-prison-update.patch
+
+  # Port the updates to kindred from DDA
+  # rm the old file else the linter errors from empty file
+  rm data/json/npcs/NPC_Brigitte_LaCroix.json
+  patch -Np1 -i "$srcdir"/npc-05_kindred-update.patch
+
+  # Port the updates to Mr Lapin from DDA
+  patch -Np1 -i "$srcdir"/npc-06_lapin-update.patch
+
+  # Port the updates to Free Merchant Center from DDA
+  # Relies on new json functions :/
+  #patch -Np1 -i "$srcdir"/npc-nn_refugee.patch
+
+  # Port the updates to Hub 01 from DDA
+  # Relies on new json functions :/
+  #patch -Np1 -i "$srcdir"/npc-nn_robofac.patch
 
-  # Port over updates to Hub 01
-  #patch -Np1 -i "$srcdir"/npc-05_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-04_dialogue-fixes.patch
+  patch -Np1 -i "$srcdir"/npc-10_dialogue-fixes.patch
 
 
   # # recipe fixes