From 9fef719ef644280eefb5f2c1d2571993745eb38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Fri, 21 Jul 2023 22:11:14 +0800 Subject: [PATCH] fix: removed the positional feedback and add the link to avarice 2.0.3.2 --- .../Actions/BaseAction_BasicInfo.cs | 4 +- RotationSolver.Basic/Actions/IBaseAction.cs | 5 --- .../Configuration/PluginConfiguration.cs | 3 -- .../Localization/EnumTranslations.cs | 9 ----- RotationSolver/Localization/Localization.json | 6 --- RotationSolver/Localization/Strings.cs | 9 ----- RotationSolver/UI/PainterManager.cs | 2 +- .../UI/RotationConfigWindow_Param.cs | 6 --- RotationSolver/Updaters/ActionUpdater.cs | 40 +------------------ 9 files changed, 5 insertions(+), 79 deletions(-) diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs index eb76272d5..922383654 100644 --- a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs +++ b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs @@ -134,9 +134,9 @@ public bool IsInCooldown public unsafe float CastTime => ActionManager.GetAdjustedCastTime(ActionType.Spell, AdjustedID) / 1000f; /// - /// Action Posotional. + /// Action Positional. /// - public virtual EnemyPositional EnemyPositional + public EnemyPositional EnemyPositional { get { diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs index 59dc3b052..310ba5c59 100644 --- a/RotationSolver.Basic/Actions/IBaseAction.cs +++ b/RotationSolver.Basic/Actions/IBaseAction.cs @@ -31,11 +31,6 @@ public interface IBaseAction : IAction [EditorBrowsable(EditorBrowsableState.Never)] internal bool IsEot { get; } - /// - /// Posotional of this action. - /// - EnemyPositional EnemyPositional { get; } - /// /// If player has these statuses from player self, this action will not used. /// diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs index 607ab5e53..2bbea7432 100644 --- a/RotationSolver.Basic/Configuration/PluginConfiguration.cs +++ b/RotationSolver.Basic/Configuration/PluginConfiguration.cs @@ -45,9 +45,6 @@ public class PluginConfiguration : IPluginConfiguration public bool ShowInfoOnDtr = true; - public bool SayPositional = true; - - public bool ToastPositional = true; public bool HealOutOfCombat = false; public bool ShowInfoOnToast = true; public bool RaiseAll = false; diff --git a/RotationSolver/Localization/EnumTranslations.cs b/RotationSolver/Localization/EnumTranslations.cs index a5a3bee92..75a762fb3 100644 --- a/RotationSolver/Localization/EnumTranslations.cs +++ b/RotationSolver/Localization/EnumTranslations.cs @@ -54,15 +54,6 @@ internal static class EnumTranslations _ => k.ToString(), }; - public static string ToName(this EnemyPositional value) => value switch - { - EnemyPositional.None => LocalizationManager.RightLang.EnemyLocation_None, - EnemyPositional.Rear => LocalizationManager.RightLang.EnemyLocation_Rear, - EnemyPositional.Flank => LocalizationManager.RightLang.EnemyLocation_Flank, - EnemyPositional.Front => LocalizationManager.RightLang.EnemyLocation_Front, - _ => string.Empty, - }; - public static string ToName(this DescType type) => type switch { DescType.BurstActions => LocalizationManager.RightLang.DescType_BurstActions, diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json index 322600231..22f797449 100644 --- a/RotationSolver/Localization/Localization.json +++ b/RotationSolver/Localization/Localization.json @@ -98,8 +98,6 @@ "ConfigWindow_Param_SampleLength": "The sample length of the line.", "ConfigWindow_Param_KeyBoardNoise": "Simulate the effect of pressing", "ConfigWindow_Param_KeyBoardNoiseTimes": "Effect times", - "ConfigWindow_Param_ToastPositional": "Hint positional anticipation by Toast", - "ConfigWindow_Param_SayPositional": "Hint positional anticipation by shouting", "ConfigWindow_Param_DrawPositional": "Draw Positional on the screen", "ConfigWindow_Param_DrawMeleeRange": "Draw the range of melee on the screen", "ConfigWindow_Param_DrawMeleeOffset": "Draw the offset of melee on the screen", @@ -321,10 +319,6 @@ "JobRole_RangedMagical": "Magical", "JobRole_DiscipleOfTheLand": "Disciple of the Land", "JobRole_DiscipleOfTheHand": "Disciple of the Hand", - "EnemyLocation_None": "None", - "EnemyLocation_Rear": "Rear", - "EnemyLocation_Flank": "Flank", - "EnemyLocation_Front": "Front", "MemberInfoName": { "IsMoving": "IsMoving", "HaveHostilesInRange": "Have Hostiles InRange", diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs index 8a19d0598..31dcb4ab0 100644 --- a/RotationSolver/Localization/Strings.cs +++ b/RotationSolver/Localization/Strings.cs @@ -155,8 +155,6 @@ internal partial class Strings public string ConfigWindow_Param_SampleLength { get; set; } = "The sample length of the line."; public string ConfigWindow_Param_KeyBoardNoise { get; set; } = "Simulate the effect of pressing"; public string ConfigWindow_Param_KeyBoardNoiseTimes { get; set; } = "Effect times"; - public string ConfigWindow_Param_ToastPositional { get; set; } = "Hint positional anticipation by Toast"; - public string ConfigWindow_Param_SayPositional { get; set; } = "Hint positional anticipation by shouting"; public string ConfigWindow_Param_DrawPositional { get; set; } = "Draw Positional on the screen"; public string ConfigWindow_Param_DrawMeleeRange { get; set; } = "Draw the range of melee on the screen"; public string ConfigWindow_Param_DrawMeleeOffset { get; set; } = "Draw the offset of melee on the screen"; @@ -448,13 +446,6 @@ internal partial class Strings #endregion - #region EnemyLocation - public string EnemyLocation_None { get; set; } = "None"; - public string EnemyLocation_Rear { get; set; } = "Rear"; - public string EnemyLocation_Flank { get; set; } = "Flank"; - public string EnemyLocation_Front { get; set; } = "Front"; - - #endregion public Dictionary MemberInfoName { get; set; } = new Dictionary() { #region Rotation diff --git a/RotationSolver/UI/PainterManager.cs b/RotationSolver/UI/PainterManager.cs index c9f09c415..9dfb6d27a 100644 --- a/RotationSolver/UI/PainterManager.cs +++ b/RotationSolver/UI/PainterManager.cs @@ -33,7 +33,7 @@ public PositionalDrawing() SubItems = new IDrawing3D[] { _noneCir, _flankCir, _rearCir }; } - void SetAction(uint id) => Svc.PluginInterface.GetOrCreateData("Avarice.ActionOverride", () => new List() { id }); + public override void UpdateOnFrame(XIVPainter.XIVPainter painter) { if (Target == null || !Target.IsNPCEnemy()) diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs index b7aabafd7..7624fd1f9 100644 --- a/RotationSolver/UI/RotationConfigWindow_Param.cs +++ b/RotationSolver/UI/RotationConfigWindow_Param.cs @@ -128,9 +128,6 @@ private void DrawParamAdvanced() DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_SayOutStateChanged, ref Service.Config.SayOutStateChanged, Service.Default.SayOutStateChanged); - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_SayPositional, - ref Service.Config.SayPositional, Service.Default.SayPositional); - ImGui.Separator(); DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_PoslockCasting, @@ -293,9 +290,6 @@ private void DrawParamDisplay() ref Service.Config.NamePlateIconId, Service.Default.NamePlateIconId, 5, 0, 150000, otherThing: RSCommands.UpdateStateNamePlate); ImGui.Spacing(); - - DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ToastPositional, - ref Service.Config.ToastPositional, Service.Default.ToastPositional); } private void DrawParamAction() diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs index 82662dc0c..6fd5a72b2 100644 --- a/RotationSolver/Updaters/ActionUpdater.cs +++ b/RotationSolver/Updaters/ActionUpdater.cs @@ -55,34 +55,6 @@ internal static void UpdateNextAction() if (NextGCDAction != GcdAction) { NextGCDAction = GcdAction; - - var rightJobAndTarget = (Player.Object.IsJobCategory(JobRole.Tank) || Player.Object.IsJobCategory(JobRole.Melee)) && GcdAction.Target.IsNPCEnemy(); - - if (rightJobAndTarget && GcdAction.IsSingleTarget) - { - PainterManager.UpdatePositional(GcdAction.EnemyPositional, GcdAction.Target); - } - else - { - PainterManager.ClearPositional(); - } - - if (GcdAction.EnemyPositional != EnemyPositional.None - && GcdAction.Target.HasPositional() - && !localPlayer.HasStatus(true, CustomRotation.TrueNorth.StatusProvide)) - { - - if (CheckAction()) - { - string positional = GcdAction.EnemyPositional.ToName(); - if (Service.Config.SayPositional) SpeechHelper.Speak(positional); - if (Service.Config.ToastPositional) Svc.Toasts.ShowQuest(" " + positional, - new Dalamud.Game.Gui.Toast.QuestToastOptions() - { - IconId = GcdAction.IconID, - }); - } - } } } return; @@ -97,18 +69,10 @@ internal static void UpdateNextAction() PainterManager.ClearPositional(); } - static DateTime lastTime; - static bool CheckAction() - { - if (DateTime.Now - lastTime > new TimeSpan(0, 0, 3) && DataCenter.StateType != StateCommandType.Cancel) - { - lastTime = DateTime.Now; - return true; - } - else return false; - } + private static void SetAction(uint id) => Svc.PluginInterface.GetOrCreateData("Avarice.ActionOverride", () => new List() { id })[0] = id; internal unsafe static void UpdateActionInfo() { + SetAction(NextGCDAction?.AdjustedID ?? 0); UpdateWeaponTime(); UpdateCombatTime(); UpdateBluSlots();