1 files changed, 70 insertions, 118 deletions
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 8bb8b517e..8ec5b140f 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -602,133 +602,85 @@ OnInit:
 OnMKSiege:
     $@SIEGE_HURNS=rand(1,10);
 OnStartSiege:
-    siege_setup("014-3");
     kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Hurnscald!!",1));
-    siege_cast("014-3", .name$, 0, TP_HURNS);
+    do_siege("012-1", "014-3", "HURNS", TP_HURNS, .name$, .siegetime);
     initnpctimer;
     end;
 
-// Warmup
-OnTimer70000:
-OnTimer95000:
-    siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-OnTimer35000:
-    siege_cast("014-3", .name$, $@SIEGE_HURNS, TP_HURNS);
-    end;
-
 // Timers
-OnTimer60000:
-    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 "Oscar";
-    disablenpc "Gwendolyn";
-    disablenpc "Milly";
-    disablenpc "LOFBot";
-    disablenpc "Locamit";
-    disablenpc "Andrei Sakar";
-    disablenpc "Luffyx";
-    disablenpc "Tezzerin";
-    disablenpc "Hinnak";
-    disablenpc "Igor";
-    disablenpc "Dyrin The Traveler";
-    disablenpc "Mahad";
-    disablenpc "Jack";
-    end;
-
-OnTimer90000:
-    siege_cast("012-1", .name$, 0, TP_HURNS);
-    siege_cast("014-3", .name$, $@SIEGE_HURNS, TP_HURNS);
-    disablenpc "Shoppa Kep";
-    disablenpc "Richard";
-
-    disablenpc "Celestia";
-    disablenpc "Airlia";
-    disablenpc "Nicholas";
-    disablenpc "Wyara";
-    disablenpc "Alan";
-    disablenpc "Khafar";
-    disablenpc "Melina";
-    disablenpc "Helena";
-    disablenpc "Rakinorf, Mayor";
-    end;
-
-OnTimer196000:
-    siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-    end;
-
-OnTimer280000:
-    siege_boss("012-1", $@SIEGE_HURNS);
-    siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-    end;
-
-// At certain moments, the difficulty rises
-OnTimer310000:
-OnTimer520000:
-OnTimer640000:
-    $@SIEGE_HURNS+=1;
-// Spawn each 45s after timer 120, difficulty raisers exempt (same for boss)
-OnTimer220000:
-OnTimer265000:
-//Timer 280000: BOSS WAVE
-//OnTimer310000: difficulty raiser
-OnTimer355000:
-OnTimer400000:
-OnTimer445000:
-OnTimer490000:
-//Timer 520000: difficulty raiser
-OnTimer535000:
-OnTimer580000:
-OnTimer625000:
-//OnTimer640000: difficulty raiser
-OnTimer670000:
-    siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-    end;
-
-OnTimer700000:
-    mapannounce("012-1", "##1The Monster Army is getting tired of resistance!", bc_map);
-    siege_cast("012-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-    end;
+OnTimer5000:
+    .siegetime+=5;
+    do_siege("012-1", "014-3", "HURNS", TP_HURNS, .name$, .siegetime);
+    switch (.siegetime) {
+    // Monster Army arrives in town
+    case 60:
+        disablenpc "Oscar";
+        disablenpc "Gwendolyn";
+        disablenpc "Milly";
+        disablenpc "LOFBot";
+        disablenpc "Locamit";
+        disablenpc "Andrei Sakar";
+        disablenpc "Luffyx";
+        disablenpc "Tezzerin";
+        disablenpc "Hinnak";
+        disablenpc "Igor";
+        disablenpc "Dyrin The Traveler";
+        disablenpc "Mahad";
+        disablenpc "Jack";
+        break;
+    // Monster Army deployed in town
+    case 90:
+        disablenpc "Shoppa Kep";
+        disablenpc "Richard";
+
+        disablenpc "Celestia";
+        disablenpc "Airlia";
+        disablenpc "Nicholas";
+        disablenpc "Wyara";
+        disablenpc "Alan";
+        disablenpc "Khafar";
+        disablenpc "Melina";
+        disablenpc "Helena";
+        disablenpc "Rakinorf, Mayor";
+        break;
+    // Monster army have withdrawn completly
+    case MK_SIEGE_DURATION:
+        announce(("Hurnscald siege is over!"), bc_all);
+        enablenpc "Gwendolyn";
+        enablenpc "Milly";
+        enablenpc "LOFBot";
+        enablenpc "Locamit";
+        enablenpc "Andrei Sakar";
+        enablenpc "Luffyx";
+        enablenpc "Tezzerin";
+        enablenpc "Hinnak";
+        enablenpc "Igor";
+        enablenpc "Dyrin The Traveler";
+        enablenpc "Mahad";
+        enablenpc "Jack";
+        enablenpc "Shoppa Kep";
+        enablenpc "Richard";
+        enablenpc "Celestia";
+        enablenpc "Airlia";
+        enablenpc "Nicholas";
+        enablenpc "Wyara";
+        enablenpc "Alan";
+        enablenpc "Khafar";
+        enablenpc "Melina";
+        enablenpc "Helena";
+        enablenpc "Rakinorf, Mayor";
+        enablenpc "Oscar";
+        stopnpctimer;
+        end;
+        break;
+    }
 
-OnTimer760000:
-    $@MK_SCENE=MK_NONE;
-    $@MK_AGGRO=$@MK_AGGRO/20;
-    mapannounce("012-1", "##1The Monster King army is preparing to withdraw!", bc_map);
-    end;
-OnTimer790000:
-    siege_revert("012-1");
-    siege_revert("014-3");
-    enablenpc("Mana Stone");
-    $@SIEGE_HURNS=0;
-    announce(("Hurnscald siege is over!"), bc_all);
-    enablenpc "Gwendolyn";
-    enablenpc "Milly";
-    enablenpc "LOFBot";
-    enablenpc "Locamit";
-    enablenpc "Andrei Sakar";
-    enablenpc "Luffyx";
-    enablenpc "Tezzerin";
-    enablenpc "Hinnak";
-    enablenpc "Igor";
-    enablenpc "Dyrin The Traveler";
-    enablenpc "Mahad";
-    enablenpc "Jack";
-    enablenpc "Shoppa Kep";
-    enablenpc "Richard";
-    enablenpc "Celestia";
-    enablenpc "Airlia";
-    enablenpc "Nicholas";
-    enablenpc "Wyara";
-    enablenpc "Alan";
-    enablenpc "Khafar";
-    enablenpc "Melina";
-    enablenpc "Helena";
-    enablenpc "Rakinorf, Mayor";
-    enablenpc "Oscar";
-    stopnpctimer;
+    // Loop again
+    initnpctimer;
     end;
 
 OnInit:
+    .siegetime=0;
     end;
 }