diff options
author | Ridley <ridley8819@gmail.com> | 2016-10-10 01:17:30 +0200 |
---|---|---|
committer | Ridley <ridley8819@gmail.com> | 2016-10-16 14:37:43 +0200 |
commit | 2f06704ee2f6be5566e8cbff0fd29a1238c7cae5 (patch) | |
tree | 231ba54b219c15b75d299c5bb6a9e90942d182b8 /npc/cities/jawaii.txt | |
parent | 80afa9c5b1d3e7eff0d03f78de3454830789c87b (diff) | |
download | hercules-2f06704ee2f6be5566e8cbff0fd29a1238c7cae5.tar.gz hercules-2f06704ee2f6be5566e8cbff0fd29a1238c7cae5.tar.bz2 hercules-2f06704ee2f6be5566e8cbff0fd29a1238c7cae5.tar.xz hercules-2f06704ee2f6be5566e8cbff0fd29a1238c7cae5.zip |
Fixes cases where player were executed
On Aegis players set their HP to 0 by script are still alive. Since we don't want to copy this, scripts that set HP to 0 and expects the player to stay alive are changed.
Additionally some scripts where changed where the HP were set to 1% instead to 1 HP and also the percentheal -100 with intended death set into close2. In megingard_seal.txt a end; was missing.
Diffstat (limited to 'npc/cities/jawaii.txt')
-rw-r--r-- | npc/cities/jawaii.txt | 11 |
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..."; |