Merge pull request #416 from FFXIV-CombatReborn/mergeWIP

slight the vault improvement
FFXIV-CombatReborn · Oct 21, 2024 · 2f6fb9d · 2f6fb9d
2 parents 98eda8d + b14d23d
commit 2f6fb9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/BossMod/Modules/Heavensward/Dungeon/D04TheVault/D043SerCharibert.cs b/BossMod/Modules/Heavensward/Dungeon/D04TheVault/D043SerCharibert.cs
@@ -49,6 +49,7 @@ class AltarPyre(BossModule module) : Components.RaidwideCast(module, ActionID.Ma
 class HeavensflameAOE(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.HeavensflameAOE), 5);
 class HolyChain(BossModule module) : Components.Chains(module, (uint)TetherID.HolyChain, ActionID.MakeSpell(AID.HolyChainPlayerTether));
 class TurretTour(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.DawnKnight).Concat(m.Enemies(OID.DuskKnight)).Where(x => x.ModelState.ModelState == 8), 10);
+class TurretTourHint(BossModule module) : Components.PersistentVoidzone(module, 2, m => m.Enemies(OID.DawnKnight).Concat(m.Enemies(OID.DuskKnight)).Where(x => x.ModelState.ModelState != 8 && !x.Position.AlmostEqual(module.Center, 10)), 3);
 
 class D043SerCharibertStates : StateMachineBuilder
 {
@@ -60,6 +61,7 @@ public D043SerCharibertStates(BossModule module) : base(module)
             .ActivateOnEnter<AltarPyre>()
             .ActivateOnEnter<HeavensflameAOE>()
             .ActivateOnEnter<HolyChain>()
+            .ActivateOnEnter<TurretTourHint>()
             .ActivateOnEnter<TurretTour>();
     }
 }

diff --git a/BossMod/Modules/Shadowbringers/Dungeon/D05MtGulg/D055ForgivenObscenity.cs b/BossMod/Modules/Shadowbringers/Dungeon/D05MtGulg/D055ForgivenObscenity.cs
@@ -76,6 +76,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
             var inRect = Module.Enemies(OID.Rings).FirstOrDefault(x => x.Position.InRect(position, 20 * o.Rotation.ToDirection(), Radius));
             if (inRect != null)
                 forbidden.Add(ShapeDistance.Capsule(o.Position, o.Rotation.ToDirection(), (position - inRect.Position).Length(), Radius));
+            else
+                forbidden.Add(ShapeDistance.Circle(o.Position, Radius));
         }
         hints.AddForbiddenZone(p => forbidden.Select(f => f(p)).Min());
     }