raidboss: ex7 small delay fixups (#5880)

quisquous · Oct 28, 2023 · d2f058b · d2f058b
1 parent 352a5a3
commit d2f058b
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/ui/raidboss/data/06-ew/trial/zeromus-ex.ts b/ui/raidboss/data/06-ew/trial/zeromus-ex.ts
@@ -18,6 +18,7 @@ export interface Data extends RaidbossData {
   miasmicBlasts: PluginCombatantState[];
   busterPlayers: string[];
   forkedPlayers: string[];
+  bigBangStackPlayer?: string;
   blackHolePlayer?: string;
   flareMechanic?: 'spread' | 'stack';
   noxPlayers: string[];
@@ -350,12 +351,25 @@ const triggerSet: TriggerSet<Data> = {
       },
     },
     {
-      id: 'ZeromusEx The Dark Beckons Stack',
+      id: 'ZeromusEx The Dark Beckons Stack Collect',
       type: 'HeadMarker',
       netRegex: { id: headmarkerMap.stack },
       condition: (data) => data.phase === 'one',
-      // Wait to collect tank markers.
-      delaySeconds: 0.5,
+      run: (data, matches) => data.bigBangStackPlayer = matches.target,
+    },
+    {
+      id: 'ZeromusEx The Dark Beckons Stack',
+      type: 'HeadMarker',
+      netRegex: { id: [headmarkerMap.stack, headmarkerMap.tankBuster] },
+      condition: (data) => {
+        if (data.phase !== 'one')
+          return false;
+        return data.bigBangStackPlayer !== undefined;
+      },
+      // If we have both busters, run immediately otherwise wait a reasonable amount of time
+      // for them to show up.
+      delaySeconds: (data) => data.busterPlayers.length === 2 ? 0 : 1,
+      suppressSeconds: 10,
       alertText: (data, matches, output) => {
         if (data.busterPlayers.includes(data.me))
           return;
@@ -530,7 +544,7 @@ const triggerSet: TriggerSet<Data> = {
       id: 'ZeromusEx Flare Mechanic No Nox',
       type: 'HeadMarker',
       netRegex: { id: headmarkerMap.nox, capture: false },
-      delaySeconds: 0.5,
+      delaySeconds: (data) => data.noxPlayers.length === 2 ? 0 : 0.5,
       suppressSeconds: 5,
       alertText: (data, _matches, output) => {
         if (data.noxPlayers.includes(data.me))