Updated to 2022-02-04-1939

Revert generic nv and telescopic lens changes.

1 files changed, 29 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5275ad7..3921cb7 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=202201220831
-_pkgver=2022-01-22-0831
-pkgrel=9
+pkgver=202202041939
+_pkgver=2022-02-04-1939
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -30,6 +30,11 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
+        "revert-01_removed-traits.patch"
+        "revert-02_revert-book-revamp.patch"
+        "revert-03_generic-nv.patch"
+        "revert-04_telescopic-lenses.patch"
+
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
         "ammo-03_fix-reloaded-50bmg.patch"
@@ -89,7 +94,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "etc-01_fix-rubbersplosion.patch"
         "etc-02_add-missing-price-postapoc.patch"
-        "etc-03_revert-book-revamp.patch"
 
         "jc_radio-can-use-ups.patch"
         "jc_ammo-loudness-ap-times-2.patch"
@@ -98,7 +102,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "jc_stop-non-faction-npc-malnourishment.patch"
         "jc_stop-sleeping-on-tables.patch"
         "jc_allow-hacker-laptop.patch"
-        "jc_restore-removed-traits.patch"
         "jc_more-military-base-overmap.patch"
         "jc_npc-eat-from-further-camp.patch"
         "jc_reduced-kcal-during-sleep.patch"
@@ -110,10 +113,14 @@ 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=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b0474855c05edfaeb004ca18b3d3b88a355704d4736167dcb42699dceb'
+b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e45c5f6630133f59cbf111155ec7ab5ef8c834ea57db080db1c68f08e1'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+        '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
+        '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
+        '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
+        '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '88668ebe3c1f66da6515043c799872082fdc7ddd85c31a1713e5753caa6ed862c047a910af80fa4f5717f0b921a863c7de24b1985a9a8242d129ca14f120a988'
         '0b782de320b3e459380cd618d5db2f3998a6dae879a84a3e4c58b1c61ecb1109f7a63485c2d6c77682eb62ba4a4aa4763a1f25eadde52486f1ce481acbf02504'
         '3fb051162e4dfc5aca3d4f41ebea18ac85d661f0ebba056a807a2a6ecf34ca117a11aeb286790f5ea6f9c6528d6b6981076da405ea0992ce8870bbe6951bdc2d'
@@ -157,7 +164,6 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
         '5a5a61ccb7e2e343fb6de2e3426688485a2f4ad65d4b001d8bd542907fd8ceb9315da7fd9e5f89a5aa6210edcd5f334c73657fc16349000d6f6a394303e22000'
-        'c620bbf0411860ebaafc48123f280e685a535fab91c0736285430ab5d36d26d028cea4ceca1cbcbf466d494ee87b76008d2a3fb64437a069650948945b3dec88'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
@@ -165,7 +171,6 @@ b2sums=('028de65b63ac40c23bff23b3e0521e5b464e6835b34fc8a6cfaca330ec5804499c8fb1b
         'd006a51f306a1397c14111788a23029a894e223a196649cac476acab761479db543bf4537ed5a2f4173ec94af04874b521a1d598ed8e98406cc2cf526d8e0083'
         'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae'
         'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099'
-        '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
@@ -190,13 +195,27 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-01-22-0831|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-02-04-1939|' Makefile
 
 
   # # # Hotfixes
   #echo "Applying hotfixes"
 
 
+  # # # Reverts
+  # Revert the book changes for now.
+  patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch
+
+  # Revert generic night vision.
+  patch -NRp1 -i "$srcdir"/revert-03_generic-nv.patch
+
+  # Revert telescopic lenses.
+  patch -NRp1 -i "$srcdir"/revert-04_telescopic-lenses.patch
+
+  # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
+  patch -Np1 -i "$srcdir"/revert-01_removed-traits.patch
+
+
   # # # Various fixes for bugs I came across
   # # Ammo fixes
   echo "Applying ammo fixes"
@@ -314,9 +333,7 @@ prepare() {
   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
+  patch -NEp1 -i "$srcdir"/npc-05_kindred-update.patch
 
   # Port the updates to Mr Lapin from DDA
   patch -Np1 -i "$srcdir"/npc-06_lapin-update.patch
@@ -408,10 +425,6 @@ prepare() {
 
   # Add price_postapoc to a number of items that did not have one set.
   patch -Np1 -i "$srcdir"/etc-02_add-missing-price-postapoc.patch
-  
-  # Revert the book changes for now.
-  patch -Np1 -i "$srcdir"/etc-03_revert-book-revamp.patch
-  rm data/json/items/book/bloat.json
 
 
   # # # Various other fixes for bugs I came across that modify src
@@ -437,9 +450,6 @@ prepare() {
   # Allow the hacker_laptop to utilize the extra functions.
   patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch
 
-  # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
-  patch -Np1 -i "$srcdir"/jc_restore-removed-traits.patch
-
   # Expand the overmap tiles for the miltiary base to be less MMMM
   patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch