diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-10-30 13:37:33 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-10-30 13:37:33 -0700 |
| commit | b2a2b2154e9b6ad235458f853fd7049525dba9e8 (patch) | |
| tree | 041f927f0b5642039543dc700a9e69c8671e3000 /world | |
| parent | 0de5ecad9758520e3c5e3f2490decf8a5c2019dc (diff) | |
| download | serverdata-2013.10.30.tar.gz serverdata-2013.10.30.tar.bz2 serverdata-2013.10.30.tar.xz serverdata-2013.10.30.zip | |
remove unequipbyid until unequipcb is merged and don't make quest logic dependent on debugv2013.10.30
Diffstat (limited to 'world')
| -rw-r--r-- | world/map/npc/008-1/annualeaster.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/026-1/munro.txt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index e4ed6b1b..a06099a1 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -168,7 +168,7 @@ OnTimer1000: set $@AEASTER_mapcount, 1 + getmapusers("008-1.gat") / 3; set $@isEaster, 0; - if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25) || debug) + if ((gettime(6) == 3 && gettime(5) >= 22) || (gettime(6) == 4 && gettime(5) <= 25)) set $@isEaster, 1; if (!$@wasEaster && $@isEaster) diff --git a/world/map/npc/026-1/munro.txt b/world/map/npc/026-1/munro.txt index 5db5709d..1151e3b8 100644 --- a/world/map/npc/026-1/munro.txt +++ b/world/map/npc/026-1/munro.txt @@ -37,7 +37,6 @@ L_Nothing: L_Exit: close; - end; } 026-1.gat,25,37,0|script|#AnnualHalloween|-1, @@ -65,7 +64,7 @@ OnTimer1000: L_enablemunro: enablenpc "Munro"; goto L_End; - + L_disablemunro: disablenpc "Munro"; @@ -76,13 +75,13 @@ L_End: function|script|CheckMunro|, { - if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5) || debug) + if ((gettime(6) == 10 && gettime(5) >= 27) || (gettime(6) == 11 && gettime(5) <= 5)) goto L_Return; - if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26) || debug) + if ((gettime(6) == 12 && gettime(5) >= 23) || (gettime(6) == 12 && gettime(5) <= 26)) goto L_Return; - unequipbyid @slotId; + // unequipbyid @slotId; L_Return: return; |