From 30051d6238b3a82244d509e9bb47c3b8e3c06fe7 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 8 May 2021 00:02:17 -0700
Subject: Apply fix for inhaler quest npcs instantly dying on mission accept

---
 0.F_backport-inhaler-mission-no-autofail.patch | 12 ++++++++++++
 PKGBUILD                                       |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 0.F_backport-inhaler-mission-no-autofail.patch

diff --git a/0.F_backport-inhaler-mission-no-autofail.patch b/0.F_backport-inhaler-mission-no-autofail.patch
new file mode 100644
index 0000000..32983d7
--- /dev/null
+++ b/0.F_backport-inhaler-mission-no-autofail.patch
@@ -0,0 +1,12 @@
+--- a/src/mission.cpp
++++ b/src/mission.cpp
+@@ -230,6 +230,9 @@
+         } else if( type->goal == MGOAL_KILL_MONSTER_SPEC ) {
+             kill_count_to_reach = kills.kill_count( monster_species ) + monster_kill_goal;
+         }
++        if( type->deadline_low != 0_turns || type->deadline_high != 0_turns ) {
++            deadline = calendar::turn + rng( type->deadline_low, type->deadline_high );
++        }
+         type->start( this );
+         status = mission_status::in_progress;
+     }
diff --git a/PKGBUILD b/PKGBUILD
index 6507aec..67cb5ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 pkgver=1710
-pkgrel=1
+pkgrel=1.2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -29,6 +29,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
 
         "0.F_backport-tacoma-barn-door-position.patch"
         "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch"
+        "0.F_backport-inhaler-mission-no-autofail.patch"
 
         "0001-quiverfull-house-correct-stairs.patch"
         "0002-ankle-ammo-pouch-is-not-a-backpack.patch"
@@ -66,6 +67,7 @@ b2sums=('117ac58ac4190370bd77611b7e528baf629323b5a3f90ef97119a67e0991564be7eea8f
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
+        '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3'
         '0b1fdf70fd02d76d35e223ac3313453ad4aae6737c0fb24f17725b0b87159883753267b95bd739b87fb709ef6cd8268ad895af5d335f45c938b29713851e7f20'
@@ -120,6 +122,9 @@ prepare() {
   # Fix npcs unable to drink from firestation and shelter basecamps wells
   patch -Np1 -i "$srcdir"/0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch
 
+  # Fix npcs with the inhaler mission instantly dying upon mission acceptance
+  patch -Np1 -i "$srcdir"/0.F_backport-inhaler-mission-no-autofail.patch
+
 
   # Various other fixes for bugs I came across
   # Fix Quiverfull house to have the correct stairs that modify json
-- 
cgit v1.2.1