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/custom/etc | |
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/custom/etc')
-rw-r--r-- | npc/custom/etc/monster_arena.txt | 3 | ||||
-rw-r--r-- | npc/custom/etc/rpsroulette.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 24edd14d9..db4c37b73 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -724,7 +724,8 @@ L_Heal: function script illegalkill { announce "Illegal Kill by " + strcharinfo(PC_NAME) + " Detected",1; - percentheal -100,-100; + Sp = 0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt index e0f8b8952..331c0f0af 100644 --- a/npc/custom/etc/rpsroulette.txt +++ b/npc/custom/etc/rpsroulette.txt @@ -96,7 +96,8 @@ cmd_in02,182,126,2 script Crazy Boris 4_M_03,{ mes "*^0000FFClick^000000* *^FF0000BANG^000000*"; mes "You're dead!"; emotion e_gg; - percentheal -100,-100; + Sp = 0; + unitkill getcharid(CHAR_ID_ACCOUNT); close; } specialeffect EF_SUI_EXPLOSION; |