From 0c778077e5a180a38116534742d139c78fa2da55 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Thu, 8 Dec 2011 16:52:23 +0100 Subject: Christmas amendments --- world/map/npc/006-1/pachua.txt | 1 + world/map/npc/xmas/2011/badguy.txt | 8 ++-- world/map/npc/xmas/2011/beddingHelper.txt | 4 +- world/map/npc/xmas/2011/bodyguards.txt | 6 +-- world/map/npc/xmas/2011/chiefHelper.txt | 2 +- world/map/npc/xmas/2011/deliverPresentsHelper.txt | 24 ++++------ world/map/npc/xmas/2011/doll.txt | 8 ++-- world/map/npc/xmas/2011/emptyBoxesHelper.txt | 10 ++-- world/map/npc/xmas/2011/entranceHelpers.txt | 8 ++-- world/map/npc/xmas/2011/glitterHelper.txt | 6 +-- world/map/npc/xmas/2011/illHelper.txt | 2 +- world/map/npc/xmas/2011/leatherBall.txt | 10 ++-- world/map/npc/xmas/2011/plushMouboo.txt | 14 +++--- world/map/npc/xmas/2011/reinboos.txt | 14 +++--- world/map/npc/xmas/2011/santa.txt | 6 ++- world/map/npc/xmas/2011/stickReinboo.txt | 4 +- world/map/npc/xmas/2011/wrappingPaperHelper.txt | 8 ++-- world/map/npc/xmas/2011/xmas2011config.txt | 58 +++++++++++------------ 18 files changed, 93 insertions(+), 100 deletions(-) (limited to 'world/map/npc') diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt index 95a43aae..9f2d1dab 100644 --- a/world/map/npc/006-1/pachua.txt +++ b/world/map/npc/006-1/pachua.txt @@ -1,5 +1,6 @@ 006-1.gat,23,100,0|script|Pachua|143,{ set @LEATHER_PATCH_PRICE, 300; +// @wants_leather_patch is used as boolean set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK; if ((gettime(5) >= $@xmas2011_start_day) && (gettime(5) < $@xmas2011_reward_start_day) && (gettime(6) == 12) && (gettime(7) == $@xmas2011_year)) diff --git a/world/map/npc/xmas/2011/badguy.txt b/world/map/npc/xmas/2011/badguy.txt index 81f79972..085ad343 100644 --- a/world/map/npc/xmas/2011/badguy.txt +++ b/world/map/npc/xmas/2011/badguy.txt @@ -9,7 +9,7 @@ goto L_NoEvent; if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day)) goto L_RewardTime; - if ((BaseLevel > 30) && (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago + if ((BaseLevel < 30) && (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago goto L_NoHelp; set @plushmouboo, (xmas11 & $@xmas11_PlushMoubooMask) >> $@xmas11_PlushMoubooShift; @@ -136,7 +136,7 @@ L_NoBall: L_NoDoll: set @choice_idx[@choices_nr], @C_nevermind; - set @choice$[@choices_nr], "Nevermind and leave."; + set @choice$[@choices_nr], "Nevermind."; menu @choice$[0],-, @@ -250,7 +250,7 @@ L_PlushMoubooWrapping: L_StickReinbooWrapping: mes "[Balthasar]"; - mes "\"Ooh, a stickreinboo! Don't you think this is an invidious thing for the reinboos? Really really mean, yes."; + mes "\"Ooh, a stickreinboo! Don't you think this is an obnoxious thing? Really really mean, yes."; mes "Do you know, reinboos are clever, they can even speak. And this is a toy reinboo! Very very disrespectful, right?\""; next; mes "\"Do you think... do you think we should punish the brat that wished for this disrespectful toy? I think so, yes, disrespectful brat."; @@ -362,7 +362,7 @@ L_ToyAgain: L_NoToyReward: if (@sabotagepoints < $@xmas2011_gloves_rewardcost) goto L_NoGlovesReward; - set @gloves, $@glove_id + rand(10); + set @gloves, $@xmas2011_glove_id + rand(10); getitem @gloves, 1; set @sabotagepoints, @sabotagepoints - $@xmas2011_gloves_rewardcost; mes "\"This will help to keep your hands warm when operating in such cold areas.\""; diff --git a/world/map/npc/xmas/2011/beddingHelper.txt b/world/map/npc/xmas/2011/beddingHelper.txt index 0398505c..7f51e3df 100644 --- a/world/map/npc/xmas/2011/beddingHelper.txt +++ b/world/map/npc/xmas/2011/beddingHelper.txt @@ -26,12 +26,12 @@ L_Helping: mes "[Osmo]"; - mes "\"You just came here in the right moment. I was informed that our bedding material for fragile presents is nearly expended."; + mes "\"You just came here in the right moment. I was informed that our bedding material for fragile presents is nearly depleted."; mes "Could you bring me " + @bedding_amount + " White Furs?\""; next; mes "[Osmo]"; mes "\"Take care that it's real White Fur."; - mes "Other materials tend to go out of place in the present box, leaving the fragile content extradited to any pushes.\""; + mes "Other materials tend to go out of place in the present box, leaving the fragile content unprotected from any pushes.\""; set xmas11, xmas11 | $@xmas11_Bedding; goto L_Close; diff --git a/world/map/npc/xmas/2011/bodyguards.txt b/world/map/npc/xmas/2011/bodyguards.txt index 84eda7a7..4ce1900e 100644 --- a/world/map/npc/xmas/2011/bodyguards.txt +++ b/world/map/npc/xmas/2011/bodyguards.txt @@ -26,7 +26,7 @@ L_NoEvent: L_RewardTime: mes "[Vilhelmiina]"; - mes "\"Santa welcomes visitors now. You may enter.\""; + mes "\"Santa is ready to see visitors now. You may enter.\""; goto L_Close; L_Close: @@ -111,10 +111,8 @@ L_RewardTime: 030-1.gat,99,53,0|script|#Door|127,1,1,{ if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) - goto L_NoEvent; + end; warp "030-2.gat", 88, 50; - -L_NoEvent: end; } diff --git a/world/map/npc/xmas/2011/chiefHelper.txt b/world/map/npc/xmas/2011/chiefHelper.txt index 5e87ebac..21d5b031 100644 --- a/world/map/npc/xmas/2011/chiefHelper.txt +++ b/world/map/npc/xmas/2011/chiefHelper.txt @@ -8,7 +8,7 @@ goto L_NoEvent; if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day)) goto L_RewardTime; - if ((BaseLevel > 30) && (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago + if ((BaseLevel < 30) && (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago goto L_NoHelp; if (xmas11 & $@xmas11_talkedToChief) goto L_Helping; diff --git a/world/map/npc/xmas/2011/deliverPresentsHelper.txt b/world/map/npc/xmas/2011/deliverPresentsHelper.txt index 8bf4d9ed..bb26e768 100644 --- a/world/map/npc/xmas/2011/deliverPresentsHelper.txt +++ b/world/map/npc/xmas/2011/deliverPresentsHelper.txt @@ -182,31 +182,23 @@ L_Wrap: goto L_Deliver; L_Deliver: - if ((@toy$ == "PlushMouboo") && (@plushmouboo == 3)) - set @plushmouboo, 5; - if ((@toy$ == "PlushMouboo") && (@plushmouboo == 4)) - set @plushmouboo, 6; + if (@toy$ == "PlushMouboo") + set @plushmouboo, @plushmouboo + 2; if (@toy$ == "PlushMouboo") set xmas11, (xmas11 & ~($@xmas11_PlushMoubooMask) | (@plushmouboo << $@xmas11_PlushMoubooShift)); - if ((@toy$ == "StickReinboo") && (@stickreinboo == 3)) - set @stickreinboo, 5; - if ((@toy$ == "StickReinboo") && (@stickreinboo == 4)) - set @stickreinboo, 6; + if (@toy$ == "StickReinboo") + set @stickreinboo, @stickreinboo + 2; if (@toy$ == "StickReinboo") set xmas11, (xmas11 & ~($@xmas11_StickReinbooMask) | (@stickreinboo << $@xmas11_StickReinbooShift)); - if ((@toy$ == "LeatherBall") && (@ball == 3)) - set @ball, 5; - if ((@toy$ == "LeatherBall") && (@ball == 4)) - set @ball, 6; + if (@toy$ == "LeatherBall") + set @ball, @ball + 2; if (@toy$ == "LeatherBall") set xmas11, (xmas11 & ~($@xmas11_BallMask) | (@ball << $@xmas11_BallShift)); - if ((@toy$ == "Doll") && (@doll == 3)) - set @doll, 5; - if ((@toy$ == "Doll") && (@doll == 4)) - set @doll, 6; + if (@toy$ == "Doll") + set @doll, @doll + 2; if (@toy$ == "Doll") set xmas11, (xmas11 & ~($@xmas11_DollMask) | (@doll << $@xmas11_DollShift)); diff --git a/world/map/npc/xmas/2011/doll.txt b/world/map/npc/xmas/2011/doll.txt index a436c4bf..ba4f82b5 100644 --- a/world/map/npc/xmas/2011/doll.txt +++ b/world/map/npc/xmas/2011/doll.txt @@ -111,7 +111,7 @@ L_Doll: mes "\"Alright, let's start.\""; mes "He takes your items and start to many different things."; mes "He dyes the Cotton Cloths and while waiting for it to dry, he takes out a doll without hair, clothes and face from his workbench."; - mes "It seems he already prepared that. He rummages in another drawer of his workbench and pulls out a ball of red wool."; + mes "It seems he has already prepared that. He rummages in another drawer of his workbench and pulls out a ball of red wool."; mes "While attaching strings of wool to the dolls head, he talks to you."; next; mes "[Raimo]"; @@ -119,12 +119,12 @@ L_Doll: mes "All kind of material deliveries went wrong, the guys up in the office are all roused up because their paperwork got mixed up and I heard some of the Reinboos are lost!\""; next; mes "\"It's kind of odd, isn't it?\""; - mes "While he was talking, he finished attaching the hair and got to tailor a cute little dress from the dyed Cotton Cloths."; - mes "He carefully puts on the dressand takes the Hard Spikes you gave him."; + mes "While he is talking, he finishes attaching the hair and get to tailor a cute little dress from the dyed Cotton Cloths."; + mes "He carefully puts on the dress and takes the Hard Spikes you gave him."; next; mes "[Raimo]"; mes "\"These spikes are excellent for making eyes, have a look.\""; - mes "He takes a sharp knife and starts carving them. After a short while he has managed to bring them in a round shape, with a gap on the backside part. He takes a needle and sewing thread and attches them to the dolls face."; + mes "He takes a sharp knife and starts carving them. After a short while he has managed to bring them in a round shape, with a gap on the backside part. He takes a needle and sewing thread and attaches them to the doll's face."; next; mes "[Raimo]"; mes "\"Alright, it's done. Could you please bring it to Aaron?\""; diff --git a/world/map/npc/xmas/2011/emptyBoxesHelper.txt b/world/map/npc/xmas/2011/emptyBoxesHelper.txt index 8e22f077..428acfe8 100644 --- a/world/map/npc/xmas/2011/emptyBoxesHelper.txt +++ b/world/map/npc/xmas/2011/emptyBoxesHelper.txt @@ -20,13 +20,13 @@ L_Helping: mes "[Urmas]"; - mes "\"Ah, I see you're one of the auxiliary forces. Ok, listen to me."; - mes "\"We have a narrow on the empty present boxes. Don't ask me how that can happen!"; + mes "\"Ah, I see you're one of the seasonal helpers. Ok, listen to me."; + mes "\"We have a shortage on the empty present boxes. Don't ask me how that can happen!"; mes "Those paper-shufflers up there probably messed up the ordering or something. Pah.\""; next; - mes "\"However, we need to fix it."; - mes "Bring me some wood, so I can make boxes out of it."; - mes "I think " + @log_amount + " Raw Logs will do for one box.\""; + mes "\"However, we need to fix it. I have only a few boxes left."; + mes "Bring me some wood, so I can make new boxes out of it."; + mes @log_amount + " Raw Logs will do for one box.\""; if (countitem("RawLog") < @log_amount) goto L_Close; next; diff --git a/world/map/npc/xmas/2011/entranceHelpers.txt b/world/map/npc/xmas/2011/entranceHelpers.txt index 03a606aa..fe712bf2 100644 --- a/world/map/npc/xmas/2011/entranceHelpers.txt +++ b/world/map/npc/xmas/2011/entranceHelpers.txt @@ -13,9 +13,9 @@ mes "No matter what I do they always come back!\""; next; mes "\"How am I supposed to work under these conditions!"; - mes "This is absoutely not acceptable! Those icky slimes!\""; + mes "This is unacceptable! Those icky slimes!\""; next; - mes "\"They occupied the entire basement where all our materials and all the remaining presents are stored."; + mes "\"They have occupied the entire basement where all our materials and all the remaining presents are stored."; mes "Grrrr.\""; mes "He seems too freaked out to have a decent conversation."; goto L_Close; @@ -28,7 +28,7 @@ L_NoEvent: L_RewardTime: mes "[Vellamo]"; - mes "\"The slimes are still there.\""; + mes "\"That annoying slimes are still there.\""; mes "Vellamo seems to be totally overwrought."; goto L_Close; @@ -52,7 +52,7 @@ L_Close: "Thank you.",L_Close; mes "[Valterri]"; mes "\"Isn't it obvious? Magic!"; - mes "Santa is a member of the Sages of Kazei, a council of powerful wizards who rule our lands.\""; + mes "Santa is a member of The Sages of Kazei, which is a council of powerful wizards who rule our lands.\""; goto L_Close; L_RewardTime: diff --git a/world/map/npc/xmas/2011/glitterHelper.txt b/world/map/npc/xmas/2011/glitterHelper.txt index 3ceba9a5..d35d3913 100644 --- a/world/map/npc/xmas/2011/glitterHelper.txt +++ b/world/map/npc/xmas/2011/glitterHelper.txt @@ -33,7 +33,7 @@ L_Helping: next; mes "[Eljas]"; mes "\"But make sure it is really gempowder and not some kind of cheap replacement."; - mes "You know, our decoration glitter is intensified by some magic, and that only works with real gempowders. Otherwise it'll loose its effect after a while.\""; + mes "You know, our decoration glitter is intensified by some magic, and that only works with real gempowders. Otherwise it'll lose its effect after a while.\""; set xmas11, xmas11 | $@xmas11_Decoration; goto L_Close; @@ -72,7 +72,7 @@ L_FakePowders: delitem "RedPowder", @red_amount; delitem "YellowPowder", @yellow_amount; set xmas11, xmas11 | $@xmas11_DecorationDone; - mes "He doesn't notice that you're giving him faked powders."; + mes "He doesn't notice that you're giving him fake powders."; mes "[Eljas]"; mes "\"Excellent! Thank you very much.\""; goto L_Close; @@ -80,7 +80,7 @@ L_FakePowders: L_Done: mes "[Eljas]"; if (xmas11 & $@xmas11_Decoration) - mes "\"The powders you gave me seem to be of poor quality.\""; + mes "\"Even after your help, the powder still isn't working right. Maybe it got wet.\""; if (!(xmas11 & $@xmas11_Decoration)) mes "\"Thanks for bringing the powders.\""; goto L_Close; diff --git a/world/map/npc/xmas/2011/illHelper.txt b/world/map/npc/xmas/2011/illHelper.txt index 7e8e2a0e..e388e749 100644 --- a/world/map/npc/xmas/2011/illHelper.txt +++ b/world/map/npc/xmas/2011/illHelper.txt @@ -73,7 +73,7 @@ L_Cactus: L_Done: mes "[Ismo]"; if (xmas11 & $@xmas11_Potion) - mes "\"I don't really feel better yet. Are you sure you gave me a Small Healing Potion?\""; + mes "\"I don't really feel better yet. Maybe it takes a moment to take effect?\""; if (!(xmas11 & $@xmas11_Potion)) mes "\"Thanks for bringing me the Small Healing Potion, I feel slightly better now.\""; goto L_Close; diff --git a/world/map/npc/xmas/2011/leatherBall.txt b/world/map/npc/xmas/2011/leatherBall.txt index 1397adc5..9a8bf5cd 100644 --- a/world/map/npc/xmas/2011/leatherBall.txt +++ b/world/map/npc/xmas/2011/leatherBall.txt @@ -35,7 +35,7 @@ L_Helping: "What is it?",-; mes "[Tarmo]"; mes "\"The form? It's an order for a toy. We have a shortage on material this year. Some things went wrong with the delivery of it."; - mes "That's why we produce only explicitely ordered toys this year.\""; + mes "That's why we produce only explicitly ordered toys this year.\""; goto L_Close; L_Ordered: @@ -52,7 +52,7 @@ L_NoEvent: L_RewardTime: mes "[Tarmo]"; - mes "\"Given all the adversities we did a pretty good job I think.\""; + mes "\"Given all the misfortunes we did a pretty good job I think.\""; goto L_Close; L_Close: @@ -78,7 +78,7 @@ L_Close: mes "[Busy Helper]"; mes "\"Hello there. I hope you have a good time visiting Santa's home."; - mes "We're usually more hospitable, but this year... I don't know why, but everything goes wrong.\""; + mes "We're usually more hospitable, but this year... I don't know why, but everything is going wrong.\""; goto L_Close; L_Helping: @@ -116,7 +116,7 @@ L_LeatherBall: getitem "LeatherBall", 1; mes "[Iivo]"; mes "\"Great!\""; - mes "He takes the material and starts to cut the leather in pieces and seam them together."; + mes "He takes the material and starts to cut the leather in pieces. Afterwards he seams them together."; mes "It seems to be hard to stitch the leather and takes a while."; next; mes "You get distracted and start daydreaming."; @@ -142,7 +142,7 @@ L_NoEvent: L_RewardTime: mes "[Iivo]"; - mes "\"This year's Christmas prepations really were a huddle. I hope we'll do better next year.\""; + mes "\"This year's Christmas prepations really were chaotic. I hope we'll do better next year.\""; goto L_Close; L_NoItems: diff --git a/world/map/npc/xmas/2011/plushMouboo.txt b/world/map/npc/xmas/2011/plushMouboo.txt index cbb154af..0cc21d49 100644 --- a/world/map/npc/xmas/2011/plushMouboo.txt +++ b/world/map/npc/xmas/2011/plushMouboo.txt @@ -20,7 +20,7 @@ if (@plushmouboo > 0) goto L_Ordered; if (xmas11 & $@xmas11_talkedToChief) goto L_Helping; - mes "You see some guy grubbing in a huge bunch of paper."; + mes "You see some guy grubbing in a huge mound of paper."; mes "[Busy Helper]"; mes "\"Where is this fu-\""; mes "He suddenly notices you nearby."; @@ -98,10 +98,10 @@ L_Helping: mes "That's very kind of you.\""; next; mes "\"Though I can't do anything right now."; - mes "I'm specialized in making plush toys. Usually I'd just create dozens of them and if they aren't on this years wishing lists, they'd be used next year.\""; + mes "I'm specialized in making plush toys. Usually I'd just create dozens of them and if they aren't on this year's wishlists, they'd be used next year.\""; mes "He sighs."; next; - mes "\"But since we're short in material we got the order to only create toys that are requested."; + mes "\"But since we're short in material, we got the order to only create toys that are requested."; mes "And now I sit here and wait to get such an order. But the guys up in the office seems to have some problems to get their paperwork done."; mes "Maybe you can go up there and ask if there's a plush toy to make?\""; goto L_Close; @@ -154,11 +154,11 @@ L_PlushMouboo: mes "Finally he adds some knob for the eyes and presents you the Plush Mouboo."; next; mes "[Launo]"; - mes "\"Here you go! Isn't it felicitous?\""; + mes "\"Here you go! Isn't it delightful?\""; menu "Wow, that was quick!",-; mes "[Launo]"; - mes "\"Well yeah, I'm used to work quickly. Usually we produce much more toys.\""; + mes "\"Well yeah, I'm used to work quickly. Usually we produce many more toys.\""; mes "However, now it needs to be put in a present box and then that box have to be wrapped.\""; next; mes "\"Could you take care about that? Urmas should have some boxes for you and Reino takes care about the wrapping paper."; @@ -167,7 +167,7 @@ L_PlushMouboo: L_PlushMoubooDone: mes "[Launo]"; - mes "\"I feel much better now after I got some work done. Please take care about packing, wrapping and giving it to Aaron.\""; + mes "\"I feel much better now after I got some work done. Please take care about packing, wrapping, and giving it to Aaron.\""; goto L_Close; L_NoEvent: @@ -178,7 +178,7 @@ L_NoEvent: L_RewardTime: mes "[Launo]"; - mes "\"Hu, it was really stressful this year."; + mes "\"Huh, it was really stressful this year."; mes "But imagining the happy kids cuddling the plush toys I made - that makes amends for all that.\""; goto L_Close; diff --git a/world/map/npc/xmas/2011/reinboos.txt b/world/map/npc/xmas/2011/reinboos.txt index 4fcfbcba..efb7f59a 100644 --- a/world/map/npc/xmas/2011/reinboos.txt +++ b/world/map/npc/xmas/2011/reinboos.txt @@ -30,7 +30,7 @@ L_Help: "Nevermind.",L_Close; mes "[Santa's Helper]"; mes "\"He did? Well, I indeed have a problem."; - mes "I'm Grombadil, the equerry of Santa's Reinboos.\""; + mes "I'm Grombadil, Santa's equerry - the person in charge of the Reinboos."; next; mes "\"Those Reinboos, you know, are much more clever than a normal animal and can even talk."; mes "But they are more like children than an adult.\""; @@ -55,7 +55,7 @@ L_Help: mes "\"Oh, one thing before you leave!\""; next; mes "\"As I told you, they're a bit like children. And as children they love all kind of candy."; - mes "But it's not good for them, they get their stomache upset from eating sweet stuff.\""; + mes "But it's not good for them, they get their stomach upset from eating sweet stuff.\""; next; mes "\"So don't give them candy! You might want to take some apples with you, that's much better for them."; mes "Red apples. Don't give them candy. Good luck.\""; @@ -78,7 +78,7 @@ L_NoEvent: L_RewardTime: mes "[Grombadil]"; - mes "\"Hu, all this stress is finally over. You might want to talk to Santa.\""; + mes "\"All this stress is finally over. You might want to talk to Santa.\""; goto L_Close; L_Close: @@ -221,7 +221,7 @@ L_GiveApple: L_NoItem: mes "[Meireles the Reinboo]"; - mes "\"Hu? It disappeared!\""; + mes "\"Huh? It disappeared!\""; goto L_Close; L_Good: @@ -341,7 +341,7 @@ L_GiveApple: L_NoItem: mes "[Meileres the Reinboo]"; - mes "\"Hu? It disappeared!\""; + mes "\"Huh? It disappeared!\""; goto L_Close; L_Good: @@ -460,7 +460,7 @@ L_GiveApple: L_NoItem: mes "[Reilemes the Reinboo]"; - mes "\"Hu? It disappeared!\""; + mes "\"Huh? It disappeared!\""; goto L_Close; L_Good: @@ -577,7 +577,7 @@ L_GiveApple: L_NoItem: mes "[Leiremes the Reinboo]"; - mes "\"Hu? It disappeared!\""; + mes "\"Huh? It disappeared!\""; goto L_Close; L_Good: diff --git a/world/map/npc/xmas/2011/santa.txt b/world/map/npc/xmas/2011/santa.txt index 70e83e7e..028239a1 100644 --- a/world/map/npc/xmas/2011/santa.txt +++ b/world/map/npc/xmas/2011/santa.txt @@ -27,7 +27,7 @@ L_Helping: L_NoEvent: mes "[Santa]"; - mes "\"I'm sorry, we're closing this house around this time of the year.\""; + mes "\"I'm sorry, no visitors this time of the year.\""; warp "030-1.gat", 99, 55; goto L_Close; @@ -45,6 +45,8 @@ L_RewardTime: goto L_Full_Inv; mes "[Santa]"; mes "\"I see you've been helping with the preparations for Christmas.\""; + if (@sabotagepoints > 0) + mes "A sad look crosses his face."; next; if (@helppoints < $@xmas2011_main_rewardcost) goto L_NoMainReward; @@ -76,7 +78,7 @@ L_ToyAgain: L_NoToyReward: if (@helppoints < $@xmas2011_gloves_rewardcost) goto L_NoGlovesReward; - set @gloves, $@glove_id + rand(10); + set @gloves, $@xmas2011_glove_id + rand(10); getitem @gloves, 1; set @helppoints, @helppoints - $@xmas2011_gloves_rewardcost; mes "\"This will keep your hands warm.\""; diff --git a/world/map/npc/xmas/2011/stickReinboo.txt b/world/map/npc/xmas/2011/stickReinboo.txt index 0436db9c..74765c66 100644 --- a/world/map/npc/xmas/2011/stickReinboo.txt +++ b/world/map/npc/xmas/2011/stickReinboo.txt @@ -158,13 +158,13 @@ L_NoEvent: L_RewardTime: mes "[Kalevi]"; - mes "\"You know, everyone is complaining how stressfull it was this year."; + mes "\"You know, everyone is complaining how stressful it was this year."; mes "But I think it wasn't that bad at all.\""; goto L_Close; L_NoItems: mes "[Kalevi]"; - mes "\"Ha, don't tell nonsense. You don't have it, so I don't have to start working.\""; + mes "\"Ha, don't speak nonsense. You don't have it, so I don't have to start working.\""; goto L_Close; L_Close: diff --git a/world/map/npc/xmas/2011/wrappingPaperHelper.txt b/world/map/npc/xmas/2011/wrappingPaperHelper.txt index 71c132e5..aa06c2ff 100644 --- a/world/map/npc/xmas/2011/wrappingPaperHelper.txt +++ b/world/map/npc/xmas/2011/wrappingPaperHelper.txt @@ -17,7 +17,7 @@ if (xmas11 & $@xmas11_talkedToChief) goto L_Helping; mes "[Busy Helper]"; - mes "\"Excuse, but please don't interrupt. We're all very busy.\""; + mes "\"Excuse me, but please don't interrupt. We're all very busy.\""; goto L_Close; L_Helping: @@ -30,7 +30,7 @@ L_Helping: mes "For making one roll of wrapping paper, I need " + @reed_amount + " Reed Bundles, " + @water_amount + " Bottle of Water and some dye to make it colored.\""; next; L_Again: - mes "\"Let's see... This is the regulation of wrapping paper colors and designs for this year. Tell me which you want.\""; + mes "\"Let's see... These are the regulations for wrapping paper colors and designs for this year. Tell me which you want.\""; mes "He shows you some officialy looking piece of paper."; menu "Red dotted (2 Red Dyes)",L_Red, @@ -95,7 +95,7 @@ L_RedGolden: delitem "YellowDye", 1; getitem "RedGoldenStripedWrap", 1; mes "[Reino]"; - mes "\"Good choice, this is my favourite this year.\""; + mes "\"Good choice, this is my favorite this year.\""; goto L_MadePaper; L_GreenRed: @@ -107,7 +107,7 @@ L_GreenRed: delitem "GreenDye", 1; getitem "GreenRedStripedWrap", 1; mes "[Reino]"; - mes "\"Yeah, this is really Christmas styled.\""; + mes "\"Yeah, this is really Christmas-styled.\""; goto L_MadePaper; L_MadePaper: diff --git a/world/map/npc/xmas/2011/xmas2011config.txt b/world/map/npc/xmas/2011/xmas2011config.txt index d6894d74..204fe791 100644 --- a/world/map/npc/xmas/2011/xmas2011config.txt +++ b/world/map/npc/xmas/2011/xmas2011config.txt @@ -3,35 +3,35 @@ OnInit: set $@xmas2011_start_day, 10; set $@xmas2011_reward_start_day, 25; set $@xmas2011_year, 2011; - set $@glove_id, 2160; - - set $@xmas11_talkedToChief, 0x1; - set $@xmas11_talkedToBadGuy, 0x2; - - set $@xmas11_startedReinbooSearch, 0x4; - set $@xmas11_firstReinboo, 0x8; - set $@xmas11_firstReinbooDone, 0x10; - set $@xmas11_secondReinboo, 0x20; - set $@xmas11_secondReinbooDone, 0x40; - set $@xmas11_thirdReinboo, 0x80; - set $@xmas11_thirdReinbooDone, 0x100; - set $@xmas11_fourthReinboo, 0x200; - set $@xmas11_fourthReinbooDone, 0x400; - - set $@xmas11_Decoration, 0x800; - set $@xmas11_DecorationDone, 0x1000; - set $@xmas11_Bedding, 0x2000; - set $@xmas11_BeddingDone, 0x4000; - set $@xmas11_Potion, 0x8000; - set $@xmas11_PotionDone, 0x10000; - - set $@xmas11_PlushMoubooMask, 0xE0000; + set $@xmas2011_glove_id, 2160; + + set $@xmas11_talkedToChief, 0x00000001; + set $@xmas11_talkedToBadGuy, 0x00000002; + + set $@xmas11_startedReinbooSearch, 0x00000004; + set $@xmas11_firstReinboo, 0x00000008; + set $@xmas11_firstReinbooDone, 0x00000010; + set $@xmas11_secondReinboo, 0x00000020; + set $@xmas11_secondReinbooDone, 0x00000040; + set $@xmas11_thirdReinboo, 0x00000080; + set $@xmas11_thirdReinbooDone, 0x00000100; + set $@xmas11_fourthReinboo, 0x00000200; + set $@xmas11_fourthReinbooDone, 0x00000400; + + set $@xmas11_Decoration, 0x00000800; + set $@xmas11_DecorationDone, 0x00001000; + set $@xmas11_Bedding, 0x00002000; + set $@xmas11_BeddingDone, 0x00004000; + set $@xmas11_Potion, 0x00008000; + set $@xmas11_PotionDone, 0x00010000; + + set $@xmas11_PlushMoubooMask, 0x000E0000; set $@xmas11_PlushMoubooShift, 17; - set $@xmas11_StickReinbooMask, 0x700000; + set $@xmas11_StickReinbooMask, 0x00700000; set $@xmas11_StickReinbooShift, 20; - set $@xmas11_DollMask, 0x3800000; + set $@xmas11_DollMask, 0x03800000; set $@xmas11_DollShift, 23; set $@xmas11_BallMask, 0x1C000000; @@ -42,7 +42,7 @@ OnInit: // 0x80000000 - set $@xmas2011_reinboopoints, 10; + set $@xmas2011_reinboopoints, 10; // there are 4 reinboos set $@xmas2011_beddingpoints, 10; set $@xmas2011_glitterpoints, 10; set $@xmas2011_potionpoints, 10; @@ -53,15 +53,15 @@ OnInit: set $@xmas2011_totalpoints, 4*$@xmas2011_reinboopoints + $@xmas2011_beddingpoints + $@xmas2011_glitterpoints + $@xmas2011_potionpoints + $@xmas2011_plushmouboopoints + $@xmas2011_stickreinboopoints + $@xmas2011_ballpoints + $@xmas2011_dollpoints; - set $@xmas2011_main_rewardcost, 70; + set $@xmas2011_main_rewardcost, 60; set $@xmas2011_toy_rewardcost, 30; - set $@xmas2011_gloves_rewardcost, 8; + set $@xmas2011_gloves_rewardcost, 11; set $@xmas2011_gingerbreadman_rewardcost, 5; set $@xmas2011_xmascake_rewardcost, 3; set $@xmas2011_candy_rewardcost, 1; } -// calculates the points for helping and sabotating +// calculates the points for helping and sabotaging function|script|xmas2011points|{ set @plushmouboo, (xmas11 & $@xmas11_PlushMoubooMask) >> $@xmas11_PlushMoubooShift; set @stickreinboo, (xmas11 & $@xmas11_StickReinbooMask) >> $@xmas11_StickReinbooShift; -- cgit v1.2.3-60-g2f50