From 01dc57b12f8af4880ce57063bdaaf28d02269543 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Sun, 11 Apr 2010 16:55:26 +1200 Subject: Fixes to Easter 2010 --- conf/magic.conf.template | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/magic.conf.template b/conf/magic.conf.template index 5125d0cd..1e63c5f2 100644 --- a/conf/magic.conf.template +++ b/conf/magic.conf.template @@ -1328,6 +1328,16 @@ NONMAGIC SILENT SPELL easter (type : STRING) : "#m" = { doevent "Doctor#who::OnManualStopTimer"; } + ) ELSE IF (type == "DOC_SHIFT_OVERTICK_UP") THEN ( + { + set $Easter_2010_Npc_State1, ($Easter_2010_Npc_State1 & (~E10_DOCTOR_TIMER_OVERTICK_MASK << E10_DOCTOR_TIMER_OVERTICK_SHIFT)) | ((((($Easter_2010_Npc_State1 >> E10_DOCTOR_TIMER_OVERTICK_SHIFT) & E10_DOCTOR_TIMER_OVERTICK_MASK) + 1 ) << E10_DOCTOR_TIMER_OVERTICK_SHIFT)); + message strcharinfo(0), "New overtick: '" + (($Easter_2010_Npc_State1 >> E10_DOCTOR_TIMER_OVERTICK_SHIFT) & E10_DOCTOR_TIMER_OVERTICK_MASK) + "'."; + } + ) ELSE IF (type == "DOC_SHIFT_OVERTICK_DOWN") THEN ( + { + set $Easter_2010_Npc_State1, ($Easter_2010_Npc_State1 & (~E10_DOCTOR_TIMER_OVERTICK_MASK << E10_DOCTOR_TIMER_OVERTICK_SHIFT)) | ((((($Easter_2010_Npc_State1 >> E10_DOCTOR_TIMER_OVERTICK_SHIFT) & E10_DOCTOR_TIMER_OVERTICK_MASK) - 1 ) << E10_DOCTOR_TIMER_OVERTICK_SHIFT)); + message strcharinfo(0), "New overtick: '" + (($Easter_2010_Npc_State1 >> E10_DOCTOR_TIMER_OVERTICK_SHIFT) & E10_DOCTOR_TIMER_OVERTICK_MASK) + "'."; + } ) ELSE IF (type == "DOC_SHIFT_RESUME") THEN ( { doevent "Doctor#who::OnManualStartTimer"; @@ -1338,11 +1348,11 @@ NONMAGIC SILENT SPELL easter (type : STRING) : "#m" = } ) ELSE IF (type == "BLOCKER_DISABLE") THEN ( { - doevent "Control#Helper::OnBarrierDisable"; + set $Easter_2010_Npc_State2, ($Easter_2010_Npc_State2 & ~(E10_BARRIER_MASK << E10_BARRIER_SHIFT)) | (E10_BARRIER_OPEN << E10_BARRIER_SHIFT); } ) ELSE IF (type == "BLOCKER_ENABLE") THEN ( { - doevent "Control#Helper::OnBarrierEnable"; + set $Easter_2010_Npc_State2, ($Easter_2010_Npc_State2 & ~(E10_BARRIER_MASK << E10_BARRIER_SHIFT)) | (E10_BARRIER_ACTIVE << E10_BARRIER_SHIFT); } ) ELSE message(caster, "Unknown action '" + type + "'!"); -- cgit v1.2.3-60-g2f50