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/news.txt | 251 +++++++++++----------- 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 ++--- 19 files changed, 219 insertions(+), 225 deletions(-) (limited to 'world') diff --git a/world/map/news.txt b/world/map/news.txt index 322b3040..329825fb 100644 --- a/world/map/news.txt +++ b/world/map/news.txt @@ -1,33 +1,33 @@ ##3 Christmas 2011 - + ##0 Christmas is coming near and Santa and his helpers are busy ##0 preparing everything for the celebration in Santa's house near Nivalis. ##0 But somehow... everything seems to go wrong. ##0 Bad luck? Or rather - malicious interference? -##0 However, someone might need your help. - +##0 It looks like someone could use your help. + ##3 November 2011 ##3 A Rule Correction on "No Botting" - + ##3 Previously, only activity while the user was ##3 away from the keyboard was a bannable offense. ##3 Now, any sort of automated following ##3 (especially, but not only, attack-following) ##3 is also covered. - + ##3 If you know any of the people who left this game ##3 due to the prevalence of bots that were previously ##3 tolerated, please tell them it's time to return. - + ##2 ~ The Hurnscald Herald ~ - + ##3 Halloween 2011 - + ##0 Happy Halloween! ##0 This year the governments of Argaes and Tonori have decided to sponsor ##0 trick-or-treating across both continents. ##0 Have fun and don't make yourself sick by pigging out! - + ##0 Credits: ##0 initial outline - enchilado ##0 intial draft - alastrim @@ -38,11 +38,11 @@ ##0 old item - maybe Black Don ? ##0 (We're not spoiling what the items *are*) ##0 -o11c - + ##3 July 2011 - + ##0 Will Kill Monsters For Food? - + ##0 Recovery from the Great Earthquake is still ##0 very slow throughout the world. The vast ##0 devastation still causes starvation and @@ -50,7 +50,7 @@ ##0 Earthquake has been the increasing number of ##0 aggressive monsters and dooms long thought ##0 forgotten. - + ##0 To answer this problem Tulimshar ##0 has issued a call to be spread far and wide: ##0 "If you're hungry, if you need work, if you @@ -58,13 +58,13 @@ ##0 Slaying monsters, liberating mines and ##0 defeating the night horrors that terrify even ##0 the most strong willed never paid so well!" - + ##0 Needless to say, many are answering this call. ##0 You may very well be one of them. - + ##0 Olana, the Innkeeper's Daughter, Returns to ##0 Hurnscald...But Where Are Her Daughters? - + ##0 Olana, who is staying in the West wing of the ##0 Hurnscald Inn, has been away to Tulimshar with ##0 her family since before the Earthquake. @@ -73,7 +73,7 @@ ##0 I would've returned immediately, but I didn't ##0 want to put my family at risk until travel ##0 became a little safer." - + ##0 When asked about her daughters, Olana smiled ##0 "They love wandering the woods around here. ##0 Other than the occasional bandit group, things @@ -81,11 +81,11 @@ ##0 in Tulimshar. I just hope they don't wander ##0 near these caves...I've heard many of them can ##0 be quite dangerous." - + ##2 ~ The Hurnscald Herald ~ - + ##3 June 2011 - + ##0 A large shipment of gold coins was plundered ##0 by pirates. The shipment was to be sent to ##0 Tulimshar as part of their effort to control @@ -93,14 +93,14 @@ ##0 no where! They took the shipment and my pet ##0 squirrel Chompers!" Captain Zierock reported ##0 while in tears. - + ##0 It is believed the pirates divided the gold ##0 then went separate ways to spend their spoils. ##0 Ironically, these pirates were the target of ##0 monsters, who plundered them not just for ##0 their new found wealth, but also for their ##0 crunchy bones and sea salty flesh. - + ##0 On that note, be on the lookout for Green Slimes, ##0 which have grown hostile as they evolve to the ##0 harsh Tonori desert, making them a threat to @@ -108,13 +108,13 @@ ##0 pirates attempted to cross the Snake Desert, ##0 where they met the Green Slimes...and their ##0 end. - + ##0 In other news, Andra, a friend of Hinnak, has ##0 increased her agricultural knowledge and needs ##0 help keeping the soil around the farm fertile. ##0 Interested volunteers should speak with her ##0 about how to help. - + ##0 Last, but certainly not least, Agostine has ##0 returned to Nivalis. While he enjoyed his ##0 time in Tulimshar, mingling with other artisans, @@ -122,41 +122,41 @@ ##0 fabulous sweater, but nobody wanted to wear it ##0 in this hot and smelly desert. That is when I ##0 decided enough was enough. Sweat is just gross." - + ##2 ~ The Hurnscald Herald ~ - + ##3 May 2011 - + ##0 Many battle hardened warriors took some time ##0 during April and enjoyed helping the somewhat ##0 forgetful Easter Bunny make his baskets. The ##0 children surely must have enjoyed their sweets. - + ##0 The demi-god Golbenez has finally made good on ##0 his promise to open a 'place of leisure' in ##0 the form of an inn. Youngsters beware, since ##0 the entrance to this inn is near the old ##0 graveyard and could be dangerous. - + ##0 There have also been reports about a mysterious ##0 stranger roaming the beaches near Tulimshar. ##0 Be on the lookout if you are in the area. - + ##2 ~ The Hurnscald Herald ~ - + ##3 January 2011 - + ##0 Reports of bandit raids to the west of ##0 Hurnscald has mobilized the town. Those ##0 injured by these bandits may have a long stay ##0 ahead of them in Hurnscald's hospital. - + ##0 Shortly after Tulimshar loosened the tariff ##0 on travel, skill trainers have come to Mana. ##0 If one wants to improve themselves through ##0 acquiring skills, be on the lookout for these ##0 trainers. - + ##0 In other news, Taro is still missing, but ##0 Diryn, an agent of Tulimshar, has established ##0 a connection with the Kaizei area, making @@ -166,7 +166,7 @@ ##0 back can be done by finding Frozenbeard, a ##0 pioneer who is mapping a trade route to get ##0 to Nivalis by ship. - + ##0 Diryn's re-connection with Nivalis came none ##0 too soon. Golbenez, a demi-god who demanded ##0 a half billion gold pieces for building some @@ -177,26 +177,26 @@ ##0 not gift the children of the world, wizards, ##0 warriors and archers rallied to pay the ##0 demi-god his demands. - + ##0 Shortly after Santa was freed, something more ##0 sinister has come to Kaizei. The yeti. ##0 Sightings of this beast returns with stories ##0 of them. Though aggressive, their behavior ##0 seems out of place. They've never been known ##0 as cave dwellers nor to kidnap people. - + ##0 Last, but definitely not least, Dimond's Cove ##0 is observing "Burns' Supper" January 24-26th. ##0 Shanon is hosting the event, which he promises ##0 will be an excellent time for food, drink and ##0 poems. - + ##2 ~ The Hurnscald Herald ~ - + ##3 Countless candy-concerning complaints: council ##3 consequently considers citizen-composed cleanup crew ##3 Eighteenth of November 2010 - + ##0 Recently, the ancient tradition of Hallowe'en ##0 was celebrated across Argaes, Tonori and other ##0 continents. Estimated tons of sweets were given @@ -205,25 +205,25 @@ ##0 dropped on the night. Even a week and a half ##0 after Hallowe'en, many kilograms of sweets ##0 still litter our pleasant woodlands. - + ##0 After dozens of letters regarding the situation, ##0 the Hurnscald Council has said that the best ##0 solution would be to organise a team of ##0 volunteers to work on collecting dropped sweets ##0 and disposing of them - but it has yet to ##0 organise any such thing. - + ##0 In the meantime, why not do your bit and collect ##0 some sweets for yourself? If you don't mind them ##0 being a bit old, you could be able to make the ##0 biggest Hallowe'en haul in history. - + ##0 Additionally, we've been getting some reports of ##0 a rather creepy skeleton hanging around the ##0 woodland. He doesn't appear to be aggressive, ##0 but he chatters unintelligibly at passers-by. - - + + ##3 Rollback ##0 2010-11-17 ##0 @@ -250,14 +250,14 @@ ##0 The current setup is more to have something ##0 partially up, and so that people know what's ##0 going on while we try to fix things; any -##0 in-game progress made right now ##1will not +##0 in-game progress made right now##1will not ##0 persist. ##0 ##3 Server outage ##0 2010-11-16 ##0 ##0 Okay, apparently even that won't work right now. -##0 Servers will remain ##3offline##0 until we figure out +##0 Servers will remain##3offline##0 until we figure out ##0 what we can do. ##0 ##3 Server outage @@ -271,7 +271,7 @@ ##0 determined. ##0 ##0 Please note that the current state may only -##0 be ##3temporary##0, and that if usable newer backups +##0 be##3temporary##0, and that if usable newer backups ##0 are found within the next 24 hours, those will ##0 be used instead, and any character progress ##0 made may be lost. If no usable backups are @@ -307,8 +307,8 @@ ##0 ##0 Experiment, and remember to give feedback! ##0 Contact us using either: -##0 The forums at ##1forums.themanaworld.org##0, -##0 Our irc server, at ##1irc.themanaworld.org##0. +##0 The forums at##1forums.themanaworld.org##0, +##0 Our irc server, at##1irc.themanaworld.org##0. ##0 /join #themanaworld and/or ##0 /join #tmw-dev ##0 The fate of this world's reality lies in your @@ -367,7 +367,7 @@ ##0 ##3 The End is not nigh ##3 2010-06-09 - + ##0 Content and technical development is currently ##0 split between the new server and the current ##0 tmwAthena server. Once the new sever is ready @@ -376,10 +376,10 @@ ##0 your old character on tmwAthena - or both! ##0 The tmwAthena server will keep running as ##0 long as there are people who want to play there. - + ##3 Keep an eye out for temporary events! ##3 2010-06-09 - + ##0 The Easter 2010 and Christmas 2009 special quests ##0 were enjoyed by many, and we will try to announce ##0 such events more visibly in the future. But though @@ -388,24 +388,24 @@ ##0 people, player-vs-player madness, drop parties, you ##0 name it. You do not need any special status to run ##0 an event yourself, just ask for help if you need any. - + ##3 News backlog continues ##3 2010-06-09 - + ##0 There were a few quick server crashes last weekend ##0 and on Monday. The server has stabilized for now, ##0 and there's a project to buy more memory for it to ##0 avoid future crashes. Thank you for your donations! - + ##0 In older news, a month ago there was some data ##0 lost on the Manaworld wiki and bugtracker due to ##0 briefly running out of hard disk space - not due ##0 to a new censorship system, as someone seemed to ##0 have thought. ;) - + ##3 Skill Changes ##3 2009-10-27 - + ##0 For simplification and realism purposes, the old ##0 basic skill has been removed. Emote, trade, and ##0 party-related abilities are now available in @@ -414,46 +414,46 @@ ##0 that give them out in Tulimshar. Don't worry, ##0 this won't affect existing parties, and sitting ##0 will always be available from now on. - + ##3 Undead? ##3 2009-10-27 - + ##0 Reports of undead south west of Dimond's Cove ##0 been pouring in. More later. - + ##2 ~ The Hurnscald Herald ~ - + ##3 Magic Fixes ##3 2009-09-15 - + ##0 The second tier healing spell no longer works on ##0 yourself, it will still take mana if you try to ##0 cast it on dead players. We're working to fix ##0 that. It will halt health regeneration when used. - + ##0 Making lifestones now prioritizes bug legs, then ##0 maggot slime, then the herbs. - + ##3 Technical updates ##3 2009-08-16 - + ##0 GMs will now have their nicks highlighted in ##0 newer clients. - + ##0 The automatic bans for spam have been ##0 adjusted. You will no longer be banned for ##0 trade spam, it will just be ignored by the ##0 server. Sit spam is now checked for and extra ##0 packets are ignored. - + ##3 Has Magic Returned? ##3 2009-05-31 - + ##0 A string of curious incidents have left Hurnscald ##0 citizens baffled, and raised questions about ##0 whether magic might have made a come-back in ##0 our peaceful province. - + ##0 Tulimshar healer Elanore reports that a small ##0 group of novice healers have sought to become ##0 her apprentices-- for the first time in years. @@ -464,18 +464,18 @@ ##0 over night! Can there be any natural explanation ##0 for these events? We do ask our readers to keep ##0 their eyes open! - + ##2 ~ The Hurnscald Herald ~ - + ##3 Central Tulimshar ##3 2009-02-11 - + ##0 Central Tulimshar is now open again. Work ##0 continues on the rest of the city. - + ##3 Rebalancing ##3 2009-01-19 - + ##0 The rebalancing done on enigma (our official ##0 test server) is now on our main server. Work is ##0 being done on getting the next testing period @@ -483,7 +483,7 @@ ##0 the desert especially has different monster ##0 positions. Monster exp has been reworked as ##0 well. - + ##0 The cotton boots are finally available in ##0 certain shops. Also, as most of you have already ##0 seen, hair styles have been reorganized so both @@ -491,10 +491,10 @@ ##0 can see them all. Older clients will only see the ##0 male styles. New hair colors are in the works as ##0 well. - + ##3 Open Testing on Official Test Server ##3 2009-01-04 through 2009-01-11 - + ##0 A testing period on enigma (our official test ##0 server) has started. Experience and drop rates ##0 are 10 times higher than normal during this @@ -504,17 +504,17 @@ ##0 though all currently supported clients are ##0 welcome. Please direct all feedback to the ##0 appropriate thread on the forums. - + ##0 To participate in this testing, set your server ##0 to enigma.dy.fi. Enigma shouldn't be used ##0 between open test periods, as the content ##0 may be in an unusable state. Characters and ##0 accounts may be wiped at any time between ##0 testing periods. - + ##3 Monster Mutations and Experience Point Changes ##3 2008-12-10 - + ##0 We have rebalanced monster experience points ##0 and added two new mechanisms to make the ##0 game more challenging: monster mutations, by @@ -527,58 +527,58 @@ ##0 increase, we have reduced base experience points ##0 for low and medium-level monsters, though we ##0 expect levelling to be easier overall. - + ##2 The TMW development team - + ##3 Mines and weddings! ##3 2008-10-11 - + ##0 A new mining operation has started north of ##0 town. The company's director has stated that ##0 the mine's output has been sufficient and no ##0 problems have been encountered. - + ##0 A new wedding officiator has been ##0 commissioned. She has set up shop west of ##0 town. Many couples are rejoicing that a new ##0 officiator is in the region. - + ##2 ~ Hurnscald Gazette ~ - + ##3 Volcano erupted! ##3 14/09/2008 - + ##0 A volcano has erupted east of the city, causing ##0 major damage. Repairs are under way. The guard ##0 has cautioned that the new beach area that was ##0 opened up by the rumbling should be explored ##0 with caution. - + ##0 In related news, local alchemists have stated ##0 that the ash from the eruption is what caused ##0 many items of clothing to be bleached. - + ##2 ~ Tulimshar Herald ~ - + ##3 Strange stones appeared and pass cleared ##3 15/04/2008 - + ##0 Strange stones appeared in towns all over The ##0 Mana World. No one knows how they appeared ##0 and what they are good for. Can you solve their ##0 riddle? - + ##0 In other news: The pass to the southeast of the ##0 desert has been cleared and a mountain area ##0 with a lot of snakes has been discovered behind ##0 it. Rumors say that an eremite lives in that ##0 area who is a genius at leatherworks. - + ##2 The Mana World News - + ##3 Fast attack bug fixed, gameplay changes ##3 07/04/2008 - + ##0 This weekend a fix was applied for the bug that ##0 allowed you to attack with light-speed with ##0 several weapons. We understand this changes @@ -587,100 +587,101 @@ ##0 of this bug has effectively prevented us from ##0 ever being able to balance the gameplay ##0 properly. - + ##0 Please stay with us and allow us some time to ##0 make the necessary adjustments. Suggestions are ##0 welcome! - + ##2 TMW Development Team - + ##3 The Mana World 0.0.24 released ##3 24/12/2007 - + ##0 Female-specific hairstyles, XP gaining ##0 notification and improved resource caching are ##0 but three examples of the new features in this ##0 release. A lot of bug fixes where also made. ##0 See the full details on the website! - + ##2 Bjorn Lindeijer - + ##3 Village of Hurnscald released ##3 21/08/2007 - + ##0 The village of Hurnscald has been released ##0 today. You will find this little village in the ##0 woodland (try to explore paths you found ##0 blocked before). In Hurnscald you will find two ##0 new quests, new items and a lot of little ##0 surprises. Enjoy! - + ##2 Crush - + ##3 The Mana World 0.0.23 released ##3 04/06/2007 - + ##0 A particle engine was added, which allowed us ##0 to add several nice effects to various locations ##0 in the world as well as effects based on hitting ##0 enemies or going level up. A series of bug fixes ##0 was also made. - + ##2 Bjorn Lindeijer - + ##3 The Mana World 0.0.22.2 released ##3 17/02/2007 - + ##0 Several small fixes have been made and we ##0 hope to have solved some updater problems. ##0 Upgrade whenever you're ready. - + ##2 Bjorn Lindeijer - + ##3 Soulless characters deleted and money cut ##3 21/01/2007 - + ##0 A long time ago we have allowed characteres to ##0 sell their soul in order to gain additional ##0 powers. They were explicitly warned that they ##0 would be eventually deleted. This time has now ##0 come. - + ##0 In addition, we have cut the fortune of ##0 anybody who had more than 10.000 GP. - + ##2 Bjorn Lindeijer - + ##3 Server address change! ##3 17/01/2007 - + ##0 The animesites.de host is no longer available. ##0 We thank Ultramichy for hosting us for so long ##0 at no cost! The new server address is: - + ##1 server.themanaworld.org - + ##0 We are now kindly hosted on platinum, thanks ##0 to Platyna. - + ##2 Bjorn Lindeijer - + ##3 The Mana World 0.0.22.1 released ##3 15/01/2007 - + ##0 A minor update was released based on the new ##0 Guichan 0.6.0. Some small fixes are also ##0 included. - + ##2 Bjorn Lindeijer - + ##3 The Mana World 0.0.22 released ##3 24/12/2006 - + ##0 On the edge of Christmas, we've released a ##0 new client version. A Christmas event is ##0 expected to start soon and you'll need the ##0 new client for it, so go get it! Read the ##0 NEWS for file details on what's new. - + ##2 Bjorn Lindeijer + 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-70-g09d2