From 98b92a2332a1dd79071e775b7932ea99053dd098 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 29 Apr 2020 05:38:31 -0300
Subject: This should solve the Arrival issue

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

diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index 9a350e3fb..b506e90f4 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -26,11 +26,13 @@ OnArrival:
     .@g=getcharid(2);
     if (.@g < 1)
         percentheal -100, -100;
+    debugmes getmap();
     if (getmap() != "042-2@"+.@g)
         end;
-    if ($@KAMELOT_WAVE[.@g] != 3)
+    debugmes $@KAMELOT_WAVE[.@g];
+    if ($@KAMELOT_WAVE[.@g] < 3)
         end;
-    $@KAMELOT_WAVE[.@g]+=1;
+    $@KAMELOT_WAVE[.@g]=100;
     setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[.@g]);
     setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[.@g]);
     initnpctimer;
@@ -43,8 +45,9 @@ OnArrival:
     end;
 
 OnEmergency:
-    setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[.@g]);
-    setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[.@g]);
+    .@m$=instance_mapname("042-2");
+    setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[getcharid(2)]);
+    setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[getcharid(2)]);
     initnpctimer;
     end;
 
@@ -230,7 +233,7 @@ function kdoor0422Spawn {
     .@x2=getarg(3);
     .@y2=getarg(4);
     .@avg=getd("$@GTEMP3_"+.@m$);
-    .@m$=getmap();
+    .@m$=instance_mapname("042-2");
     freeloop(true);
     for (.@i=0; .@i < .@gcount; .@i++) {
         .@mobId=any(CursedSoldier, CursedArcher); // 50-50 ratio
-- 
cgit v1.2.3-60-g2f50