diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2011-11-16 18:27:03 +0100 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-11-16 19:44:11 +0100 |
commit | d6e40e7eaafe3b1979a71ffc7e58a6ff9f66705d (patch) | |
tree | 24673682cdf10f160e8c22247995a1d79bc8bf91 /world | |
parent | 206c3720a29b0db6c73ea534bd3f34bacaef17de (diff) | |
download | serverdata-d6e40e7eaafe3b1979a71ffc7e58a6ff9f66705d.tar.gz serverdata-d6e40e7eaafe3b1979a71ffc7e58a6ff9f66705d.tar.bz2 serverdata-d6e40e7eaafe3b1979a71ffc7e58a6ff9f66705d.tar.xz serverdata-d6e40e7eaafe3b1979a71ffc7e58a6ff9f66705d.zip |
Removed all trailing whitespaces.
Diffstat (limited to 'world')
-rw-r--r-- | world/map/npc/007-1/voltain.txt | 6 | ||||
-rw-r--r-- | world/map/npc/easter/2010/Blocker.txt | 2 | ||||
-rw-r--r-- | world/map/npc/easter/2010/Doctor2.txt | 2 | ||||
-rw-r--r-- | world/map/npc/xmas/2009/event.txt | 12 | ||||
-rw-r--r-- | world/map/npc/xmas/2010/golbanez.txt | 2 | ||||
-rw-r--r-- | world/map/npc/xmas/2010/santa.txt | 22 |
6 files changed, 23 insertions, 23 deletions
diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt index eea17aad..2046eb7c 100644 --- a/world/map/npc/007-1/voltain.txt +++ b/world/map/npc/007-1/voltain.txt @@ -3,12 +3,12 @@ // # AUTHORS: MrDudle, tarq, Salmondine, Jenalya, Pjotr Orial // # REVIEWERS: Jenalya // # -// # Basic Idea: A Person with lots of dark minds requires different stuff. +// # Basic Idea: A Person with lots of dark minds requires different stuff. // # Basically he tries to figure out, how to poison moobous, since he doesn't like the nature at all // # // # The variables are not attached to a player but to an npc variable, so it is more or less random, which // # quest comes up, when a player asks him. -// # +// # // # used Variables: global variable $state // # $state = 0: bring bottles // # $state = 1: bring black scorpion stinger @@ -190,7 +190,7 @@ state5: set $state, 6; mes "\"Great! Now I can thicken the potion! I will try directly.\""; goto L_Close; - + state6: mes "[Voltain]"; mes "\"Hello I am looking for " + @REDAPPLE_NEEDED + " red apples, maybe I can inject some venoms.. DOH not this again! Of course I meant a strength potion. Did you hear about the new potions from Caul? He is a pretty good alchimist. He can do strength potions, can't he?\""; diff --git a/world/map/npc/easter/2010/Blocker.txt b/world/map/npc/easter/2010/Blocker.txt index 8b3aa120..64502411 100644 --- a/world/map/npc/easter/2010/Blocker.txt +++ b/world/map/npc/easter/2010/Blocker.txt @@ -2,7 +2,7 @@ end; OnTouch: if (($Easter_2010_Npc_State2 >> E10_BARRIER_SHIFT) & E10_BARRIER_MASK == E10_BARRIER_ACTIVE) goto L_block; - + warp "028-3.gat", 33, 76; end; diff --git a/world/map/npc/easter/2010/Doctor2.txt b/world/map/npc/easter/2010/Doctor2.txt index 71b7ec70..02a2e7f7 100644 --- a/world/map/npc/easter/2010/Doctor2.txt +++ b/world/map/npc/easter/2010/Doctor2.txt @@ -443,7 +443,7 @@ L_At_Island_Helped: // =================================================================== // Helper portions, duplicated in each script for want of time, sorry. // =================================================================== - + // The player has defeated the invader and helped enough times. L_Return_Ready_Optional: if (!(~(Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK) || ((Easter_2010_QuestState >> E10_HELPED_DOCTOR_ISLAND_SHIFT) & E10_HELPED_DOCTOR_ISLAND_MASK)) diff --git a/world/map/npc/xmas/2009/event.txt b/world/map/npc/xmas/2009/event.txt index 2cb390c2..9750e661 100644 --- a/world/map/npc/xmas/2009/event.txt +++ b/world/map/npc/xmas/2009/event.txt @@ -8,17 +8,17 @@ if (countitem("AquaOrnament") > 0) set @cond, @cond + 1; if (countitem("BlueOrnament") > 0) set @cond, @cond + 1; if (countitem("MagentaOrnament") > 0) set @cond, @cond + 1; - + if (@cond == 6) goto L_Give; - - if ((strcharinfo(0) == "xxDimondXX")) goto L_LUMP_OF_COAL; + + if ((strcharinfo(0) == "xxDimondXX")) goto L_LUMP_OF_COAL; if (SANTA == 0 && BaseLevel <= 30) goto L_SANTA_TOO_YOUNG; L_SANTA_Start: if (Sex) set @honorific$, "Young Hero"; if (!Sex) - set @honorific$, "Young Heroine"; + set @honorific$, "Young Heroine"; mes "[Santa Claus]"; mes "\"ho-hum ho-hum ho-hum, I'm sorry, " + @honorific$ + " Not really in the Christmas spirit."; @@ -33,7 +33,7 @@ L_SANTA_Start: "There must be something that can be done!", L_SANTA_DESCRIBE_QUEST; close; - + L_Message: mes "[Santa Claus]"; @@ -103,7 +103,7 @@ L_Finished: mes "And would like to help others complete it too?\""; close; -L_LUMP_OF_COAL: +L_LUMP_OF_COAL: mes "[Santa Claus]"; mes "\"Hi "+strcharinfo(0)+",You are on the Naughty list."; mes "Maybe you teased developers too much in IRC?,"; diff --git a/world/map/npc/xmas/2010/golbanez.txt b/world/map/npc/xmas/2010/golbanez.txt index 8d7b3e02..a32b70c9 100644 --- a/world/map/npc/xmas/2010/golbanez.txt +++ b/world/map/npc/xmas/2010/golbanez.txt @@ -9,7 +9,7 @@ //# This is Golbanez, he took Santa Claus as a hostage. //# Santa will be accessible only if players give what golbenez want. //# if the player reach santa, he will donate some stuff to the players. -//# +//# //################################################################################# // Please, remove the debug script bofore releasing the quest. diff --git a/world/map/npc/xmas/2010/santa.txt b/world/map/npc/xmas/2010/santa.txt index 8c53b22f..781dc70f 100644 --- a/world/map/npc/xmas/2010/santa.txt +++ b/world/map/npc/xmas/2010/santa.txt @@ -9,15 +9,15 @@ //# This is Santa Claus. //# He was taken as hostage by golbanez, and now that he is free, he would like to //# give a reward for those who helped him. -//# +//# //################################################################################# - - + + 031-3.gat,122,51,0 script Santa 105,{ if (Sex) set @honorific$, "young hero"; if (Sex) set @gender$, "boy"; - if (!Sex) set @honorific$, "young heroine"; + if (!Sex) set @honorific$, "young heroine"; if (!Sex) set @gender$, "girl"; if (Xmas2010 == 2) goto L_Returning; if (Xmas2010 == 3) goto L_Stocking_Prize; @@ -44,7 +44,7 @@ L_Skip_Dialogue: L_Calculate_Prizes: getinventorylist; - if (@inventorylist_count == 100) goto L_full; + if (@inventorylist_count == 100) goto L_full; setarray @prizes, 1216, 629, 630, 634, 1214, 633, 628, 627, 621; mes "\"You are so generous! I believe I can give you one of the hats from this bag. I know you like these silly hats. Yes, Santa knows this kind of thing... Ho-Ho-Ho! Put your hand here and pick one hat... No, you cant look, it MUST be a surprise...\""; getitem @prizes[rand(8)], 1; @@ -64,7 +64,7 @@ L_Returning: L_Stocking_Prize: set Xmas2010, 3; getinventorylist; - if (@inventorylist_count == 100) goto L_full; + if (@inventorylist_count == 100) goto L_full; mes "[Santa Claus]"; mes "\"Good to know you liked it! Now I would like to give you a personal item. It is not a hat, but something that will always make you remember how grateful I am.\""; next; @@ -77,26 +77,26 @@ L_Stocking_Prize: close2; percentheal -20, 0; message strcharinfo(0), "You suddenly get dizzy... Something is not right with you. Maybe you shouldnt have put the Red Stocking so close to your face!"; - end; + end; L_full: mes "[Santa Claus]"; - mes "\"Your backpack seems to be full. You should get rid of some unused stuff before you get my gifts, or maybe try one super resistant red bag, my personal favorite! Hoh-hoh!\""; + mes "\"Your backpack seems to be full. You should get rid of some unused stuff before you get my gifts, or maybe try one super resistant red bag, my personal favorite! Hoh-hoh!\""; close; L_Close: mes "[Santa Claus]"; - mes "\"Ho, Ho... Ok, see you later " +@honorific$+ "!\""; + mes "\"Ho, Ho... Ok, see you later " +@honorific$+ "!\""; close; L_Bad: mes "[Santa Claus]"; - mes "\"Hmm... and I was thinking you were a good " +@gender$+ "! Dont be ungrateful and next time, think before you get a gift.\""; + mes "\"Hmm... and I was thinking you were a good " +@gender$+ "! Dont be ungrateful and next time, think before you get a gift.\""; close; L_Event_Done: mes "[Santa Claus]"; - mes "\"Hello again " +strcharinfo(0)+ "! I cant chat with you right now, because we are really late for Christmas, but, when it is over, you will always be welcome in my house for a hot chocolate.\""; + mes "\"Hello again " +strcharinfo(0)+ "! I cant chat with you right now, because we are really late for Christmas, but, when it is over, you will always be welcome in my house for a hot chocolate.\""; close; } |