Merge pull request #533 from FFXIV-CombatReborn/mergeWIP

forbid movement while mounted setting
FFXIV-CombatReborn · Dec 31, 2024 · 9ed86f2 · 9ed86f2
2 parents 68ca103 + ccbb776
commit 9ed86f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/BossMod/AI/AIBehaviour.cs b/BossMod/AI/AIBehaviour.cs
@@ -143,7 +143,7 @@ private void AdjustTargetPositional(Actor player, ref Targeting targeting)
 
     private async Task<(NavigationDecision decision, Targeting updatedTargeting)> BuildNavigationDecision(Actor player, Actor master, Targeting targeting)
     {
-        if (_config.ForbidMovement)
+        if (_config.ForbidMovement || _config.ForbidAIMovementMounted && player.MountId != 0)
             return (new NavigationDecision { LeewaySeconds = float.MaxValue }, targeting);
 
         if (_followMaster && (AIPreset == null || _config.OverrideAutorotation))

diff --git a/BossMod/AI/AIConfig.cs b/BossMod/AI/AIConfig.cs
@@ -64,5 +64,8 @@ sealed class AIConfig : ConfigNode
     [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;
 
+    [PropertyDisplay("Forbid AI movement while mounted")]
+    public bool ForbidAIMovementMounted = false;
+
     public string? AIAutorotPresetName;
 }
diff --git a/BossMod/AI/AIManagementWindow.cs b/BossMod/AI/AIManagementWindow.cs
@@ -55,6 +55,8 @@ private Task UIAsync()
         ImGui.SameLine();
         configModified |= ImGui.Checkbox("Forbid movement", ref _config.ForbidMovement);
         ImGui.SameLine();
+        configModified |= ImGui.Checkbox("Forbid mounted movement", ref _config.ForbidAIMovementMounted);
+        ImGui.SameLine();
         configModified |= ImGui.Checkbox("Follow during combat", ref _config.FollowDuringCombat);
         ImGui.Spacing();
         configModified |= ImGui.Checkbox("Follow during active boss module", ref _config.FollowDuringActiveBossModule);