From da906bd6300bf7ca4aed3a381555a34ba60baee0 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Mon, 29 Apr 2019 12:03:44 -0300
Subject: Remove one minute of Hurnscald Campaign, which will now be used for
 MK Army to arrive there.

---
 npc/012-1/guards.txt | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'npc/012-1')

diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 13fc66fca..2282330e7 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -615,16 +615,15 @@ OnMKSiege:
     $@SIEGE_HURNS=rand(1,10);
 OnStartSiege:
     siege_setup("014-3");
-    siege_setup("012-1");
-    kamibroadcast(col("WARNING! WARNING! Siege starting at Hurnscald!!",1));
+    kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Hurnscald!!",1));
     siege_cast("014-3", .name$, 0, TP_HURNS);
     initnpctimer;
     end;
 
 // Timers
-OnTimer5000:
-    siege_cast("014-3", .name$, 0, TP_HURNS);
-    siege_cast("012-1", .name$, 0, TP_HURNS);
+OnTimer35000:
+    siege_setup("012-1");
+    siege_cast("014-3", .name$, $@SIEGE_HURNS, TP_HURNS);
     mapannounce("012-1", "##2Message to all Hurnscald NPCs: Take shelter!", bc_map);
     disablenpc "Gwendolyn";
     disablenpc "Milly";
@@ -640,9 +639,9 @@ OnTimer5000:
     disablenpc "Jack";
     end;
 
-OnTimer15000:
+OnTimer65000:
+    siege_cast("012-1", .name$, 0, TP_HURNS);
     siege_cast("014-3", .name$, $@SIEGE_HURNS, TP_HURNS);
-    siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
     disablenpc "Shoppa Kep";
     disablenpc "Richard";
 
@@ -657,14 +656,12 @@ OnTimer15000:
     disablenpc "Rakinorf, Mayor";
     end;
 
-OnTimer120000:
-    siege_boss("012-1", $@SIEGE_HURNS);
+OnTimer96000:
     siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
     end;
 
-// At the middle (5 min), we spawn at 014-3 again
-OnTimer300000:
-    siege_cast("014-3", .name$, $@SIEGE_HURNS, TP_HURNS);
+OnTimer180000:
+    siege_boss("012-1", $@SIEGE_HURNS);
     siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
     end;
 
@@ -674,8 +671,9 @@ OnTimer360000:
 OnTimer480000:
     $@SIEGE_HURNS+=1;
 // Other minutes are not affected
-OnTimer60000:
+OnTimer120000:
 OnTimer240000:
+OnTimer300000:
 OnTimer420000:
     siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
     end;
-- 
cgit v1.2.3-60-g2f50