From 111d00dd71528918abd5e2820af2ffcb878fd808 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 10 Jun 2019 11:27:08 -0300
Subject: Cindy's Hero cannot die. Cleanup fixes.

---
 npc/021-4/main.txt    | 17 ++++++++++++-----
 npc/functions/hub.txt |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'npc')

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;
-- 
cgit v1.2.3-60-g2f50