diff options
Diffstat (limited to 'world/map/npc')
| -rw-r--r-- | world/map/npc/functions/global_event_handler.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/magic/_procedures.txt | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt index 4d453c83..ad1ba65c 100644 --- a/world/map/npc/functions/global_event_handler.txt +++ b/world/map/npc/functions/global_event_handler.txt @@ -13,6 +13,7 @@ OnPCLoginEvent: callfunc "ClearVariables"; // removes / converts old variables callfunc "DisplayMOTD"; // send the motd to the client, if enabled callfunc "getBroadcast"; // get the scheduled broadcast, if any + addtimer 0, "Magic Timer::OnLogin"; // prevent cast rate abuse // add more here set @login_event, 2; end; @@ -29,7 +30,7 @@ OnPCDieEvent: callfunc "fightclub_GoBack"; // this used by the battle master //callfunc "fightclub_event_die"; // this is used by the 1v1 arena set @necromancer, 0; - set @_M_BLOCK, 0; // reset magic block on death + addtimer 0, "Magic Timer::OnClear"; // reset magic block on death set @killerrid, 0; // reset killer rid end; diff --git a/world/map/npc/magic/_procedures.txt b/world/map/npc/magic/_procedures.txt index 466d8ca8..d3c63bf7 100644 --- a/world/map/npc/magic/_procedures.txt +++ b/world/map/npc/magic/_procedures.txt @@ -12,6 +12,12 @@ function|script|magic_register -|script|Magic Timer|32767 { end; + +OnLogin: + set @_M_BLOCK, 1; + addtimer 10000, "Magic Timer::OnClear"; + end; + OnClear: set @_M_BLOCK, 0; end; @@ -24,6 +30,8 @@ function|script|magic_checks if(getpvpflag(1)) set .@r, 1; // FIXME: make HIDDEN into a param if(@_M_BLOCK) set .@r, 2; // check if last debuff ended if(Hp < 1) set .@r, 3; // can not cast when dead + if (.@r) + smsg SMSG_FAILURE, "Magic: Impossible to cast right now."; return .@r; } |