From d8c9ff3ba3ece0973d313847f43fc9a866868d3b Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Tue, 20 Aug 2019 23:14:12 -0400
Subject: avoid killing players in quest NPCs

---
 world/map/npc/051-3/ambush.txt         | 21 ++++++++++-----------
 world/map/npc/051-3/reinforcements.txt |  6 ++++--
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'world/map/npc/051-3')

diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 7d659710..13aa29d2 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -29,7 +29,8 @@ L_PrepareAmbush:
     end;
 
 L_ShouldNotBeHere:
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 }
@@ -47,8 +48,9 @@ L_MakeAmbush:
     end;
 
 L_ShouldNotBeHere:
-    heal -Hp, 0;
+    set Hp, 1;
     message strcharinfo(0), "Your throat got cut by a sneaky bandit!";
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 }
 
@@ -92,7 +94,8 @@ OnA:
     if (strcharinfo(0) == $@ILLIA_HELPER3$)
         goto L_CaptureHelper3;
     // kill that player otherwise, since not part of the quest.
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_CaptureHero:
@@ -100,8 +103,7 @@ L_CaptureHero:
     // Unequip all equipments
     nude;
     // put the health at 40%.
-    heal MaxHp, 0;
-    heal ((MaxHp/100) * -60), 0;
+    set Hp, (MaxHp / 100) * 40;
     warp "051-3", 69, 109;
     message strcharinfo(0), "Meh... Where am I?";
     end;
@@ -111,8 +113,7 @@ L_CaptureHelper1:
     // Unequip all equipments
     nude;
     // put the health at 40%.
-    heal MaxHp, 0;
-    heal ((MaxHp/100) * -60), 0;
+    set Hp, (MaxHp / 100) * 40;
     warp "051-3", 64, 102;
     message strcharinfo(0), "Meh... Where am I?";
     end;
@@ -122,8 +123,7 @@ L_CaptureHelper2:
     // Unequip all equipments
     nude;
     // put the health at 40%.
-    heal MaxHp, 0;
-    heal ((MaxHp/100) * -60), 0;
+    set Hp, (MaxHp / 100) * 40;
     warp "051-3", 62, 102;
     message strcharinfo(0), "Meh... Where am I?";
     end;
@@ -133,8 +133,7 @@ L_CaptureHelper3:
     // Unequip all equipments
     nude;
     // put the health at 40%.
-    heal MaxHp, 0;
-    heal ((MaxHp/100) * -60), 0;
+    set Hp, (MaxHp / 100) * 40;
     warp "051-3", 58, 102;
     message strcharinfo(0), "Meh... Where am I?";
     end;
diff --git a/world/map/npc/051-3/reinforcements.txt b/world/map/npc/051-3/reinforcements.txt
index 5870671c..5184f173 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -10,7 +10,8 @@ L_CallReinforcements:
     end;
 
 L_ShouldNotBeHere:
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 }
 
@@ -24,7 +25,8 @@ L_ShouldNotBeHere:
         "Do nothing", L_Close;
 
 L_ShouldNotBeHere:
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_TryOpen:
-- 
cgit v1.2.3-70-g09d2