From 521be068670a70bacdbafcf5778291c2f99d84e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <53346444+ArchiDog1998@users.noreply.github.com> Date: Mon, 19 Feb 2024 02:10:54 +0800 Subject: [PATCH] fix: fixed drawing. --- Resources/AnimationLockTime.json | 2 ++ Resources/HostileCastingArea.json | 6 ++++- Resources/RotationSolverRecord.json | 4 ++-- RotationSolver.Basic/Helpers/ObjectHelper.cs | 5 ++-- RotationSolver/Localization/Localization.json | 24 ++++++++++++++++++- RotationSolver/UI/PainterManager.cs | 5 +++- XIVPainter | 2 +- 7 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index 096ad0868..9d09147db 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -217,6 +217,8 @@ "7439": 0.6, "7442": 0.1, "7443": 0.6, + "7444": 0.6, + "7445": 0.6, "7447": 0.1, "7477": 0.6, "7478": 0.6, diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json index 0dd5b06ae..6b6dd3230 100644 --- a/Resources/HostileCastingArea.json +++ b/Resources/HostileCastingArea.json @@ -480,5 +480,9 @@ 30287, 30288, 28907, - 24189 + 24189, + 35948, + 35331, + 10827, + 10799 ] \ No newline at end of file diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json index 8dbc82fb7..2da1c7c8f 100644 --- a/Resources/RotationSolverRecord.json +++ b/Resources/RotationSolverRecord.json @@ -1,5 +1,5 @@ { - "ClickingCount": 63171, - "SayingHelloCount": 13, + "ClickingCount": 63570, + "SayingHelloCount": 36, "SaidUsers": [] } \ No newline at end of file diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs index a279c0e3f..741ec9681 100644 --- a/RotationSolver.Basic/Helpers/ObjectHelper.cs +++ b/RotationSolver.Basic/Helpers/ObjectHelper.cs @@ -175,9 +175,8 @@ public static unsafe bool IsEnemy(this GameObject obj) /// /// public static unsafe bool IsAlliance(this GameObject obj) - => obj != null - && (ActionManager.CanUseActionOnTarget((uint)ActionID.CurePvE, obj.Struct()) - || ActionManager.CanUseActionOnTarget((uint)ActionID.RaisePvE, obj.Struct())); + => obj != null && obj.ObjectId is not 0 and not GameObject.InvalidGameObjectId + && ActionManager.CanUseActionOnTarget((uint)ActionID.CurePvE, obj.Struct()); public static bool IsParty(this GameObject gameObject) { diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json index 68f0cacb6..3f7590d63 100644 --- a/RotationSolver/Localization/Localization.json +++ b/RotationSolver/Localization/Localization.json @@ -1,4 +1,26 @@ { "RotationSolver.Data.UiString.ConfigWindowHeader": "Rotation Solver Settings v", - "RotationSolver.Data.UiString.Commands_Rotation": "Open config window." + "RotationSolver.Data.UiString.Commands_Rotation": "Open config window.", + "RotationSolver.Basic.Data.StateCommandType.Manual": "Start the addon in Manual mode. You need to choose the target manually. This will bypass any engage settings that you have set up and will start attacking immediately once something is targeted.", + "RotationSolver.Basic.Data.StateCommandType.Cancel": "Stop the addon. Always remember to turn it off when it is not in use!", + "RotationSolver.Basic.Data.StateCommandType.Auto": "Start the addon in Auto mode. When out of combat or when combat starts, switches the target according to the set condition.", + "RotationSolver.Basic.Data.TargetingType.Big": "Big", + "RotationSolver.Data.UiString.InfoWindowNoMove": "No Move", + "RotationSolver.Data.UiString.InfoWindowMove": "Move", + "RotationSolver.Basic.Data.SpecialCommandType.HealArea": "Open a window to use AoE heal.", + "RotationSolver.Basic.Data.SpecialCommandType.HealSingle": "Open a window to use single heal.", + "RotationSolver.Basic.Data.SpecialCommandType.DefenseArea": "Open a window to use AoE defense.", + "RotationSolver.Basic.Data.SpecialCommandType.DefenseSingle": "Open a window to use single defense.", + "RotationSolver.Basic.Data.SpecialCommandType.MoveForward": "Open a window to move forward.", + "RotationSolver.Basic.Data.SpecialCommandType.MoveBack": "Open a window to move back.", + "RotationSolver.Basic.Data.SpecialCommandType.Burst": "Open a window to burst.", + "RotationSolver.Basic.Data.SpecialCommandType.EndSpecial": "To end this special duration before the set time.", + "RotationSolver.Basic.Data.SpecialCommandType.DispelStancePositional": "Open a window to use Esuna, tank stance actions or True North.", + "RotationSolver.Basic.Data.SpecialCommandType.RaiseShirk": "Open a window to use Raise or Shirk.", + "RotationSolver.Basic.Data.SpecialCommandType.AntiKnockback": "Open a window to use knockback immunity actions.", + "RotationSolver.Basic.Data.SpecialCommandType.Speed": "Open a window to speed up.", + "RotationSolver.Basic.Data.TargetHostileType.TargetsHaveTarget": "Previously engaged targets (engages on countdown timer)", + "RotationSolver.Data.UiString.ActionAbility": "Ability", + "RotationSolver.Data.UiString.ActionAttack": "Attack", + "RotationSolver.Data.UiString.ActionFriendly": "Friendly" } \ No newline at end of file diff --git a/RotationSolver/UI/PainterManager.cs b/RotationSolver/UI/PainterManager.cs index e64c807e0..2ee73055e 100644 --- a/RotationSolver/UI/PainterManager.cs +++ b/RotationSolver/UI/PainterManager.cs @@ -282,7 +282,10 @@ public static void Init() }, }; - _painter.AddDrawings(_highLight, _stateImage, annulus, movingTarget, new TargetDrawing(), new TargetsDrawing(), new TargetText(), new BeneficialPositionDrawing()); + _painter.AddDrawings( + _highLight, _stateImage,new TargetDrawing(), annulus, movingTarget, + new TargetsDrawing(), new TargetText(), new BeneficialPositionDrawing() + ); } public static void UpdateSettings() diff --git a/XIVPainter b/XIVPainter index 792d6198c..5bb869b81 160000 --- a/XIVPainter +++ b/XIVPainter @@ -1 +1 @@ -Subproject commit 792d6198c5d3db93a9673b452f885553083cb6cb +Subproject commit 5bb869b81892036e842e08a44524164cad96061e