Skip to content

Commit

Permalink
Merge pull request #8 from CarnifexOptimus/slave_aetherfront
Browse files Browse the repository at this point in the history
reverted module priority fix
  • Loading branch information
CarnifexOptimus authored Mar 28, 2024
2 parents 5710c47 + b36dab6 commit d11989c
Show file tree
Hide file tree
Showing 48 changed files with 48 additions and 96 deletions.
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/FATE/Chi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/FATE/Daivadipa.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Aegeiros.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/ArchEta.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/FanAil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Gurangatch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Hulder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/LunatenderQueen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Minerva.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/MoussePrincess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Petalodus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Storsie.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Sugriva.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntA/Yilan.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/Armstrong.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/Burfurlur.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/Ker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/KerShroud.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/NarrowRift.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/Ophioneus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/Ruminator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Endwalker/HuntS/Sphatika.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;

namespace BossMod.RealmReborn.Raid.T01Caduceus
Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/FATE/Archaeotania.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/FATE/Formidable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Baal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Grassman.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Huracan.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/LilMurderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Maliktender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Nariphon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Nuckelavee.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/OPoorestPauldia.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Rusalka.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Sugaar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/Supay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntA/TheMudman.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntS/Aglaope.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntS/ForgivenGossip.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
3 changes: 1 addition & 2 deletions BossMod/Modules/Shadowbringers/HuntS/ForgivenPedantry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
}
}

Expand Down
Loading

0 comments on commit d11989c

Please sign in to comment.