From 2f06704ee2f6be5566e8cbff0fd29a1238c7cae5 Mon Sep 17 00:00:00 2001 From: Ridley Date: Mon, 10 Oct 2016 01:17:30 +0200 Subject: 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. --- npc/cities/jawaii.txt | 11 ++++++----- npc/cities/umbala.txt | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'npc/cities') 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..."; diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index d705e4baa..a8127c372 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -1021,7 +1021,7 @@ umbala,140,197,1 script Bungee Jump FAKE_NPC,0,0,{ OnTouch: switch(rand(1,3)) { case 1: - percentheal -100,0; + Hp = 1; mapannounce "umbala","Bungee Jump: "+strcharinfo(PC_NAME)+" : Kyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~~~~~~~",bc_map; end; case 2: @@ -1030,7 +1030,7 @@ OnTouch: end; case 3: if (rand(1,2) == 2) { - percentheal -99,0; + Hp = 1; warp "nif_in",69,15; } end; -- cgit v1.2.3-70-g09d2