Fix military searchlights not working with plutonium generator furniture.

Add missing roasted walnuts to expanded fmc broker patch.

3 files changed, 28 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bf37641..1cb0465 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _pkgname=Cataclysm-BN-cbn
 pkgver=0.5.1
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=1
+pkgrel=3
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -149,6 +149,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "src-10_reduced-kcal-during-sleep.patch"
         "src-11_fix-tacoma-farmfield.patch"
         "src-12_lower-lockpicking-experience.patch"
+        "src-13_searchlights-with-plut-gen-furn.patch"
         "src-20_fix-default-mods.patch"
         
         "vampirism.patch"
@@ -220,7 +221,7 @@ b2sums=('d7321d8f209920f6ea2a7c49aa55620b9a39e08a2d8d727c05581c65ecf56dd7b84995c
         '49d39404138e5e45fdb05b772636388eb7aada9dab6e549904e4b87053329d9df506ad6f390d73fb25c518299459df657ca6e02142fed9d29f4cd1c5f89734d7'
         '246a189a0002e755bbed91257c324d0f34bab724f38a31bad1d5eb8bc5b126ecb3a0af8f69a6d0f5f084930c670d2747942beabab0b684f7f66a13044dec394a'
         '739d0a1acbf6cdd1c6e78cac75a792d475b140219ffbf8c44d4db9fa82dc93f0822763be14c81afe69ab167a611a5d89fceb3df39d28b191835e14628c369140'
-        'f7a9c6d083f73c780be2f7ebf4e5e8deb4001aaca39b73ec9c6a5ef69f0621b45f9c384f32bc1c86cf238052ad77cf4703cc07886ede8bc62f19433d838b282a'
+        'eeb7565ca52f3be3b6ae3396bd48c06722f32b3e0a6f2ba9abdda89e658ec05393f7849d13134006889da11e0a02dc7e7603b8b354576e0021a3f0a593b75b46'
         '88ea84a5affa0d59a613d3806b01912f2728f7f995ee957754a77d8ad3b44033e1bec452d2bb9ac7a79fc6aba1aaee1d452d2ca3fecdd2d1c953d334cbd3beb3'
         '0449ffab9ecf7183253cfb56c7bf489ca6f0a2002f96caa37f2cdb9c77e51e7f8561589e5179496cfb6760b1e8c34a5aefcce4fe0790cab81db3409582a2c835'
         'abafa39e57cf04396b841833215aca427655dd3b56ebc260b8a57d6376360b31a4b1d4493da76ec4dc0129939ab9e23cada70dd6f49e647f02bce12c81f6451a'
@@ -254,6 +255,7 @@ b2sums=('d7321d8f209920f6ea2a7c49aa55620b9a39e08a2d8d727c05581c65ecf56dd7b84995c
         '6f78478f642c18101e9cd24a0c693abaa1348bb5c730c9d29b8f80d6309aa4bf16f6672dbc36161875db81a071256a0a388769c96810a7c67e3687ec750605d8'
         'e0a9e8f1129650208f7a5a37680091a6d2abaa60f5d4fd7fc691854d49c9f59317ca18dbe764cb05cacd4a2a95de702bbdd072571862ee0b27bd8df3be7a5764'
         'a5e8bca3ccec2990098e8cf1c504ce6bec03cecef03b0450a4396d5b1e0ffc4e91592f40c3e389eea74fc53114cce0f2c1d2237a779e5ec7e6c12b2863d6c731'
+        'c0ccf5af2fbf0c9bb59bd226ce17084658cbe6bc859bd8a76c292845dbf57679ac08de339d4cb90736bfa48fcc9f2f734c3fadaa5b91b0fc6e58d157c848a328'
         'a408f468a4a0b0fea78b3c1cc31be22fc913c0a27052b08e9dde523135ed473008bba6a0245d64ed9863431c3905f6e7663d19e3aa9ba769053a160bcb8bcbfa'
         '718c242ea5b5e6546ba5a8baba8e26f1250cf41a53f538c20c392636a2430a8966bd6e66c4ca6c7d340303742a8d21ee1e083b9af081c461be3bcaf0c212fb40'
         '08323e5a95bc755bec6cc7103f82cdad798e1040d04564c26ad3d1b66252afb950f8c92e444bec638ff01b5f592e374948092f2e890b9b031729f9dda774f8cc'
@@ -568,11 +570,6 @@ prepare() {
   # I can only reason it is a typo.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-12_fix-eddie-requiring-1000-clay.patch
 
-  # Reduce the mechanical skill experience from lockpicking:
-  # With lock_roll being 1-120 and used in place of difficulty,
-  # it often caused a level up with every lock, even at very high skill levels
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-12_lower-lockpicking-experience.patch
-
   # Assorted typos in NPC dialogue.
   # Fix Jack Isherwood mission listing 10 jars, when it is actually 20.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/npc-20_dialogue-fixes.patch
@@ -704,6 +701,16 @@ prepare() {
   # The two plot purchasing functions use the seemingly obsolete player_character.cash instead of g->u.cash
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-11_fix-tacoma-farmfield.patch
 
+  # Reduce the mechanical skill experience from lockpicking:
+  # With lock_roll being 1-120 and used in place of difficulty,
+  # it often caused a level up with every lock, even at very high skill levels
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-12_lower-lockpicking-experience.patch
+
+  # Allow military searchlights to be powered by the plutonium generator grid furniture:
+  # Searchlights check for a nearby plutonium generator terrain to function,
+  # but the function was never updated to include the new grid furniture version.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-13_searchlights-with-plut-gen-furn.patch
+
 
   # # # Additional changes
   echo "Applying vampirism patch"
diff --git a/npc-09_broker-takes-more-foods.patch b/npc-09_broker-takes-more-foods.patch
index c0b8343..0c226c5 100644
--- a/npc-09_broker-takes-more-foods.patch
+++ b/npc-09_broker-takes-more-foods.patch
@@ -1,6 +1,6 @@
 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json	
 +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
-@@ -88,20 +88,140 @@
+@@ -88,20 +88,141 @@
      "dynamic_line": "Excellent.  What've you brought us?",
      "repeat_responses": {
        "for_item": [
@@ -144,6 +144,7 @@
 +        "veggy_pickled",
 +        "veggy_salted",
 +        "vinegar",
++        "walnut_roasted",
 +        "wine_barley",
 +        "yeast"
        ],
diff --git a/src-13_searchlights-with-plut-gen-furn.patch b/src-13_searchlights-with-plut-gen-furn.patch
new file mode 100644
index 0000000..d18ec30
--- /dev/null
+++ b/src-13_searchlights-with-plut-gen-furn.patch
@@ -0,0 +1,12 @@
+--- a/src/monattack.cpp
++++ b/src/monattack.cpp
+@@ -3552,7 +3552,8 @@
+         for( int x = zposx - 24; x < zposx + 24; x++ ) {
+             for( int y = zposy - 24; y < zposy + 24; y++ ) {
+                 tripoint dest( x, y, z->posz() );
+-                if( g->m.ter( dest ) == ter_str_id( "t_plut_generator" ) ) {
++                if( ( g->m.ter( dest ) == ter_str_id( "t_plut_generator" ) ) ||
++                    ( g->m.furn( dest ) == furn_str_id( "f_grid_plut_generator" ) ) ) {
+                     generator_ok = true;
+                 }
+             }