summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorFrost <networktoy@cox.net>2011-09-04 10:33:02 -0700
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-04 20:17:53 +0200
commit60758bac20b02f7313f5f9506e3b59743894030f (patch)
tree7e2c5bc0928cae244bc6ba5f1da27e2f9ba6af4e /world/map
parentbdb23d8abee81d35efc839e4979cff978424a61f (diff)
downloadserverdata-60758bac20b02f7313f5f9506e3b59743894030f.tar.gz
serverdata-60758bac20b02f7313f5f9506e3b59743894030f.tar.bz2
serverdata-60758bac20b02f7313f5f9506e3b59743894030f.tar.xz
serverdata-60758bac20b02f7313f5f9506e3b59743894030f.zip
Removed tabs from cindyHouse.txt and labyrinth.txt NPCs
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/031-2/cindyHouse.txt70
-rw-r--r--world/map/npc/031-3/labyrinth.txt4
2 files changed, 37 insertions, 37 deletions
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 97aa2bb9..d92da10b 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -1,51 +1,51 @@
// author: Jenalya
-// reviewed by:
+// reviewed by:
// state0,1,2: you shouldn't be able to reach this place
// state3 and greater: Cindy is saved, she says one of some random phrases
//
-031-2.gat,27,26,0 script Cindy 197, {
+031-2.gat,27,26,0|script|Cindy|197, {
- set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
- set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
+ set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
+ set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
- set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
-
- if (@rescue_Cindy > 2) goto L_Happy_Random;
+ set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
- mes "...";
- close;
+ if (@rescue_Cindy > 2) goto L_Happy_Random;
+
+ mes "...";
+ close;
L_Happy_Random:
- getinventorylist;
- set @candy, rand(50);
- if (@inventorylist_count < 100 && @candy == 42) goto L_Candy;
-
- setarray @quote_Cindy$, "Thank you so much for rescuing me!",
- "My mother made really tasty cookies yesterday. But I already ate them all...",
- "I want to go ice skating tomorrow. That will be fun!",
- "I wonder when Daddy will come home next time. He always brings exciting stuff!",
- strcharinfo(0) + "! You're my hero!",
- "My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder what's wrong with them.",
- "When I'm a little older, I want to travel like you and my father. I want to see every place on the world!",
- "Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.",
- strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
- set @random, rand(9);
- if (@random != 5) emotion 3;
- set @quote$, "\"" + @quote_Cindy$[@random] + "\"";
- mes "[Cindy]";
- mes @quote$;
- close;
-
+ getinventorylist;
+ set @candy, rand(50);
+ if (@inventorylist_count < 100 && @candy == 42) goto L_Candy;
+
+ setarray @quote_Cindy$, "Thank you so much for rescuing me!",
+ "My mother made really tasty cookies yesterday. But I already ate them all...",
+ "I want to go ice skating tomorrow. That will be fun!",
+ "I wonder when Daddy will come home next time. He always brings exciting stuff!",
+ strcharinfo(0) + "! You're my hero!",
+ "My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder what's wrong with them.",
+ "When I'm a little older, I want to travel like you and my father. I want to see every place on the world!",
+ "Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.",
+ strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
+ set @random, rand(9);
+ if (@random != 5) emotion 3;
+ set @quote$, "\"" + @quote_Cindy$[@random] + "\"";
+ mes "[Cindy]";
+ mes @quote$;
+ close;
+
L_Candy:
- mes "[Cindy]";
- mes "\"Santa gave me some candy! Please, take that!\"";
- getitem "Candy", 1;
- close;
-
+ mes "[Cindy]";
+ mes "\"Santa gave me some candy! Please, take that!\"";
+ getitem "Candy", 1;
+ close;
+
S_Update_Mask:
set QUEST_Nivalis_state,
- (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
+ (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
| (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
return;
}
diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt
index feef9c1d..b1b5543a 100644
--- a/world/map/npc/031-3/labyrinth.txt
+++ b/world/map/npc/031-3/labyrinth.txt
@@ -8,10 +8,10 @@
//#
//#################################################################################
-031-3.gat,46,24,0 script #YetiBarrier 127,1,1,{
+031-3.gat,46,24,0|script|#YetiBarrier|127,1,1,{
if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked;
warp "031-4.gat", 40, 69;
- end;
+ end;
L_Blocked:
message strcharinfo(0), "A force field seems to be blocking you from entering.";
end;