diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-06-10 11:27:08 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-06-10 11:27:08 -0300 |
| commit | 111d00dd71528918abd5e2820af2ffcb878fd808 (patch) | |
| tree | ec4ba6f5a370518793af322d4054e2c77730c8bf | |
| parent | c74e42d78b5c734aeafa7f08247e046295829fca (diff) | |
| download | serverdata-111d00dd71528918abd5e2820af2ffcb878fd808.tar.gz serverdata-111d00dd71528918abd5e2820af2ffcb878fd808.tar.bz2 serverdata-111d00dd71528918abd5e2820af2ffcb878fd808.tar.xz serverdata-111d00dd71528918abd5e2820af2ffcb878fd808.zip | |
Cindy's Hero cannot die. Cleanup fixes.
| -rw-r--r-- | npc/021-4/main.txt | 17 | ||||
| -rw-r--r-- | npc/functions/hub.txt | 1 |
2 files changed, 13 insertions, 5 deletions
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt index 8ecc59659..fefadf7e5 100644 --- a/npc/021-4/main.txt +++ b/npc/021-4/main.txt @@ -122,6 +122,7 @@ L_Reset: end; // Timeout +OnReckless: L_Reckless: kamibroadcast("People failed to rescue Cindy!"); areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnFail"; @@ -186,18 +187,23 @@ L_Winner: kamibroadcast("Cindy was rescued by \""+.@v$+"\"."); } + // Better proccess this before everything else... + $@CINDY_HERO$=""; + setnpcdisplay .name$, NPC_ICE_CAGE; + .@q=getq(NivalisQuest_Cindy); // First time - if (.@q == 4) + if (.@q == 4) { getitem Earmuffs, 1; - else + } else { Zeny=Zeny+rand(5000,15000); - $@CINDY_HERO$=""; + getitem TreasureMap, 1; + getitem TreasureKey, 1; + } setq1 NivalisQuest_Cindy, 5; next; npctalk l("Cindy is gone..."); closedialog; - setnpcdisplay .name$, NPC_ICE_CAGE; close; // Events @@ -236,8 +242,9 @@ L_CleanUp: disablenpc "#CindySwitch_08"; disablenpc "#CindySwitch_09"; disablenpc "#CindySwitch_10"; - setnpcdisplay .name$, NPC_CINDY; + setnpcdisplay .name$, NPC_CINDY_CAGE; changemusic "021-4", "water_prelude.ogg"; + stopnpctimer; end; // Main loop diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index 81462ac40..bccc7b907 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -24,6 +24,7 @@ function script HUB_Logout { // Vanished on Cindy Cave if (.@mapa$ == "021-4" && strcharinfo(0) == $@CINDY_HERO$) { + donpcevent("Cindy#Outside::OnReckless"); recovery(getcharid(3)); warp any("010-1", "010-2"), 0, 0; percentheal -100, -100; |