merge percentheal & itemheal into heal

1 files changed, 6 insertions, 6 deletions

diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index ac425fdb..e65d47a8 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -21,7 +21,7 @@ L_EnchantDoor:
     end;
 
 L_ShouldNotBeHere:
-    percentheal -100, 0;
+    heal -Hp, 0;
     end;
 
 }
@@ -33,7 +33,7 @@ L_ShouldNotBeHere:
 
 L_PushBack:
     warp "052-1", 57, 34;
-    percentheal -20, 0;
+    heal ((MaxHp/100) * -20), 0;
     message strcharinfo(0), "You are pushed back violently. There is probably some way to break this barrier.";
     mes "You are pushed back violently.";
     mes "There is probably some way to break this barrier.";
@@ -231,7 +231,7 @@ S_CheckChannelling:
         goto L_ChannellingFail;
     // Display an effect showing the drain
     misceffect FX_CHANNELLING_RAISE;
-    percentheal -4, 0;
+    heal ((MaxHp/100) * -4), 0;
 
     if (isdead())
         goto L_ChannellingDead;
@@ -298,14 +298,14 @@ L_ChannellingMoved:
     // and does not need being killed)
     if (isin("052-1",1,1,100,80) == 0)
         goto L_ChannellingFail;
-    percentheal -100, 0;
+    heal -Hp, 0;
     misceffect FX_MAGIC_DARK_EXPLOSION, strcharinfo(0);
     message strcharinfo(0), "You moved out of the power circle. The magic power you accumulated backfires at you!";
     goto L_ChannellingFail;
 
 L_ChPwrVanish:
     // kill the player as part of the process: the magic process drained his life.
-    percentheal -100, 0;
+    heal -Hp, 0;
     misceffect FX_MAGIC_DARK_EXPLOSION, strcharinfo(0);
     message strcharinfo(0), "The magic power vanished, and your spell backfires at you!";
     goto L_ChannellingFail;
@@ -324,6 +324,6 @@ L_ChannellingFail:
     end;
 
 L_ShouldNotBeHere:
-    percentheal -100, 0;
+    heal -Hp, 0;
     end;
 }