From b36dab62afb05253452164e18ef4e5aa857bceb6 Mon Sep 17 00:00:00 2001
From: CarnifexOptimus <Bastianfahr@pm.me>
Date: Thu, 28 Mar 2024 14:32:45 +0100
Subject: [PATCH] reverted module priority fix

---
 BossMod/Modules/Endwalker/FATE/Chi.cs                       | 3 +--
 BossMod/Modules/Endwalker/FATE/Daivadipa.cs                 | 3 +--
 BossMod/Modules/Endwalker/HuntA/Aegeiros.cs                 | 3 +--
 BossMod/Modules/Endwalker/HuntA/ArchEta.cs                  | 3 +--
 BossMod/Modules/Endwalker/HuntA/FanAil.cs                   | 3 +--
 BossMod/Modules/Endwalker/HuntA/Gurangatch.cs               | 3 +--
 BossMod/Modules/Endwalker/HuntA/Hulder.cs                   | 3 +--
 BossMod/Modules/Endwalker/HuntA/LunatenderQueen.cs          | 3 +--
 BossMod/Modules/Endwalker/HuntA/Minerva.cs                  | 3 +--
 BossMod/Modules/Endwalker/HuntA/MoussePrincess.cs           | 3 +--
 BossMod/Modules/Endwalker/HuntA/Petalodus.cs                | 3 +--
 BossMod/Modules/Endwalker/HuntA/Storsie.cs                  | 3 +--
 BossMod/Modules/Endwalker/HuntA/Sugriva.cs                  | 3 +--
 BossMod/Modules/Endwalker/HuntA/Yilan.cs                    | 3 +--
 BossMod/Modules/Endwalker/HuntS/Armstrong.cs                | 3 +--
 BossMod/Modules/Endwalker/HuntS/Burfurlur.cs                | 3 +--
 BossMod/Modules/Endwalker/HuntS/Ker.cs                      | 3 +--
 BossMod/Modules/Endwalker/HuntS/KerShroud.cs                | 3 +--
 BossMod/Modules/Endwalker/HuntS/NarrowRift.cs               | 3 +--
 BossMod/Modules/Endwalker/HuntS/Ophioneus.cs                | 3 +--
 BossMod/Modules/Endwalker/HuntS/Ruminator.cs                | 3 +--
 BossMod/Modules/Endwalker/HuntS/Sphatika.cs                 | 3 +--
 BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01Caduceus.cs | 1 -
 BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs         | 3 +--
 BossMod/Modules/Shadowbringers/FATE/Formidable.cs           | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Baal.cs                | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Grassman.cs            | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Huracan.cs             | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/LilMurderer.cs         | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Maliktender.cs         | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Nariphon.cs            | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Nuckelavee.cs          | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/OPoorestPauldia.cs     | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Rusalka.cs             | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Sugaar.cs              | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/Supay.cs               | 3 +--
 BossMod/Modules/Shadowbringers/HuntA/TheMudman.cs           | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/Aglaope.cs             | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/ForgivenGossip.cs      | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/ForgivenPedantry.cs    | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/ForgivenRebellion.cs   | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/Gunitt.cs              | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/Ixtab.cs               | 5 ++---
 BossMod/Modules/Shadowbringers/HuntS/Tarchia.cs             | 3 +--
 BossMod/Modules/Shadowbringers/HuntS/Tyger.cs               | 3 +--
 BossMod/Modules/Stormblood/HuntA/Angada.cs                  | 3 +--
 BossMod/Modules/Stormblood/HuntA/Gajasura.cs                | 3 +--
 BossMod/Modules/Stormblood/HuntS/Okina.cs                   | 3 +--
 48 files changed, 48 insertions(+), 96 deletions(-)

diff --git a/BossMod/Modules/Endwalker/FATE/Chi.cs b/BossMod/Modules/Endwalker/FATE/Chi.cs
index e4bf79afe5..5cf88f7f6d 100644
--- a/BossMod/Modules/Endwalker/FATE/Chi.cs
+++ b/BossMod/Modules/Endwalker/FATE/Chi.cs
@@ -339,8 +339,7 @@ public ChiStates(BossModule module) : base(module)
                 .ActivateOnEnter<ThermobaricExplosive>()
                 .ActivateOnEnter<Bunkerbuster>()
                 .ActivateOnEnter<BouncingBomb>()
-                .ActivateOnEnter<MissileShower>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<MissileShower>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/FATE/Daivadipa.cs b/BossMod/Modules/Endwalker/FATE/Daivadipa.cs
index 12e31f6944..9ae5e58dae 100644
--- a/BossMod/Modules/Endwalker/FATE/Daivadipa.cs
+++ b/BossMod/Modules/Endwalker/FATE/Daivadipa.cs
@@ -313,8 +313,7 @@ public DaivadipaStates(BossModule module) : base(module)
                 .ActivateOnEnter<ErrantAkasa>()
                 .ActivateOnEnter<KarmicFlames>()
                 .ActivateOnEnter<LitPath>()
-                .ActivateOnEnter<Burn>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Burn>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Aegeiros.cs b/BossMod/Modules/Endwalker/HuntA/Aegeiros.cs
index b0e0a829e1..20459af8e4 100644
--- a/BossMod/Modules/Endwalker/HuntA/Aegeiros.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Aegeiros.cs
@@ -71,8 +71,7 @@ public AegeirosStates(BossModule module) : base(module)
                 .ActivateOnEnter<LeafstormRimestorm>()
                 .ActivateOnEnter<Snowball>()
                 .ActivateOnEnter<Canopy>()
-                .ActivateOnEnter<BackhandBlow>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<BackhandBlow>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/ArchEta.cs b/BossMod/Modules/Endwalker/HuntA/ArchEta.cs
index 1763966c67..b680dc1d7a 100644
--- a/BossMod/Modules/Endwalker/HuntA/ArchEta.cs
+++ b/BossMod/Modules/Endwalker/HuntA/ArchEta.cs
@@ -50,8 +50,7 @@ public ArchEtaStates(BossModule module) : base(module)
                 .ActivateOnEnter<TailSwipe>()
                 .ActivateOnEnter<HeavyStomp>()
                 .ActivateOnEnter<SonicHowl>()
-                .ActivateOnEnter<SteelFang>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<SteelFang>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/FanAil.cs b/BossMod/Modules/Endwalker/HuntA/FanAil.cs
index ebda7e327e..6ef9f0f43e 100644
--- a/BossMod/Modules/Endwalker/HuntA/FanAil.cs
+++ b/BossMod/Modules/Endwalker/HuntA/FanAil.cs
@@ -52,8 +52,7 @@ public FanAilStates(BossModule module) : base(module)
                 .ActivateOnEnter<LiquidHell>()
                 .ActivateOnEnter<Plummet>()
                 .ActivateOnEnter<DeathSentence>()
-                .ActivateOnEnter<CycloneWing>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<CycloneWing>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Gurangatch.cs b/BossMod/Modules/Endwalker/HuntA/Gurangatch.cs
index d81a78db97..d81bece321 100644
--- a/BossMod/Modules/Endwalker/HuntA/Gurangatch.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Gurangatch.cs
@@ -69,8 +69,7 @@ public GurangatchStates(BossModule module) : base(module)
         {
             TrivialPhase()
                 .ActivateOnEnter<Slammer>()
-                .ActivateOnEnter<BoneShaker>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<BoneShaker>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Hulder.cs b/BossMod/Modules/Endwalker/HuntA/Hulder.cs
index 0c05759256..cb595c0aae 100644
--- a/BossMod/Modules/Endwalker/HuntA/Hulder.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Hulder.cs
@@ -49,8 +49,7 @@ public HulderStates(BossModule module) : base(module)
                 .ActivateOnEnter<TempestuousWrath>()
                 .ActivateOnEnter<RottingElegy>()
                 .ActivateOnEnter<OdeToLostLove>()
-                .ActivateOnEnter<StormOfColor>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<StormOfColor>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/LunatenderQueen.cs b/BossMod/Modules/Endwalker/HuntA/LunatenderQueen.cs
index fbbc8c1660..af57415b35 100644
--- a/BossMod/Modules/Endwalker/HuntA/LunatenderQueen.cs
+++ b/BossMod/Modules/Endwalker/HuntA/LunatenderQueen.cs
@@ -70,8 +70,7 @@ public LunatenderQueenStates(BossModule module) : base(module)
                 .ActivateOnEnter<WickedWhim>()
                 .ActivateOnEnter<AvertYourEyesInverted>()
                 .ActivateOnEnter<YouMayApproachInverted>()
-                .ActivateOnEnter<AwayWithYouInverted>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<AwayWithYouInverted>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Minerva.cs b/BossMod/Modules/Endwalker/HuntA/Minerva.cs
index 7ba6dacbed..6e81a1357b 100644
--- a/BossMod/Modules/Endwalker/HuntA/Minerva.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Minerva.cs
@@ -113,8 +113,7 @@ public MinervaStates(BossModule module) : base(module)
                 .ActivateOnEnter<BallisticMissile>()
                 .ActivateOnEnter<Hyperflame>()
                 .ActivateOnEnter<SonicAmplifier>()
-                .ActivateOnEnter<HammerKnuckles>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<HammerKnuckles>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/MoussePrincess.cs b/BossMod/Modules/Endwalker/HuntA/MoussePrincess.cs
index 8c936b80ed..088372b048 100644
--- a/BossMod/Modules/Endwalker/HuntA/MoussePrincess.cs
+++ b/BossMod/Modules/Endwalker/HuntA/MoussePrincess.cs
@@ -102,8 +102,7 @@ public MoussePrincessStates(BossModule module) : base(module)
                 .ActivateOnEnter<WhimsyAlaMode>()
                 .ActivateOnEnter<AmorphicFlail>()
                 .ActivateOnEnter<PrincessCacophony>()
-                .ActivateOnEnter<Banish>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Banish>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Petalodus.cs b/BossMod/Modules/Endwalker/HuntA/Petalodus.cs
index 2c99ba2f67..9a53698811 100644
--- a/BossMod/Modules/Endwalker/HuntA/Petalodus.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Petalodus.cs
@@ -44,8 +44,7 @@ public PetalodusStates(BossModule module) : base(module)
                 .ActivateOnEnter<MarineMayhem>()
                 .ActivateOnEnter<Waterga>()
                 .ActivateOnEnter<TidalGuillotine>()
-                .ActivateOnEnter<AncientBlizzard>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<AncientBlizzard>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Storsie.cs b/BossMod/Modules/Endwalker/HuntA/Storsie.cs
index b6a67d3867..c1f1b3252f 100644
--- a/BossMod/Modules/Endwalker/HuntA/Storsie.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Storsie.cs
@@ -70,8 +70,7 @@ public StorsieStates(BossModule module) : base(module)
         {
             TrivialPhase()
                 .ActivateOnEnter<Aspect>()
-                .ActivateOnEnter<FangsEnd>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<FangsEnd>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Sugriva.cs b/BossMod/Modules/Endwalker/HuntA/Sugriva.cs
index ebc0b4fd81..d286dfd9d9 100644
--- a/BossMod/Modules/Endwalker/HuntA/Sugriva.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Sugriva.cs
@@ -142,8 +142,7 @@ public SugrivaStates(BossModule module) : base(module)
                 .ActivateOnEnter<ButcherHint>()
                 .ActivateOnEnter<Rip>()
                 .ActivateOnEnter<RockThrow>()
-                .ActivateOnEnter<Crosswind>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Crosswind>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntA/Yilan.cs b/BossMod/Modules/Endwalker/HuntA/Yilan.cs
index 0356ef9d8e..7ba5c03dd9 100644
--- a/BossMod/Modules/Endwalker/HuntA/Yilan.cs
+++ b/BossMod/Modules/Endwalker/HuntA/Yilan.cs
@@ -96,8 +96,7 @@ public YilanStates(BossModule module) : base(module)
                 .ActivateOnEnter<MiniLight>()
                 .ActivateOnEnter<Devour>()
                 .ActivateOnEnter<BogBomb>()
-                .ActivateOnEnter<BrackishRain>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<BrackishRain>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/Armstrong.cs b/BossMod/Modules/Endwalker/HuntS/Armstrong.cs
index b42c87818a..a8b0277f76 100644
--- a/BossMod/Modules/Endwalker/HuntS/Armstrong.cs
+++ b/BossMod/Modules/Endwalker/HuntS/Armstrong.cs
@@ -91,8 +91,7 @@ public ArmstrongStates(BossModule module) : base(module)
                 .ActivateOnEnter<AcceleratedLanding>()
                 .ActivateOnEnter<CalculatedCombustion>()
                 .ActivateOnEnter<Pummel>()
-                .ActivateOnEnter<SoporificGas>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<SoporificGas>();
         }
     }
     [ModuleInfo(NotoriousMonsterID = 196)]
diff --git a/BossMod/Modules/Endwalker/HuntS/Burfurlur.cs b/BossMod/Modules/Endwalker/HuntS/Burfurlur.cs
index b1e87bc76d..7163b75a2b 100644
--- a/BossMod/Modules/Endwalker/HuntS/Burfurlur.cs
+++ b/BossMod/Modules/Endwalker/HuntS/Burfurlur.cs
@@ -89,8 +89,7 @@ public BurfurlurStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<QuintupleSneeze>()
                 .ActivateOnEnter<Uppercut>()
-                .ActivateOnEnter<RottenSpores>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<RottenSpores>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/Ker.cs b/BossMod/Modules/Endwalker/HuntS/Ker.cs
index c4f802a6ea..db43dcba7a 100644
--- a/BossMod/Modules/Endwalker/HuntS/Ker.cs
+++ b/BossMod/Modules/Endwalker/HuntS/Ker.cs
@@ -276,8 +276,7 @@ public KerStates(BossModule module) : base(module)
                 .ActivateOnEnter<AncientFlare>()
                 .ActivateOnEnter<AncientHoly>()
                 .ActivateOnEnter<AncientHoly2>()
-                .ActivateOnEnter<AncientHolyWhispersManifest>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<AncientHolyWhispersManifest>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/KerShroud.cs b/BossMod/Modules/Endwalker/HuntS/KerShroud.cs
index 5799f3f234..8a55ce7855 100644
--- a/BossMod/Modules/Endwalker/HuntS/KerShroud.cs
+++ b/BossMod/Modules/Endwalker/HuntS/KerShroud.cs
@@ -28,8 +28,7 @@ public KerShroudStates(BossModule module) : base(module)
         {
             TrivialPhase()
                 .ActivateOnEnter<AccursedPox>()
-                .ActivateOnEnter<EntropicFlame>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<EntropicFlame>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/NarrowRift.cs b/BossMod/Modules/Endwalker/HuntS/NarrowRift.cs
index bc2a68f915..98fc124936 100644
--- a/BossMod/Modules/Endwalker/HuntS/NarrowRift.cs
+++ b/BossMod/Modules/Endwalker/HuntS/NarrowRift.cs
@@ -125,8 +125,7 @@ public NarrowRiftStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<EmptyPromise>()
                 .ActivateOnEnter<VanishingRay>()
-                .ActivateOnEnter<ContinualMeddling>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<ContinualMeddling>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/Ophioneus.cs b/BossMod/Modules/Endwalker/HuntS/Ophioneus.cs
index 4b767e7833..2c836739ef 100644
--- a/BossMod/Modules/Endwalker/HuntS/Ophioneus.cs
+++ b/BossMod/Modules/Endwalker/HuntS/Ophioneus.cs
@@ -81,8 +81,7 @@ public OphioneusStates(BossModule module) : base(module)
                 .ActivateOnEnter<RightMaw>()
                 .ActivateOnEnter<LeftMaw>()
                 .ActivateOnEnter<PyricCircleBurst>()
-                .ActivateOnEnter<Scratch>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Scratch>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/Ruminator.cs b/BossMod/Modules/Endwalker/HuntS/Ruminator.cs
index 6710c39627..cdfefe7022 100644
--- a/BossMod/Modules/Endwalker/HuntS/Ruminator.cs
+++ b/BossMod/Modules/Endwalker/HuntS/Ruminator.cs
@@ -84,8 +84,7 @@ public RuminatorStates(BossModule module) : base(module)
         {
             TrivialPhase()
                 .ActivateOnEnter<ChitinousTrace>()
-                .ActivateOnEnter<StygianVapor>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<StygianVapor>();
         }
     }
 
diff --git a/BossMod/Modules/Endwalker/HuntS/Sphatika.cs b/BossMod/Modules/Endwalker/HuntS/Sphatika.cs
index b67e499cf1..aad9156a67 100644
--- a/BossMod/Modules/Endwalker/HuntS/Sphatika.cs
+++ b/BossMod/Modules/Endwalker/HuntS/Sphatika.cs
@@ -146,8 +146,7 @@ public SphatikaStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<Gnaw>()
                 .ActivateOnEnter<Caterwaul>()
-                .ActivateOnEnter<Stance>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Stance>();
         }
     }
 
diff --git a/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01Caduceus.cs b/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01Caduceus.cs
index 49f545cc61..352d972132 100644
--- a/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01Caduceus.cs
+++ b/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01Caduceus.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace BossMod.RealmReborn.Raid.T01Caduceus
diff --git a/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs b/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs
index ebfcc62a31..4ffee7a9a9 100644
--- a/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs
+++ b/BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs
@@ -166,8 +166,7 @@ public ArchaeotaniaStates(BossModule module) : base(module)
                 .ActivateOnEnter<PillarPierce>()
                 .ActivateOnEnter<AncientAevis>()
                 .ActivateOnEnter<HeadlongRush>()
-                .ActivateOnEnter<Aether>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Aether>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/FATE/Formidable.cs b/BossMod/Modules/Shadowbringers/FATE/Formidable.cs
index 8e8861779a..3e46f21d69 100644
--- a/BossMod/Modules/Shadowbringers/FATE/Formidable.cs
+++ b/BossMod/Modules/Shadowbringers/FATE/Formidable.cs
@@ -270,8 +270,7 @@ public FormidableStates(BossModule module) : base(module)
                 .ActivateOnEnter<DwarvenDischargeCircle>()
                 .ActivateOnEnter<AutomatonEscort>()
                 .ActivateOnEnter<SteamDome>()
-                .ActivateOnEnter<DynamicSensoryJammer>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<DynamicSensoryJammer>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Baal.cs b/BossMod/Modules/Shadowbringers/HuntA/Baal.cs
index e6f7b7b793..6eb3fcab08 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Baal.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Baal.cs
@@ -82,8 +82,7 @@ public BaalStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<SewageWave>()
                 .ActivateOnEnter<SewerWater>()
-                .ActivateOnEnter<SewerWater2>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<SewerWater2>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Grassman.cs b/BossMod/Modules/Shadowbringers/HuntA/Grassman.cs
index c25b69441e..3bfad74715 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Grassman.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Grassman.cs
@@ -94,8 +94,7 @@ public GrassmanStates(BossModule module) : base(module)
                 .ActivateOnEnter<Streak>()
                 .ActivateOnEnter<Browbeat>()
                 .ActivateOnEnter<StoolPelt>()
-                .ActivateOnEnter<ChestThump>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<ChestThump>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Huracan.cs b/BossMod/Modules/Shadowbringers/HuntA/Huracan.cs
index cf25fefbe4..776c7ada6e 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Huracan.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Huracan.cs
@@ -101,8 +101,7 @@ public HuracanStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<SpringBreeze>()
                 .ActivateOnEnter<SummerHeat>()
-                .ActivateOnEnter<Combos>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Combos>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/LilMurderer.cs b/BossMod/Modules/Shadowbringers/HuntA/LilMurderer.cs
index 1ef39248ba..2f5696f79b 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/LilMurderer.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/LilMurderer.cs
@@ -75,8 +75,7 @@ public LilMurdererStates(BossModule module) : base(module)
                 .ActivateOnEnter<GobthunderII>()
                 .ActivateOnEnter<GobthunderIII>()
                 .ActivateOnEnter<GobthunderIIIHint>()
-                .ActivateOnEnter<Gobhaste>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Gobhaste>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Maliktender.cs b/BossMod/Modules/Shadowbringers/HuntA/Maliktender.cs
index cbe5221ab6..9aa38fbfdf 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Maliktender.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Maliktender.cs
@@ -59,8 +59,7 @@ public MaliktenderStates(BossModule module) : base(module)
                 .ActivateOnEnter<Sabotendance>()
                 .ActivateOnEnter<TwentyKNeedles>()
                 .ActivateOnEnter<NineNineNineKNeedles>()
-                .ActivateOnEnter<Haste>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Haste>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Nariphon.cs b/BossMod/Modules/Shadowbringers/HuntA/Nariphon.cs
index 050cfeec19..6d0afd0284 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Nariphon.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Nariphon.cs
@@ -99,8 +99,7 @@ public NariphonStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<OdiousMiasma>()
                 .ActivateOnEnter<RootsOfAtopy>()
-                .ActivateOnEnter<AllergenInjection>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<AllergenInjection>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Nuckelavee.cs b/BossMod/Modules/Shadowbringers/HuntA/Nuckelavee.cs
index fbe403662d..d3942a3df6 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Nuckelavee.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Nuckelavee.cs
@@ -77,8 +77,7 @@ public NuckelaveeStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<Torpedo>()
                 .ActivateOnEnter<BogBody>()
-                .ActivateOnEnter<Spite>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Spite>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/OPoorestPauldia.cs b/BossMod/Modules/Shadowbringers/HuntA/OPoorestPauldia.cs
index 2fbc618941..d1a9e429f6 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/OPoorestPauldia.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/OPoorestPauldia.cs
@@ -43,8 +43,7 @@ public OPoorestPauldiaStates(BossModule module) : base(module)
                 .ActivateOnEnter<RustingClaw>()
                 .ActivateOnEnter<TailDrive>()
                 .ActivateOnEnter<WordsOfWoe>()
-                .ActivateOnEnter<TheSpin>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<TheSpin>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Rusalka.cs b/BossMod/Modules/Shadowbringers/HuntA/Rusalka.cs
index 738e3ac782..f1183967d8 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Rusalka.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Rusalka.cs
@@ -62,8 +62,7 @@ public RusalkaStates(BossModule module) : base(module)
                 .ActivateOnEnter<Hydrocannon>()
                 .ActivateOnEnter<AetherialSpark>()
                 .ActivateOnEnter<AetherialPull>()
-                .ActivateOnEnter<Flood>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Flood>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Sugaar.cs b/BossMod/Modules/Shadowbringers/HuntA/Sugaar.cs
index f4b2ac5584..833d5f14c4 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Sugaar.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Sugaar.cs
@@ -103,8 +103,7 @@ public SugaarStates(BossModule module) : base(module)
                 .ActivateOnEnter<NumbingNoise>()
                 .ActivateOnEnter<TailSnap>()
                 .ActivateOnEnter<NumbingNoiseTailSnapRotating>()
-                .ActivateOnEnter<NumbingNoiseTailSnapAttract>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<NumbingNoiseTailSnapAttract>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/Supay.cs b/BossMod/Modules/Shadowbringers/HuntA/Supay.cs
index 40cbbe3f86..2e34b7ed62 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/Supay.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/Supay.cs
@@ -63,8 +63,7 @@ public SupayStates(BossModule module) : base(module)
         {
             TrivialPhase()
                 .ActivateOnEnter<PetroEyes>()
-                .ActivateOnEnter<BlasphemousHowl>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<BlasphemousHowl>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntA/TheMudman.cs b/BossMod/Modules/Shadowbringers/HuntA/TheMudman.cs
index 014cb754f1..318b99e5a6 100644
--- a/BossMod/Modules/Shadowbringers/HuntA/TheMudman.cs
+++ b/BossMod/Modules/Shadowbringers/HuntA/TheMudman.cs
@@ -81,8 +81,7 @@ public TheMudmanStates(BossModule module) : base(module)
                 .ActivateOnEnter<FeculentFlood>()
                 .ActivateOnEnter<RoyalFlush>()
                 .ActivateOnEnter<GravityForce>()
-                .ActivateOnEnter<GravityForceHint>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<GravityForceHint>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/Aglaope.cs b/BossMod/Modules/Shadowbringers/HuntS/Aglaope.cs
index 0dcc76c8e1..07d1df9b45 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/Aglaope.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/Aglaope.cs
@@ -108,8 +108,7 @@ public AglaopeStates(BossModule module) : base(module)
                 .ActivateOnEnter<FourfoldSuffering>()
                 .ActivateOnEnter<AncientAero>()
                 .ActivateOnEnter<AncientAeroIII>()
-                .ActivateOnEnter<AncientAeroIIIKB>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<AncientAeroIIIKB>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/ForgivenGossip.cs b/BossMod/Modules/Shadowbringers/HuntS/ForgivenGossip.cs
index 6730702319..7d6b5870d1 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/ForgivenGossip.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/ForgivenGossip.cs
@@ -28,8 +28,7 @@ public ForgivenGossipStates(BossModule module) : base(module)
         {
             TrivialPhase()
                 .ActivateOnEnter<PetrifyingEye>()
-                .ActivateOnEnter<Icefall>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Icefall>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/ForgivenPedantry.cs b/BossMod/Modules/Shadowbringers/HuntS/ForgivenPedantry.cs
index a80c173e8c..df5b4def1c 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/ForgivenPedantry.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/ForgivenPedantry.cs
@@ -157,8 +157,7 @@ public ForgivenPedantryStates(BossModule module) : base(module)
                 .ActivateOnEnter<CleansingFire>()
                 .ActivateOnEnter<FeveredFlagellation>()
                 .ActivateOnEnter<FeveredFlagellationHint>()
-                .ActivateOnEnter<WitchHunt>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<WitchHunt>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/ForgivenRebellion.cs b/BossMod/Modules/Shadowbringers/HuntS/ForgivenRebellion.cs
index 16ca33749a..5ae1b5110a 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/ForgivenRebellion.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/ForgivenRebellion.cs
@@ -228,8 +228,7 @@ public ForgivenRebellionStates(BossModule module) : base(module)
                 .ActivateOnEnter<SanctifiedBlizzard>()
                 .ActivateOnEnter<SanctifiedBlizzardChain>()
                 .ActivateOnEnter<SanctifiedBlizzardChainHint>()
-                .ActivateOnEnter<RoyalDecree>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<RoyalDecree>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/Gunitt.cs b/BossMod/Modules/Shadowbringers/HuntS/Gunitt.cs
index 9bc29c8e3f..851d36f7af 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/Gunitt.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/Gunitt.cs
@@ -109,8 +109,7 @@ public GunittStates(BossModule module) : base(module)
                 .ActivateOnEnter<TheDeepRendsHint>()
                 .ActivateOnEnter<CoinToss>()
                 .ActivateOnEnter<SwivelGun>()
-                .ActivateOnEnter<TheDeepSeeks>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<TheDeepSeeks>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/Ixtab.cs b/BossMod/Modules/Shadowbringers/HuntS/Ixtab.cs
index c4b59a4b5f..2ba0aa48d8 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/Ixtab.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/Ixtab.cs
@@ -135,7 +135,7 @@ public CryptcallHint() : base(ActionID.MakeSpell(AID.Cryptcall), "Cone reduces h
 
     class Doom : BossComponent
     {
-        private List<Actor> _doomed = new();
+        private readonly List<Actor> _doomed = [];
         public bool Doomed { get; private set; }
 
         public override void OnStatusGain(BossModule module, Actor actor, ActorStatus status)
@@ -189,8 +189,7 @@ public IxtabStates(BossModule module) : base(module)
                 .ActivateOnEnter<ArchaicDualcast>()
                 .ActivateOnEnter<Cryptcall>()
                 .ActivateOnEnter<CryptcallHint>()
-                .ActivateOnEnter<Doom>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Doom>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/Tarchia.cs b/BossMod/Modules/Shadowbringers/HuntS/Tarchia.cs
index 8554556ee3..be2f81bd62 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/Tarchia.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/Tarchia.cs
@@ -94,8 +94,7 @@ public TarchiaStates(BossModule module) : base(module)
                 .ActivateOnEnter<Trounce>()
                 .ActivateOnEnter<BafflementBulb>()
                 .ActivateOnEnter<Groundstorm>()
-                .ActivateOnEnter<ForestFire>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<ForestFire>();
         }
     }
 
diff --git a/BossMod/Modules/Shadowbringers/HuntS/Tyger.cs b/BossMod/Modules/Shadowbringers/HuntS/Tyger.cs
index b41099481f..7e7c85fabb 100644
--- a/BossMod/Modules/Shadowbringers/HuntS/Tyger.cs
+++ b/BossMod/Modules/Shadowbringers/HuntS/Tyger.cs
@@ -104,8 +104,7 @@ public TygerStates(BossModule module) : base(module)
                 .ActivateOnEnter<TheRamsBreath>()
                 .ActivateOnEnter<TheRamsEmbrace>()
                 .ActivateOnEnter<TheRamsVoice>()
-                .ActivateOnEnter<TheRamsVoiceHint>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<TheRamsVoiceHint>();
         }
     }
 
diff --git a/BossMod/Modules/Stormblood/HuntA/Angada.cs b/BossMod/Modules/Stormblood/HuntA/Angada.cs
index 5fbed68123..5cb999fc72 100644
--- a/BossMod/Modules/Stormblood/HuntA/Angada.cs
+++ b/BossMod/Modules/Stormblood/HuntA/Angada.cs
@@ -66,8 +66,7 @@ public AngadaStates(BossModule module) : base(module)
                 .ActivateOnEnter<ScytheTail>()
                 .ActivateOnEnter<Butcher>()
                 .ActivateOnEnter<Rip>()
-                .ActivateOnEnter<RockThrow>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<RockThrow>();
         }
     }
 
diff --git a/BossMod/Modules/Stormblood/HuntA/Gajasura.cs b/BossMod/Modules/Stormblood/HuntA/Gajasura.cs
index c67e0b07f9..cc804df438 100644
--- a/BossMod/Modules/Stormblood/HuntA/Gajasura.cs
+++ b/BossMod/Modules/Stormblood/HuntA/Gajasura.cs
@@ -36,8 +36,7 @@ public GajasuraStates(BossModule module) : base(module)
             TrivialPhase()
                 .ActivateOnEnter<Spin>()
                 .ActivateOnEnter<Hurl>()
-                .ActivateOnEnter<Buffet>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<Buffet>();
         }
     }
 
diff --git a/BossMod/Modules/Stormblood/HuntS/Okina.cs b/BossMod/Modules/Stormblood/HuntS/Okina.cs
index f69bf67073..efa2b56ab5 100644
--- a/BossMod/Modules/Stormblood/HuntS/Okina.cs
+++ b/BossMod/Modules/Stormblood/HuntS/Okina.cs
@@ -79,8 +79,7 @@ public OkinaStates(BossModule module) : base(module)
                 .ActivateOnEnter<Immersion>()
                 .ActivateOnEnter<BodySlam>()
                 .ActivateOnEnter<BodySlamKB>()
-                .ActivateOnEnter<RubyTide>()
-                .Raw.Update = () => module.PrimaryActor.IsDead || !module.PrimaryActor.InCombat;
+                .ActivateOnEnter<RubyTide>();
         }
     }