From 409ae537700ae00a7198a5854d31ac69eb6bde1e Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 5 Nov 2014 11:16:52 -0600 Subject: NPCs on 031-* fixed --- world/map/npc/031-1/angelaOutside.txt | 2 +- world/map/npc/031-1/dock.txt | 6 +++--- world/map/npc/031-1/frozenbeard.txt | 2 +- world/map/npc/031-1/house.txt | 2 +- world/map/npc/031-2/angelaHouse.txt | 2 +- world/map/npc/031-2/cindyHouse.txt | 2 +- world/map/npc/031-3/labyrinth.txt | 2 +- world/map/npc/031-4/barrier.txt | 2 +- world/map/npc/031-4/cindyCave.txt | 24 ++++++++++++------------ 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt index 60e156f0..bec0988b 100644 --- a/world/map/npc/031-1/angelaOutside.txt +++ b/world/map/npc/031-1/angelaOutside.txt @@ -4,7 +4,7 @@ // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward // state greater than 3: Angela invites and asks you to bring present boxes -031-1.gat,79,24,0|script|Angela|195, +031-1.gat,79,24,0|script|Angela|195 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt index a8711403..48d32d8e 100644 --- a/world/map/npc/031-1/dock.txt +++ b/world/map/npc/031-1/dock.txt @@ -1,19 +1,19 @@ // The ferry dock // Ferry Sign -031-1.gat,95,107,0|script|Ferry Schedule#6|398, +031-1.gat,95,107,0|script|Ferry Schedule#6|398 { callfunc "FerryManifest"; end; } -031-1.gat,110,108,0|script|Nivalis Koga|395,6,2, +031-1.gat,110,108,0|script|Nivalis Koga|395,6,2 { callfunc "BoardFerry"; close; } -031-1.gat,100,100,0|script|#NivalisDock|127, +031-1.gat,100,100,0|script|#NivalisDock|127 { end; diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt index 6a62a104..e05b3d67 100644 --- a/world/map/npc/031-1/frozenbeard.txt +++ b/world/map/npc/031-1/frozenbeard.txt @@ -1,6 +1,6 @@ // -031-1.gat,96,113,0|script|Frozenbeard|138, +031-1.gat,96,113,0|script|Frozenbeard|138 { mes "[Frozenbeard]"; diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt index 3d250e4e..e9bd33c0 100644 --- a/world/map/npc/031-1/house.txt +++ b/world/map/npc/031-1/house.txt @@ -2,7 +2,7 @@ // player can enter, if Cindy is already saved and the player has been invited, quest status > 2 // author: Jenalya -031-1.gat,95,80,0|script|#Door|45,0,0, +031-1.gat,95,80,0|script|#Door|45,0,0 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt index 1b3ccb0a..24759211 100644 --- a/world/map/npc/031-2/angelaHouse.txt +++ b/world/map/npc/031-2/angelaHouse.txt @@ -3,7 +3,7 @@ // state3: it's your first visit, you can choose a reward // state4: you can do daily quests with white and yellow presents boxes -031-2.gat,29,28,0|script|Angela#house|196, +031-2.gat,29,28,0|script|Angela#house|196 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt index 277d2380..34e84863 100644 --- a/world/map/npc/031-2/cindyHouse.txt +++ b/world/map/npc/031-2/cindyHouse.txt @@ -2,7 +2,7 @@ // 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#house|197, +031-2.gat,27,26,0|script|Cindy#house|197 { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt index 6fc31fad..465ba55a 100644 --- a/world/map/npc/031-3/labyrinth.txt +++ b/world/map/npc/031-3/labyrinth.txt @@ -1,7 +1,7 @@ // Conditional warp for yeti cave // Authors: Jenalya -031-3.gat,46,24,0|script|#YetiBarrier-outside|45,0,0, +031-3.gat,46,24,0|script|#YetiBarrier-outside|45,0,0 { if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; warp "031-4.gat", 40, 70; diff --git a/world/map/npc/031-4/barrier.txt b/world/map/npc/031-4/barrier.txt index 460a3985..49157e6f 100644 --- a/world/map/npc/031-4/barrier.txt +++ b/world/map/npc/031-4/barrier.txt @@ -1,4 +1,4 @@ -031-4.gat,40,71,0|script|#YetiBarrier-inside|45,0,0, +031-4.gat,40,71,0|script|#YetiBarrier-inside|45,0,0 { if ($@FIGHT_YETI_STATUS == 1) goto L_Block; warp "031-3.gat", 46, 25; diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index d7d16155..de9062fd 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -4,7 +4,7 @@ // state2: Cindy is saved, she gives you a reward (wizard hat or wooden staff) // state3: and greater: Cindy is saved, she asks you to visit them -031-4.gat,42,42,0|script|Cindy|198, +031-4.gat,42,42,0|script|Cindy|198 { if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti; @@ -238,17 +238,17 @@ L_End: OnInit: setarray $@FIGHT_YETI_MESSAGES$, "", // unused - // " : " is magic so that it says "global announcement from" - "Cindy : Yetis!", - "Cindy : Watch out!", - "Cindy : More of them are coming!", - "Cindy : Be careful! More of them!", - "Cindy : Attention! There is another bunch of them!", - "Cindy : Hang on! More of them!", - "Cindy : More Yetis! Will this never end?", - "Cindy : There are coming more and more!", - "Cindy : Watch your back! There are so many of them!", - "Cindy : This seems to be their final attack! I believe in you!"; + // ":* " is magic so that it says "global announcement from" + "Cindy:* Yetis!", + "Cindy:* Watch out!", + "Cindy:* More of them are coming!", + "Cindy:* Be careful! More of them!", + "Cindy:* Attention! There is another bunch of them!", + "Cindy:* Hang on! More of them!", + "Cindy:* More Yetis! Will this never end?", + "Cindy:* There are coming more and more!", + "Cindy:* Watch your back! There are so many of them!", + "Cindy:* This seems to be their final attack! I believe in you!"; end; ///////// -- cgit v1.2.3-60-g2f50