diff --git a/BossMod/BossModule/BossModule.cs b/BossMod/BossModule/BossModule.cs index 53a145e5d4..951143c412 100644 --- a/BossMod/BossModule/BossModule.cs +++ b/BossMod/BossModule/BossModule.cs @@ -216,13 +216,15 @@ public BossComponent.GlobalHints CalculateGlobalHints() return hints; } - // TODO: should not be virtual - public virtual void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + public void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { hints.Center = Center; hints.Bounds = Bounds; foreach (var comp in _components) comp.AddAIHints(slot, actor, assignment, hints); + CalculateModuleAIHints(slot, actor, assignment, hints); + if (!WindowConfig.AllowAutomaticActions) + hints.ActionsToExecute.Clear(); } public virtual bool NeedToJump(WPos from, WDir dir) => false; // if arena has complicated shape that requires jumps to navigate, module can provide this info to AI @@ -244,6 +246,7 @@ public void ReportError(BossComponent? comp, string message) protected virtual void UpdateModule() { } protected virtual void DrawArenaBackground(int pcSlot, Actor pc) { } // before modules background protected virtual void DrawArenaForeground(int pcSlot, Actor pc) { } // after border, before modules foreground + protected virtual void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { } // called at the very end to draw important enemies, default implementation draws primary actor protected virtual void DrawEnemies(int pcSlot, Actor pc) diff --git a/BossMod/BossModule/BossModuleConfig.cs b/BossMod/BossModule/BossModuleConfig.cs index 73ac4686e3..35eb55fd8f 100644 --- a/BossMod/BossModule/BossModuleConfig.cs +++ b/BossMod/BossModule/BossModuleConfig.cs @@ -65,6 +65,9 @@ public class BossModuleConfig : ConfigNode [PropertyDisplay("Show outlines and shadows on various radar markings")] public bool ShowOutlinesAndShadows = false; + [PropertyDisplay("Allow modules to automatically use actions (eg anti knockback, etc)")] + public bool AllowAutomaticActions = true; + [PropertyDisplay("Minimal maturity for the module to be loaded")] public BossModuleInfo.Maturity MinMaturity = BossModuleInfo.Maturity.Contributed; } diff --git a/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D012Sanduruva.cs b/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D012Sanduruva.cs index 32e2d89020..1ba1de3e0e 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D012Sanduruva.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D012Sanduruva.cs @@ -89,9 +89,8 @@ public D012SanduruvaStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Contributed, Contributors = "dhoggpt, Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 783, NameID = 10257)] public class D012Sanduruva(WorldState ws, Actor primary) : BossModule(ws, primary, new(-258, -26), new ArenaBoundsCircle(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs b/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs index bc3cc50474..f9789454ab 100644 --- a/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs +++ b/BossMod/Modules/Endwalker/Dungeon/D01TowerOfZot/D013MagusSisters.cs @@ -217,9 +217,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actors(Enemies(OID.Sanduruva), ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs index d6114d44bf..bbb8e0c7ad 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheExcitatron6000/LuckyFace.cs @@ -133,9 +133,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs index 50965f99e0..458a8287b2 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouAcheloios.cs @@ -162,9 +162,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs index 62a13b81d3..1a5d0b4fed 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouLeon.cs @@ -58,9 +58,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs index ddbfd43c18..99aedf7231 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMandragoras.cs @@ -72,9 +72,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs index ae740cb21a..5f14a5136f 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMegakantha.cs @@ -99,9 +99,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs index 1efe50802d..e15b9b8a59 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouMeganereis.cs @@ -107,9 +107,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs index 9fedf51fab..236a41fe35 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouPithekos.cs @@ -105,9 +105,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs index 02cc7a9e95..8f3ad69d03 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSatyros.cs @@ -65,9 +65,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs index cfb03832bb..3e596d8c3f 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouSphinx.cs @@ -101,9 +101,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs index 742422f296..993b264e15 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouStyphnolobion.cs @@ -117,9 +117,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs index 11cc227d59..9e8b56d186 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTigris.cs @@ -83,9 +83,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTriton.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTriton.cs index 60036f4ef2..05ab4c7724 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTriton.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/GymnasiouTriton.cs @@ -48,9 +48,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs index 71f5bcdae4..16f3a0e2a4 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LampasChrysine.cs @@ -64,9 +64,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs index 4eaef24e40..7f8d8ab348 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/LyssaChrysine.cs @@ -135,9 +135,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs index 4861869e41..b39114aeb0 100644 --- a/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs +++ b/BossMod/Modules/Endwalker/TreasureHunt/TheShiftingGymnasionAgonon/Narkissos.cs @@ -123,9 +123,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs index dfe0d142de..f1c07294c7 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage04GentlemanPreferSwords/Stage04Act2.cs @@ -66,9 +66,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act1.cs index 7e0205482e..15748ce0a3 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act1.cs @@ -128,9 +128,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act2.cs index 27dc3ad28e..44f4e80982 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage06EyeSociety/Stage06Act2.cs @@ -153,9 +153,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act1.cs index 676cc6190a..75a6181ee0 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act1.cs @@ -100,9 +100,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs index 4633f85251..ce7b966856 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage08BombedyOfErrors/Stage08Act2.cs @@ -90,9 +90,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs index 68672e0d25..27f11a090b 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage09ToKillAMockingslime/Stage09.cs @@ -59,9 +59,8 @@ public class Stage09 : BossModule ActivateComponent(); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage12ThePlantomOfTheOpera/Stage12Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage12ThePlantomOfTheOpera/Stage12Act2.cs index 017d86cac1..09fdca929a 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage12ThePlantomOfTheOpera/Stage12Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage12ThePlantomOfTheOpera/Stage12Act2.cs @@ -56,9 +56,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage15TheMeNobodyNodes/Stage15.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage15TheMeNobodyNodes/Stage15.cs index ad2cf3d5ef..197119fe5c 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage15TheMeNobodyNodes/Stage15.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage15TheMeNobodyNodes/Stage15.cs @@ -181,9 +181,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage16SunsetBullevard/Stage16Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage16SunsetBullevard/Stage16Act2.cs index 68fd4fbb5d..c0bc094f59 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage16SunsetBullevard/Stage16Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage16SunsetBullevard/Stage16Act2.cs @@ -95,9 +95,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object, false); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act1.cs index 492648efe4..033733d048 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act1.cs @@ -67,9 +67,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act2.cs index 0d7b3883ed..5e6e6bbc94 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage17TheSwordOfMusic/Stage17Act2.cs @@ -78,9 +78,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs index 466b5918f7..184d9b5f04 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act1.cs @@ -95,9 +95,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs index 55301e95da..2f6b2ca29a 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage18MidsummerNightsExplosion/Stage18Act2.cs @@ -96,9 +96,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs index 1e904fb1f4..7d5a304c41 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage20MissTyphon/Stage20Act3.cs @@ -79,9 +79,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object, false); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs index 0f31080c09..18025fef27 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act1.cs @@ -69,9 +69,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs index 3e94a8bebf..f7ea21e008 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act2.cs @@ -79,9 +79,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs index f6554de8c3..42df35bcba 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage24AmazingTechnicolorPitFiends/Stage24Act3.cs @@ -117,9 +117,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Enemy); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act2.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act2.cs index 719a9b09be..3b32a26fb0 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act2.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage25DirtyRottenAzulmagia/Stage25Act2.cs @@ -78,9 +78,8 @@ public class Stage25Act2 : BossModule ActivateComponent(); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs b/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs index 794b3c6c59..5308257d50 100644 --- a/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs +++ b/BossMod/Modules/Global/MaskedCarnivale/Stage27LockUpYourSnorters/Stage27.cs @@ -180,9 +180,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D05Totorak/D053Graffias.cs b/BossMod/Modules/RealmReborn/Dungeon/D05Totorak/D053Graffias.cs index 56854596f4..8ec81abbde 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D05Totorak/D053Graffias.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D05Totorak/D053Graffias.cs @@ -42,10 +42,8 @@ public D053GraffiasStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 1, NameID = 444)] public class D053Graffias(WorldState ws, Actor primary) : BossModule(ws, primary, new(215, -145), new ArenaBoundsCircle(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); - bool haveTail = Enemies(OID.GraffiasTail).Count > 0; foreach (var e in hints.PotentialTargets) { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D063LadyAmandine.cs b/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D063LadyAmandine.cs index 40e06cafb8..098b3a4745 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D063LadyAmandine.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D06Haukke/D063LadyAmandine.cs @@ -44,9 +44,8 @@ public D063LadyAmandineStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 6, NameID = 422)] public class D063LadyAmandine(WorldState ws, Actor primary) : BossModule(ws, primary, new(0, 4), new ArenaBoundsSquare(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D081Teratotaur.cs b/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D081Teratotaur.cs index c75021326f..250f348cf1 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D081Teratotaur.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D081Teratotaur.cs @@ -98,9 +98,8 @@ public D081TeratotaurStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 9, NameID = 1567)] public class D081Teratotaur(WorldState ws, Actor primary) : BossModule(ws, primary, new(-70, -60), new ArenaBoundsSquare(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D082TempleGuardian.cs b/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D082TempleGuardian.cs index 466d8fef4a..f10c7a8f3f 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D082TempleGuardian.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D082TempleGuardian.cs @@ -34,9 +34,8 @@ public D082TempleGuardianStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 9, NameID = 1569)] public class D082TempleGuardian(WorldState ws, Actor primary) : BossModule(ws, primary, new(50, -10), new ArenaBoundsCircle(15)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D083Adjudicator.cs b/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D083Adjudicator.cs index 9b5b067558..badd5dc6fa 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D083Adjudicator.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D08Qarn/D083Adjudicator.cs @@ -36,9 +36,8 @@ public D083AdjudicatorStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 9, NameID = 1570)] public class D083Adjudicator(WorldState ws, Actor primary) : BossModule(ws, primary, new(238, 0), new ArenaBoundsCircle(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D111AllSeeingEye.cs b/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D111AllSeeingEye.cs index fe73f5b55c..17a94ef7ec 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D111AllSeeingEye.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D111AllSeeingEye.cs @@ -60,9 +60,8 @@ public D111AllSeeingEyeStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 13, NameID = 1397)] public class D111AllSeeingEye(WorldState ws, Actor primary) : BossModule(ws, primary, new(40, 70), new ArenaBoundsSquare(30)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); if (PrimaryActor.FindStatus(SID.Invincibility) != null) hints.PotentialTargets.RemoveAll(e => e.Actor == PrimaryActor); } diff --git a/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D113Batraal.cs b/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D113Batraal.cs index aee3ffe0a9..f7deba7a7d 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D113Batraal.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D11DzemaelDarkhold/D113Batraal.cs @@ -49,9 +49,8 @@ public D113BatraalStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 13, NameID = 1396)] public class D113Batraal(WorldState ws, Actor primary) : BossModule(ws, primary, new(85, -180), new ArenaBoundsSquare(25)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D123MisersMistress.cs b/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D123MisersMistress.cs index 129600dc1b..bbb9780ae7 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D123MisersMistress.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D12AurumVale/D123MisersMistress.cs @@ -44,9 +44,8 @@ public D123MisersMistressStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 5, NameID = 1532)] public class D123MisersMistress(WorldState ws, Actor primary) : BossModule(ws, primary, new(-400, -130), new ArenaBoundsSquare(25)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D142Nero.cs b/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D142Nero.cs index 2406d78391..4f3b4e1e45 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D142Nero.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D142Nero.cs @@ -54,9 +54,8 @@ public D142NeroStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 16, NameID = 2135)] public class D142Nero(WorldState ws, Actor primary) : BossModule(ws, primary, new(-164, 0), new ArenaBoundsCircle(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D153TonberryKing.cs b/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D153TonberryKing.cs index 840471d8e7..a28984fc1c 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D153TonberryKing.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D15WanderersPalace/D153TonberryKing.cs @@ -35,9 +35,8 @@ public D153TonberryKingStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 10, NameID = 1547)] public class D153TonberryKing(WorldState ws, Actor primary) : BossModule(ws, primary, new(73, -435), new ArenaBoundsCircle(30)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); //var rancorStacks = PrimaryActor.FindStatus(SID.Rancor)?.Extra ?? 0; foreach (var e in hints.PotentialTargets) { diff --git a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs index 28b47f20c5..3c922507e2 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D161Psycheflayer.cs @@ -59,9 +59,8 @@ public D161PsycheflayerStates(D161Psycheflayer module) : base(module) private Actor? _bossP2; public Actor MainBoss() => _bossP2 ?? PrimaryActor; - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs index 879ed273e0..f3231829a7 100644 --- a/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs +++ b/BossMod/Modules/RealmReborn/Dungeon/D16Amdapor/D163Anantaboga.cs @@ -106,9 +106,8 @@ public D163AnantabogaStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 14, NameID = 1696)] public class D163Anantaboga(WorldState ws, Actor primary) : BossModule(ws, primary, new(10, 0), new ArenaBoundsSquare(25)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs b/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs index ada22d2d39..6e0b85525c 100644 --- a/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs +++ b/BossMod/Modules/RealmReborn/Extreme/Ex3Titan/Ex3Titan.cs @@ -21,7 +21,7 @@ public class Ex3Titan : BossModule Bombs = Enemies(OID.BombBoulder); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { var heart = Heart(); if (heart != null && heart.IsTargetable) @@ -31,7 +31,6 @@ public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.As hints.PotentialTargets.Add(new(heart, false)); //hints.PotentialTargets.Add(new(PrimaryActor, false)); } - base.CalculateAIHints(slot, actor, assignment, hints); } protected override void DrawEnemies(int pcSlot, Actor pc) diff --git a/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01ADS.cs b/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01ADS.cs index 8eb7fcc295..095f89954e 100644 --- a/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01ADS.cs +++ b/BossMod/Modules/RealmReborn/Raid/T01Caduceus/T01ADS.cs @@ -50,9 +50,8 @@ public T01ADSStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 93, NameID = 1459, SortOrder = 1)] public class T01ADS(WorldState ws, Actor primary) : BossModule(ws, primary, new(-3, 27), new ArenaBoundsRect(7, 28)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var enemy in hints.PotentialTargets) { if (enemy.Actor == PrimaryActor) diff --git a/BossMod/Modules/RealmReborn/Raid/T04Gauntlet/T04Gauntlet.cs b/BossMod/Modules/RealmReborn/Raid/T04Gauntlet/T04Gauntlet.cs index b5d8ee11a0..642cbe1efe 100644 --- a/BossMod/Modules/RealmReborn/Raid/T04Gauntlet/T04Gauntlet.cs +++ b/BossMod/Modules/RealmReborn/Raid/T04Gauntlet/T04Gauntlet.cs @@ -87,10 +87,8 @@ public class T04Gauntlet : BossModule Dreadnaughts = Enemies(OID.ClockworkDreadnaught); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); - // note: we don't bother checking for physical/magical defense on knights/soldiers and just have everyone aoe them down; magic reflect is very small // note: we try to kill dreadnaught first, since it's the only dangerous thing here // note: we try to offtank all bugs and not have dreadnaught eat them @@ -124,4 +122,4 @@ protected override void DrawEnemies(int pcSlot, Actor pc) foreach (var e in Dreadnaughts) Arena.Actor(e, ArenaColor.Enemy); } -} \ No newline at end of file +} diff --git a/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs b/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs index 738793ea56..46a3495e8b 100644 --- a/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs +++ b/BossMod/Modules/RealmReborn/Trial/T02TitanN/T02TitanN.cs @@ -69,9 +69,8 @@ public class T02TitanN : BossModule _heart = Enemies(OID.TitansHeart); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var heart in ActiveHeart) hints.PotentialTargets.Add(new(heart, actor.Role == Role.Tank)); foreach (var e in hints.PotentialTargets) diff --git a/BossMod/Modules/RealmReborn/Trial/T03GarudaN/T03GarudaN.cs b/BossMod/Modules/RealmReborn/Trial/T03GarudaN/T03GarudaN.cs index 82452b36be..858900ae14 100644 --- a/BossMod/Modules/RealmReborn/Trial/T03GarudaN/T03GarudaN.cs +++ b/BossMod/Modules/RealmReborn/Trial/T03GarudaN/T03GarudaN.cs @@ -77,9 +77,8 @@ public T03GarudaNStates(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 58, NameID = 1644)] public class T03GarudaN(WorldState ws, Actor primary) : BossModule(ws, primary, new(0, 0), new ArenaBoundsCircle(21)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Trial/T04PortaDecumana/T04PortaDecumana1.cs b/BossMod/Modules/RealmReborn/Trial/T04PortaDecumana/T04PortaDecumana1.cs index 880cdd9dbf..de8b370864 100644 --- a/BossMod/Modules/RealmReborn/Trial/T04PortaDecumana/T04PortaDecumana1.cs +++ b/BossMod/Modules/RealmReborn/Trial/T04PortaDecumana/T04PortaDecumana1.cs @@ -92,9 +92,8 @@ public T04PortaDecumana1States(BossModule module) : base(module) [ModuleInfo(BossModuleInfo.Maturity.Verified, GroupType = BossModuleInfo.GroupType.CFC, GroupID = 830, NameID = 2137, SortOrder = 1)] public class T04PortaDecumana1(WorldState ws, Actor primary) : BossModule(ws, primary, new(-772, -600), new ArenaBoundsCircle(20)) { - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); if (PrimaryActor.FindStatus(SID.Invincibility) != null || PrimaryActor.FindStatus(SID.VortexBarrier) != null) hints.PotentialTargets.RemoveAll(e => e.Actor == PrimaryActor); } diff --git a/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs b/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs index b8c901827e..028cb2637f 100644 --- a/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T05IfritH/T05IfritH.cs @@ -92,9 +92,8 @@ public class T05IfritH : BossModule _nails = Enemies(OID.InfernalNail); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs b/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs index 4d59e9554b..4006793c42 100644 --- a/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T06GarudaH/T06GarudaH.cs @@ -93,9 +93,8 @@ public class T06GarudaH : BossModule _monoliths = Enemies(OID.Monolith); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs b/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs index 9ca14d6971..e2f6cb4bbc 100644 --- a/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T07TitanH/T07TitanH.cs @@ -131,9 +131,8 @@ public class T07TitanH : BossModule _heart = Enemies(OID.TitansHeart); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var heart in ActiveHeart) hints.PotentialTargets.Add(new(heart, assignment == PartyRolesConfig.Assignment.MT)); foreach (var enemy in hints.PotentialTargets) diff --git a/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs b/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs index 3b51545e35..8808455617 100644 --- a/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs +++ b/BossMod/Modules/RealmReborn/Trial/T09WhorleaterH/T09WhorleaterH.cs @@ -38,9 +38,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(c, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); var TankMimikry = actor.FindStatus(2124); //Bluemage Tank Mimikry foreach (var e in hints.PotentialTargets) { diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs index 502c945e56..709f12593a 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheDungeonsOfLyheGhiah/Goliath.cs @@ -94,9 +94,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs index d71202c2ea..b439ce4883 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/FuathTroublemaker.cs @@ -53,9 +53,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs index 8a6a6c441f..7823775844 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/GreedyPixie.cs @@ -104,9 +104,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretBasket.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretBasket.cs index 6cdf69ee9f..8cbbb1601c 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretBasket.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretBasket.cs @@ -123,9 +123,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretCladoselache.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretCladoselache.cs index 479db054f4..cca7e97b50 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretCladoselache.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretCladoselache.cs @@ -123,9 +123,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs index 0d85ae7621..c1a4f7916a 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretDjinn.cs @@ -69,9 +69,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKeeper.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKeeper.cs index 9b589ba8d5..6158753f18 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKeeper.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKeeper.cs @@ -68,9 +68,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs index 1d1761c460..d688caf1dd 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretKorrigan.cs @@ -76,9 +76,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPegasus.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPegasus.cs index 6fb1b2c010..12b1fdb5aa 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPegasus.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPegasus.cs @@ -60,9 +60,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs index 2cd3f39944..defa62c72e 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretPorxie.cs @@ -117,9 +117,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs index 73a9576493..c6893822b5 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSerpent.cs @@ -81,9 +81,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs index a4ee29694f..408363b9da 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretSwallow.cs @@ -57,9 +57,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs index 168a7899c7..db3e74de6f 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretUndine.cs @@ -68,9 +68,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs index 8b39b43b6b..4fc1094621 100644 --- a/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs +++ b/BossMod/Modules/Shadowbringers/TreasureHunt/TheShiftingOubliettesOfLyheGhiah/SecretWorm.cs @@ -125,9 +125,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs index 86aaebed5e..b102882340 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheLostCanalsOfUznair/CanalIcebeast.cs @@ -65,9 +65,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs index a018c49b37..8356ae988f 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarAiravata.cs @@ -135,9 +135,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs index fee98ea1fc..0669cfc777 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarArachne.cs @@ -70,9 +70,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs index 144a760171..5c81b079f9 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarBeast.cs @@ -97,9 +97,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs index ec5fc164cd..c1680cf6c6 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarChimera.cs @@ -120,9 +120,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs index 9c0e48b28a..27c676db5d 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDiresaur.cs @@ -124,9 +124,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs index ad9b7c0f09..ade2a02a0a 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarDullahan.cs @@ -102,9 +102,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs index 69e05d3ba8..4ee8f372d9 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarKelpie.cs @@ -132,9 +132,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs index 26cd0fee3e..cc0cff6110 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarMandragora.cs @@ -77,9 +77,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs index 0d1a74413d..38edc6ffa8 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarSkatene.cs @@ -45,9 +45,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs index 397c007375..002e8e460c 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/AltarTotem.cs @@ -115,9 +115,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs index b66ccb2877..7bddb0259c 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/Hati.cs @@ -49,9 +49,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Object); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheGreatGoldWhisker.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheGreatGoldWhisker.cs index 117b7dd842..d28d07ba62 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheGreatGoldWhisker.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheGreatGoldWhisker.cs @@ -42,9 +42,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs index 1efcad76b5..fafa4d1da8 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheOlderOne.cs @@ -102,9 +102,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch diff --git a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs index 155a6a29af..a9a6e63bca 100644 --- a/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs +++ b/BossMod/Modules/Stormblood/TreasureHunt/TheShiftingAltarsOfUznair/TheWinged.cs @@ -97,9 +97,8 @@ protected override void DrawEnemies(int pcSlot, Actor pc) Arena.Actor(s, ArenaColor.Vulnerable); } - public override void CalculateAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) + protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints) { - base.CalculateAIHints(slot, actor, assignment, hints); foreach (var e in hints.PotentialTargets) { e.Priority = (OID)e.Actor.OID switch