Update Tulimshar to follow same logic

2 files changed, 34 insertions, 22 deletions

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 7906bf13b..c6505f6d6 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -132,9 +132,8 @@ OnMKSiege:
     $@SIEGE_TULIM=rand(1,10);
 OnStartSiege:
     siege_setup("004-1");
-    siege_setup("003-1");
-    kamibroadcast(col("WARNING! WARNING! Siege starting at Tulimshar!!",1));
-    siege_cast("014-3", .name$, 0, TP_TULIM);
+    kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Tulimshar!!",1));
+    siege_cast("004-1", .name$, 0, TP_TULIM);
     initnpctimer;
     end;
 
@@ -149,7 +148,9 @@ OnRespawn:
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
-OnTimer5000:
+// Timers
+OnTimer35000:
+    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);
@@ -212,7 +213,7 @@ OnTimer5000:
     monster("003-1",107,  80, ("Guard Biscop"), FallenGuard3, 1, "Lieutenant Dausen::OnGuardDeath", Size_Medium, 1);
     end;
 
-OnTimer15000:
+OnTimer65000:
     siege_cast("004-1", .name$, $@SIEGE_TULIM, TP_TULIM);
     siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
     disablenpc "Aidan";
@@ -226,42 +227,53 @@ OnTimer15000:
     disablenpc "Colin";
     end;
 
-// Boss after 2 minutes
-OnTimer120000:
-    siege_boss("003-1", $@SIEGE_TULIM);
+OnTimer96000:
     siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
     end;
 
-// Special spawn after 5 minutes
-OnTimer300000:
-    siege_cast("004-1", .name$, $@SIEGE_TULIM, TP_TULIM);
+// The |BOSS| is here!
+OnTimer180000:
+    siege_boss("003-1", $@SIEGE_TULIM);
     siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
     end;
 
-// At minute 3, 6 and 8, difficulty raises
-OnTimer180000:
-OnTimer360000:
-OnTimer480000:
+// At certain moments, the difficulty rises
+OnTimer210000:
+OnTimer420000:
+OnTimer540000:
     $@SIEGE_TULIM+=1;
-// Other minutes are not affected
-OnTimer60000:
+// Spawn each 30s after timer 120, difficulty raisers exempt (same for boss)
+OnTimer120000:
+OnTimer150000:
+//OnTimer180000: BOSS WAVE
+//OnTimer210000: difficulty raiser
 OnTimer240000:
-OnTimer420000:
+OnTimer270000:
+OnTimer300000:
+OnTimer330000:
+OnTimer360000:
+OnTimer390000:
+//OnTimer420000: difficulty raiser
+OnTimer450000:
+OnTimer480000:
+OnTimer510000:
+//OnTimer540000: difficulty raiser
+OnTimer570000:
     siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
     end;
 
-OnTimer540000:
+OnTimer600000:
     mapannounce("003-1", "##1The Monster Army is getting tired of resistance!", bc_map);
     siege_cast("003-1", .name$, $@SIEGE_TULIM, TP_TULIM);
     end;
 
-OnTimer600000:
+OnTimer660000:
     $@MK_SCENE=MK_NONE;
     $@MK_AGGRO=$@MK_AGGRO/20;
     mapannounce("003-1", "##1The Monster King army is preparing to withdraw!", bc_map);
     end;
 
-OnTimer630000:
+OnTimer690000:
     siege_revert("003-1");
     siege_revert("004-1");
     enablenpc("Mana Stone");
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index e009ac253..48c34b382 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -605,7 +605,7 @@ OnInit:
 // Respawn monster from $@SIEGE_TMPMOBS memory
 OnRespawn:
     getmapxy(.@m$,.@x,.@y,0);
-    siege_spawn(.@m$, any_of($@SIEGE_TMPMOBS), 1, "#HurnscaldSiege::OnRespawn");
+    siege_spawn(.@m$, any_of($@SIEGE_TMPMOBS), 1, .name$+"::OnRespawn");
     if (rand(10000) <= $coinsrate+($@SIEGE_HURNS*50))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;