From 2a7178e4a6f77730d82545a98c2572a2a782308a Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 7 Jan 2024 14:57:34 -0800
Subject: Add patch to fix npcs taking no action while in melee range. Fix
 version string.

---
 PKGBUILD                                | 11 +++++++++--
 src-14_fix-npc_melee-calculations.patch | 11 +++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src-14_fix-npc_melee-calculations.patch

diff --git a/PKGBUILD b/PKGBUILD
index ce2edaa..4451f10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _pkgname=Cataclysm-BN
 pkgver=0.5.2
 #pkgver=202310040030
 #_pkgver=2023-10-04-0030
-pkgrel=1
+pkgrel=2
 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-11_fix-tacoma-farmfield.patch"
         "src-12_lower-lockpicking-experience.patch"
         "src-13_searchlights-with-plut-gen-furn.patch"
+        "src-14_fix-npc_melee-calculations.patch"
         "src-20_fix-default-mods.patch"
         
         "vampirism.patch"
@@ -250,6 +251,7 @@ b2sums=('9daaba287ef99aa3b33b6f3fbb129b97a2b4dcc265dd7affa08ccee1bdd41b4568e061a
         'e0a9e8f1129650208f7a5a37680091a6d2abaa60f5d4fd7fc691854d49c9f59317ca18dbe764cb05cacd4a2a95de702bbdd072571862ee0b27bd8df3be7a5764'
         'a5e8bca3ccec2990098e8cf1c504ce6bec03cecef03b0450a4396d5b1e0ffc4e91592f40c3e389eea74fc53114cce0f2c1d2237a779e5ec7e6c12b2863d6c731'
         'c0ccf5af2fbf0c9bb59bd226ce17084658cbe6bc859bd8a76c292845dbf57679ac08de339d4cb90736bfa48fcc9f2f734c3fadaa5b91b0fc6e58d157c848a328'
+        'f10ba62a41e6c0f627b501b907c879ae66e480e90e2ca324d09ba084a6fc0f25e33b384847558f00feb992efcba44eb355ed202351597c5a10a3480bd659f88d'
         'a408f468a4a0b0fea78b3c1cc31be22fc913c0a27052b08e9dde523135ed473008bba6a0245d64ed9863431c3905f6e7663d19e3aa9ba769053a160bcb8bcbfa'
         '718c242ea5b5e6546ba5a8baba8e26f1250cf41a53f538c20c392636a2430a8966bd6e66c4ca6c7d340303742a8d21ee1e083b9af081c461be3bcaf0c212fb40')
 
@@ -288,7 +290,7 @@ prepare() {
 
   # Fix version
 #  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-10-04-0030"|' Makefile
-  sed -i 's|VERSION = unstable|VERSION = "0.5.1"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.5.2"|' Makefile
 
 
   # # # Hotfixes
@@ -701,6 +703,11 @@ prepare() {
   # 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
 
+  # Fix calculation of npc npc_melee assessment:
+  # dist == 1 always fails, but dist <= 1 works.
+  # Without this, npcs in melee range will never take any action and be swiftly slain.
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-14_fix-npc_melee-calculations.patch
+
 
   # # # Additional changes
   echo "Applying vampirism patch"
diff --git a/src-14_fix-npc_melee-calculations.patch b/src-14_fix-npc_melee-calculations.patch
new file mode 100644
index 0000000..ea98989
--- /dev/null
+++ b/src-14_fix-npc_melee-calculations.patch
@@ -0,0 +1,11 @@
+--- a/src/npcmove.cpp
++++ b/src/npcmove.cpp
+@@ -1409,7 +1409,7 @@
+         return npc_reload;
+     }
+ 
+-    if( dist == 1 && same_z ) {
++    if( dist <= 1 && same_z ) {
+         add_msg( m_debug, "%s is trying a melee attack", disp_name() );
+         return npc_melee;
+     }
-- 
cgit v1.2.1