From 2768f651d67771f28387ead2d0947aef8fe039b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Sat, 11 Nov 2023 09:47:56 +0800 Subject: [PATCH] fix: geting all actions when rightnow rotation is null. --- ECommons | 2 +- RotationSolver/Localization/Localization.json | 21 ++++++++++--------- RotationSolver/Updaters/RotationUpdater.cs | 2 +- XIVPainter | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ECommons b/ECommons index 1a7ab8659..d3479f842 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit 1a7ab86593549d4e8e2f7370d70415b988d9aa73 +Subproject commit d3479f842c1d0908119af1598d9a7fa6bac3312b diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json index b88c8163e..702775129 100644 --- a/RotationSolver/Localization/Localization.json +++ b/RotationSolver/Localization/Localization.json @@ -18,7 +18,7 @@ "ConfigWindow_HelpItem_DefenseSingle": "Open a window to use single defense.", "ConfigWindow_HelpItem_Esuna": "Open a window to use Esuna, tank stance actions or True North.", "ConfigWindow_HelpItem_RaiseShirk": "Open a window to use Raise or Shirk.", - "ConfigWindow_HelpItem_AntiKnockback": "Open a window to use knockback-penalty actions.", + "ConfigWindow_HelpItem_AntiKnockback": "Open a window to use knockback immunity actions.", "ConfigWindow_HelpItem_Burst": "Open a window to burst.", "ConfigWindow_HelpItem_MoveForward": "Open a window to move forward.", "ConfigWindow_HelpItem_MoveBack": "Open a window to move back.", @@ -38,9 +38,9 @@ "ConfigWindow_Events_DutyEnd": "Duty End: ", "ConfigWindow_Param_UseOverlayWindow": "Display UI Overlay", "ConfigWindow_Param_UseOverlayWindowDesc": "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc.", - "ConfigWindow_Param_ActionAhead": "The before an oGCD is avaliable to start trying using it", + "ConfigWindow_Param_ActionAhead": "The time before an oGCD is avaliable to start trying using it", "ConfigWindow_Param_MinLastAbilityAdvanced": "The time ahead of the last oGCD before the next GCD being avaliable to start trying using it (may affect skill weaving)", - "ConfigWindow_Param_CountDownAhead": "The abilities will be used before finishing the countdown", + "ConfigWindow_Param_CountDownAhead": "The starting when abilities will be used before finishing the countdown", "ConfigWindow_Param_SpecialDuration": "The duration of special windows set by commands", "ConfigWindow_Param_AddDotGCDCount": "The number of GCDs in advance for DOT refreshing", "ConfigWindow_Param_MaxPing": "The max ping that RS can get to before skipping to the next action.", @@ -89,13 +89,14 @@ "ConfigWindow_Param_ShowInfoOnDtr": "Display plugin status on server info", "ConfigWindow_Param_ShowInfoOnToast": "Display plugin status on toast", "ConfigWindow_Param_ShowToastsAboutDoAction": "Display do action feedback on toast", + "ConfigWindow_Param_ShowToggledActionInChat": "Display toggle action feedback on chat", "ConfigWindow_Param_UseAOEAction": "Use AoE actions", "ConfigWindow_Param_UseAOEWhenManual": "Use AoE actions in manual mode", "ConfigWindow_Param_AutoBurst": "Automatically trigger dps burst phase", "ConfigWindow_Param_AutoHeal": "Automatic Heal", "ConfigWindow_Param_UseAbility": "Auto-use abilities", "ConfigWindow_Param_NoNewHostiles": "Don't attack new mobs by AoE", - "ConfigWindow_Params_NoNewHostilesDesc": "Never use any AoE action when this action may attack the mobs that are not hostile targets.", + "ConfigWindow_Params_NoNewHostilesDesc": "Never use any AoE action when this may attack the mobs that are not hostile targets.", "ConfigWindow_Param_UseDefenseAbility": "Use defensive abilities", "ConfigWindow_Param_UseDefenseAbilityDesc": "It is recommended to check this option if you are playing Raids or you can plan the heal and defense ability usage by yourself.", "ConfigWindow_Param_AutoShield": "Automatically activate tank stance", @@ -278,10 +279,10 @@ "TargetConditionType_Vfx": "Vfx", "TargetConditionType_IsNull": "Is Null", "ConfigUnitType_Seconds": "Time Unit, in seconds.", - "ConfigUnitType_Degree": "Angle Unit, in degree.", - "ConfigUnitType_Pixels": "Display Unit, in piexels.", + "ConfigUnitType_Degree": "Angle Unit, in degrees.", + "ConfigUnitType_Pixels": "Display Unit, in pixels.", "ConfigUnitType_Yalms": "Distance Unit, in yalms.", - "ConfigUnitType_Ratio": "Ratio Unit, in percents.", + "ConfigUnitType_Ratio": "Ratio Unit, as percentage.", "TerritoryConditionType_TerritoryContentType": "Territory Content Type", "TerritoryConditionType_TerritoryName": "Territory Name", "TerritoryConditionType_DutyName": "Duty Name", @@ -441,8 +442,8 @@ "LilyTime": "Lily Time" }, "HighEndWarning": "Please separately keybind damage reduction / shield cooldowns in case RS fails at a crucial moment in {0}!", - "TextToTalkWarning": "You didn't install TextToTalk, please install it to make Rotation Solver say something for you!", - "AvariceWarning": "It seems that you didn't installed Avarice. If you want to get the positional indicator from Rotation Solver, please install it.", + "TextToTalkWarning": "TextToTalk addon was not detected, please install it to make Rotation Solver give audio notifications!", + "AvariceWarning": "Avarice addon was not detected, please install it if you want to get the positional indicators for Rotation Solver!", "ClickingMistakeMessage": "OOOps! RS clicked the wrong action ({0})!", "ConfigWindow_About_Punchline": "Analyses PvE combat information every frame and finds the best action.", "ConfigWindow_About_Description": "This means almost all the information available in one frame in combat, including the status of all players in the party, the status of any hostile targets, skill cooldowns, the MP and HP of characters, the location of characters, casting status of the hostile target, combo, combat duration, player level, etc.\n\nThen, it will highlight the best action on the hot bar, or help you to click on it.", @@ -537,7 +538,7 @@ "ConfigWindow_Basic_ClickingDuration": "The clicking duration, RS will try to click at this moment.", "ConfigWindow_Basic_WeaponDelay": "This is the clipping time.\nGCD is over. However, RS forgets to click the next action.", "ConfigWindow_About_ClickingCount": "Rotation Solver helped you by clicking actions {0:N0} times.", - "ConfigWindow_About_SayHelloCount": "You have sayed hello to other users {0:N0} times!", + "ConfigWindow_About_SayHelloCount": "You have said hello to other users {0:N0} times!", "ConfigWindow_Auto_AutoHealTimeToKill": "Stop healing when time to kill is lower then...", "ConfigWindow_UI_ShowHostiles": "Show the hostile target icon", "ConfigWindow_UI_HostileIconHeight": "Hostile Icon height from position", diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs index c537758e4..e71717df1 100644 --- a/RotationSolver/Updaters/RotationUpdater.cs +++ b/RotationSolver/Updaters/RotationUpdater.cs @@ -446,7 +446,7 @@ public static void UpdateRotation() rotation?.OnTerritoryChanged(); } DataCenter.RightNowRotation = rotation; - RightRotationActions = DataCenter.RightNowRotation.AllActions; + RightRotationActions = DataCenter.RightNowRotation?.AllActions ?? Array.Empty(); DataCenter.Job = DataCenter.RightNowRotation?.Jobs[0] ?? Job.ADV; return; } diff --git a/XIVPainter b/XIVPainter index f377f0f8f..57603c65b 160000 --- a/XIVPainter +++ b/XIVPainter @@ -1 +1 @@ -Subproject commit f377f0f8f86596a47c6eeb78e55387b011833234 +Subproject commit 57603c65b9f12ddb85c9e66c77b01d83e2f75f49