diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json index 6df3f4312..1656ee196 100644 --- a/Resources/AnimationLockTime.json +++ b/Resources/AnimationLockTime.json @@ -74,7 +74,7 @@ "159": 0.1, "162": 0.1, "167": 0.6, - "173": 0.6, + "173": 0.1, "181": 0.6, "185": 0.1, "190": 0.1, @@ -495,7 +495,9 @@ "26802": 2.1, "26804": 0.6, "28619": 2.1, + "28896": 2.1, "28900": 2.1, + "28901": 2.1, "28917": 2.1, "28924": 2.1, "29223": 0.1, @@ -514,5 +516,6 @@ "29401": 2.5, "29709": 0.1, "31323": 2.1, - "33041": 2.1 + "33041": 2.1, + "33708": 2.1 } \ No newline at end of file diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json index 01506247a..3c82f1cfd 100644 --- a/Resources/HostileCastingArea.json +++ b/Resources/HostileCastingArea.json @@ -117,15 +117,26 @@ 18639, 18668, 18678, + 18753, 19288, 19306, 19315, 19324, 23367, 23383, + 23517, + 23538, + 23541, + 23558, 23629, + 23647, + 23670, + 23671, 23703, 23710, + 24239, + 24241, + 24245, 25386, 25524, 25654, diff --git a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs index 33ac7858a..3787d6bec 100644 --- a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs @@ -75,9 +75,10 @@ public override void DisplayStatus() ActionCheck = (b, m) => HasSummon && IsGarudaReady, }; + static RandomDelay _carbuncleDelay = new RandomDelay(() => (1, 1)); public static IBaseAction SummonCarbuncle { get; } = new BaseAction(ActionID.SummonCarbuncle) { - ActionCheck = (b, m) => !DataCenter.HasPet && AttunmentTimerRemainingRaw == 0 && SummonTimerRemainingRaw == 0, + ActionCheck = (b, m) => _carbuncleDelay.Delay(!DataCenter.HasPet && AttunmentTimerRemainingRaw == 0 && SummonTimerRemainingRaw == 0), }; #endregion diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json index 55e018663..a237730b9 100644 --- a/RotationSolver/Localization/Localization.json +++ b/RotationSolver/Localization/Localization.json @@ -169,7 +169,8 @@ "ConfigWindow_Param_MoveTowardsScreen": "Using movement actions towards the object in the center of the screen", "ConfigWindow_Param_MoveTowardsScreenDesc": "Using movement actions towards the object in the center of the screen, otherwise toward the facing object.", "ConfigWindow_Param_RaiseAll": "Raise all (include passerby)", - "ConfigWindow_Param_TargetFriendly": "Target all for friendly actions(include passerby)", + "ConfigWindow_Param_ActionTargetFriendly": "Target all for friendly actions (include passerby)", + "ConfigWindow_Param_TargetFriendly": "Auto switch target for alliance.", "ConfigWindow_Param_RaiseBrinkOfDeath": "Raise player even has Brink of Death", "ConfigWindow_Param_MoveAreaActionFarthest": "Moving Area Ability to farthest", "ConfigWindow_Param_MoveAreaActionFarthestDesc": "Move to the furthest position from character's face direction.", @@ -425,5 +426,6 @@ }, "HighEndWarning": "Please separately keybind damage reduction / shield cooldowns in case RS fails at a crucial moment in {0}!", "HighEndBan": "{0} can not be used in High-end Duty!", - "TextToTalkWarning": "You didn't install TextToTalk, please install it to make Rotation Solver say something for you!" + "TextToTalkWarning": "You didn't install TextToTalk, please install it to make Rotation Solver say something for you!", + "WhiteListDownloadingFailed": "Failed to load white List. Click to retry." } \ No newline at end of file diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs index 2dbe966d4..2b956b85d 100644 --- a/RotationSolver/RotationSolverPlugin.cs +++ b/RotationSolver/RotationSolverPlugin.cs @@ -14,6 +14,8 @@ using RotationSolver.Localization; using RotationSolver.UI; using RotationSolver.Updaters; +using System.IO.Compression; +using System.Net; using Module = ECommons.Module; namespace RotationSolver; diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs index 13fd687f2..abae8f7a6 100644 --- a/RotationSolver/UI/RotationConfigWindow_Debug.cs +++ b/RotationSolver/UI/RotationConfigWindow_Debug.cs @@ -162,11 +162,18 @@ private void DrawLastAction() private unsafe void DrawIcon() { - var ptr = AgentMap.Instance(); + var ptr = (IntPtr)AgentMap.Instance(); for (var i = 23064; i < 23079; i++) { - var value = *(byte*)(ptr + i); - ImGui.Text($"{i}: {value}"); + try + { + var value = *(byte*)(ptr + i); + ImGui.Text($"{i}: {value}"); + } + catch + { + + } } }