Convert Lieutenant Dausen to new Siege Style.

1 files changed, 138 insertions, 187 deletions

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 929a816ee..d9fb2b20a 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -128,204 +128,155 @@ L_MKControl:
     }
     close;
 
+OnGuardDeath:
+    end;
+
 OnMKSiege:
     $@SIEGE_TULIM=rand(1,10);
     // Reduce difficulty here so it ranges from 1~6 instead of 1~10, with higher chances at 2~5 range.
     $@SIEGE_TULIM=($@SIEGE_TULIM/2)+1;
 OnStartSiege:
-    siege_setup("004-1");
     kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Tulimshar!!",1));
-    siege_cast("004-1", .name$, 0, TP_TULIM);
+    do_siege("003-1", "004-3", "TULIM", TP_TULIM, .name$, .siegetime);
     initnpctimer;
     end;
 
-OnGuardDeath:
-    end;
-
-// Warmup
-OnTimer70000:
-OnTimer95000:
-OnTimer140000:
-    siege_cast("003-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-OnTimer35000:
-    siege_cast("004-1", .name$, $@SIEGE_HURNS, TP_HURNS);
-    end;
-
 // Timers
-OnTimer60000:
-    siege_setup("003-1");
-    siege_cast("004-1", .name$, 0, TP_TULIM);
-    siege_cast("003-1", .name$, 0, TP_TULIM);
-    mapannounce("003-1", "##2Message to all Tulimshar NPCs: Take shelter!", bc_map);
-    disablenpc "Ched";
-    disablenpc "Aahna";
-    disablenpc "Constable Perry";
-    disablenpc "Cyndala";
-    disablenpc "Eomie";
-    disablenpc "Eugene";
-    disablenpc "Gladys";
-    disablenpc "Inac";
-    disablenpc "Ishi";
-    disablenpc "Itka";
-    disablenpc "Jakod";
-    disablenpc "Jerican";
-    disablenpc "Mahoud";
-    disablenpc "Marius The Bard";
-    disablenpc "Michel";
-    disablenpc "Neko";
-    disablenpc "Nina The Traveler";
-    disablenpc "Sarah";
-    disablenpc "Silvia";
-    disablenpc "Tamiloc";
-    disablenpc "Tinris";
-    disablenpc "#water_animation0";
-    disablenpc "Sailors#003-1";
-    disablenpc "Guard Philip";
-    disablenpc "Guard Defou";
-    disablenpc "Guard Avou";
-    disablenpc "Guard Benji";
-    disablenpc "Guard Valou";
-    disablenpc "Guard Nutelo";
-    disablenpc "Guard Moustacha";
-    disablenpc "Guard Popaul";
-    disablenpc "Guard Yen";
-    disablenpc "Guard Maxim";
-    disablenpc "Guard Totor";
-    disablenpc "Guard Roukin";
-    disablenpc "Guard Falko";
-    disablenpc "Guard Froma";
-    disablenpc "Guard Tetric";
-    disablenpc "Guard Biscop";
-
-    // Create guards
-    monster("003-1", 98, 100, ("Guard Philip"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 98, 121, ("Guard Defou"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1",102, 121, ("Guard Avou"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 58, 158, ("Guard Benji"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 62, 158, ("Guard Valou"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 71, 138, ("Guard Nutelo"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 58, 128, ("Guard Moustacha"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 58, 100, ("Guard Popaul"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 51,  73, ("Guard Yen"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 54,  52, ("Guard Maxim"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 50,  36, ("Guard Totor"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 53,  36, ("Guard Roukin"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1", 35,  34, ("Guard Falko"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1",111, 101, ("Guard Froma"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1",102,  80, ("Guard Tetric"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    monster("003-1",107,  80, ("Guard Biscop"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
-    end;
-
-OnTimer90000:
-    siege_cast("004-1", .name$, $@SIEGE_TULIM, TP_TULIM);
-    siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
-    disablenpc "Aidan";
-    disablenpc "Inar";
-    disablenpc "Malivox";
-    disablenpc "Estard";
-    disablenpc "Malindou";
-    disablenpc "Jhedia";
-    disablenpc "Swezanne";
-    disablenpc "Luca";
-    disablenpc "Colin";
-    end;
-
-// The |BOSS| is here!
-OnTimer380000:
-    siege_boss("003-1", $@SIEGE_TULIM);
-    siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
-    end;
-
-// At certain moments, the difficulty rises
-OnTimer410000:
-OnTimer620000:
-OnTimer740000:
-    $@SIEGE_TULIM+=1;
-// Spawn each 45s after timer 120, difficulty raisers exempt (same for boss)
-OnTimer296000:
-OnTimer320000:
-OnTimer365000:
-//Timer 380000: BOSS WAVE
-//OnTimer410000: difficulty raiser
-OnTimer455000:
-OnTimer500000:
-OnTimer545000:
-OnTimer590000:
-//Timer 620000: difficulty raiser
-OnTimer635000:
-OnTimer680000:
-OnTimer725000:
-//OnTimer740000: difficulty raiser
-OnTimer770000:
-    siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
-    end;
-
-OnTimer800000:
-    mapannounce("003-1", "##1The Monster Army is getting tired of resistance!", bc_map);
-    siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
-    end;
-
-OnTimer860000:
-    $@MK_SCENE=MK_NONE;
-    $@MK_AGGRO=$@MK_AGGRO/20;
-    mapannounce("003-1", "##1The Monster King army is preparing to withdraw!", bc_map);
-    end;
-
-OnTimer890000:
-    siege_revert("003-1");
-    siege_revert("004-1");
-    enablenpc("Mana Stone");
-    $@SIEGE_TULIM=0;
+OnTimer5000:
+    .siegetime+=5;
+    do_siege("012-1", "014-3", "HURNS", TP_HURNS, .name$, .siegetime);
+    switch (.siegetime) {
+    // Monster Army arrives in town
+    case 60:
+        disablenpc "Ched";
+        disablenpc "Aahna";
+        disablenpc "Constable Perry";
+        disablenpc "Cyndala";
+        disablenpc "Eomie";
+        disablenpc "Eugene";
+        disablenpc "Gladys";
+        disablenpc "Inac";
+        disablenpc "Ishi";
+        disablenpc "Itka";
+        disablenpc "Jakod";
+        disablenpc "Jerican";
+        disablenpc "Mahoud";
+        disablenpc "Marius The Bard";
+        disablenpc "Michel";
+        disablenpc "Neko";
+        disablenpc "Nina The Traveler";
+        disablenpc "Sarah";
+        disablenpc "Silvia";
+        disablenpc "Tamiloc";
+        disablenpc "Tinris";
+        disablenpc "#water_animation0";
+        disablenpc "Sailors#003-1";
+        disablenpc "Guard Philip";
+        disablenpc "Guard Defou";
+        disablenpc "Guard Avou";
+        disablenpc "Guard Benji";
+        disablenpc "Guard Valou";
+        disablenpc "Guard Nutelo";
+        disablenpc "Guard Moustacha";
+        disablenpc "Guard Popaul";
+        disablenpc "Guard Yen";
+        disablenpc "Guard Maxim";
+        disablenpc "Guard Totor";
+        disablenpc "Guard Roukin";
+        disablenpc "Guard Falko";
+        disablenpc "Guard Froma";
+        disablenpc "Guard Tetric";
+        disablenpc "Guard Biscop";
+
+        // Create guards
+        monster("003-1", 98, 100, ("Guard Philip"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 98, 121, ("Guard Defou"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1",102, 121, ("Guard Avou"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 58, 158, ("Guard Benji"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 62, 158, ("Guard Valou"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 71, 138, ("Guard Nutelo"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 58, 128, ("Guard Moustacha"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 58, 100, ("Guard Popaul"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 51,  73, ("Guard Yen"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 54,  52, ("Guard Maxim"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 50,  36, ("Guard Totor"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 53,  36, ("Guard Roukin"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1", 35,  34, ("Guard Falko"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1",111, 101, ("Guard Froma"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1",102,  80, ("Guard Tetric"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        monster("003-1",107,  80, ("Guard Biscop"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
+        break;
+    // Monster Army deployed in town
+    case 90:
+        disablenpc "Aidan";
+        disablenpc "Inar";
+        disablenpc "Malivox";
+        disablenpc "Estard";
+        disablenpc "Malindou";
+        disablenpc "Jhedia";
+        disablenpc "Swezanne";
+        disablenpc "Luca";
+        disablenpc "Colin";
+        break;
+    // Monster army have withdrawn completly
+    case MK_SIEGE_DURATION:
+        .siegetime=0;
     announce(("Tulimshar siege is over!"), bc_all);
-    enablenpc "Ched";
-    enablenpc "Aahna";
-    enablenpc "Constable Perry";
-    enablenpc "Cyndala";
-    enablenpc "Eomie";
-    enablenpc "Eugene";
-    enablenpc "Gladys";
-    enablenpc "Inac";
-    enablenpc "Ishi";
-    enablenpc "Itka";
-    enablenpc "Jakod";
-    enablenpc "Jerican";
-    enablenpc "Mahoud";
-    enablenpc "Marius The Bard";
-    enablenpc "Michel";
-    enablenpc "Neko";
-    enablenpc "Nina The Traveler";
-    enablenpc "Sarah";
-    enablenpc "Silvia";
-    enablenpc "Swezanne";
-    enablenpc "Tamiloc";
-    enablenpc "Tinris";
-    enablenpc "#water_animation0";
-    enablenpc "Aidan";
-    enablenpc "Inar";
-    enablenpc "Malivox";
-    enablenpc "Luca";
-    enablenpc "Colin";
-    enablenpc "Estard";
-    enablenpc "Malindou";
-    enablenpc "Jhedia";
-    enablenpc "Sailors#003-1";
-    enablenpc "Guard Philip";
-    enablenpc "Guard Defou";
-    enablenpc "Guard Avou";
-    enablenpc "Guard Benji";
-    enablenpc "Guard Valou";
-    enablenpc "Guard Nutelo";
-    enablenpc "Guard Moustacha";
-    enablenpc "Guard Popaul";
-    enablenpc "Guard Yen";
-    enablenpc "Guard Maxim";
-    enablenpc "Guard Totor";
-    enablenpc "Guard Roukin";
-    enablenpc "Guard Falko";
-    enablenpc "Guard Froma";
-    enablenpc "Guard Tetric";
-    enablenpc "Guard Biscop";
-    stopnpctimer;
+        enablenpc "Ched";
+        enablenpc "Aahna";
+        enablenpc "Constable Perry";
+        enablenpc "Cyndala";
+        enablenpc "Eomie";
+        enablenpc "Eugene";
+        enablenpc "Gladys";
+        enablenpc "Inac";
+        enablenpc "Ishi";
+        enablenpc "Itka";
+        enablenpc "Jakod";
+        enablenpc "Jerican";
+        enablenpc "Mahoud";
+        enablenpc "Marius The Bard";
+        enablenpc "Michel";
+        enablenpc "Neko";
+        enablenpc "Nina The Traveler";
+        enablenpc "Sarah";
+        enablenpc "Silvia";
+        enablenpc "Swezanne";
+        enablenpc "Tamiloc";
+        enablenpc "Tinris";
+        enablenpc "#water_animation0";
+        enablenpc "Aidan";
+        enablenpc "Inar";
+        enablenpc "Malivox";
+        enablenpc "Luca";
+        enablenpc "Colin";
+        enablenpc "Estard";
+        enablenpc "Malindou";
+        enablenpc "Jhedia";
+        enablenpc "Sailors#003-1";
+        enablenpc "Guard Philip";
+        enablenpc "Guard Defou";
+        enablenpc "Guard Avou";
+        enablenpc "Guard Benji";
+        enablenpc "Guard Valou";
+        enablenpc "Guard Nutelo";
+        enablenpc "Guard Moustacha";
+        enablenpc "Guard Popaul";
+        enablenpc "Guard Yen";
+        enablenpc "Guard Maxim";
+        enablenpc "Guard Totor";
+        enablenpc "Guard Roukin";
+        enablenpc "Guard Falko";
+        enablenpc "Guard Froma";
+        enablenpc "Guard Tetric";
+        enablenpc "Guard Biscop";
+        stopnpctimer;
+        end;
+        break;
+    }
+
+    // Loop again
+    initnpctimer;
     end;
 
 OnInit: