diff options
author | mekolat <mekolat@gmail.com> | 2014-11-04 13:01:07 -0500 |
---|---|---|
committer | mekolat <mekolat@gmail.com> | 2014-11-12 14:02:47 -0500 |
commit | 64a4adaa06f1059c4ac705199d5a0716c8edef60 (patch) | |
tree | 32d1f05c6e846aa791f82d1773f2972f71ad166e /world/map/npc/functions | |
parent | 0ca075ae66c4e6a983e1f25f6e63a39ee12a568e (diff) | |
download | serverdata-64a4adaa06f1059c4ac705199d5a0716c8edef60.tar.gz serverdata-64a4adaa06f1059c4ac705199d5a0716c8edef60.tar.bz2 serverdata-64a4adaa06f1059c4ac705199d5a0716c8edef60.tar.xz serverdata-64a4adaa06f1059c4ac705199d5a0716c8edef60.zip |
fix fight club => v0.4
disallow towel inside ring
kill on exit
replace killer var with duel_killer
remove nosave
trigger restart on enable/disable
remove accept/decline notification
fix ring x2 and y2
forbid betsanc and asorm
fix password var in debug
allow random passwords
handle all effects
do not accept if not present
fix rules
check map too
warp randomly on death
fallthrough if no acceptable requests
use bitmasking instead of modulo
remove resave
simplify goback
do not re-declare randompassword
password minigame
Diffstat (limited to 'world/map/npc/functions')
-rw-r--r-- | world/map/npc/functions/global_event_handler.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index 0e5650e1..f05e3b62 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -20,7 +20,7 @@ OnPCDieEvent: // custom handlers below L_Fightclub_Killed: - set @killer, 0; + set @duel_killer, 0; if(@Duel_Fighter != 1) goto L_End; if(getmap() != "009-7") goto L_End; set $@duel_loser, getcharid(3); // grab the rid of the victim @@ -30,7 +30,7 @@ L_Fightclub_Killed: goto L_End; L_Fightclub_Die: - set @killer, 0; + set @duel_killer, 0; if(@Duel_Fighter != 1) goto L_End; if(getmap() != "009-7") goto L_End; set @killerrid, 0; // since the player was not murdered, the killerrid is 0 |