Merge pull request #964 from FFXIV-CombatReborn/mergeWIP

more vault oneiron modules

Author: CarnifexOptimus

BossMod/BossModule/AIHints.cs

@@ -92,6 +92,9 @@ public readonly struct DamagePrediction(BitMask players, DateTime activation, Pr
     // other parts of the code can return small (e.g. 0.01) values to slightly (de)prioritize some positions, or large (e.g. 1000) values to effectively soft-override target position (but still utilize pathfinding)
     public readonly List<Func<WPos, float>> GoalZones = [];
 
+    // AI will treat the pixels inside these shapes as unreachable and not try to pathfind through them (unlike imminent forbidden zones)
+    public List<Func<WPos, float>> TemporaryObstacles = [];
+
     // positioning: next positional hint (TODO: reconsider, maybe it should be a list prioritized by in-gcds, and imminent should be in-gcds instead? or maybe it should be property of an enemy? do we need correct?)
     public (Actor? Target, Positional Pos, bool Imminent, bool Correct) RecommendedPositional;
 
@@ -140,6 +143,7 @@ public void Clear()
         InteractWithTarget = null;
         ForbiddenZones.Clear();
         GoalZones.Clear();
+        TemporaryObstacles.Clear();
         RecommendedPositional = default;
         ForbiddenDirections.Clear();
         ImminentSpecialMode = default;

BossMod/BossModule/BossModuleManager.cs

@@ -72,7 +72,7 @@ public void Update()
             {
                 var m = PendingModules[i];
                 var prim = m.PrimaryActor;
-                if (prim.IsDestroyed)
+                if (prim.IsDeadOrDestroyed)
                 {
                     PendingModules.RemoveAt(i);
                     m.Dispose();

BossMod/Components/Voidzone.cs

@@ -29,7 +29,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
             var forbidden = new List<Func<WPos, float>>();
             foreach (var s in Sources(Module))
                 forbidden.Add(ShapeDistance.Circle(s.Position.Quantized(), radius));
-            hints.AddForbiddenZone(ShapeDistance.Union(forbidden));
+            hints.TemporaryObstacles.Add(ShapeDistance.Union(forbidden));
         }
         else
         {
@@ -46,7 +46,7 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
                 forbiddenFarFarFuture.Add(ShapeDistance.Capsule(s.Position, s.Rotation, 3f * MovementHintLength, radius));
                 forbiddenImminent.Add(ShapeDistance.Circle(s.Position, radius));
             }
-            hints.AddForbiddenZone(ShapeDistance.Union(forbiddenImminent));
+            hints.TemporaryObstacles.Add(ShapeDistance.Union(forbiddenImminent));
             hints.AddForbiddenZone(ShapeDistance.Union(forbiddenNearFuture), WorldState.FutureTime(1.1d));
             hints.AddForbiddenZone(ShapeDistance.Union(forbiddenSoon), WorldState.FutureTime(3d));
             hints.AddForbiddenZone(ShapeDistance.Union(forbiddenFarFuture), WorldState.FutureTime(10d));

BossMod/Modules/Dawntrail/Hunt/RankS/Ihnuxokiy.cs

@@ -23,12 +23,10 @@ public enum AID : uint
 
 public enum SID : uint
 {
-    Aetherstock = 4136, // Boss->Boss, extra=0x0
     AboutFace = 2162, // Boss->player, extra=0x0
     LeftFace = 2163, // Boss->player, extra=0x0
     RightFace = 2164, // Boss->player, extra=0x0
-    ForwardMarch = 2161, // Boss->player, extra=0x0
-    ForcedMarch = 1257 // Boss->player, extra=0x1/0x2/0x4/0x8
+    ForwardMarch = 2161 // Boss->player, extra=0x0
 }
 
 sealed class AetherstockAbyssalSmog(BossModule module) : Components.GenericAOEs(module)

BossMod/Modules/Dawntrail/TreasureHunt/VaultOneiron/Fastitocalon.cs

@@ -11,6 +11,7 @@ public enum OID : uint
     VaultTomato = 0x48BC, // R0.84, icon 4, needs to be killed in order from 1 to 5 for maximum rewards
     VaultQueen = 0x48BD, // R0.84, icon 5, needs to be killed in order from 1 to 5 for maximum rewards
     GoldyCat = 0x48B7, // R1.87
+    Vaultkeeper = 0x48B8, // R2.0
     Helper = 0x233C
 }
 
@@ -38,6 +39,9 @@ public enum AID : uint
     CanyonVisual = 43671, // Fastitocalon->self, 4.0+1,0s cast, single-target
     Canyon = 43672, // Helper->self, 5.0s cast, range 45 circle
 
+    AutoAttack3 = 871, // Vaultkeeper->player, no cast, single-target
+    Thunderlance = 43727, // Vaultkeeper->self, 3.5s cast, range 20 width 3 rect
+    LanceSwing = 43726, // Vaultkeeper->self, 4.0s cast, range 8 circle
     TearyTwirl = 32301, // VaultOnion->self, 3.5s cast, range 7 circle
     PluckAndPrune = 32302, // VaultEggplant->self, 3.5s cast, range 7 circle
     PungentPirouette = 32303, // VaultGarlic->self, 3.5s cast, range 7 circle
@@ -86,6 +90,8 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell)
     }
 }
 
+sealed class Thunderlance(BossModule module) : Components.SimpleAOEs(module, (uint)AID.Thunderlance, new AOEShapeRect(20f, 1.5f));
+sealed class LanceSwing(BossModule module) : Components.SimpleAOEs(module, (uint)AID.LanceSwing, 8f);
 sealed class MandragoraAOEs(BossModule module) : Components.SimpleAOEGroups(module, [(uint)AID.PluckAndPrune, (uint)AID.TearyTwirl,
 (uint)AID.HeirloomScream, (uint)AID.PungentPirouette, (uint)AID.Pollen], 7f);
 
@@ -100,6 +106,8 @@ public FastitocalonStates(BossModule module) : base(module)
             .ActivateOnEnter<Earthshake>()
             .ActivateOnEnter<Canyon>()
             .ActivateOnEnter<MandragoraAOEs>()
+            .ActivateOnEnter<Thunderlance>()
+            .ActivateOnEnter<LanceSwing>()
             .Raw.Update = () => AllDeadOrDestroyed(Fastitocalon.All);
     }
 }
@@ -112,7 +120,7 @@ public Fastitocalon(WorldState ws, Actor primary) : base(ws, primary)
         lasercannons = Enemies((uint)OID.VaultLaserCannon);
     }
 
-    private static readonly uint[] bonusAdds = [(uint)OID.VaultOnion, (uint)OID.VaultTomato, (uint)OID.VaultGarlic, (uint)OID.VaultEggplant, (uint)OID.VaultQueen, (uint)OID.GoldyCat];
+    private static readonly uint[] bonusAdds = [(uint)OID.VaultOnion, (uint)OID.VaultTomato, (uint)OID.VaultGarlic, (uint)OID.VaultEggplant, (uint)OID.VaultQueen, (uint)OID.Vaultkeeper, (uint)OID.GoldyCat];
     public static readonly uint[] All = [(uint)OID.Fastitocalon, (uint)OID.VaultLaserCannon, .. bonusAdds];
     private readonly List<Actor> lasercannons;
 
@@ -131,11 +139,12 @@ protected override void CalculateModuleAIHints(int slot, Actor actor, PartyRoles
             var e = hints.PotentialTargets[i];
             e.Priority = e.Actor.OID switch
             {
-                (uint)OID.VaultOnion => 6,
-                (uint)OID.VaultEggplant => 5,
-                (uint)OID.VaultGarlic => 4,
-                (uint)OID.VaultTomato => 3,
-                (uint)OID.VaultQueen or (uint)OID.GoldyCat => 2,
+                (uint)OID.VaultOnion => 7,
+                (uint)OID.VaultEggplant => 6,
+                (uint)OID.VaultGarlic => 5,
+                (uint)OID.VaultTomato => 4,
+                (uint)OID.VaultQueen or (uint)OID.GoldyCat => 3,
+                (uint)OID.Vaultkeeper => 2,
                 (uint)OID.VaultLaserCannon => 1,
                 _ => 0
             };

BossMod/Modules/Dawntrail/TreasureHunt/VaultOneiron/GildedSentry.cs

@@ -20,6 +20,8 @@ public enum AID : uint
     AlexandrianThunderVisual = 43720, // GildedSentry->self, 2.5+0,5s cast, single-target
     AlexandrianThunder = 43721, // Helper->location, 3.0s cast, range 6 circle
     SkeweringLance = 43725, // GildedSentry->player, 5.0s cast, single-target, tankbuster
+    AlexandrianThunderIIIVisual = 43722, // GildedSentry->self, 4.5+0,5s cast, single-target
+    AlexandrianThunderIII = 43723, // Helper->location, 5.0s cast, range 35 circle, raidwide
 
     Thunderlance = 43727, // Vaultkeeper->self, 3.5s cast, range 20 width 3 rect
     LanceSwing = 43726, // Vaultkeeper->self, 4.0s cast, range 8 circle
@@ -30,6 +32,7 @@ sealed class AlexandrianThunder(BossModule module) : Components.SimpleAOEs(modul
 sealed class CrossLightning(BossModule module) : Components.SimpleAOEs(module, (uint)AID.CrossLightning, new AOEShapeCross(50f, 5f));
 sealed class Electray(BossModule module) : Components.SimpleAOEs(module, (uint)AID.Electray, new AOEShapeRect(75f, 2f));
 sealed class SkeweringLance(BossModule module) : Components.SingleTargetCast(module, (uint)AID.SkeweringLance);
+sealed class AlexandrianThunderIII(BossModule module) : Components.RaidwideCast(module, (uint)AID.AlexandrianThunderIII);
 
 sealed class Thunderlance(BossModule module) : Components.SimpleAOEs(module, (uint)AID.Thunderlance, new AOEShapeRect(20f, 1.5f));
 sealed class LanceSwing(BossModule module) : Components.SimpleAOEs(module, (uint)AID.LanceSwing, 8f);
@@ -43,6 +46,7 @@ public GildedSentryStates(BossModule module) : base(module)
             .ActivateOnEnter<CrossLightning>()
             .ActivateOnEnter<Electray>()
             .ActivateOnEnter<SkeweringLance>()
+            .ActivateOnEnter<AlexandrianThunderIII>()
             .ActivateOnEnter<Thunderlance>()
             .ActivateOnEnter<LanceSwing>()
             .Raw.Update = () => AllDeadOrDestroyed(GildedSentry.All);