summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-04-13 21:26:19 -0500
committerWushin <pasekei@gmail.com>2015-04-13 21:26:19 -0500
commit85a8149eeb2fde05a28863516399b667b9ab3c81 (patch)
tree6c4892765fe665925551f29dcb0a7ea7774e664d /world/map/npc
parent9694fdc1c7ca65fc2a7396f736fa83fde9954999 (diff)
parent9a2e1a8e79ca78a16ebd67a596583f00914ca022 (diff)
downloadserverdata-85a8149eeb2fde05a28863516399b667b9ab3c81.tar.gz
serverdata-85a8149eeb2fde05a28863516399b667b9ab3c81.tar.bz2
serverdata-85a8149eeb2fde05a28863516399b667b9ab3c81.tar.xz
serverdata-85a8149eeb2fde05a28863516399b667b9ab3c81.zip
Merge pull request #322 from mekolat/heal
percentheal, itemheal => heal
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/002-5/sema.txt2
-rw-r--r--world/map/npc/007-1/witch.txt2
-rw-r--r--world/map/npc/009-7/core.txt2
-rw-r--r--world/map/npc/011-1/oscar.txt2
-rw-r--r--world/map/npc/012-3/mana-seed.txt2
-rw-r--r--world/map/npc/015-3/katze.txt2
-rw-r--r--world/map/npc/017-4/waric.txt10
-rw-r--r--world/map/npc/018-2/caul.txt2
-rw-r--r--world/map/npc/025-3/barriers.txt23
-rw-r--r--world/map/npc/025-4/battlecaves.txt24
-rw-r--r--world/map/npc/027-3/casket_traps.txt16
-rw-r--r--world/map/npc/027-4/casket_traps.txt16
-rw-r--r--world/map/npc/027-5/casket_traps.txt16
-rw-r--r--world/map/npc/027-6/casket_traps.txt14
-rw-r--r--world/map/npc/029-1/hasan.txt2
-rw-r--r--world/map/npc/029-3/parua.txt2
-rw-r--r--world/map/npc/030-4/mana_battery.txt2
-rw-r--r--world/map/npc/033-1/kimarr.txt2
-rw-r--r--world/map/npc/034-1/yetiSpawn.txt2
-rw-r--r--world/map/npc/048-2/slimes.txt14
-rw-r--r--world/map/npc/051-1/desert.txt2
-rw-r--r--world/map/npc/051-1/forest.txt4
-rw-r--r--world/map/npc/051-3/ambush.txt22
-rw-r--r--world/map/npc/051-3/reinforcements.txt4
-rw-r--r--world/map/npc/052-1/channelling.txt12
-rw-r--r--world/map/npc/052-2/chest.txt2
-rw-r--r--world/map/npc/052-2/lobby.txt4
-rw-r--r--world/map/npc/052-2/partyroom.txt6
-rw-r--r--world/map/npc/052-2/storage.txt4
-rw-r--r--world/map/npc/055-1/pumpkins.txt2
-rw-r--r--world/map/npc/056-2/mirak.txt2
-rw-r--r--world/map/npc/annuals/xmas/barriers.txt4
-rw-r--r--world/map/npc/items/scissors.txt2
-rw-r--r--world/map/npc/items/shock_sweet.txt2
34 files changed, 114 insertions, 115 deletions
diff --git a/world/map/npc/002-5/sema.txt b/world/map/npc/002-5/sema.txt
index 7a859f05..57ac1790 100644
--- a/world/map/npc/002-5/sema.txt
+++ b/world/map/npc/002-5/sema.txt
@@ -59,7 +59,7 @@ L_Sema_TooMany:
L_Sema_Not_Happy:
set @state, 26;
callsub S_Update_Var;
- itemheal -Hp, 0;
+ heal -Hp, 0;
mes "A stone falls on your head.";
goto L_Close;
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index f1290699..e8eb1ffc 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -681,7 +681,7 @@ OnTimer300000:
goto L_EndQuest;
L_KillHero:
- percentheal -100, 0;
+ heal -Hp, 0;
goto L_EndQuest;
}
diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt
index c4999606..b8439b03 100644
--- a/world/map/npc/009-7/core.txt
+++ b/world/map/npc/009-7/core.txt
@@ -236,7 +236,7 @@ function|script|fightclub_DestroyMe
{
set @Duel_Fighter, 0;
sc_end 132; sc_end 14; sc_end 37; sc_end 185; sc_end 194; sc_end 195; sc_end 196; sc_end 197; sc_end 198; sc_end 199; // remove effects
- percentheal -100, 0; // doing @killer is unreliable
+ heal -Hp, 0; // doing @killer is unreliable
gmcommand "@alive"; // refill hp/mana
if(getmap() == "009-7") warp "009-7", rand($@fightclub_x1, $@fightclub_x2), rand(($@fightclub_y1 - 2), ($@fightclub_y1 - 3));
return;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 5a0994cc..157dc0c9 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -404,7 +404,7 @@ OnPDP:
L_KillBadHunter:
misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0);
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_PumpkinsRuined:
diff --git a/world/map/npc/012-3/mana-seed.txt b/world/map/npc/012-3/mana-seed.txt
index 3ed6d918..bb479c2b 100644
--- a/world/map/npc/012-3/mana-seed.txt
+++ b/world/map/npc/012-3/mana-seed.txt
@@ -213,7 +213,7 @@ L_magic_levelup:
set @SUP_xp, @exp_bonus[1 + getskilllv(SKILL_MAGIC)];
set @SUP_lvl, 1 + getskilllv(SKILL_MAGIC);
callfunc "SkillUp";
- itemheal 0, 10000;
+ heal 0, 10000, 1;
next;
goto L_end;
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index 8e94ce06..15dea917 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -43,7 +43,7 @@ L_NeedsMilk:
L_ThrowStone:
set @cat, 0;
callsub S_Update_Katze;
- percentheal -30, 0;
+ heal ((MaxHp/100) * -30), 0;
warp "015-1", 60, 32;
mes "\"GRAAUWL! Hissss...\"";
mes "Yikes, the cat attacked you! Your whole body is scratched. Maybe throwing a stone wasn't such a great idea...";
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 421a04ab..f98cb0d0 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -215,8 +215,8 @@ L_Next3:
set @SUP_lvl, 2;
callfunc "SkillUp";
next;
- percentheal 100, 0;
- percentheal -99, 0;
+ heal MaxHp, 0;
+ heal ((MaxHp/100) * -99), 0;
mes "You feel completely exhausted.";
set OrumQuest, 36;
goto L_Close;
@@ -224,8 +224,8 @@ L_Next3:
L_NoOath:
mes "Waric mumbles something. You guess it's a magic spell.";
warp "005-3", 86 , 33;
- percentheal 100, 0;
- percentheal -50, 0;
+ heal MaxHp, 0;
+ heal ((MaxHp/100) * -50), 0;
set OrumQuest, OrumQuest + 1;
goto L_Close;
@@ -364,7 +364,7 @@ L_Banished:
mes "The wizard looks at you with despise.";
mes "[Waric]";
mes "\"How did you...\"";
- percentheal -100, 0;
+ heal -Hp, 0;
goto L_Close;
L_NoItem:
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 5753b1aa..5d53ba48 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -465,7 +465,7 @@ L_mo_explode:
goto L_mo_explode_dodge;
mes "The burst of boiling monster brew hits you.";
next;
- itemheal (15 * rand(readparam(bVit))) - 1500, 0;
+ heal (15 * rand(readparam(bVit))) - 1500, 0, 1;
close;
L_mo_explode_dodge:
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;
}
-
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index c21fafbc..ffab9a05 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -16,7 +16,7 @@
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -108,7 +108,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -198,7 +198,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -289,7 +289,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -383,7 +383,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -477,7 +477,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -571,7 +571,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -667,7 +667,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -763,7 +763,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -854,7 +854,7 @@ 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.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Start:
@@ -981,7 +981,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.";
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
end;
L_Done:
@@ -1003,7 +1003,7 @@ L_Done:
L_Cheat:
message strcharinfo(0), "You shouldn't be here, you cheater.";
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Done:
diff --git a/world/map/npc/027-3/casket_traps.txt b/world/map/npc/027-3/casket_traps.txt
index 030a4c78..6b00f2d3 100644
--- a/world/map/npc/027-3/casket_traps.txt
+++ b/world/map/npc/027-3/casket_traps.txt
@@ -3,7 +3,7 @@
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -13,7 +13,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -23,7 +23,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -33,7 +33,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -43,7 +43,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -53,7 +53,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -63,7 +63,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -73,7 +73,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
diff --git a/world/map/npc/027-4/casket_traps.txt b/world/map/npc/027-4/casket_traps.txt
index c4ee4da7..1aec16ab 100644
--- a/world/map/npc/027-4/casket_traps.txt
+++ b/world/map/npc/027-4/casket_traps.txt
@@ -3,7 +3,7 @@
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -13,7 +13,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -23,7 +23,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -33,7 +33,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -43,7 +43,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -53,7 +53,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -63,7 +63,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -73,7 +73,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
diff --git a/world/map/npc/027-5/casket_traps.txt b/world/map/npc/027-5/casket_traps.txt
index 1170c415..965f91cb 100644
--- a/world/map/npc/027-5/casket_traps.txt
+++ b/world/map/npc/027-5/casket_traps.txt
@@ -3,7 +3,7 @@
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -13,7 +13,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -23,7 +23,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -33,7 +33,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -43,7 +43,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -53,7 +53,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -63,7 +63,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -73,7 +73,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
diff --git a/world/map/npc/027-6/casket_traps.txt b/world/map/npc/027-6/casket_traps.txt
index e2ce6a6a..551f9d6b 100644
--- a/world/map/npc/027-6/casket_traps.txt
+++ b/world/map/npc/027-6/casket_traps.txt
@@ -3,7 +3,7 @@
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -13,7 +13,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -23,7 +23,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -33,7 +33,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -43,7 +43,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -53,7 +53,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
@@ -63,7 +63,7 @@ OnTouch:
end;
OnTouch:
- percentheal -10, 0;
+ heal ((MaxHp/100) * -10), 0;
specialeffect 301;
specialeffect 302;
end;
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index 1cded616..a5d3894b 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -170,7 +170,7 @@ L_Summon:
L_SummonAgain:
message strcharinfo(0), "Kaan is mad at you for your interference! He summons a rock above your head, then summons another scorpion near Hasan!";
- percentheal -100, 0;
+ heal -Hp, 0;
goto L_Summon;
OnTimer5000:
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index f2aa728c..41e1fe8c 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -343,7 +343,7 @@ OnNewRound:
goto L_IdleCheckPassed;
set @candor_idle_counter, @candor_idle_counter + 1;
sc_start sc_poison, 1, @candor_idle_counter*25;
- percentheal -20 * @candor_idle_counter, 0;
+ heal ((MaxHp/100) * (-20 * @candor_idle_counter)), 0;
message strcharinfo(0), "The evil energy of this place hurts you. You should keep moving!";
end;
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index 28f791c8..c57e5ea5 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -277,7 +277,7 @@ OnTick:
L_DangerCell:
message strcharinfo(0), "Target Aquired. Locking on Now.";
misceffect 10001, strcharinfo(0);
- percentheal -20, 0;
+ heal ((MaxHp/100) * -20), 0;
end;
OnGuardDeath:
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index f51eae66..e1c26251 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -330,7 +330,7 @@ L_Punish:
areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath";
npctalk strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
- percentheal -100, 0;
+ heal -Hp, 0;
set @MobID, 0;
end;
diff --git a/world/map/npc/034-1/yetiSpawn.txt b/world/map/npc/034-1/yetiSpawn.txt
index 81d76ddd..c1f60312 100644
--- a/world/map/npc/034-1/yetiSpawn.txt
+++ b/world/map/npc/034-1/yetiSpawn.txt
@@ -51,7 +51,7 @@ L_End:
L_NonQuestKill:
message strcharinfo(0), "The dying Yeti takes you along to the other side.";
- percentheal -100, 0;
+ heal -Hp, 0;
goto L_End;
S_Update_Mask:
diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt
index 99a1b7e3..b07420db 100644
--- a/world/map/npc/048-2/slimes.txt
+++ b/world/map/npc/048-2/slimes.txt
@@ -36,7 +36,7 @@
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
@@ -125,7 +125,7 @@ L_ClearedPoint:
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
@@ -214,7 +214,7 @@ L_ClearedPoint:
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
@@ -303,7 +303,7 @@ L_ClearedPoint:
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
@@ -392,7 +392,7 @@ L_ClearedPoint:
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
@@ -481,7 +481,7 @@ L_ClearedPoint:
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
@@ -570,7 +570,7 @@ L_ClearedPoint:
goto L_End;
L_BlowUp:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "A slime dripped out of a bookshelf right in front of you and stepped onto it. It exploded. That hurt.";
goto L_End;
diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt
index 10164b36..02289bf4 100644
--- a/world/map/npc/051-1/desert.txt
+++ b/world/map/npc/051-1/desert.txt
@@ -50,7 +50,7 @@ OnTimer6500:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_HintToHelpers:
diff --git a/world/map/npc/051-1/forest.txt b/world/map/npc/051-1/forest.txt
index b0ff78af..870465c3 100644
--- a/world/map/npc/051-1/forest.txt
+++ b/world/map/npc/051-1/forest.txt
@@ -22,7 +22,7 @@
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_HandleHelper:
@@ -71,7 +71,7 @@ L_TaskComplete:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_Blocked:
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index fd663f33..305423ca 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -29,7 +29,7 @@ L_PrepareAmbush:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
}
@@ -47,7 +47,7 @@ L_MakeAmbush:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
message strcharinfo(0), "Your throat got cut by a sneaky bandit!";
end;
}
@@ -92,7 +92,7 @@ OnA:
if (strcharinfo(0) == $@ILLIA_HELPER3$)
goto L_CaptureHelper3;
// kill that player otherwise, since not part of the quest.
- percentheal -100,0;
+ heal -Hp, 0;
end;
L_CaptureHero:
@@ -100,8 +100,8 @@ L_CaptureHero:
// Unequip all equipments
nude;
// put the health at 40%.
- percentheal 100, 0;
- percentheal -60, 0;
+ heal MaxHp, 0;
+ heal ((MaxHp/100) * -60), 0;
warp "051-3", 69, 109;
message strcharinfo(0), "Meh... Where am I?";
end;
@@ -111,8 +111,8 @@ L_CaptureHelper1:
// Unequip all equipments
nude;
// put the health at 40%.
- percentheal 100, 0;
- percentheal -60, 0;
+ heal MaxHp, 0;
+ heal ((MaxHp/100) * -60), 0;
warp "051-3", 64, 102;
message strcharinfo(0), "Meh... Where am I?";
end;
@@ -122,8 +122,8 @@ L_CaptureHelper2:
// Unequip all equipments
nude;
// put the health at 40%.
- percentheal 100, 0;
- percentheal -60, 0;
+ heal MaxHp, 0;
+ heal ((MaxHp/100) * -60), 0;
warp "051-3", 62, 102;
message strcharinfo(0), "Meh... Where am I?";
end;
@@ -133,8 +133,8 @@ L_CaptureHelper3:
// Unequip all equipments
nude;
// put the health at 40%.
- percentheal 100, 0;
- percentheal -60, 0;
+ heal MaxHp, 0;
+ heal ((MaxHp/100) * -60), 0;
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 34f5434b..73236dec 100644
--- a/world/map/npc/051-3/reinforcements.txt
+++ b/world/map/npc/051-3/reinforcements.txt
@@ -10,7 +10,7 @@ L_CallReinforcements:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
}
@@ -24,7 +24,7 @@ L_ShouldNotBeHere:
"Do nothing", L_Close;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_TryOpen:
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;
}
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 03b08b82..2012e0a8 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -26,7 +26,7 @@
goto L_Pick;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
OnInit:
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index 50eb472f..a8a2dfa2 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -28,7 +28,7 @@ L_Warp:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -100, 0;
end;
}
@@ -46,7 +46,7 @@ L_StartVoices:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -100, 0;
end;
}
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index 83bb51ee..a602704e 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -22,7 +22,7 @@ L_SpawnLuvia:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
}
@@ -59,7 +59,7 @@ L_Start:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
OnTimer1000:
@@ -281,6 +281,6 @@ OnW00t:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
}
diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt
index 4ddfdc09..8abbb732 100644
--- a/world/map/npc/052-2/storage.txt
+++ b/world/map/npc/052-2/storage.txt
@@ -17,7 +17,7 @@
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
L_StartItemInvoker:
@@ -185,7 +185,7 @@ L_Warp:
end;
L_ShouldNotBeHere:
- percentheal -100, 0;
+ heal -Hp, 0;
end;
}
diff --git a/world/map/npc/055-1/pumpkins.txt b/world/map/npc/055-1/pumpkins.txt
index f0b9741c..528546bd 100644
--- a/world/map/npc/055-1/pumpkins.txt
+++ b/world/map/npc/055-1/pumpkins.txt
@@ -62,7 +62,7 @@ L_HeavyPoison1:
L_HeavyPoison2:
set @discover_poisonous_pumpkin, @discover_poisonous_pumpkin + 1;
misceffect FX_PUMPKIN_EXPLOSION, strcharinfo(0);
- percentheal -100,0;
+ heal -Hp, 0;
end;
}
diff --git a/world/map/npc/056-2/mirak.txt b/world/map/npc/056-2/mirak.txt
index 93dca520..e1a37347 100644
--- a/world/map/npc/056-2/mirak.txt
+++ b/world/map/npc/056-2/mirak.txt
@@ -103,7 +103,7 @@ L_TooSoon:
L_Kill:
misceffect sfx_magic_war, strcharinfo(0);
- percentheal -100, 0;
+ heal -Hp, 0;
set @annoy, 0;
callsub S_Update_Mask_Annoy;
set Mirak_Bantime, gettimetick(2) + 86400;
diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt
index 4c7837af..5dd30774 100644
--- a/world/map/npc/annuals/xmas/barriers.txt
+++ b/world/map/npc/annuals/xmas/barriers.txt
@@ -92,7 +92,7 @@ L_EnterDialogue:
"Hit it with my strong fist.", L_Enter;
L_Tux9th:
- itemheal -20, 0;
+ heal -20, 0;
message strcharinfo(0), "Ouch, that hurt!";
setlook LOOK_HAIR_STYLE, rand(20);
goto L_Fail;
@@ -110,7 +110,7 @@ L_Sword:
L_Gloves:
mes "Wow! Next time you plan to hit a wall,";
mes "you had better equip some decent gloves in advance.";
- itemheal -20, 0;
+ heal -20, 0;
message strcharinfo(0), "Ouch, that hurt!";
goto L_QueryWarp;
diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt
index 7e58ae98..44dbbac8 100644
--- a/world/map/npc/items/scissors.txt
+++ b/world/map/npc/items/scissors.txt
@@ -3,7 +3,7 @@ function|script|useScissors
if (rand(3))
goto L_Change;
message strcharinfo(0), "Whoops!";
- itemheal -20 - rand(Hp >> 1), 0;
+ heal -20 - rand(Hp >> 1), 0;
getitem "Scissors", 1;
end;
diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt
index e8ff6003..1ae787e3 100644
--- a/world/map/npc/items/shock_sweet.txt
+++ b/world/map/npc/items/shock_sweet.txt
@@ -3,7 +3,7 @@ function|script|useShockSweet
if (rand(5))
goto L_Change;
message strcharinfo(0), "Yuck, this tastes like earwax!";
- itemheal -20 - (Hp >> 2), 0;
+ heal -20 - (Hp >> 2), 0;
end;
L_Change: