summaryrefslogtreecommitdiff
path: root/npc/cities/jawaii.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-10-16 15:12:01 +0200
committerGitHub <noreply@github.com>2016-10-16 15:12:01 +0200
commitfd5292f70192c61956556b3c53c68485938a022e (patch)
tree025a3a24d8b6bfddcf86ec3002c5d3cfbeeb1d96 /npc/cities/jawaii.txt
parent9805dcccbb3f8e5d400d4976486a6b41edfc1af0 (diff)
parent2f06704ee2f6be5566e8cbff0fd29a1238c7cae5 (diff)
downloadhercules-fd5292f70192c61956556b3c53c68485938a022e.tar.gz
hercules-fd5292f70192c61956556b3c53c68485938a022e.tar.bz2
hercules-fd5292f70192c61956556b3c53c68485938a022e.tar.xz
hercules-fd5292f70192c61956556b3c53c68485938a022e.zip
Merge pull request #1473 from Ridley8819/0hp
Fix cases were player were executed
Diffstat (limited to 'npc/cities/jawaii.txt')
-rw-r--r--npc/cities/jawaii.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 0c841a76e..e308d9f73 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -862,7 +862,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{
mes "["+strcharinfo(PC_NAME)+"]";
mes "Thank you.";
close2;
- percentheal -100,0;
+ unitkill getcharid(CHAR_ID_ACCOUNT);
end;
}
while (1) {
@@ -893,7 +893,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{
mes "Thank you...";
mes "So much...";
close2;
- percentheal -100,0;
+ unitkill getcharid(CHAR_ID_ACCOUNT);
end;
}
if (Zeny > 99) Zeny -= 100;
@@ -1103,7 +1103,7 @@ S_KillChar:
mes "Thank you...";
mes "Mr. Bartender...";
close2;
- percentheal -100,0;
+ unitkill getcharid(CHAR_ID_ACCOUNT);
end;
}
if (Zeny > 99) Zeny -= 100;
@@ -1154,8 +1154,9 @@ jawaii_in,43,115,0 script Customer#jaw_1 4W_M_01,{
mes "the one who laughs last!";
next;
mes "^3355FFYou drank to your fill.^000000";
- close;
- percentheal -100,0;
+ close2;
+ unitkill getcharid(CHAR_ID_ACCOUNT);
+ end;
}
mes "[Buchi]";
mes "You look happy...";