From 019903f6e70e26789ff9ea88bbaa507e4f1894e6 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 20 Mar 2021 15:04:45 -0300
Subject: Oh frankly

---
 npc/029-9/boss.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'npc/029-9')

diff --git a/npc/029-9/boss.txt b/npc/029-9/boss.txt
index ab1cee106..0570560ba 100644
--- a/npc/029-9/boss.txt
+++ b/npc/029-9/boss.txt
@@ -47,6 +47,7 @@ Level of difficulty setting (100/130/160/190/220)
     // PC no longer attached
     // Start the event
     mapwarp("029-9", "029-9", 96, 41);
+    sleep(100);
     maptimer2("029-9", 200, "Book#FoS::OnMFStun");
     sleep(200);
     // Cleanup previous data (if any)
@@ -75,13 +76,13 @@ Level of difficulty setting (100/130/160/190/220)
     .Support4=monster("029-9", 96, 27, "Assassin", Assassin, 1);
     .Support5=monster("029-9", 97, 27, "Assassin", Assassin, 1);
     // Freeze everyone!
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, $@FOS_AND);
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, $@FOS_ISB);
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support1);
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support2);
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support3);
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support4);
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support5);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, $@FOS_AND);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, $@FOS_ISB);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support1);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support2);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support3);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support4);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .Support5);
     // Boost Isbamuth stats
     .@avg=$@FIRESOFSTEAM_DIFF;
     // Reconfigure the monster
@@ -178,7 +179,7 @@ OnProlEnd:
     .Support4=0;
     .Support5=0;
     maptimer2("029-9", 10000, "Book#FoS::OnMFMark");
-    maptimer2("029-9", .firstime, "Book#FoS::OnMFScene");
+    maptimer2("029-9", 18000, "Book#FoS::OnMFScene");
     // Ensure Andrei Sakar is at his place and stunned
     unitwarp($@FOS_AND, "029-9", 39, 21);
     sc_start(SC_STUN, INT_MAX, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, $@FOS_AND);
@@ -193,7 +194,7 @@ OnProlEnd:
     setunitdata(.Support1, UDT_HP,       999999);
     setunitdata(.Support2, UDT_MAXHP,    999999);
     setunitdata(.Support2, UDT_HP,       999999);
-    sleep(.firstime+100); // Wait for cutscene to start + latebloomers
+    sleep(18000+100); // Wait for cutscene to start + latebloomers
     //////////////////////////////////////////////////////////////
     unittalk(.Support1, "...I'm sorry!");
     sleep(1000);
@@ -360,7 +361,7 @@ OnEventEnd:
 
 ////////////// Map Broadcast //////////////
 OnMFStun:
-    sc_start(SC_STUN, .firstime, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK);
+    sc_start(SC_STUN, 18000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK);
     end;
 
 OnMFAndreiMagic:
@@ -398,7 +399,7 @@ OnMFDispose:
 OnTimer15000:
     maptimer2("029-9", 10, "Book#FoS::OnMFDispose");
     sleep(30);
-    if (getmapusers("029-9")) goto L_Defeat;
+    if (getmapusers("029-9") < 1) goto L_Defeat;
     // Main cycle
     if ($@FIRESOFSTEAM_BOSS == 1) {
         monster("029-9", 102, 47, "Assassin", Assassin, 1);
@@ -529,7 +530,6 @@ L_Defeat:
     end;
 
 OnInit:
-    .firstime = 18000;
     .boostime = 900000;
     .subitime = 47000;
     .distance = 5;
-- 
cgit v1.2.3-60-g2f50