summaryrefslogtreecommitdiff
path: root/world/map/npc/031-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/031-1')
-rw-r--r--world/map/npc/031-1/angelaOutside.txt26
-rw-r--r--world/map/npc/031-1/frozenbeard.txt3
-rw-r--r--world/map/npc/031-1/house.txt11
3 files changed, 19 insertions, 21 deletions
diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 3e503187..9fce8e10 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -5,7 +5,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;
@@ -21,8 +21,9 @@
next;
mes "\"It's terrible, oh my dear child!\"";
next;
-
- if (countitem("ConcentrationPotion") > 0 && baselevel > 69) goto L_Menu_Potion;
+ if (countitem("ConcentrationPotion") > 0
+ && baselevel > 69)
+ goto L_Menu_Potion;
menu
"\"Please calm down and tell me what happened.\"", L_Whining,
@@ -60,7 +61,8 @@ L_Menu_Potion:
close;
L_Calm_Down:
- if (countitem("ConcentrationPotion") == 0) goto L_No_Potion;
+ if (countitem("ConcentrationPotion") == 0)
+ goto L_No_Potion;
delitem "ConcentrationPotion", 1;
mes "She drinks the concentration potions and calms down.";
mes "[Angela]";
@@ -103,14 +105,8 @@ L_Please_Visit_Again:
close;
S_Update_Mask:
- set QUEST_Nivalis_state,
- (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
- | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
- return;
-}
-
-
-
-
-
-
+ set QUEST_Nivalis_state,
+ (QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
+ | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
+ return;
+} \ No newline at end of file
diff --git a/world/map/npc/031-1/frozenbeard.txt b/world/map/npc/031-1/frozenbeard.txt
index 923ae449..6a8eb467 100644
--- a/world/map/npc/031-1/frozenbeard.txt
+++ b/world/map/npc/031-1/frozenbeard.txt
@@ -10,7 +10,8 @@
close;
L_Frozenbeard_Argaes:
- if (zeny < 500) goto L_NoMoney;
+ if (zeny < 500)
+ goto L_NoMoney;
mes "[Frozenbeard]";
mes "\"Pleasant Journeys!\"";
set zeny, zeny-500;
diff --git a/world/map/npc/031-1/house.txt b/world/map/npc/031-1/house.txt
index 9913bdec..aa0d4067 100644
--- a/world/map/npc/031-1/house.txt
+++ b/world/map/npc/031-1/house.txt
@@ -7,12 +7,13 @@
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_Warp;
- message strcharinfo(0), "The door is locked.";
+
+ if (@rescue_Cindy > 2)
+ goto L_Warp;
+ message strcharinfo(0), "The door is locked.";
close;
-
-L_Warp:
+
+L_Warp:
warp "031-2.gat", 23, 28;
end;
}