It still outputs a fairly high amount of errors

1 files changed, 16 insertions, 4 deletions

diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt
index 152da954f..fa3e97b9a 100644
--- a/npc/015-8-1/campaign.txt
+++ b/npc/015-8-1/campaign.txt
@@ -14,27 +14,39 @@
 // There is no instance init
 OnBegin:
     .@m$=getmap();
+    .@in=getq2(HurnscaldQuest_Sagratha);
 
     setq3 HurnscaldQuest_Sagratha, 1;
     // We're in an instance, ofc. Here we still have player attached.
-    npctalk3 l("Open your eyes!");
+    //npctalk3 l("Open your eyes!");
+    //npctalk("Sagratha: Open your eyes!", instance_npcname(.name$, .@in), false);
+    //npctalk("Sagratha: Open your eyes!");
+    mapannounce(.@m$, l("Sagratha: Open your eyes!"), 0);
+    .SAGRATHA=monster(.@m$, 52, 40, "Sagratha", Sagratha, 1, instance_npcname(.name$, .@in)+"::OnError", Size_Medium, 2);
+
+    unittalk(.SAGRATHA, l("Open your eyes!"));
 
     monster .@m$, 49, 45, "Real Monster", RedSlime, 1;
     // max AI id 4. You are in 49,39
-    monster .@m$, 49, 41, "AI Tx", RedSlime, 1, .name$+"::OnError", Size_Medium, 2;
-    monster .@m$, 51, 41, "AI Xt", RedSlime, 1, .name$+"::OnError", Size_Medium, 2;
+    monster .@m$, 49, 41, "AI Tx", RedSlime, 1, instance_npcname(.name$, .@in)+"::OnError", Size_Medium, 2;
+    monster .@m$, 51, 41, "AI Xt", RedSlime, 1, instance_npcname(.name$, .@in)+"::OnError", Size_Medium, 2;
 
-    addtimer(5000, "#SaggyDungeonCore::OnError");
+    addtimer(5000, instance_npcname(.name$, .@in)+"::OnError");
     end;
 
 // Assassin, HoodedNinja, HoodedAssassin (boss)
 // Mouboo, ForestMushroom, Fluffy, Sagratha (boss)
 
 OnError:
+    unittalk(.SAGRATHA, l("Watch out!"));
     debugmes "Error";
     npctalk "Error";
     end;
 
+OnInit:
+    .SAGRATHA=0;
+    end;
+
 }
 
 // Dummy NPC to fire #SaggyDungeonCore when you get close to battle scene