Spawn General Terogan for the fight after 20 seconds

(nothing out of ordinary with him)

2 files changed, 23 insertions, 9 deletions

diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt
index 453724976..51ca64aa5 100644
--- a/npc/042-10/ctrl.txt
+++ b/npc/042-10/ctrl.txt
@@ -30,7 +30,8 @@ OnTouch:
     if (.@g < 1) percentheal -100, -100;
     if (!($KAMELOT_QUEST[.@g] & 8) || !($KAMELOT_QUEST[.@g] & 16) || !($KAMELOT_QUEST[.@g] & 32)) goto L_NoAccess;
     warp "042-11@"+.@g, 41, 56;
-    // TODO Fire Events
+    addtimer 5000, "#KamelotBoss::OnDialog";
+    addtimer 20000, "#KamelotBoss::OnBegin"; // FIXME?
     end;
 
 L_NoAccess:
diff --git a/npc/042-11/boss.txt b/npc/042-11/boss.txt
index b2fe93a9d..9a813f3c1 100644
--- a/npc/042-11/boss.txt
+++ b/npc/042-11/boss.txt
@@ -41,20 +41,33 @@ L_NoAccess:
 // TODO: Boss Showdown
 // TODO: Spawn GMGiftBox and Treasure Chests upon end
 // TODO: Arthur gives rewards to survivors and boot them out of Kamelot
-042-11,0,-,0	script	#KamelotBoss	NPC_HIDDEN,{
+042-11,0,0,0	script	#KamelotBoss	NPC_HIDDEN,{
+    end;
+
+OnDialog:
+    announce "??? : "+l("Who sent you here? Merlin?"), bc_self|bc_pc;
+    addtimer 5000, "#KamelotBoss::OnDialog2";
+    end;
+
+OnDialog2:
+    announce "??? : "+l("It matters not, because soon, all of you will be..."), bc_self|bc_pc;
+    addtimer 5000, "#KamelotBoss::OnBegin"; // FIXME?
     end;
 
 // Spawns Terogan
 OnBegin:
-    explode(.@map$, .map$, "@");
-    .@g=atoi(.@map$[1]);
-    if (.@g < 1) {
-        debugmes "[ERROR] [KAMELOT] Unable to find Terogan Death %s", .map$;
-        .@g=0;
-    }
-    .@m$=.map$;
+    .@g=getcharid(2);
+    .@m$=getmap();
     .@avg=$KAMELOT_MX[.@g]+10;
 
+    // Dialog
+    announce l("General Terogan : DEAD! Muahahahaha!"), bc_self|bc_pc;
+
+    // Check if Terogan doesn't exists already
+    .@exist=getd("$@GTEMP_"+.@m$);
+    if (.@exist)
+        end;
+
     .@mob=monster(.@m$, 34, 26, strmobinfo(1, GeneralTerogan), GeneralTerogan, 1, .@n$+"::OnKillBoss");
     // Reconfigure the monster
     setunitdata(.@mob, UDT_LEVEL, .@avg);