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

Commit

Permalink
fix: changed the style of status show.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed May 16, 2023
1 parent 03e4922 commit 0a927be
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"3593": 0.6,
"3594": 0.1,
"3595": 0.6,
"3596": 0.6,
"3596": 0.1,
"3598": 0.1,
"3599": 0.6,
"3600": 0.1,
Expand Down
1 change: 1 addition & 0 deletions Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
2225,
2375,
2398,
3282,
3416,
3519,
3676,
Expand Down
4 changes: 0 additions & 4 deletions RotationSolver/RotationSolverPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public sealed class RotationSolverPlugin : IDalamudPlugin, IDisposable
static ControlWindow _controlWindow;
static NextActionWindow _nextActionWindow;
static CooldownWindow _cooldownWindow;
static StatusWindow _statusWindow;

static readonly List<IDisposable> _dis = new();
public string Name => "Rotation Solver";
Expand All @@ -43,14 +42,12 @@ public unsafe RotationSolverPlugin(DalamudPluginInterface pluginInterface)
_controlWindow = new();
_nextActionWindow = new();
_cooldownWindow = new();
_statusWindow = new();

windowSystem = new WindowSystem(Name);
windowSystem.AddWindow(_comboConfigWindow);
windowSystem.AddWindow(_controlWindow);
windowSystem.AddWindow(_nextActionWindow);
windowSystem.AddWindow(_cooldownWindow);
windowSystem.AddWindow(_statusWindow);

Service.Interface.UiBuilder.OpenConfigUi += OnOpenConfigUi;
Service.Interface.UiBuilder.Draw += windowSystem.Draw;
Expand Down Expand Up @@ -135,6 +132,5 @@ internal static void UpdateDisplayWindow()
_controlWindow.IsOpen = isValid && Service.Config.ShowControlWindow;
_nextActionWindow.IsOpen = isValid && Service.Config.ShowNextActionWindow;
_cooldownWindow.IsOpen = isValid && Service.Config.ShowCooldownWindow;
_statusWindow.IsOpen = isValid && Service.Config.ShowStatusWindow;
}
}
23 changes: 23 additions & 0 deletions RotationSolver/UI/NextActionWindow.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Dalamud.Interface.Colors;
using FFXIVClientStructs.FFXIV.Client.Game;
using RotationSolver.Basic.Configuration;
using RotationSolver.Updaters;

namespace RotationSolver.UI;
Expand All @@ -16,6 +17,28 @@ public override void Draw()
var width = Service.Config.ControlWindowGCDSize * Service.Config.ControlWindowNextSizeRatio;
DrawGcdCooldown(width, false);
ControlWindow.DrawIAction(ActionUpdater.NextAction, width, 1);

var strs = new List<string>(3);
if(PluginConfiguration.GetValue(SettingsCommand.UseAOEAction)
&& (DataCenter.StateType != StateCommandType.Manual
|| PluginConfiguration.GetValue(SettingsCommand.UseAOEWhenManual)))
{
strs.Add("AOE");
}
if (PluginConfiguration.GetValue(SettingsCommand.PreventActions))
{
strs.Add("Prevent");
}
if (PluginConfiguration.GetValue(SettingsCommand.AutoBurst))
{
strs.Add("Burst");
}
if(strs.Count > 0)
{
ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudWhite2);
ImGui.TextWrapped(string.Join(", ", strs));
ImGui.PopStyleColor();
}
}

public static unsafe void DrawGcdCooldown(float width, bool drawTittle)
Expand Down
28 changes: 0 additions & 28 deletions RotationSolver/UI/StatusWindow.cs

This file was deleted.

0 comments on commit 0a927be

Please sign in to comment.