summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/021-4/main.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index f628e34e8..2c2bc5280 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -48,6 +48,9 @@ function script CindySwitch_Check_214 {
setnpcdisplay .name$, NPC_CINDY_UNCAGE;
.@pl = getmapusers("021-4")+1;
areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@pl/2)+rand(2,6), "Cindy#Outside::OnPetDeath";
+ areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, ($@CINDY_STATE/2)+1, "Cindy#Outside::OnPetDeath";
+ areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1, "Cindy#Outside::OnPetDeath";
+ .canfinish=1;
}
hello; end;
@@ -108,6 +111,7 @@ OnReward:
L_CleanUp:
.lifetime=0;
+ .canfinish=0;
$@CINDY_HERO="";
disablenpc "#CindySwitch_06";
disablenpc "#CindySwitch_07";
@@ -117,19 +121,21 @@ L_CleanUp:
setnpcdisplay .name$, NPC_CINDY_CAGE;
end;
-OnTimer1000:
+OnTimer5000:
.@y=mobcount("021-4", "Cindy#Outside::OnPetDeath");
.@v=CindySwitch_Check_214();
- if (.@y == 0 && .@v >= 5) {
+ if (.@y == 0 && .@v >= 5 && .canfinish) {
mapannounce "021-4", "You won.",0;
areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnReward";
- goto L_CleanUp;
+ goto L_CleanUp; // Too early but oh well
}
+ initnpctimer;
end;
OnInit:
.distance=5;
.lifetime=0; // Controls Yeti Wave
+ .canfinish=0;// Can finish or must talk to cage first?
$@CINDY_HERO="";
disablenpc "#CindySwitch_06";
disablenpc "#CindySwitch_07";