merge percentheal & itemheal into heal

1 files changed, 11 insertions, 12 deletions

diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index c9c404fa..e4a794f7 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -67,7 +67,7 @@ L_Win:
         set $@cave1start, $@cave1start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave1_timer, $@cave1_timer + 5;
     if ($@cave1_timer >= 60)
         goto L_BadAir;
@@ -194,7 +194,7 @@ L_Win:
         set $@cave2start, $@cave2start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave2_timer, $@cave2_timer + 5;
     if ($@cave2_timer >= 60)
         goto L_BadAir;
@@ -320,7 +320,7 @@ L_Win:
         set $@cave3start, $@cave3start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave3_timer, $@cave3_timer + 5;
     if ($@cave3_timer >= 60)
         goto L_BadAir;
@@ -446,7 +446,7 @@ L_Win:
         set $@cave4start, $@cave4start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave4_timer, $@cave4_timer + 5;
     if ($@cave4_timer >= 60)
         goto L_BadAir;
@@ -572,7 +572,7 @@ L_Win:
         set $@cave5start, $@cave5start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave5_timer, $@cave5_timer + 5;
     if ($@cave5_timer >= 60)
         goto L_BadAir;
@@ -698,7 +698,7 @@ L_Win:
         set $@cave6start, $@cave6start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave6_timer, $@cave6_timer + 5;
     if ($@cave6_timer >= 60)
         goto L_BadAir;
@@ -824,7 +824,7 @@ L_Win:
         set $@cave7start, $@cave7start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave7_timer, $@cave7_timer + 5;
     if ($@cave7_timer >= 60)
         goto L_BadAir;
@@ -950,7 +950,7 @@ L_Win:
         set $@cave8start, $@cave8start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave8_timer, $@cave8_timer + 5;
     if ($@cave8_timer >= 60)
         goto L_BadAir;
@@ -1076,7 +1076,7 @@ L_Win:
         set $@cave9start, $@cave9start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave9_timer, $@cave9_timer + 5;
     if ($@cave9_timer >= 60)
         goto L_BadAir;
@@ -1172,7 +1172,7 @@ L_AlreadyClean:
 
 L_Hurt:
     message strcharinfo(0), "As you try to enter, you bump into a magic barrier. Its force pushes you back, hurting you badly.";
-    percentheal @barrier_force * 10, 0;
+    heal (MaxHp * (@barrier_force / 10)), 0;
     warp "025-3", 77, 164;
     end;
 
@@ -1223,7 +1223,7 @@ L_Win:
         set $@cave10start, $@cave10start + 60;
     if (Hp - (MaxHp*5)/100 <= 0)
         goto L_BadAir;
-    percentheal -5, 0;
+    heal ((MaxHp/100) * -5), 0;
     set $@cave10_timer, $@cave10_timer + 5;
     if ($@cave10_timer >= 60)
         goto L_BadAir;
@@ -1293,4 +1293,3 @@ L_AlreadyClean:
     setnpctimer 0;
     end;
 }
-