Okay, for now, this will be enough

2 files changed, 17 insertions, 4 deletions

diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt
index 87a660324..dff631386 100644
--- a/npc/015-8-1/campaign.txt
+++ b/npc/015-8-1/campaign.txt
@@ -2,7 +2,7 @@
 // Authors:
 //    Jesusalva
 // Description:
-//    Sagratha Quest
+//    Sagratha Quest (field 3)
 
 015-8-1,49,38,0	script	#SaggyDungeonCore	NPC_HIDDEN,{
     // Not in instance, we don't care.
@@ -13,17 +13,28 @@
 
 // There is no instance init
 OnBegin:
-    // We're in an instance, ofc. But without player attached
-    initnpctimer;
+    setq3 HurnscaldQuest_Sagratha, 1;
+    // We're in an instance, ofc. Here we still have player attached.
+    npctalk3 l("Open your eyes");
+    initnpctimer; // Maybe addtimer() would be better?
     end;
 
 OnTimer1000:
+    debugmes "Error";
     end;
 
 }
 
 // Dummy NPC to fire #SaggyDungeonCore when you get close to battle scene
 015-8-1,49,38,0	script	#SaggyDungeonFire	NPC_HIDDEN,0,0,{
-end;
+    end;
+OnTouch:
+    if (instance_id() < 0)
+        end;
+
+    if (!getq3(HurnscaldQuest_Sagratha))
+        doevent "#SaggyDungeonCore::OnBegin";
+    end;
 }
 
+
diff --git a/npc/015-8/sealedshrine.txt b/npc/015-8/sealedshrine.txt
index c0ba73350..95efa69e2 100644
--- a/npc/015-8/sealedshrine.txt
+++ b/npc/015-8/sealedshrine.txt
@@ -557,6 +557,7 @@ function	script	SaggyShrineStatue	{
         if (0158_Riddle_BlackBox()) {
             deltimer(.@n$+"::OnScheduledDeath");
             setq1 HurnscaldQuest_Sagratha, 5;
+            setq3 HurnscaldQuest_Sagratha, 0;
             mesn;
             mesq l("You shall pass. Beyond this gate, she waits for you.");
             next;
@@ -631,6 +632,7 @@ OnInit:
         next;
         disable_items();
         if (askyesno() == ASK_YES) {
+            setq3 HurnscaldQuest_Sagratha, 0;
             closeclientdialog;
 
             .@map2$=SaggyInstCheck(false);