diff --git a/RotationSolver/Actions/BaseAction/BaseAction_Target.cs b/RotationSolver/Actions/BaseAction/BaseAction_Target.cs index 3cacf47ee..e63e36145 100644 --- a/RotationSolver/Actions/BaseAction/BaseAction_Target.cs +++ b/RotationSolver/Actions/BaseAction/BaseAction_Target.cs @@ -331,11 +331,12 @@ private bool TargetSelf(bool mustUse, int aoeCount) } //如果不用自动找目标,那就不打AOE - if (RSCommands.StateType != StateCommandType.Manual) + if (RSCommands.StateType == StateCommandType.Manual) { if (!Service.Configuration.UseAOEWhenManual && !mustUse) return false; } var count = TargetFilter.GetObjectInRadius(TargetFilterFuncEot(TargetUpdater.HostileTargets, mustUse), _action.EffectRange).Count(); + if (count < aoeCount) return false; } return true; diff --git a/RotationSolver/Properties/AssemblyInfo.cs b/RotationSolver/Properties/AssemblyInfo.cs index b9eb2ae52..4a493408e 100644 --- a/RotationSolver/Properties/AssemblyInfo.cs +++ b/RotationSolver/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyCompany("-")] [assembly: AssemblyConfiguration("Release")] -[assembly: AssemblyDescription("Teach you how to perform better in combat!")] +[assembly: AssemblyDescription("Based on the pve combat information in one frame, find the best action.")] [assembly: AssemblyFileVersion("1.1.0")] [assembly: AssemblyInformationalVersion("1.1.0")] [assembly: TargetPlatform("Windows7.0")] diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs index 87c42125a..cb9acb7a3 100644 --- a/RotationSolver/Updaters/MajorUpdater.cs +++ b/RotationSolver/Updaters/MajorUpdater.cs @@ -7,31 +7,31 @@ namespace RotationSolver.Updaters; internal static class MajorUpdater { -#if DEBUG - private static readonly Dictionary _valus = new Dictionary(); -#endif +//#if DEBUG +// private static readonly Dictionary _valus = new Dictionary(); +//#endif private unsafe static void FrameworkUpdate(Framework framework) { if (!Service.Conditions.Any() || Service.ClientState.LocalPlayer == null) return; -#if DEBUG - //Get changed condition. - string[] enumNames = Enum.GetNames(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag)); - int[] indexs = (int[])Enum.GetValues(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag)); - if (enumNames.Length == indexs.Length) - { - for (int i = 0; i < enumNames.Length; i++) - { - string key = enumNames[i]; - bool newValue = Service.Conditions[(Dalamud.Game.ClientState.Conditions.ConditionFlag)indexs[i]]; - if (_valus.ContainsKey(i) && _valus[i] != newValue && indexs[i] != 48 && indexs[i] != 27) - { - Service.ToastGui.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString()); - } - _valus[i] = newValue; - } - } -#endif +//#if DEBUG +// //Get changed condition. +// string[] enumNames = Enum.GetNames(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag)); +// int[] indexs = (int[])Enum.GetValues(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag)); +// if (enumNames.Length == indexs.Length) +// { +// for (int i = 0; i < enumNames.Length; i++) +// { +// string key = enumNames[i]; +// bool newValue = Service.Conditions[(Dalamud.Game.ClientState.Conditions.ConditionFlag)indexs[i]]; +// if (_valus.ContainsKey(i) && _valus[i] != newValue && indexs[i] != 48 && indexs[i] != 27) +// { +// Service.ToastGui.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString()); +// } +// _valus[i] = newValue; +// } +// } +//#endif //Update State. PreviewUpdater.UpdatePreview(); diff --git a/RotationSolver/Windows/OverlayWindow.cs b/RotationSolver/Windows/OverlayWindow.cs index 09053b8e2..956df26fd 100644 --- a/RotationSolver/Windows/OverlayWindow.cs +++ b/RotationSolver/Windows/OverlayWindow.cs @@ -87,17 +87,17 @@ private static void DrawMoveTarget() var c = Service.Configuration.MovingTargetColor; var color = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1)); -#if DEBUG - Service.GameGui.WorldToScreen(Service.ClientState.LocalPlayer.Position, out var plp); - var calHealth = (double)ObjectHelper.GetHealthFromMulty(1); - foreach (var t in TargetUpdater.AllTargets) - { - if (Service.GameGui.WorldToScreen(t.Position, out var p)) - { - ImGui.GetWindowDrawList().AddText(p, color, $"Boss Ratio (Max): {t.MaxHp / calHealth:F2}\nDying Ratio (Current): {t.CurrentHp / calHealth:F2}"); - } - } -#endif +//#if DEBUG +// Service.GameGui.WorldToScreen(Service.ClientState.LocalPlayer.Position, out var plp); +// var calHealth = (double)ObjectHelper.GetHealthFromMulty(1); +// foreach (var t in TargetUpdater.AllTargets) +// { +// if (Service.GameGui.WorldToScreen(t.Position, out var p)) +// { +// ImGui.GetWindowDrawList().AddText(p, color, $"Boss Ratio (Max): {t.MaxHp / calHealth:F2}\nDying Ratio (Current): {t.CurrentHp / calHealth:F2}"); +// } +// } +//#endif var tar = IconReplacer.RightNowRotation?.MoveTarget; if (tar == null || tar == Service.ClientState.LocalPlayer) return;