Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: carbuncle delay.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jul 3, 2023
1 parent 16b0044 commit 52bd225
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 8 deletions.
7 changes: 5 additions & 2 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -514,5 +516,6 @@
"29401": 2.5,
"29709": 0.1,
"31323": 2.1,
"33041": 2.1
"33041": 2.1,
"33708": 2.1
}
11 changes: 11 additions & 0 deletions Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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."
}
2 changes: 2 additions & 0 deletions RotationSolver/RotationSolverPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 10 additions & 3 deletions RotationSolver/UI/RotationConfigWindow_Debug.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{

}
}
}

Expand Down

0 comments on commit 52bd225

Please sign in to comment.