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

Commit

Permalink
fix: add no casting window.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Mar 1, 2024
1 parent 52b2aa9 commit a2fcba6
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 5 deletions.
1 change: 1 addition & 0 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
"3629": 0.6,
"3634": 0.6,
"3636": 0.6,
"3638": 0.6,
"3639": 0.6,
"3640": 0.6,
"3643": 0.6,
Expand Down
4 changes: 2 additions & 2 deletions Resources/RotationSolverRecord.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ClickingCount": 91311,
"SayingHelloCount": 132,
"ClickingCount": 92543,
"SayingHelloCount": 133,
"SaidUsers": []
}
3 changes: 3 additions & 0 deletions RotationSolver.Basic/Actions/ActionBasicInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ internal readonly bool BasicCheck(bool skipStatusProvideCheck, bool skipComboChe
])
&& !ActionsNoNeedCasting.Contains(ID))
{
//No casting.
if(DataCenter.SpecialType == SpecialCommandType.NoCasting) return false;

//Is knocking back.
if (DateTime.Now > DataCenter.KnockbackStart && DateTime.Now < DataCenter.KnockbackFinished) return false;

Expand Down
6 changes: 6 additions & 0 deletions RotationSolver.Basic/Data/RSCommandType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ public enum SpecialCommandType : byte
/// </summary>
[Description("Open a window to use limit break.")]
LimitBreak,

/// <summary>
///
/// </summary>
[Description("Open a window to do not use the casting action.")]
NoCasting,
}

/// <summary>
Expand Down
1 change: 0 additions & 1 deletion RotationSolver.Basic/Helpers/StatusHelper.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Dalamud.Game.ClientState.Statuses;
using ECommons.Automation;
using ECommons.ExcelServices;
using ECommons.GameHelpers;
using RotationSolver.Basic.Configuration;

Expand Down
3 changes: 3 additions & 0 deletions RotationSolver/Data/UiString.cs
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,9 @@ internal enum UiString
[Description("Limit Break")]
SpecialCommandType_LimitBreak,

[Description("No Casting")]
SpecialCommandType_NoCasting,

[Description("Auto Target ")]
SpecialCommandType_Smart,

Expand Down
1 change: 1 addition & 0 deletions RotationSolver/Localization/EnumTranslations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ internal static class EnumTranslations
SpecialCommandType.EndSpecial => UiString.SpecialCommandType_EndSpecial.Local(),
SpecialCommandType.Speed => UiString.SpecialCommandType_Speed.Local(),
SpecialCommandType.LimitBreak => UiString.SpecialCommandType_LimitBreak.Local(),
SpecialCommandType.NoCasting => UiString.SpecialCommandType_NoCasting.Local(),
_ => string.Empty,
};

Expand Down
4 changes: 3 additions & 1 deletion RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -342,5 +342,7 @@
"RotationSolver.Data.UiString.ConfigWindow_Timeline_Name": "Name",
"RotationSolver.Data.UiString.ConfigWindow_Timeline_Actions": "Actions",
"RotationSolver.Data.UiString.ForcedEnableConditionDesc": "The conditions of forced to make it true.",
"RotationSolver.Data.UiString.ForcedDisableConditionDesc": "The conditions of forced to make it false."
"RotationSolver.Data.UiString.ForcedDisableConditionDesc": "The conditions of forced to make it false.",
"RotationSolver.Basic.Data.SpecialCommandType.NoCasting": "Open a window to do not use the casting action.",
"RotationSolver.Data.UiString.SpecialCommandType_NoCasting": "No Casting"
}
4 changes: 3 additions & 1 deletion RotationSolver/UI/RotationConfigWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ static string GetName(TerritoryType? territory)
AddButton();
ImGui.SameLine();

ImGui.Text(item.Name);
ImGui.TextWrapped(item.Name);

ImGui.TableNextColumn();

Expand Down Expand Up @@ -976,6 +976,8 @@ private static void DrawAboutMacros()
SpecialCommandType.Burst.DisplayCommandHelp(getHelp: LocalizationManager.Local);

SpecialCommandType.LimitBreak.DisplayCommandHelp(getHelp: LocalizationManager.Local);

SpecialCommandType.NoCasting.DisplayCommandHelp(getHelp: LocalizationManager.Local);
}

private static void DrawAboutCompatibility()
Expand Down

0 comments on commit a2fcba6

Please sign in to comment.