merge vbm

BossMod/ActionQueue/Tanks/GNB.cs

@@ -152,6 +152,7 @@ public enum SID : uint
     HeartOfCorundumPvP = 4295, // applied by Heart of Corundum to self
     CatharsisOfCorundumPvP = 4296, // applied by Heart of Corundum to self
     RelentlessRushPvP = 3052,
+    RelentlessShrapnelPvP = 3053,
 
     //Shared
     Elixir = ClassShared.AID.Elixir,

BossMod/Autorotation/MiscAI/AutoFarm.cs

@@ -2,9 +2,10 @@
 
 public sealed class AutoFarm(RotationModuleManager manager, Actor player) : RotationModule(manager, player)
 {
-    public enum Track { General, Fate, Specific }
+    public enum Track { General, Fate, Specific, Mount }
     public enum GeneralStrategy { FightBack, AllowPull, Aggressive, Passive }
     public enum PriorityStrategy { None, Prioritize }
+    public enum MountedStrategy { None, DisableFightBack, DisableAll }
 
     public static RotationModuleDefinition Definition()
     {
@@ -24,6 +25,11 @@ public static RotationModuleDefinition Definition()
             .AddOption(PriorityStrategy.None, "None", "Do not do anything special")
             .AddOption(PriorityStrategy.Prioritize, "Prioritize", "Prioritize specific mobs by targeting criterion");
 
+        res.Define(Track.Mount).As<MountedStrategy>("Mount")
+            .AddOption(MountedStrategy.None, "None", "Do not do anything special")
+            .AddOption(MountedStrategy.DisableFightBack, "NoFightBack", "Do not engage previously uninteresting mobs if they aggro on player")
+            .AddOption(MountedStrategy.DisableAll, "NoAll", "Do not engage anything while mounted");
+
         return res;
     }
 
@@ -34,6 +40,11 @@ public override void Execute(StrategyValues strategy, Actor? primaryTarget, floa
         if (generalStrategy == GeneralStrategy.Passive)
             return;
 
+        var mountStrategy = strategy.Option(Track.Mount).As<MountedStrategy>();
+        var mounted = Player.MountId > 0;
+        if (mounted && mountStrategy == MountedStrategy.DisableAll)
+            return;
+
         var allowPulling = generalStrategy switch
         {
             GeneralStrategy.AllowPull => !Player.InCombat,
@@ -58,14 +69,12 @@ void prioritize(AIHints.Enemy e, int prio)
         // first deal with pulling new enemies
         if (allowPulling)
         {
-            if (Utils.IsPlayerSyncedToFate(World) && strategy.Option(Track.Fate).As<PriorityStrategy>() == PriorityStrategy.Prioritize)
+            var allowFate = Utils.IsPlayerSyncedToFate(World) && strategy.Option(Track.Fate).As<PriorityStrategy>() == PriorityStrategy.Prioritize;
+            foreach (var e in Hints.PotentialTargets)
             {
-                foreach (var e in Hints.PotentialTargets)
+                if (allowFate && e.Actor.FateID == World.Client.ActiveFate.ID && e.Priority == AIHints.Enemy.PriorityUndesirable)
                 {
-                    if (e.Actor.FateID == World.Client.ActiveFate.ID && e.Priority == AIHints.Enemy.PriorityUndesirable)
-                    {
-                        prioritize(e, 1);
-                    }
+                    prioritize(e, 1);
                 }
             }
 
@@ -85,7 +94,9 @@ void prioritize(AIHints.Enemy e, int prio)
         }
 
         // if we did not select an enemy to pull, see if we can target something higher-priority than what we have now
-        if (switchTarget == null && Player.InCombat)
+        // if mounted, check if the "fight back" strategy is undesired
+        var mountNoFightBack = mounted && mountStrategy == MountedStrategy.DisableFightBack;
+        if (switchTarget == null && Player.InCombat && !mountNoFightBack)
         {
             var curTargetPrio = Hints.FindEnemy(primaryTarget)?.Priority ?? int.MinValue;
             switchTarget = ResolveTargetOverride(generalOpt.Value) ?? (curTargetPrio < Hints.HighestPotentialTargetPriority ? Hints.PriorityTargets.MinBy(e => (e.Actor.Position - Player.Position).LengthSq())?.Actor : null);

BossMod/Autorotation/MiscAI/AutoPull.cs

@@ -8,7 +8,7 @@ public enum Track { QuestBattle, DeepDungeon, EpicEcho, Hunt }
 
     public static RotationModuleDefinition Definition()
     {
-        var def = new RotationModuleDefinition("Misc AI: Auto-pull", "Automatically attack passive mobs in certain circumstances", "Misc", "xan", RotationModuleQuality.Basic, new(~0ul), 1000, Order: RotationModuleOrder.HighLevel, CanUseWhileRoleplaying: true);
+        var def = new RotationModuleDefinition("Auto-pull", "Automatically attack passive mobs in certain circumstances", "AI", "xan", RotationModuleQuality.Basic, new(~0ul), 1000, Order: RotationModuleOrder.HighLevel, CanUseWhileRoleplaying: true);
 
         def.AbilityTrack(Track.QuestBattle, "Automatically attack solo duty bosses");
         def.AbilityTrack(Track.DeepDungeon, "Automatically attack deep dungeon bosses when solo");

BossMod/Autorotation/RotationModule.cs

@@ -170,9 +170,14 @@ public int FindDutyActionSlot(ActionID action, ActionID other)
 
     protected (Actor? Target, P Priority) FindBetterTargetBy<P>(Actor? initial, float maxDistanceFromPlayer, Func<Actor, P> prioFunc, Func<AIHints.Enemy, bool>? filterFunc = null) where P : struct, IComparable
     {
+        bool inRange(Actor tar) => tar.Position.InCircle(Player.Position, maxDistanceFromPlayer + tar.HitboxRadius + 0.5f);
+
+        if (initial != null && !inRange(initial))
+            initial = null;
+
         var bestTarget = initial;
         var bestPrio = initial != null ? prioFunc(initial) : default;
-        foreach (var enemy in Hints.PriorityTargets.Where(x => x.Actor != initial && x.Actor.Position.InCircle(Player.Position, maxDistanceFromPlayer + x.Actor.HitboxRadius) && (filterFunc?.Invoke(x) ?? true)))
+        foreach (var enemy in Hints.PriorityTargets.Where(x => x.Actor != initial && inRange(x.Actor) && (filterFunc?.Invoke(x) ?? true)))
         {
             var newPrio = prioFunc(enemy.Actor);
             if (newPrio.CompareTo(bestPrio) > 0)