From df3add067182e3977fa2a5dc4e69d4595ed6a1c6 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 30 Apr 2020 11:34:33 -0300
Subject: Fix bugs, some which I missed earlier

---
 npc/042-2/boss.txt |  2 +-
 npc/042-4/ctrl.txt | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index 964bea2c9..2355c6074 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -345,7 +345,7 @@ function kdoor0422Spawn {
     freeloop(true);
     for (.@i=0; .@i < .@gcount; .@i++) {
         .@mobId=any(CursedSoldier, CursedArcher); // 50-50 ratio
-        .@mob=areamonster(.@m$, 21, 24, 59, 99, strmobinfo(1, .@mobId), .@mobId, 1, .@label$);
+        .@mob=areamonster(.@m$, .@x1, .@y1, .@x2, .@y2, strmobinfo(1, .@mobId), .@mobId, 1, .@label$);
         // Reconfigure the monster
         setunitdata(.@mob, UDT_LEVEL, .@avg);
         setunitdata(.@mob, UDT_STR, 1+.@avg/4);
diff --git a/npc/042-4/ctrl.txt b/npc/042-4/ctrl.txt
index 600759382..e373af11d 100644
--- a/npc/042-4/ctrl.txt
+++ b/npc/042-4/ctrl.txt
@@ -33,7 +33,7 @@ OnInstanceInit:
     .@mx=getguildavg(.@g);
     monster0424(1, 20, 20, 115, 100, .@mx);
     monster0424(4, 20, 51,  51,  71, .@mx);
-    monster0424(5, 76, 56, 115, 100, .@mx);
+    monster0424(5, 85, 56, 115, 100, .@mx);
     monster0424(2, 79, 40,  97,  52, .@mx);
     monster0424(5, 51, 20,  80,  50, .@mx);
 
@@ -47,6 +47,16 @@ OnInstanceInit:
     end;
 
 OnKillMob:
+    if (!playerattached())
+        goto OnRespawn;
+    // Maybe a reward is due
+    .@g=getcharid(2);
+    if (.@g < 1) percentheal -100, -100;
+    getexp $KAMELOT_MX[.@g]*7, $KAMELOT_MX[.@g]*3;
+    // FALLTHROUGH
+
+OnRespawn:
+    sleep(3000);
     // Yes, we just hope it works out of box
     explode(.@map$, .map$, "@");
     .@g=atoi(.@map$[1]);
@@ -55,12 +65,6 @@ OnKillMob:
         .@g=0;
     }
     monster0424(1, 20, 20, 115, 100, $KAMELOT_MX[.@g]);
-
-    // Maybe a reward is due
-    if (!playerattached()) end;
-    .@g=getcharid(2);
-    if (.@g < 1) percentheal -100, -100;
-    getexp $KAMELOT_MX[.@g]*7, $KAMELOT_MX[.@g]*3;
     end;
 
 function monster0424 {
@@ -76,7 +80,7 @@ function monster0424 {
     freeloop(true);
     for (.@i=0; .@i < .@gcount; .@i++) {
         .@mobId=any(CursedSoldier, CursedArcher); // 50-50 ratio
-        .@mob=areamonster(.@m$, 21, 24, 59, 99, strmobinfo(1, .@mobId), .@mobId, 1, .@label$);
+        .@mob=areamonster(.@m$, .@x1, .@y1, .@x2, .@y2, strmobinfo(1, .@mobId), .@mobId, 1, .@label$);
         // Reconfigure the monster
         setunitdata(.@mob, UDT_LEVEL, .@avg);
         setunitdata(.@mob, UDT_STR, 1+.@avg*3/10);
-- 
cgit v1.2.3-60-g2f50