summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/npc/031-1/angelaOutside.txt13
-rw-r--r--world/map/npc/031-4/cindyCave.txt4
2 files changed, 9 insertions, 8 deletions
diff --git a/world/map/npc/031-1/angelaOutside.txt b/world/map/npc/031-1/angelaOutside.txt
index 322cbfb0..2ffd0804 100644
--- a/world/map/npc/031-1/angelaOutside.txt
+++ b/world/map/npc/031-1/angelaOutside.txt
@@ -36,8 +36,6 @@ OnInit:
031-1,79,24,0|script|Angela|195,15,15
{
- set @minlevel, 70;
-
if (QL_CINDY == 3) goto L_Please_Visit_Again;
if (QL_CINDY > 1 && QL_CINDY < 5) goto L_Please_Visit;
if (QL_CINDY == 1) goto L_Please_Help;
@@ -47,7 +45,7 @@ OnInit:
next;
mes "\"It's terrible, oh my dear child!\"";
next;
- if (countitem("ConcentrationPotion") > 0 && BaseLevel >= @minlevel && QL_CINDY == 6)
+ if (countitem("ConcentrationPotion") > 0 && BaseLevel >= .minlevel && QL_CINDY == 6)
goto L_Menu_Potion;
menu
@@ -55,7 +53,7 @@ OnInit:
"Leave", L_Close;
OnTouch:
- if(BaseLevel >= @minlevel && !QL_CINDY)
+ if(BaseLevel >= .minlevel && QL_CINDY < 1)
set QL_CINDY, 5;
end;
@@ -80,7 +78,7 @@ L_Whining:
mes "She is crying and sobbing.";
next;
mes "It seems she is too upset to tell you anything helpful. If she would just calm down and concentrate a bit...";
- if(BaseLevel >= @minlevel) goto L_GetQuest;
+ if(BaseLevel >= .minlevel) goto L_GetQuest;
goto L_Close;
L_GetQuest:
@@ -139,6 +137,9 @@ L_Please_Visit_Again:
goto L_Close;
L_Close:
- set @minlevel, 0;
close;
+
+OnInit:
+ set .minlevel, 70;
+ end;
}
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index c97b166d..1655205f 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -86,7 +86,7 @@ L_Reward:
L_Wizard_Hat:
// get a wizard hat in one of the ten colors - no white
- setarray @wizardhats, 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209;
+ setarray @wizardhats[0], 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209;
getitem @wizardhats[@reward], 1;
set QL_CINDY, 3;
goto L_Visit;
@@ -215,7 +215,7 @@ L_End:
end;
OnInit:
- setarray $@FIGHT_YETI_MESSAGES$,
+ setarray $@FIGHT_YETI_MESSAGES$[0],
"", // unused
// " : " is magic so that it says "global announcement from"
"Cindy : Yetis!",