diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-10-25 22:59:26 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-10-25 23:00:10 -0300 |
| commit | 61c6393855cb76e1cd6b8b08d99ea911b6bf38b8 (patch) | |
| tree | 6e10813521ea2b6fb55288aba32d78be2970b732 /npc/021-4 | |
| parent | 10a56e69db5d71b1278c7eb5625bb827e6ecb477 (diff) | |
| download | serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.tar.gz serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.tar.bz2 serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.tar.xz serverdata-61c6393855cb76e1cd6b8b08d99ea911b6bf38b8.zip | |
Correct bugs reported by @demure
Diffstat (limited to 'npc/021-4')
| -rw-r--r-- | npc/021-4/doors.txt | 2 | ||||
| -rw-r--r-- | npc/021-4/main.txt | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/npc/021-4/doors.txt b/npc/021-4/doors.txt index c97aec317..1d84e72d5 100644 --- a/npc/021-4/doors.txt +++ b/npc/021-4/doors.txt @@ -8,7 +8,7 @@ if ($@CINDY_STATE % 2 == 1 && $@CINDY_STATE < 150000) goto L_Blocked; if ($@CINDY_STATE > 150000) goto L_Check; L_Warp: - warp "021-3", 24, 123; + warp "021-3", 24, 122; end; L_Blocked: diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt index 75d6bff9e..eb146ca5a 100644 --- a/npc/021-4/main.txt +++ b/npc/021-4/main.txt @@ -42,8 +42,9 @@ function script CindySwitch_Check_214 { goto L_Cheat; if ($@CINDY_STATE > 150000) goto L_Reset; if ($@CINDY_STATE % 2 == 0) goto L_Start; - if (CindySwitch_Check_214() == 5) { + if (CindySwitch_Check_214() == 5 && !.canfinish) { // Gate is open, advance to stage 2 + .canfinish=1; .lifetime+=3; .wtime=0; mapannounce "021-4", "*roaaaaar*",0; @@ -52,8 +53,7 @@ function script CindySwitch_Check_214 { .@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; + areamonster "021-4", 20, 20, 100, 80, "Slime Blast", SlimeBlast, $@CINDY_STATE+1; } hello; end; @@ -153,6 +153,7 @@ OnReward: getexp 10000, JobLevel; end; +OnCleanUp: L_CleanUp: .lifetime=0; .wtime=0; @@ -177,14 +178,16 @@ OnTimer2500: goto L_CleanUp; } .wtime+=5; - if (.wtime >= rand(60,80)) { + if (.wtime >= rand(60,90)) { .wtime=0; .lifetime+=1; .@pl = getmapusers("021-4")+1; // If gate was unlocked, more Yetis will appear depending on switches state. if (.canfinish) .@pl+=5-CindySwitch_Check_214(); - areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3), "Cindy#Outside::OnPetDeath"; + .@value=(.@pl/2)+($@CINDY_STATE/2)+(.lifetime/3); + areamonster "021-4", 20, 20, 100, 80, "Yeti", Yeti, (.@value+1)/2, "Cindy#Outside::OnPetDeath"; + areamonster "021-4", 20, 20, 100, 80, "Moggun", Moggun, (.@value+1)/2, "Cindy#Outside::OnPetDeath"; npctalk any("Yetis!", "Watch out!", "More of them are coming!", |