diff options
| -rw-r--r-- | world/map/npc/004-2/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/008-1/george.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/010-2/chef.txt | 27 | ||||
| -rw-r--r-- | world/map/npc/031-1/frozenbeard.txt | 10 | ||||
| -rw-r--r-- | world/map/npc/scripts.conf | 2 |
5 files changed, 26 insertions, 21 deletions
diff --git a/world/map/npc/004-2/_warps.txt b/world/map/npc/004-2/_warps.txt index 4da173a0..76eccea3 100644 --- a/world/map/npc/004-2/_warps.txt +++ b/world/map/npc/004-2/_warps.txt @@ -4,7 +4,7 @@ 004-2.gat,39,20|warp|To Room|0,-1,004-2.gat,74,29 004-2.gat,75,30|warp|To Entrance|0,-1,004-2.gat,38,21 004-2.gat,21,29|warp|To Outside|-1,-1,004-1.gat,80,32 -//004-2.gat,62,28|warp|To Basement|-1,-1,004-2.gat,21,61 +004-2.gat,62,28|warp|To Basement|-1,-1,004-2.gat,21,61 004-2.gat,20,62|warp|To First Floor|-1,-1,004-2.gat,63,27 004-2.gat,68,66|warp|To First Floor|0,-1,004-2.gat,35,19 004-2.gat,36,18|warp|To Second Floor|0,-1,004-2.gat,67,65 diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt index c4bca7f6..70725432 100644 --- a/world/map/npc/008-1/george.txt +++ b/world/map/npc/008-1/george.txt @@ -5,9 +5,9 @@ if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day) goto L_TrickOrTreat; - if (QUEST_Easter12 == 3 && ((gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) || (gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day))) - menu - "Hey George, I need to ask some questions about a crime.", L_George_Easter2012; +// if (QUEST_Easter12 == 3 && ((gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) || (gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day))) +// menu +// "Hey George, I need to ask some questions about a crime.", L_George_Easter2012; L_Begin: if (getequipid(equip_head) == 617) goto L_Pirate; 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; +//} diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt index 817dc74a..c75d6f16 100644 --- a/world/map/npc/031-1/frozenbeard.txt +++ b/world/map/npc/031-1/frozenbeard.txt @@ -1,10 +1,10 @@ // 031-1.gat,97,115,0|script|Frozenbeard|138,{ - if (QUEST_Easter12 == 2 && ((gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) || (gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day))) - menu - "I need to find a way to go back home, can you help me?", L_Frozenbeard_Default, - "I heard you know pirates from all around the world, is it true?", L_Frozenbeard_Easter2012; +// if (QUEST_Easter12 == 2 && ((gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) || (gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day))) +// menu +// "I need to find a way to go back home, can you help me?", L_Frozenbeard_Default, +// "I heard you know pirates from all around the world, is it true?", L_Frozenbeard_Easter2012; L_Frozenbeard_Default: mes "[Frozenbeard]"; @@ -33,6 +33,8 @@ L_NoMoney: mes "\"You need more money. I'll wait here while you get some.\""; close; +// lines below here belong to Easter 2012 + L_Frozenbeard_Easter2012: mes "[Frozenbeard]"; mes "\"Arrrrh mate! Ye be right! I know every single pirate in this world. But not all of them are to be trusted, I must say.\""; diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index 0e93035a..46bbe109 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -96,5 +96,5 @@ import: npc/halloween/2011/_import.txt // import: npc/xmas/2011/_import.txt // Easter 2012 -import: npc/easter/2012/_import.txt +// import: npc/easter/2012/_import.txt |