From 7f2305a07314b6efd62befc783ba246ad6eb9042 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 29 Apr 2020 05:29:27 -0300
Subject: Should work now

---
 npc/042-2/boss.txt | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'npc/042-2/boss.txt')

diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index 0f8367035..9a350e3fb 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -31,6 +31,8 @@ OnArrival:
     if ($@KAMELOT_WAVE[.@g] != 3)
         end;
     $@KAMELOT_WAVE[.@g]+=1;
+    setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[.@g]);
+    setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[.@g]);
     initnpctimer;
     debugmes "Timer Started";
     //if ($@KAMELOT_WAVE == 0)
@@ -41,6 +43,8 @@ OnArrival:
     end;
 
 OnEmergency:
+    setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[.@g]);
+    setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[.@g]);
     initnpctimer;
     end;
 
@@ -51,14 +55,13 @@ OnEmergency2:
 OnTimer1000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "??? : What's this? Why do I hear a commotion up there??", 0;
-    .@gcount=$KAMELOT_PC[.@g];
+    .@gcount=getd("$@GTEMP2_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59); // Prologue monsters
     end;
 
 OnTimer30000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "??? : WHAT?! It is not possible. Who are you, and how did you manage to come down here?", 0;
-    .@gcount=$KAMELOT_PC[.@g];
     end;
 
 OnTimer35000:
@@ -86,18 +89,21 @@ OnTimer74000:
 OnTimer80000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "General Krukan : Both is impossible for weaklings like you lot. Minions, ATTACK!", 0;
+    .@gcount=getd("$@GTEMP2_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
 
 OnTimer100000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "General Krukan : MUhahahahaha! Minions, Dispose of these Adventurers! Kill them already!", 0;
+    .@gcount=getd("$@GTEMP2_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
 
 OnTimer120000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "General Krukan : *facepalm* Now, you're just being pathetic minions. How about you try a different approach and kill them already!", 0;
+    .@gcount=getd("$@GTEMP2_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
 
@@ -105,7 +111,8 @@ OnTimer180000:
     .@m$=instance_mapname("042-2");
     .@n$=instance_npcname(.name$);
     mapannounce .@m$, "General Krukan : Looks like if you want something done right you have to do it yourself. Charge!", 0;
-    .@gcount=$KAMELOT_PC[.@g];
+    .@gcount=getd("$@GTEMP2_"+.@m$);
+    .@avg=getd("$@GTEMP3_"+.@m$);
     kdoor0422Spawn(.@gcount*3, 20, 24, 59, 59);
     .@mob=monster(.@m$, 34, 26, strmobinfo(1, GeneralKrukan), GeneralKrukan, 1, .@n$+"::OnKillBoss");
     // Reconfigure the monster
@@ -134,7 +141,6 @@ OnTimer180000:
     // Loop through
     setd("$@GTEMP_"+.@m$, .@mob);
     setd("$@GTEMP1_"+.@m$, 10);
-    setd("$@GTEMP2_"+.@m$, .@gdcount);
     end;
 
 OnTimer185000:
@@ -223,7 +229,7 @@ function kdoor0422Spawn {
     .@y1=getarg(2);
     .@x2=getarg(3);
     .@y2=getarg(4);
-    .@avg=$KAMELOT_MX[.@g];
+    .@avg=getd("$@GTEMP3_"+.@m$);
     .@m$=getmap();
     freeloop(true);
     for (.@i=0; .@i < .@gcount; .@i++) {
-- 
cgit v1.2.3-70-g09d2