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

Commit

Permalink
fix: rename timeline to action sequencer.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Apr 24, 2023
1 parent 9768d5c commit a829b61
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 81 deletions.
4 changes: 2 additions & 2 deletions RotationSolver.Basic/DataCenter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ public static bool SetAutoStatus(AutoStatus status, bool keep)
}

private static List<NextAct> NextActs = new List<NextAct>();
public static IAction TimeLineAction { private get; set; }
public static IAction ActionSequencerAction { private get; set; }
public static IAction CommandNextAction
{
get
{
if (TimeLineAction != null) return TimeLineAction;
if (ActionSequencerAction != null) return ActionSequencerAction;

var next = NextActs.FirstOrDefault();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,17 @@ public void Draw(ICustomRotation combo)
case ActionConditionType.ShouldUse:
combos = new string[]
{
LocalizationManager.RightLang.Timeline_Can,
LocalizationManager.RightLang.Timeline_Cannot,
LocalizationManager.RightLang.ActionSequencer_Can,
LocalizationManager.RightLang.ActionSequencer_Cannot,
};
break;

case ActionConditionType.EnoughLevel:
case ActionConditionType.IsCoolDown:
combos = new string[]
{
LocalizationManager.RightLang.Timeline_Is,
LocalizationManager.RightLang.Timeline_Isnot,
LocalizationManager.RightLang.ActionSequencer_Is,
LocalizationManager.RightLang.ActionSequencer_Isnot,
};
break;
}
Expand All @@ -147,21 +147,21 @@ public void Draw(ICustomRotation combo)
{
Param1 = Math.Max(0, Param1);
}
if (ConditionHelper.DrawDragInt($"{LocalizationManager.RightLang.Timeline_Ability}##Ability{GetHashCode()}", ref Param2))
if (ConditionHelper.DrawDragInt($"{LocalizationManager.RightLang.ActionSequencer_Ability}##Ability{GetHashCode()}", ref Param2))
{
Param2 = Math.Max(0, Param2);
}
break;

case ActionConditionType.ShouldUse:

ConditionHelper.DrawCheckBox($"{LocalizationManager.RightLang.Timeline_MustUse}##MustUse{GetHashCode()}", ref Param1, LocalizationManager.RightLang.Timeline_MustUseDesc);
ConditionHelper.DrawCheckBox($"{LocalizationManager.RightLang.Timeline_Empty}##MustUse{GetHashCode()}", ref Param2, LocalizationManager.RightLang.Timeline_EmptyDesc);
ConditionHelper.DrawCheckBox($"{LocalizationManager.RightLang.ActionSequencer_MustUse}##MustUse{GetHashCode()}", ref Param1, LocalizationManager.RightLang.ActionSequencer_MustUseDesc);
ConditionHelper.DrawCheckBox($"{LocalizationManager.RightLang.ActionSequencer_Empty}##MustUse{GetHashCode()}", ref Param2, LocalizationManager.RightLang.ActionSequencer_EmptyDesc);
break;

case ActionConditionType.CurrentCharges:
case ActionConditionType.MaxCharges:
if (ConditionHelper.DrawDragInt($"{LocalizationManager.RightLang.Timeline_Charges}##Charges{GetHashCode()}", ref Param1))
if (ConditionHelper.DrawDragInt($"{LocalizationManager.RightLang.ActionSequencer_Charges}##Charges{GetHashCode()}", ref Param1))
{
Param1 = Math.Max(0, Param1);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ private void AddButton()

if (ImGui.BeginPopup("Popup" + GetHashCode().ToString()))
{
AddOneCondition<ConditionSet>(LocalizationManager.RightLang.Timeline_ConditionSet);
AddOneCondition<ActionCondition>(LocalizationManager.RightLang.Timeline_ActionCondition);
AddOneCondition<TargetCondition>(LocalizationManager.RightLang.Timeline_TargetCondition);
AddOneCondition<RotationCondition>(LocalizationManager.RightLang.Timeline_RotationCondition);
AddOneCondition<ConditionSet>(LocalizationManager.RightLang.ActionSequencer_ConditionSet);
AddOneCondition<ActionCondition>(LocalizationManager.RightLang.ActionSequencer_ActionCondition);
AddOneCondition<TargetCondition>(LocalizationManager.RightLang.ActionSequencer_TargetCondition);
AddOneCondition<RotationCondition>(LocalizationManager.RightLang.ActionSequencer_RotationCondition);

ImGui.EndPopup();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ public void Draw(ICustomRotation rotation)
ImGui.SetNextItemWidth(80);
ImGui.Combo($"##IsOrNot{GetHashCode()}", ref Condition, new string[]
{
LocalizationManager.RightLang.Timeline_Is,
LocalizationManager.RightLang.Timeline_Isnot,
LocalizationManager.RightLang.ActionSequencer_Is,
LocalizationManager.RightLang.ActionSequencer_Isnot,
}, 2);
break;

Expand Down Expand Up @@ -211,8 +211,8 @@ public void Draw(ICustomRotation rotation)
ImGui.SetNextItemWidth(80);
ImGui.Combo($"##IsNot{GetHashCode()}", ref Condition, new string[]
{
LocalizationManager.RightLang.Timeline_Is,
LocalizationManager.RightLang.Timeline_Isnot,
LocalizationManager.RightLang.ActionSequencer_Is,
LocalizationManager.RightLang.ActionSequencer_Isnot,
}, 2);

ImGui.SameLine();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,22 @@ public void Draw(ICustomRotation combo)
ImGuiHelper.DrawCondition(IsTrue(combo));
ImGui.SameLine();

var name = _action != null ? string.Format(LocalizationManager.RightLang.Timeline_ActionTarget, _action.Name)
var name = _action != null ? string.Format(LocalizationManager.RightLang.ActionSequencer_ActionTarget, _action.Name)
: IsTarget
? LocalizationManager.RightLang.Timeline_Target
: LocalizationManager.RightLang.Timeline_Player;
? LocalizationManager.RightLang.ActionSequencer_Target
: LocalizationManager.RightLang.ActionSequencer_Player;

ImGui.SetNextItemWidth(Math.Max(80, ImGui.CalcTextSize(name).X + 30));
if (ImGui.BeginCombo($"##ActionChoice{GetHashCode()}", name, ImGuiComboFlags.HeightLargest))
{
if (ImGui.Selectable(LocalizationManager.RightLang.Timeline_Target))
if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_Target))
{
_action = null;
ID = ActionID.None;
IsTarget = true;
}

if (ImGui.Selectable(LocalizationManager.RightLang.Timeline_Player))
if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_Player))
{
_action = null;
ID = ActionID.None;
Expand All @@ -169,17 +169,17 @@ public void Draw(ICustomRotation combo)
case TargetConditionType.HaveStatus:
combos = new string[]
{
LocalizationManager.RightLang.Timeline_Have,
LocalizationManager.RightLang.Timeline_Havenot,
LocalizationManager.RightLang.ActionSequencer_Have,
LocalizationManager.RightLang.ActionSequencer_Havenot,
};
break;
case TargetConditionType.IsDying:
case TargetConditionType.IsBoss:
case TargetConditionType.CastingAction:
combos = new string[]
{
LocalizationManager.RightLang.Timeline_Is,
LocalizationManager.RightLang.Timeline_Isnot,
LocalizationManager.RightLang.ActionSequencer_Is,
LocalizationManager.RightLang.ActionSequencer_Isnot,
};
break;

Expand Down Expand Up @@ -211,10 +211,10 @@ public void Draw(ICustomRotation combo)

ImGui.SameLine();

ImGui.Checkbox($"{LocalizationManager.RightLang.Timeline_StatusSelf}##Self{GetHashCode()}", ref FromSelf);
ImGui.Checkbox($"{LocalizationManager.RightLang.ActionSequencer_StatusSelf}##Self{GetHashCode()}", ref FromSelf);
if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(LocalizationManager.RightLang.Timeline_StatusSelfDesc);
ImGui.SetTooltip(LocalizationManager.RightLang.ActionSequencer_StatusSelfDesc);
}
break;

Expand All @@ -229,10 +229,10 @@ public void Draw(ICustomRotation combo)

ImGui.SameLine();

ImGui.Checkbox($"{LocalizationManager.RightLang.Timeline_StatusSelf}##Self{GetHashCode()}", ref FromSelf);
ImGui.Checkbox($"{LocalizationManager.RightLang.ActionSequencer_StatusSelf}##Self{GetHashCode()}", ref FromSelf);
if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(LocalizationManager.RightLang.Timeline_StatusSelfDesc);
ImGui.SetTooltip(LocalizationManager.RightLang.ActionSequencer_StatusSelfDesc);
}

ConditionHelper.DrawDragFloat($"s##Seconds{GetHashCode()}", ref DistanceOrTime);
Expand All @@ -250,14 +250,14 @@ public void Draw(ICustomRotation combo)

ImGui.SameLine();

ImGui.Checkbox($"{LocalizationManager.RightLang.Timeline_StatusSelf}##Self{GetHashCode()}", ref FromSelf);
ImGui.Checkbox($"{LocalizationManager.RightLang.ActionSequencer_StatusSelf}##Self{GetHashCode()}", ref FromSelf);
if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(LocalizationManager.RightLang.Timeline_StatusSelfDesc);
ImGui.SetTooltip(LocalizationManager.RightLang.ActionSequencer_StatusSelfDesc);
}

ConditionHelper.DrawDragInt($"GCD##GCD{GetHashCode()}", ref GCD);
ConditionHelper.DrawDragInt($"{LocalizationManager.RightLang.Timeline_Ability}##Ability{GetHashCode()}", ref Ability);
ConditionHelper.DrawDragInt($"{LocalizationManager.RightLang.ActionSequencer_Ability}##Ability{GetHashCode()}", ref Ability);
break;

case TargetConditionType.Distance:
Expand Down
48 changes: 24 additions & 24 deletions RotationSolver/Localization/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -281,30 +281,30 @@ internal partial class Strings
#endregion

#region ScriptWindow
public string Timeline_DragdropDescription { get; set; } = "Drag&drop to move,Ctrl+Alt+RightClick to delete.";
public string Timeline_SearchBar { get; set; } = "Search Bar";
public string Timeline_MustUse { get; set; } = "MustUse";
public string Timeline_MustUseDesc { get; set; } = "Skip AOE and Buff.";
public string Timeline_Empty { get; set; } = "UseUp";
public string Timeline_EmptyDesc { get; set; } = "UseUp or Skip Combo";
public string Timeline_TimelineDescription { get; set; } = "Add some condition to automatic use this action.";
public string Timeline_Can { get; set; } = "Can";
public string Timeline_Cannot { get; set; } = "Cannot";
public string Timeline_Is { get; set; } = "Is";
public string Timeline_Isnot { get; set; } = "Isnot";
public string Timeline_Have { get; set; } = "Have";
public string Timeline_Havenot { get; set; } = "Havenot";
public string Timeline_Ability { get; set; } = "Ability";
public string Timeline_Charges { get; set; } = "Charges";
public string Timeline_ConditionSet { get; set; } = "ConditionSet";
public string Timeline_ActionCondition { get; set; } = "ActionCondition";
public string Timeline_TargetCondition { get; set; } = "TargetCondition";
public string Timeline_RotationCondition { get; set; } = "RotationCondition";
public string Timeline_ActionTarget { get; set; } = "{0}'s target";
public string Timeline_Target { get; set; } = "Target";
public string Timeline_Player { get; set; } = "Player";
public string Timeline_StatusSelf { get; set; } = "StatusSelf";
public string Timeline_StatusSelfDesc { get; set; } = "StatusSelf";
public string ActionSequencer_DragdropDescription { get; set; } = "Drag&drop to move,Ctrl+Alt+RightClick to delete.";
public string ActionSequencer_SearchBar { get; set; } = "Search Bar";
public string ActionSequencer_MustUse { get; set; } = "MustUse";
public string ActionSequencer_MustUseDesc { get; set; } = "Skip AOE and Buff.";
public string ActionSequencer_Empty { get; set; } = "UseUp";
public string ActionSequencer_EmptyDesc { get; set; } = "UseUp or Skip Combo";
public string ActionSequencer_ActionSequencerDescription { get; set; } = "Add some condition to automatic use this action.";
public string ActionSequencer_Can { get; set; } = "Can";
public string ActionSequencer_Cannot { get; set; } = "Cannot";
public string ActionSequencer_Is { get; set; } = "Is";
public string ActionSequencer_Isnot { get; set; } = "Isnot";
public string ActionSequencer_Have { get; set; } = "Have";
public string ActionSequencer_Havenot { get; set; } = "Havenot";
public string ActionSequencer_Ability { get; set; } = "Ability";
public string ActionSequencer_Charges { get; set; } = "Charges";
public string ActionSequencer_ConditionSet { get; set; } = "ConditionSet";
public string ActionSequencer_ActionCondition { get; set; } = "ActionCondition";
public string ActionSequencer_TargetCondition { get; set; } = "TargetCondition";
public string ActionSequencer_RotationCondition { get; set; } = "RotationCondition";
public string ActionSequencer_ActionTarget { get; set; } = "{0}'s target";
public string ActionSequencer_Target { get; set; } = "Target";
public string ActionSequencer_Player { get; set; } = "Player";
public string ActionSequencer_StatusSelf { get; set; } = "StatusSelf";
public string ActionSequencer_StatusSelfDesc { get; set; } = "StatusSelf";
#endregion

#region Actions
Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/RotationSolverPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public unsafe RotationSolverPlugin(DalamudPluginInterface pluginInterface)
Service.Interface.UiBuilder.Draw += OverlayWindow.Draw;

MajorUpdater.Enable();
TimeLineUpdater.Enable(pluginInterface.ConfigDirectory.FullName);
ActionSequencerUpdater.Enable(pluginInterface.ConfigDirectory.FullName);
IActionHelper.GetAnimationLockTimeAsync(pluginInterface.ConfigDirectory.FullName);
SocialUpdater.Enable();
_dis.Add(new Watcher());
Expand Down Expand Up @@ -104,7 +104,7 @@ public void Dispose()
_dis?.Clear();

MajorUpdater.Dispose();
TimeLineUpdater.SaveFiles();
ActionSequencerUpdater.SaveFiles();
SocialUpdater.Disable();

IconSet.Dispose();
Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/UI/ImGuiHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ internal unsafe static bool DrawEditorList<T>(List<T> items, Action<T> draw)
}
else if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(LocalizationManager.RightLang.Timeline_DragdropDescription);
ImGui.SetTooltip(LocalizationManager.RightLang.ActionSequencer_DragdropDescription);

if ((ImGui.IsKeyDown(ImGuiKey.LeftCtrl) || ImGui.IsKeyDown(ImGuiKey.RightCtrl))
&& (ImGui.IsKeyDown(ImGuiKey.LeftAlt) || ImGui.IsKeyDown(ImGuiKey.RightAlt))
Expand Down Expand Up @@ -296,7 +296,7 @@ private static string GetMemberDescription(this MemberInfo info)

internal static void SearchItems<T>(ref string searchTxt, IEnumerable<T> actions, Func<T, string> getName, Action<T> selectAction, Action<T> extraDraw = null, Func<T, string> getDesc = null)
{
ImGui.Text(LocalizationManager.RightLang.Timeline_SearchBar + ": ");
ImGui.Text(LocalizationManager.RightLang.ActionSequencer_SearchBar + ": ");
ImGui.SetNextItemWidth(150);
ImGui.InputText("##SearchBar", ref searchTxt, 16);

Expand Down
10 changes: 5 additions & 5 deletions RotationSolver/UI/RotationConfigWindow_Action.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private void DrawActionTab()

ImGui.NextColumn();

DrawTimelineCondition();
DrawActionSequencerCondition();

ImGui.Columns(1);
}
Expand Down Expand Up @@ -45,19 +45,19 @@ private void DrawActionList()
ImGui.PopStyleVar();
}

private void DrawTimelineCondition()
private void DrawActionSequencerCondition()
{
ImGui.TextWrapped(LocalizationManager.RightLang.Timeline_TimelineDescription);
ImGui.TextWrapped(LocalizationManager.RightLang.ActionSequencer_ActionSequencerDescription);

var rotation = RotationUpdater.RightNowRotation;
if (rotation == null) return;

TimeLineUpdater.DrawHeader();
ActionSequencerUpdater.DrawHeader();

if (ActiveAction == null) return;
if (!RotationUpdater.RightRotationActions.Any(a => a.ID == ActiveAction.ID)) return;

var set = TimeLineUpdater.RightSet;
var set = ActionSequencerUpdater.RightSet;
if (set == null) return;

if (!set.Conditions.TryGetValue(ActiveAction.ID, out var conditionSet))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

namespace RotationSolver.Updaters;

internal class TimeLineUpdater
internal class ActionSequencerUpdater
{
static string _timelineFolder;
static string _actionSequencerFolder;

static IEnumerable<MajorConditionSet> _conditionSet;
public static MajorConditionSet RightSet => _conditionSet?.ElementAtOrDefault(Service.Config.TimelineIndex);

public static string[] ConditionSetsName => _conditionSet?.Select(s => s.Name).ToArray() ?? new string[0];

public static void UpdateTimelineAction()
public static void UpdateActionSequencerAction()
{
if (_conditionSet == null) return;
var customRotation = RotationUpdater.RightNowRotation;
Expand All @@ -32,38 +32,38 @@ public static void UpdateTimelineAction()

if (!conditionPair.Value.IsTrue(customRotation)) continue;

DataCenter.TimeLineAction = nextAct;
DataCenter.ActionSequencerAction = nextAct;
find = true;
break;
}
if (!find)
{
DataCenter.TimeLineAction = null;
DataCenter.ActionSequencerAction = null;
}
}

public static void Enable(string folder)
{
_timelineFolder = folder;
if (!Directory.Exists(_timelineFolder)) Directory.CreateDirectory(_timelineFolder);
_actionSequencerFolder = folder;
if (!Directory.Exists(_actionSequencerFolder)) Directory.CreateDirectory(_actionSequencerFolder);

_conditionSet = MajorConditionSet.Read(_timelineFolder);
_conditionSet = MajorConditionSet.Read(_actionSequencerFolder);
}

public static void SaveFiles()
{
try
{
Directory.Delete(_timelineFolder);
Directory.CreateDirectory(_timelineFolder);
Directory.Delete(_actionSequencerFolder);
Directory.CreateDirectory(_actionSequencerFolder);
}
catch
{

}
foreach (var set in _conditionSet)
{
set.Save(_timelineFolder);
set.Save(_actionSequencerFolder);
}
}

Expand Down Expand Up @@ -127,7 +127,7 @@ public static void DrawHeader()
ImGui.SameLine();
if (ImGuiHelper.IconButton(FontAwesomeIcon.Folder, "##OpenDefinationFolder"))
{
Process.Start("explorer.exe", _timelineFolder);
Process.Start("explorer.exe", _actionSequencerFolder);
}
}
}
Loading

0 comments on commit a829b61

Please sign in to comment.