1 files changed, 42 insertions, 82 deletions
diff --git a/npc/020-1/guards.txt b/npc/020-1/guards.txt
index 6d5ec7836..0f9ad9d02 100644
--- a/npc/020-1/guards.txt
+++ b/npc/020-1/guards.txt
@@ -34,97 +34,57 @@ L_MKControl:
 OnMKSiege:
     $@SIEGE_NIVAL=rand(1,10);
 OnStartSiege:
-    siege_setup("019-2");
     kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Nivalis!!",1));
-    siege_cast("019-2", .name$, 0, TP_NIVAL);
+    do_siege("020-1", "019-2", "NIVAL", TP_NIVAL, .name$, .siegetime);
     initnpctimer;
     end;
 
 // Timers
-OnTimer35000:
-    siege_setup("020-1");
-    siege_cast("019-2", .name$, $@SIEGE_NIVAL, TP_NIVAL);
-    mapannounce("020-1", "##2Message to all Nivalis NPCs: Take shelter!", bc_map);
-    disablenpc "Serge";
-    disablenpc "Knox The Traveler";
-    disablenpc "Camilot";
-    disablenpc "Mede";
-    disablenpc "Gambler#020-4";
-    disablenpc "Gambling Xan";
-    disablenpc "Baktar";
-    disablenpc "Bracco";
-    disablenpc "Agostine";
-    end;
-
-OnTimer65000:
-    siege_cast("020-1", .name$, 0, TP_NIVAL);
-    siege_cast("019-2", .name$, $@SIEGE_NIVAL, TP_NIVAL);
-    disablenpc "Ben#NivBanker";
-    end;
-
-OnTimer96000:
-    siege_cast("020-1", .name$, $@SIEGE_NIVAL, TP_NIVAL);
-    end;
-
-OnTimer180000:
-    siege_boss("020-1", $@SIEGE_NIVAL);
-    siege_cast("020-1", .name$, $@SIEGE_NIVAL, TP_NIVAL);
-    end;
-
-// At certain moments, the difficulty rises
-OnTimer210000:
-OnTimer420000:
-OnTimer540000:
-    $@SIEGE_NIVAL+=1;
-// Spawn each 45s after timer 120, difficulty raisers exempt (same for boss)
-OnTimer120000:
-OnTimer165000:
-//Timer 180000: BOSS WAVE
-//OnTimer210000: difficulty raiser
-OnTimer255000:
-OnTimer300000:
-OnTimer345000:
-OnTimer390000:
-//Timer 420000: difficulty raiser
-OnTimer435000:
-OnTimer480000:
-OnTimer525000:
-//OnTimer540000: difficulty raiser
-OnTimer570000:
-    siege_cast("020-1", .name$, $@SIEGE_NIVAL, TP_NIVAL);
-    end;
-
-OnTimer600000:
-    mapannounce("020-1", "##1The Monster Army is getting tired of resistance!", bc_map);
-    siege_cast("020-1", .name$, $@SIEGE_NIVAL, TP_NIVAL);
-    end;
-
-OnTimer660000:
-    $@MK_SCENE=MK_NONE;
-    $@MK_AGGRO=$@MK_AGGRO/20;
-    mapannounce("020-1", "##1The Monster King army is preparing to withdraw!", bc_map);
-    end;
+OnTimer5000:
+    .siegetime+=5;
+    do_siege("020-1", "019-2", "NIVAL", TP_NIVAL, .name$, .siegetime);
+    switch (.siegetime) {
+    // Monster Army arrives in town
+    case 60:
+        disablenpc "Serge";
+        disablenpc "Knox The Traveler";
+        disablenpc "Camilot";
+        disablenpc "Mede";
+        disablenpc "Gambler#020-4";
+        disablenpc "Gambling Xan";
+        disablenpc "Baktar";
+        disablenpc "Bracco";
+        disablenpc "Agostine";
+        break;
+    // Monster Army deployed in town
+    case 90:
+        disablenpc "Ben#NivBanker";
+        break;
+    // Monster army have withdrawn completly
+    case MK_SIEGE_DURATION:
+        .siegetime=0;
+        announce(("Nivalis siege is over!"), bc_all);
+        enablenpc "Serge";
+        enablenpc "Knox The Traveler";
+        enablenpc "Camilot";
+        enablenpc "Mede";
+        enablenpc "Gambler#020-4";
+        enablenpc "Gambling Xan";
+        enablenpc "Baktar";
+        enablenpc "Bracco";
+        enablenpc "Agostine";
+        enablenpc "Ben#NivBanker";
+        stopnpctimer;
+        end;
+        break;
+    }
 
-OnTimer690000:
-    siege_revert("020-1");
-    siege_revert("019-2");
-    enablenpc("Mana Stone");
-    $@SIEGE_NIVAL=0;
-    announce(("Nivalis siege is over!"), bc_all);
-    enablenpc "Serge";
-    enablenpc "Knox The Traveler";
-    enablenpc "Camilot";
-    enablenpc "Mede";
-    enablenpc "Gambler#020-4";
-    enablenpc "Gambling Xan";
-    enablenpc "Baktar";
-    enablenpc "Bracco";
-    enablenpc "Agostine";
-    enablenpc "Ben#NivBanker";
-    stopnpctimer;
+    // Loop again
+    initnpctimer;
     end;
 
 OnInit:
+    .siegetime=0;
     .sex = G_MALE;
     .distance = 4;