diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2012-04-21 11:06:33 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2012-04-21 11:34:55 +0200 |
| commit | 9f096abc9e427fee702b7bd9075febb09ffd3078 (patch) | |
| tree | d59e5101278e10beeed081e6cab820b5ac1077a3 /world/map/npc/010-2 | |
| parent | 9e68eaf60e4eda3a90aa5076289c5c9870b3b2ce (diff) | |
| download | serverdata-9f096abc9e427fee702b7bd9075febb09ffd3078.tar.gz serverdata-9f096abc9e427fee702b7bd9075febb09ffd3078.tar.bz2 serverdata-9f096abc9e427fee702b7bd9075febb09ffd3078.tar.xz serverdata-9f096abc9e427fee702b7bd9075febb09ffd3078.zip | |
Remove Easter Event 2012
1) Comment out Easter scripts.
2) Revert "Remove warp on 004-2 to basement for Easter Event. To be reverted later."
This reverts commit 3c5c9a539f95d71bd8c59580304e2949f13f8572.
Diffstat (limited to 'world/map/npc/010-2')
| -rw-r--r-- | world/map/npc/010-2/chef.txt | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt index b88fac3a..f0b391a0 100644 --- a/world/map/npc/010-2/chef.txt +++ b/world/map/npc/010-2/chef.txt @@ -9,11 +9,12 @@ // if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 8) goto L_MakeJellyBean; // if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 9) goto L_SeeBunny; - if (!(gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) && !(gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)) goto L_Begin; - if (QUEST_Easter12 == 6) goto L_Easter2012_Begin; - if (QUEST_Easter12 == 7) goto L_Easter2012_Wait; - if (QUEST_Easter12 == 8) goto L_Easter2012Foolplayers; - if (QUEST_Easter12 == 9) goto OnEaster2012Out; +// lines belong to Easter 2012: +// if (!(gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) && !(gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)) goto L_Begin; +// if (QUEST_Easter12 == 6) goto L_Easter2012_Begin; +// if (QUEST_Easter12 == 7) goto L_Easter2012_Wait; +// if (QUEST_Easter12 == 8) goto L_Easter2012Foolplayers; +// if (QUEST_Easter12 == 9) goto OnEaster2012Out; L_Begin: mes "[Chef]"; @@ -202,6 +203,8 @@ L_SeeBunny: goto L_Begin; close; +// Lines below here belong to Easter 2012: + L_Easter2012_Begin: mes "[Chef]"; mes "\"Ahh, " + strcharinfo(0) + "! I really need to talk to you. Did the Easter Bunny give you a very thick and heavy pan?\""; @@ -334,10 +337,10 @@ L_Close: close; } -010-2.gat,28,31,0|script|#chefproposition|32767,0,0{ -OnTouch: - if (gettime(7) != $@easter2012_year || QUEST_Easter12 != 8 || !((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day) && (gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day))) - end; - doevent "Chef::OnEaster2012Out"; - end; -} +//010-2.gat,28,31,0|script|#chefproposition|32767,0,0{ +//OnTouch: +// if (gettime(7) != $@easter2012_year || QUEST_Easter12 != 8 || !((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day) && (gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day))) +// end; +// doevent "Chef::OnEaster2012Out"; +// end; +//} |