summaryrefslogtreecommitdiff
path: root/npc/custom/etc
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/custom/etc
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/custom/etc')
-rw-r--r--npc/custom/etc/monster_arena.txt3
-rw-r--r--npc/custom/etc/rpsroulette.txt3
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;