Add hotfixes:

-Fix player being given a wakeup from noise notice when it happens to npcs
--also reduces npc 'move please' chat spam when following the player
-Fix card readers not despawning riot turrets
-Fix npcs detecting explosives using psychic powers

4 files changed, 126 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 098d590..796c4ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN
 pkgver=0.5.2
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=5
+pkgrel=6
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -64,6 +64,9 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
         "hotfix-03_fix-Fix-overlapping-text-in-look-around.-4156.patch"
         "hotfix-04_fix-uaf-in-safe-references-4165.patch"
         "hotfix-05_feat-balance-closed-glass-windows-block-scent-4114.patch"
+        "hotfix-06_fix-two-cases-of-NPCs-printing-messages-in-odd-conte.patch"
+        "hotfix-07_fix-allow-card-readers-to-despawn-riot-turrets-too-4.patch"
+        "hotfix-09_fix-NPCs-no-longer-magically-aware-of-explosives-the.patch"
 
         "ammo-10_ammo-order-fix.patch"
         "ammo-11_fix-volume-40mm.patch"
@@ -189,6 +192,9 @@ b2sums=('9daaba287ef99aa3b33b6f3fbb129b97a2b4dcc265dd7affa08ccee1bdd41b4568e061a
         '29bc7e4f9ca7437930a43455be8d1166ff2b7bbaaa58209692d4a15fa7c4b19a4b185881d9a1c5abafe363de31f31fe44585da24dbeecaba183e884539443228'
         'af8d397d3b42ec0ff461337c19e470dd05b367a362cff092dbe6083841fee062cf899799e69db11fba05179775ac398f8ef3bf79a9f0e25b8774350451e73363'
         'b388513e6e2d67b3c6ae4f7c27d59bcd78fac9909e887fa4c58932052c0f3355b1dad23abfe404ca2bec82e278759e5be5982abb8b5b1dc7c908c51f7a510d05'
+        '8dd1ade1242764bb7b69bf3b564f4e0ad7a2a53e4153a421f2b901c811daa038508e6eae21cd25d48f1c685024229a286e57f9357a04608332b3c8de1cb904e2'
+        'f6a8421d0aaf32e1062ce9b90b4a699b66374ddd6a3f7bd1705b476d2e74c627f594b99006c6f88389c444f7ed3a5d87fc2b323b2331c4221706120d6eb52abb'
+        'c1cdb13cf76e0f3b879c463258701a8ef268097323f6befcda1a1027be19256daf38ad4d80d982347e36570a5df4339a3020159b7498a997e0e26998fdaa564d'
         'df26a597afe46a35e07f02c32839e2f7f57cf4d4d9bf0e62eb645d1b720f601fe2e9787462a0ab0ba8b788c727b846272a4ca6ecf81f96bb058d070b53633dcc'
         'ba2964e64df20167c722e71951db28d039e637397a6be2e7f5312da10ab3c57a1982ec1ae1c37dd361317292b8c519f678472eb06360d4368294e0b636704c15'
         '365e1ac9f9ee636f2578f6fd8ab16b6460894cb9b76cf0aee5d8a55f42d882d6ee0b04e80194f4c346bfdb0778e11e30b8c03541b4d351602ccfd63cee7e3cf0'
@@ -312,12 +318,22 @@ prepare() {
   # Fix overlapping text when looking around
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-03_fix-Fix-overlapping-text-in-look-around.-4156.patch
 
-  # Fix safe reference error on save and quit
+  # Fix safe reference error on throwing explosives. fix for error on save and quit still MIA.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-04_fix-uaf-in-safe-references-4165.patch
 
   # Fix zombies having a psychic sense of smell
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-05_feat-balance-closed-glass-windows-block-scent-4114.patch
 
+  # Fix player being given a wakeup from noise notice when it happens to npcs
+  # also reduces npc 'move please' chat spam when following the player
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-06_fix-two-cases-of-NPCs-printing-messages-in-odd-conte.patch
+
+  # Fix card readers not despawning riot turrets
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-07_fix-allow-card-readers-to-despawn-riot-turrets-too-4.patch
+
+  # Fix npcs detecting explosives using psychic powers
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/hotfix-09_fix-NPCs-no-longer-magically-aware-of-explosives-the.patch
+
 
   # # Adjust default mods
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-20_fix-default-mods.patch
diff --git a/hotfix-06_fix-two-cases-of-NPCs-printing-messages-in-odd-conte.patch b/hotfix-06_fix-two-cases-of-NPCs-printing-messages-in-odd-conte.patch
new file mode 100644
index 0000000..3ef0e24
--- /dev/null
+++ b/hotfix-06_fix-two-cases-of-NPCs-printing-messages-in-odd-conte.patch
@@ -0,0 +1,44 @@
+From dea4a4901e2420aab13a60c40f7ed18e52be9197 Mon Sep 17 00:00:00 2001
+From: Chaosvolt <chaosvolt@users.noreply.github.com>
+Date: Thu, 11 Jan 2024 19:41:48 -0600
+Subject: [PATCH] fix: two cases of NPCs printing messages in odd contexts
+ (#4098)
+
+fix: fix two cases of NPCs printing messages in odd contexts
+---
+ src/npcmove.cpp | 5 ++++-
+ src/sounds.cpp  | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/npcmove.cpp b/src/npcmove.cpp
+index b7ee6f6df0e..d55ff473d70 100644
+--- a/src/npcmove.cpp
++++ b/src/npcmove.cpp
+@@ -2365,7 +2365,10 @@ void npc::move_to( const tripoint &pt, bool no_bashing, std::set<tripoint> *nomo
+             // other npcs should not try to move into this npc anymore,
+             // so infinite loop can be avoided.
+             realnomove->insert( pos() );
+-            say( "<let_me_pass>" );
++            // Don't spam player with messages over followers blunder into each other.
++            if( !np->is_following() ) {
++                say( "<let_me_pass>" );
++            }
+             np->move_away_from( pos(), true, realnomove );
+             // if we moved NPC, readjust their path, so NPCs don't jostle each other out of their activity paths.
+             if( np->attitude == NPCATT_ACTIVITY ) {
+diff --git a/src/sounds.cpp b/src/sounds.cpp
+index bed0803fd61..d59207f6cb3 100644
+--- a/src/sounds.cpp
++++ b/src/sounds.cpp
+@@ -497,7 +497,7 @@ void sounds::process_sound_markers( player *p )
+                 !p->has_effect( effect_narcosis ) ) {
+                 //Not kidding about sleep-through-firefight
+                 p->wake_up();
+-                add_msg( m_warning, _( "Something is making noise." ) );
++                p->add_msg_if_player( m_warning, _( "Something is making noise." ) );
+             } else {
+                 continue;
+             }
+-- 
+2.43.0
+
diff --git a/hotfix-07_fix-allow-card-readers-to-despawn-riot-turrets-too-4.patch b/hotfix-07_fix-allow-card-readers-to-despawn-riot-turrets-too-4.patch
new file mode 100644
index 0000000..17416a3
--- /dev/null
+++ b/hotfix-07_fix-allow-card-readers-to-despawn-riot-turrets-too-4.patch
@@ -0,0 +1,36 @@
+From cc76e12a7b9ff5ed7810943e4c55424dbe8fc759 Mon Sep 17 00:00:00 2001
+From: Chaosvolt <chaosvolt@users.noreply.github.com>
+Date: Mon, 8 Jan 2024 17:25:06 -0600
+Subject: [PATCH] fix: allow card readers to despawn riot turrets too (#4077)
+
+---
+ data/json/monsters/turrets.json | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json
+index f74755395a3..40aadfa159e 100644
+--- a/data/json/monsters/turrets.json
++++ b/data/json/monsters/turrets.json
+@@ -130,7 +130,18 @@
+     ],
+     "death_drops": {  },
+     "death_function": [ "BROKEN" ],
+-    "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO", "BIOPROOF" ]
++    "flags": [
++      "SEES",
++      "NOHEAD",
++      "ELECTRONIC",
++      "COLDPROOF",
++      "IMMOBILE",
++      "NO_BREATHE",
++      "DROPS_AMMO",
++      "ID_CARD_DESPAWN",
++      "CONSOLE_DESPAWN",
++      "BIOPROOF"
++    ]
+   },
+   {
+     "id": "mon_turret_light",
+-- 
+2.43.0
+
diff --git a/hotfix-09_fix-NPCs-no-longer-magically-aware-of-explosives-the.patch b/hotfix-09_fix-NPCs-no-longer-magically-aware-of-explosives-the.patch
new file mode 100644
index 0000000..315594a
--- /dev/null
+++ b/hotfix-09_fix-NPCs-no-longer-magically-aware-of-explosives-the.patch
@@ -0,0 +1,28 @@
+From 3552f9a79d6c3ea29b1fb694c6d6839704ca64af Mon Sep 17 00:00:00 2001
+From: Chaosvolt <chaosvolt@users.noreply.github.com>
+Date: Thu, 11 Jan 2024 19:39:05 -0600
+Subject: [PATCH] fix: NPCs no longer magically aware of explosives they can't
+ see (#4097)
+
+---
+ src/npcmove.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/npcmove.cpp b/src/npcmove.cpp
+index 9569a31f099..b7ee6f6df0e 100644
+--- a/src/npcmove.cpp
++++ b/src/npcmove.cpp
+@@ -315,6 +315,10 @@ std::vector<sphere> npc::find_dangerous_explosives() const
+             continue;
+         }
+ 
++        if( !sees( elem->position() ) ) {
++            continue;   // We can't worry about what we can't see.
++        }
++
+         const explosion_iuse *actor = dynamic_cast<const explosion_iuse *>( use->get_actor_ptr() );
+         const int safe_range = actor->explosion.safe_range();
+ 
+-- 
+2.43.0
+