Merge pull request #125 from FFXIV-CombatReborn/mergeWIP2

code analyzer fix
FFXIV-CombatReborn · Jun 7, 2024 · 0554fe9 · 0554fe9
2 parents 6a3410b + 4306596
commit 0554fe9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/BossMod/AI/AIBehaviour.cs b/BossMod/AI/AIBehaviour.cs
@@ -12,7 +12,6 @@ sealed class AIBehaviour(AIController ctrl, Autorotation autorot) : IDisposable
     private bool _followMaster; // if true, our navigation target is master rather than primary target - this happens e.g. in outdoor or in dungeons during gathering trash
     private float _maxCastTime;
     private WPos _masterPrevPos;
-    private WPos _masterMovementStart;
     private DateTime _masterLastMoved;
 
     public void Dispose()
@@ -105,7 +104,7 @@ private NavigationDecision BuildNavigationDecision(Actor player, Actor master, r
         if (_followMaster && !_config.FollowTarget || _followMaster && _config.FollowTarget && target == null)
             return NavigationDecision.Build(autorot.WorldState, autorot.Hints, player, master.Position, 1, new(), Positional.Any);
         if (_followMaster && _config.FollowTarget && target != null)
-            return NavigationDecision.Build(autorot.WorldState, autorot.Hints, player, target.Position, target.HitboxRadius + player.HitboxRadius + 3, target.Rotation, _config.DesiredPositional);
+            return NavigationDecision.Build(autorot.WorldState, autorot.Hints, player, target.Position, target.HitboxRadius + 2.6f, target.Rotation, _config.DesiredPositional);
         if (targeting.Target == null)
             return NavigationDecision.Build(autorot.WorldState, autorot.Hints, player, null, 0, new(), Positional.Any);
         var adjRange = targeting.PreferredRange + player.HitboxRadius + targeting.Target.Actor.HitboxRadius;
@@ -131,7 +130,7 @@ private void FocusMaster(Actor master)
         if (masterChanged)
         {
             ctrl.SetFocusTarget(master);
-            _masterPrevPos = _masterMovementStart = master.Position;
+            _masterPrevPos = master.Position;
             _masterLastMoved = autorot.WorldState.CurrentTime.AddSeconds(-1);
         }
     }
@@ -149,7 +148,6 @@ private bool TrackMasterMovement(Actor master)
         else if ((autorot.WorldState.CurrentTime - _masterLastMoved).TotalSeconds > 0.5f)
         {
             // master has stopped, consider previous movement finished
-            _masterMovementStart = _masterPrevPos;
             masterIsMoving = false;
         }
         // else: don't consider master to have stopped moving unless he's standing still for some small time

diff --git a/UIDev/UITest.cs b/UIDev/UITest.cs
@@ -65,7 +65,7 @@ public static void Main(string[] args)
             Service.WindowSystem.Draw();
         };
 
-        var configPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "XIVLauncher", "pluginConfigs", "BossMod.json");
+        var configPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "XIVLauncher", "pluginConfigs", "BossModReborn.json");
         var mainWindow = new UITestWindow(scene, configPath);
         mainWindow.IsOpen = true;
         scene.Run();