summaryrefslogtreecommitdiff
path: root/world/map/npc/017-4
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2019-08-20 23:14:12 -0400
committergumi <git@gumi.ca>2020-03-08 16:07:59 -0400
commitd8c9ff3ba3ece0973d313847f43fc9a866868d3b (patch)
tree6e284b3fa574beb6b67acb5bf6473209cde21ac3 /world/map/npc/017-4
parent71f5ceed044d3908b971f5f5f6457086e0ebaa30 (diff)
downloadserverdata-d8c9ff3ba3ece0973d313847f43fc9a866868d3b.tar.gz
serverdata-d8c9ff3ba3ece0973d313847f43fc9a866868d3b.tar.bz2
serverdata-d8c9ff3ba3ece0973d313847f43fc9a866868d3b.tar.xz
serverdata-d8c9ff3ba3ece0973d313847f43fc9a866868d3b.zip
avoid killing players in quest NPCshardcore
Diffstat (limited to 'world/map/npc/017-4')
-rw-r--r--world/map/npc/017-4/orum.txt2
-rw-r--r--world/map/npc/017-4/waric.txt10
2 files changed, 6 insertions, 6 deletions
diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt
index 213f14af..a6f9b785 100644
--- a/world/map/npc/017-4/orum.txt
+++ b/world/map/npc/017-4/orum.txt
@@ -656,7 +656,7 @@ L_Additive:
mes "Orum agrees and starts mixing the powders. You're ready to pour in the additive once the mixture reached a high level of bubbling.";
next;
mes "The next dash of powder Orum adds causes the mixture to sputter and splash. Some of the hot liquid lands on the back of your hand!";
- heal -5, 0;
+ set Hp, max(1, Hp - 5);
menu
"Ouch!",L_Next24,
"Aah!", L_Next24,
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 7a8c4e68..9c641b11 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -215,8 +215,7 @@ L_Next3:
set @SUP_lvl, 2;
callfunc "SkillUp";
next;
- heal MaxHp, 0;
- heal ((MaxHp/100) * -99), 0;
+ set Hp, 1;
mes "You feel completely exhausted.";
set OrumQuest, 36;
goto L_Close;
@@ -224,8 +223,7 @@ L_Next3:
L_NoOath:
mes "Waric mumbles something. You guess it's a magic spell.";
warp "005-3", 86 , 33;
- heal MaxHp, 0;
- heal ((MaxHp/100) * -50), 0;
+ set Hp, min(Hp, MaxHp / 2);
set OrumQuest, OrumQuest + 1;
goto L_Close;
@@ -364,7 +362,9 @@ L_Banished:
mes "The wizard looks at you with despise.";
mes "[Waric]";
mes "\"How did you...\"";
- heal -Hp, 0;
+ set Hp, 1;
+ close2;
+ warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
goto L_Close;
L_NoItem: