1 files changed, 23 insertions, 13 deletions

diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index ffab9a05..808e0440 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -16,7 +16,8 @@
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -108,7 +109,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -198,7 +200,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -289,7 +292,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -383,7 +387,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -477,7 +482,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -571,7 +577,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -667,7 +674,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -763,7 +771,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -854,7 +863,8 @@ L_Done:
     if ($@battlecave10 == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15)
         goto L_Start;
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Start:
@@ -981,7 +991,7 @@ L_Out:
     if (Rossy_Quest > 15)
         goto L_Done;
     message strcharinfo(0), "As you try to walk through, you bump into a strong magical barrier.";
-    heal ((MaxHp/100) * -10), 0;
+    set Hp, max(1, Hp - 100);
     end;
 
 L_Done:
@@ -1003,7 +1013,8 @@ L_Done:
 
 L_Cheat:
     message strcharinfo(0), "You shouldn't be here, you cheater.";
-    heal -Hp, 0;
+    set Hp, 1;
+    warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
     end;
 
 L_Done:
@@ -1015,4 +1026,3 @@ L_Save:
     message strcharinfo(0), "You can't leave Julia here, all alone!";
     end;
 }
-