From 3d09c81da1d9940c1682333ee07c293d00a7be24 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 29 Apr 2019 11:26:36 -0300
Subject: Just kidding, boss death should be handled by a global NPC imho

---
 npc/012-1/guards.txt    | 16 +---------------
 npc/functions/siege.txt | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'npc')

diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 8039a5ca3..4e72678fe 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -601,20 +601,6 @@ OnRespawn:
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
-// Boss Death Labels
-OnLieutenantDeath:
-    getitem StrangeCoin, 1;
-    mapannounce("012-1", l("##2The Monster Lieutenant was defeated by @@!", strcharinfo(0)), bc_map);
-    $MK_TEMPVAR+=1;
-    end;
-
-OnColonelDeath:
-    getitem StrangeCoin, 5;
-    $MOST_HEROIC$=strcharinfo(0);
-    mapannounce("012-1", l("##2The Monster Colonel was defeated by @@!", strcharinfo(0)), bc_map);
-    $MK_TEMPVAR+=10;
-    end;
-
 // Begin Siege
 OnMKSiege:
     siege_setup("014-3");
@@ -699,7 +685,7 @@ OnTimer120000:
     }
 
     // Announce and spawn
-    siege_spawn("012-1", .@mobId, 1, "#HurnscaldSiege::On"+.@ts$+"Death");
+    siege_spawn("012-1", .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
     mapannounce("012-1", "##1The Monster "+.@ts$+" arrived! It is a "+strmobinfo(1, .@mobId), bc_map);
 
     // Clear $@SIEGE_TMPMOBS and start casting
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 1a0d92dbe..bf8d8ce0b 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -190,3 +190,24 @@ function	script	siege_cast	{
     return;
 }
 
+
+// Utility NPC
+-	script	#SiegeCtrl	NPC_HIDDEN,{
+    end;
+
+// Boss Death Labels
+OnLieutenantDeath:
+    getitem StrangeCoin, 1;
+    mapannounce(getmap(), l("##2The Monster Lieutenant was defeated by @@!", strcharinfo(0)), bc_map);
+    $MK_TEMPVAR+=1;
+    end;
+
+OnColonelDeath:
+    getitem StrangeCoin, 5;
+    $MOST_HEROIC$=strcharinfo(0);
+    mapannounce(getmap(), l("##2The Monster Colonel was defeated by @@!", strcharinfo(0)), bc_map);
+    $MK_TEMPVAR+=10;
+    end;
+
+}
+
-- 
cgit v1.2.3-60-g2f50