AI update

BossMod/AI/AIConfig.cs

@@ -10,7 +10,7 @@ sealed class AIConfig : ConfigNode
     public bool DrawUI = false;
 
     [PropertyDisplay("Focus target master")]
-    public bool FocusTargetLeader = false;
+    public bool FocusTargetMaster = false;
 
     [PropertyDisplay("Broadcast keypresses to other windows")]
     public bool BroadcastToSlaves = false;
@@ -49,9 +49,6 @@ sealed class AIConfig : ConfigNode
     [PropertyDisplay("Max distance to target")]
     public float MaxDistanceToTarget = 2.6f;
 
-    [PropertyDisplay("Override autorotation values", tooltip: "Uses your custom positional and distance settings instead of autorotation specific values")]
-    public bool OverrideAutorotation = true;
-
     [PropertyDisplay("Enable auto AFK", tooltip: "Enables auto AFK if out of combat. While AFK AI will not use autorotation or target anything")]
     public bool AutoAFK = false;
 
@@ -62,7 +59,7 @@ sealed class AIConfig : ConfigNode
     public bool AllowAIToBeOutsideBounds = false;
 
     [PropertyDisplay("Movement decision delay", tooltip: "Only change this at your own risk and keep this value low! Too high and it won't move in time for some mechanics. Make sure to readjust the value for different content.")]
-    public float MoveDelay = 0;
+    public double MoveDelay = 0;
 
     [PropertyDisplay("Idle while mounted")]
     public bool ForbidAIMovementMounted = false;

BossMod/AI/AIController.cs

@@ -16,7 +16,6 @@ sealed class AIController(WorldState ws, ActionManagerEx amex, MovementOverride
 
     private readonly ActionManagerEx _amex = amex;
     private readonly MovementOverride _movement = movement;
-    private DateTime _nextInteract;
 
     public bool IsVerticalAllowed => Service.Condition[ConditionFlag.InFlight];
     public Angle CameraFacing => (Camera.Instance?.CameraAzimuth ?? 0).Radians() + 180.Degrees();
@@ -55,24 +54,10 @@ public void Update(Actor? player, AIHints hints, DateTime now)
         }
         else
         {
-            _amex.ForceCancelCastNextFrame |= ForceCancelCast && castInProgress;
+            hints.ForceCancelCast |= ForceCancelCast && castInProgress;
         }
 
         if (hints.ForcedMovement == null && desiredPosition != null)
             hints.ForcedMovement = desiredPosition.Value - player.PosRot.XYZ();
-
-        if (hints.InteractWithTarget is Actor tar && player.DistanceToHitbox(tar) <= 3)
-            ExecuteInteract(now, tar);
-    }
-
-    private unsafe void ExecuteInteract(DateTime now, Actor target)
-    {
-        if (AIManager.Instance?.Beh == null || _amex.EffectiveAnimationLock > 0 || now < _nextInteract)
-            return;
-        var obj = GameObjectManager.Instance()->Objects.IndexSorted[target.SpawnIndex].Value;
-        if (obj == null || obj->GetGameObjectId() != target.InstanceID)
-            return;
-        TargetSystem.Instance()->OpenObjectInteraction(obj);
-        _nextInteract = now.AddMilliseconds(100);
     }
 }

BossMod/AI/AIManagementWindow.cs

@@ -43,7 +43,6 @@ public override void Draw()
         var configModified = false;
 
         ImGui.TextUnformatted($"Navi={_manager.Controller.NaviTargetPos}");
-        _manager.Beh?.DrawDebug();
 
         configModified |= ImGui.Checkbox("Forbid actions", ref _config.ForbidActions);
         ImGui.SameLine();
@@ -61,8 +60,6 @@ public override void Draw()
         ImGui.Spacing();
         configModified |= ImGui.Checkbox("Manual targeting", ref _config.ManualTarget);
         ImGui.SameLine();
-        configModified |= ImGui.Checkbox("Override autorotation values", ref _config.OverrideAutorotation);
-        ImGui.SameLine();
         configModified |= ImGui.Checkbox("Allow outside bounds", ref _config.AllowAIToBeOutsideBounds);
 
         ImGui.Text("Follow party slot");
@@ -90,7 +87,7 @@ public override void Draw()
         ImGui.SetNextItemWidth(100);
         var positionalOptions = Enum.GetNames(typeof(Positional));
         var positionalIndex = (int)_config.DesiredPositional;
-        if (ImGui.Combo("##DesiredPositional", ref positionalIndex, positionalOptions, positionalOptions.Length))
+        if (ImGui.Combo("##DesiredPositional", ref positionalIndex, positionalOptions, 4))
         {
             _config.DesiredPositional = (Positional)positionalIndex;
             configModified = true;

BossMod/AI/AIManager.cs

@@ -114,7 +114,7 @@ private void OnCommand(string cmd, string message)
                 ToggleConfig();
                 break;
             case "TARGETMASTER":
-                configModified = ToggleFocusTargetLeader();
+                configModified = ToggleFocusTargetMaster();
                 break;
             case "FOLLOW":
                 var cfgFollowSlot = _config.FollowSlot;
@@ -164,11 +164,7 @@ private void OnCommand(string cmd, string message)
                 ToggleOutOfBounds(messageData);
                 configModified = cfgOOB != _config.AllowAIToBeOutsideBounds;
                 break;
-            case "OVERRIDEAUTOROTATION":
-                var cfgARO = _config.OverrideAutorotation;
-                ToggleAutorotationOverride(messageData);
-                configModified = cfgARO != _config.OverrideAutorotation;
-                break;
+
             case "POSITIONAL":
                 var cfgPositional = _config.DesiredPositional;
                 HandlePositionalCommand(messageData);
@@ -227,34 +223,12 @@ private void ToggleConfig()
             SwitchToIdle();
     }
 
-    private bool ToggleFocusTargetLeader()
+    private bool ToggleFocusTargetMaster()
     {
-        _config.FocusTargetLeader = !_config.FocusTargetLeader;
+        _config.FocusTargetMaster = !_config.FocusTargetMaster;
         return true;
     }
 
-    private void ToggleAutorotationOverride(string[] messageData)
-    {
-        if (messageData.Length == 1)
-            _config.OverrideAutorotation = !_config.OverrideAutorotation;
-        else
-        {
-            switch (messageData[1].ToUpperInvariant())
-            {
-                case "ON":
-                    _config.OverrideAutorotation = true;
-                    break;
-                case "OFF":
-                    _config.OverrideAutorotation = false;
-                    break;
-                default:
-                    Service.ChatGui.Print($"[AI] Unknown follow target command: {messageData[1]}");
-                    return;
-            }
-        }
-        Service.Log($"[AI] Following targets is now {(_config.OverrideAutorotation ? "enabled" : "disabled")}");
-    }
-
     private void ToggleOutOfBounds(string[] messageData)
     {
         if (messageData.Length == 1)

BossMod/AI/AIRotationModule.cs

@@ -1,15 +1,18 @@
 using BossMod.Autorotation;
+using BossMod.Pathfinding;
 
 namespace BossMod.AI;
 
 public abstract class AIRotationModule(RotationModuleManager manager, Actor player) : RotationModule(manager, player)
 {
-    protected float Deadline(DateTime deadline) => Math.Max(0, (float)(deadline - World.CurrentTime).TotalSeconds);
-    protected float Speed() => Player.FindStatus(50) != null ? 7.8f : 6;
+    protected NavigationDecision.Context NavigationContext = new();
+
+    protected float Deadline(DateTime deadline) => Math.Max(0f, (float)(deadline - World.CurrentTime).TotalSeconds);
+    protected float Speed() => Player.FindStatus((uint)ClassShared.SID.Sprint) != null ? 7.8f : 6f;
 
     protected bool InMeleeRange(Actor target, WPos position)
     {
-        var maxRange = target.HitboxRadius + Player.HitboxRadius + 3;
+        var maxRange = target.HitboxRadius + 2.6f;
         return (target.Position - position).LengthSq() < maxRange * maxRange;
     }
 
@@ -31,7 +34,7 @@ protected WPos ClosestInRange(WPos pos, WPos target, float maxRange)
         return range <= maxRange ? pos : target + maxRange * toPlayer.Normalized();
     }
 
-    protected WPos ClosestInMelee(WPos pos, Actor target, float tolerance = 0.25f) => ClosestInRange(pos, target.Position, target.HitboxRadius + 3 - tolerance);
+    protected WPos ClosestInMelee(WPos pos, Actor target, float tolerance = 0f) => ClosestInRange(pos, target.Position, target.HitboxRadius + 2.6f - tolerance);
 
     // return uptime position if player will be able to reach downtime position within deadline having started movement after next action, otherwise downtime position
     protected WPos UptimeDowntimePos(WPos uptimePos, WPos downtimePos, float nextAction, float deadline)
@@ -41,7 +44,7 @@ protected WPos UptimeDowntimePos(WPos uptimePos, WPos downtimePos, float nextAct
     }
 
     // return position that will make the target (assumed aggro'd) move to specified position, ensuring we're back in melee range by the deadline
-    protected WPos MoveTarget(Actor target, WPos desired, float nextAction, float targetMeleeRange = 2)
+    protected WPos MoveTarget(Actor target, WPos desired, float nextAction, float targetMeleeRange = 2f)
     {
         var dir = desired - target.Position;
         if (dir.LengthSq() < 0.01f)

BossMod/ActionQueue/ActionQueue.cs

@@ -8,7 +8,7 @@
 // - repeat the process until no more actions can be found
 public sealed class ActionQueue
 {
-    public readonly record struct Entry(ActionID Action, Actor? Target, float Priority, float Expire = float.MaxValue, float Delay = 0, Vector3 TargetPos = default, Angle? FacingAngle = null);
+    public readonly record struct Entry(ActionID Action, Actor? Target, float Priority, float Expire, float Delay, float CastTime, Vector3 TargetPos, Angle? FacingAngle);
 
     // reference priority guidelines
     // values divisible by 1000 are reserved for standard cooldown planner priorities
@@ -38,7 +38,7 @@ public static class Priority
     public readonly List<Entry> Entries = [];
 
     public void Clear() => Entries.Clear();
-    public void Push(ActionID action, Actor? target, float priority, float expire = float.MaxValue, float delay = 0, Vector3 targetPos = default, Angle? facingAngle = null) => Entries.Add(new(action, target, priority, expire, delay, targetPos, facingAngle));
+    public void Push(ActionID action, Actor? target, float priority, float expire = float.MaxValue, float delay = 0, float castTime = 0, Vector3 targetPos = default, Angle? facingAngle = null) => Entries.Add(new(action, target, priority, expire, delay, castTime, targetPos, facingAngle));
 
     public Entry FindBest(WorldState ws, Actor player, ReadOnlySpan<Cooldown> cooldowns, float animationLock, AIHints hints, float instantAnimLockDelay)
     {
@@ -54,6 +54,9 @@ public Entry FindBest(WorldState ws, Actor player, ReadOnlySpan<Cooldown> cooldo
             if (def == null || !def.IsUnlocked(ws, player))
                 continue; // unregistered or locked action
 
+            if (candidate.CastTime > hints.MaxCastTime)
+                continue; // this cast can't be finished in time, look for something else
+
             var startDelay = Math.Max(Math.Max(candidate.Delay, animationLock), def.ReadyIn(cooldowns, ws.Client.DutyActions));
 
             // TODO: adjusted cast time!

BossMod/ActionQueue/Casters/BLM.cs

@@ -84,8 +84,6 @@ public enum TraitID : uint
 public enum SID : uint
 {
     None = 0,
-    LucidDreaming = 1204, // applied by Lucid Dreaming to self
-    Swiftcast = 167, // applied by Swiftcast to self
     Manaward = 168, // applied by Manaward to self
     Thunder = 161, // applied by Thunder to target
     ThunderII = 162, // applied by Thunder II to target
@@ -101,6 +99,9 @@ public enum SID : uint
 
     //Shared
     Addle = ClassShared.SID.Addle, // applied by Addle to target
+    Surecast = ClassShared.SID.Surecast, // applied by Surecast to self
+    LucidDreaming = ClassShared.SID.LucidDreaming, // applied by Lucid Dreaming to self
+    Swiftcast = ClassShared.SID.Swiftcast, // applied by Swiftcast to self
 }
 
 public sealed class Definitions : IDisposable

BossMod/ActionQueue/Casters/PCT.cs

@@ -90,7 +90,7 @@ public enum SID : uint
     Aetherhues = 3675, // applied by Fire in Red, Fire II in Red, Blizzard II in Cyan, Blizzard in Cyan to self
     AetherhuesII = 3676, // applied by Aero in Green, Aero II in Green, Stone in Yellow to self
     TemperaCoat = 3686, // applied by Tempera Coat to self
-    Swiftcast = 167, // applied by Swiftcast to self
+    TemperaGrassa = 3687, // applied by Tempera Grassa to self
     Smudge = 3684, // applied by Smudge to self
     HammerTime = 3680, // applied by Striking Muse to self
     SubtractivePalette = 3674, // applied by Subtractive Palette to self
@@ -103,6 +103,9 @@ public enum SID : uint
 
     //Shared
     Addle = ClassShared.SID.Addle, // applied by Addle to target
+    Surecast = ClassShared.SID.Surecast, // applied by Surecast to self
+    LucidDreaming = ClassShared.SID.LucidDreaming, // applied by Lucid Dreaming to self
+    Swiftcast = ClassShared.SID.Swiftcast, // applied by Swiftcast to self
 }
 
 public sealed class Definitions : IDisposable

BossMod/ActionQueue/Casters/RDM.cs

@@ -87,8 +87,6 @@ public enum TraitID : uint
 public enum SID : uint
 {
     None = 0,
-    LucidDreaming = 1204, // applied by Lucid Dreaming to self
-    Swiftcast = 167, // applied by Swiftcast to self
     VerfireReady = 1234,
     VerstoneReady = 1235,
     Acceleration = 1238,
@@ -101,6 +99,9 @@ public enum SID : uint
 
     //Shared
     Addle = ClassShared.SID.Addle, // applied by Addle to target
+    Surecast = ClassShared.SID.Surecast, // applied by Surecast to self
+    LucidDreaming = ClassShared.SID.LucidDreaming, // applied by Lucid Dreaming to self
+    Swiftcast = ClassShared.SID.Swiftcast, // applied by Swiftcast to self
 }
 
 public sealed class Definitions : IDisposable

BossMod/ActionQueue/Casters/SMN.cs

@@ -126,7 +126,6 @@ public enum SID : uint
     None = 0,
     Sleep = 3, // applied by Sleep to target
     FurtherRuin = 2701, // applied by Energy Drain, Energy Siphon to self
-    LucidDreaming = 1204, // applied by Lucid Dreaming to self
     SearingLight = 2703, // applied by Searing Light to self/target
     TitansFavor = 2853, // applied by Topaz Rite, Topaz Catastrophe to self
     Rekindle = 2704, // applied by Rekindle to self
@@ -140,8 +139,9 @@ public enum SID : uint
 
     //Shared
     Addle = ClassShared.SID.Addle, // applied by Addle to target
+    Surecast = ClassShared.SID.Surecast, // applied by Surecast to self
+    LucidDreaming = ClassShared.SID.LucidDreaming, // applied by Lucid Dreaming to self
     Swiftcast = ClassShared.SID.Swiftcast, // applied by Swiftcast to self
-
 }
 
 public sealed class Definitions : IDisposable

BossMod/ActionQueue/ClassShared.cs

@@ -79,6 +79,8 @@ public enum SID : uint
     #region PvE
     None = 0,
 
+    Sprint = 50, // applied by Sprint to self
+
     // Tank
     Reprisal = 1193, // applied by Reprisal to target
 
@@ -89,8 +91,12 @@ public enum SID : uint
     // PhysRanged
     Peloton = 1199, // applied by Peloton to self/party
 
-    // Caster/Healer
+    // Caster
     Addle = 1203, // applied by Addle to target
+
+    // Magical
+    LucidDreaming = 1204, // applied by Lucid Dreaming to self
+    Surecast = 160, // applied by Surecast to self
     Swiftcast = 167, // applied by Swiftcast to self
     Raise = 148, // applied by Raise to target
 

BossMod/ActionQueue/Healers/AST.cs

@@ -95,21 +95,46 @@ public enum TraitID : uint
 public enum SID : uint
 {
     None = 0,
-    LucidDreaming = 1204, // applied by Lucid Dreaming to self
-    Surecast = 160, // applied by Surecast to self
     Combust = 838,
-    AspectedHelios = 836,
-    AspectedBenefic = 835,
-    HeliosConjunction = 3894,
-    Lightspeed = 841,
     CombustII = 843,
     CombustIII = 1881,
+    AspectedBenefic = 835,
+    AspectedHelios = 836,
+    HeliosConjunction = 3894,
+    Horoscope = 1890,
+    HoroscopeHelios = 1891,
+    NeutralSect = 1892,
+    NeutralSectShield = 1921,
     Divination = 1878,
+    GiantDominance = 1248,
+    ClarifyingDraw = 2713,
+    Macrocosmos = 2718,
+    Lightspeed = 841,
+    SelfSynastry = 845,
+    TargetSynastry = 846,
+    Divining = 3893,
+
+    //Cards
     TheBalance = 3887,
     TheSpear = 3889,
-    Divining = 3893,
+    LordOfCrownsDrawn = 2054,
+    LadyOfCrownsDrawn = 2055,
+    BalanceDrawn = 913,
+    BoleDrawn = 914,
+    ArrowDrawn = 915,
+    SpearDrawn = 916,
+    EwerDrawn = 917,
+    SpireDrawn = 918,
+    BalanceBuff = 3887,
+    BoleBuff = 3890,
+    ArrowBuff = 3888,
+    SpearBuff = 3889,
+    EwerBuff = 3891,
+    SpireBuff = 3892,
 
     //Shared
+    Surecast = ClassShared.SID.Surecast, // applied by Surecast to self
+    LucidDreaming = ClassShared.SID.LucidDreaming, // applied by Lucid Dreaming to self
     Swiftcast = ClassShared.SID.Swiftcast, // applied by Swiftcast to self
 }
 

BossMod/ActionQueue/Healers/SCH.cs

@@ -96,15 +96,16 @@ public enum SID : uint
     Bio2 = 189, // applied by Bio2 to target, dot
     Biolysis = 1895,
     Galvanize = 297, // applied by Adloquium to target, shield
-    LucidDreaming = 1204, // applied by Lucid Dreaming to self
     Sleep = 3, // applied by Repose to target
     BanefulImpaction = 3883, // applied by Baneful Impaction to target
     ImpactImminent = 3882, // applied by Chain Stratagem to self
     ChainStratagem = 1221, // applied by Chain Stratagem to target
-    FeyUnion = 1222, // applied by Aetherpact to target
+    FeyUnion = 1223, // applied by Aetherpact to target
     Seraphism = 3884, // applied by Seraphism to self
 
     //Shared
+    Surecast = ClassShared.SID.Surecast, // applied by Surecast to self
+    LucidDreaming = ClassShared.SID.LucidDreaming, // applied by Lucid Dreaming to self
     Swiftcast = ClassShared.SID.Swiftcast, // applied by Swiftcast to self
 }