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

Commit

Permalink
fix: add enable toggle.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArchiDog1998
ArchiDog1998 committed Jun 12, 2023
1 parent 53e6bd4 commit 4d90cb2
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 47 deletions.
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Configuration/PluginConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class PluginConfiguration : IPluginConfiguration
public Vector4 TargetColor = new(1f, 0.2f, 0f, 0.8f);
public Vector4 SubTargetColor = new(1f, 0.9f, 0f, 0.8f);
public bool DrawMeleeRange = false;
public bool UseOverlayWindow = true;

public float DrawingHeight = 3;
public float SampleLength = 0.2f;
Expand All @@ -90,7 +91,6 @@ public class PluginConfiguration : IPluginConfiguration
public float HealthDifference = 0.25f;
public float MeleeRangeOffset = 1;
public bool TargetFriendly = false;
public float AlphaInFill = 0.15f;
public float MinLastAbilityAdvanced = 0.1f;

public float HealWhenNothingTodoBelow = 0.8f;
Expand Down
4 changes: 3 additions & 1 deletion RotationSolver/Localization/Strings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ internal partial class Strings
public string ConfigWindow_Events_DutyStart { get; set; } = "Duty Start: ";
public string ConfigWindow_Events_DutyEnd{ get; set; } = "Duty End: ";
public string ConfigWindow_Params_Description { get; set; } = "In this window, you can set the parameters about the using way of actions.";

public string ConfigWindow_Param_UseOverlayWindow { get; set; } = "Display Top Overlay";
public string ConfigWindow_Param_UseOverlayWindowDesc { get; set; } = "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc.";
public string ConfigWindow_Param_Basic { get; set; } = "Basic";

public string ConfigWindow_Param_ActionAhead { get; set; } = "Set the time advance of using actions";
Expand Down Expand Up @@ -154,7 +157,6 @@ internal partial class Strings
public string ConfigWindow_Param_DrawPositional { get; set; } = "Draw Positional on the screen";
public string ConfigWindow_Param_DrawMeleeRange { get; set; } = "Draw the range of melee on the screen";
public string ConfigWindow_Param_DrawMeleeOffset { get; set; } = "Draw the offset of melee on the screen";
public string ConfigWindow_Param_AlphaInFill { get; set; } = "The alpha value in fill.";
public string ConfigWindow_Param_ShowMoveTarget { get; set; } = "Show the target of the move action";
public string ConfigWindow_Param_ShowTarget { get; set; } = "Show Target";
public string ConfigWindow_Param_SayOutStateChanged { get; set; } = "Saying the state changes out";
Expand Down
95 changes: 51 additions & 44 deletions RotationSolver/UI/RotationConfigWindow_Param.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ private void DrawParamAdvanced()

private void DrawParamDisplay()
{

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_TeachingMode,
ref Service.Config.TeachingMode, Service.Default.TeachingMode);

Expand All @@ -180,48 +179,68 @@ private void DrawParamDisplay()

ImGui.Separator();

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowMoveTarget,
ref Service.Config.ShowMoveTarget, Service.Default.ShowMoveTarget);
DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseOverlayWindow,
ref Service.Config.UseOverlayWindow, Service.Default.UseOverlayWindow,
LocalizationManager.RightLang.ConfigWindow_Param_UseOverlayWindowDesc, otherThing: () =>
{
PainterManager._painter.Enable = Service.Config.UseOverlayWindow;
});

if (Service.Config.ShowMoveTarget)
if (Service.Config.UseOverlayWindow)
{
ImGuiHelper.Spacing();

DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_MovingTargetColor,
ref Service.Config.MovingTargetColor, Service.Default.MovingTargetColor);
}
DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowMoveTarget,
ref Service.Config.ShowMoveTarget, Service.Default.ShowMoveTarget);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowTarget,
ref Service.Config.ShowTarget, Service.Default.ShowTarget);
if (Service.Config.ShowMoveTarget)
{
ImGuiHelper.Spacing();

if (Service.Config.ShowTarget)
{
ImGuiHelper.Spacing();
DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_MovingTargetColor,
ref Service.Config.MovingTargetColor, Service.Default.MovingTargetColor);
}

DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_TargetColor,
ref Service.Config.TargetColor, Service.Default.TargetColor);
DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ShowTarget,
ref Service.Config.ShowTarget, Service.Default.ShowTarget);

ImGuiHelper.Spacing();
if (Service.Config.ShowTarget)
{
ImGuiHelper.Spacing();

DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_SubTargetColor,
ref Service.Config.SubTargetColor, Service.Default.SubTargetColor);
}
DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_TargetColor,
ref Service.Config.TargetColor, Service.Default.TargetColor);

DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_DrawingHeight, ref Service.Config.DrawingHeight, Service.Default.DrawingHeight, 0.02f, 0, 8, otherThing: () =>
{
PainterManager._painter.DrawingHeight = Service.Config.DrawingHeight;
});
ImGuiHelper.Spacing();

DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_SampleLength, ref Service.Config.SampleLength, Service.Default.SampleLength, 0.005f, 0.05f, 3, otherThing: () =>
{
PainterManager._painter.SampleLength = Math.Max(0.05f, Service.Config.SampleLength);
});
DrawColor4(LocalizationManager.RightLang.ConfigWindow_Param_SubTargetColor,
ref Service.Config.SubTargetColor, Service.Default.SubTargetColor);
}

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseTaskToDrawing,
ref Service.Config.UseTaskToDrawing, Service.Default.UseTaskToDrawing, otherThing: () =>
{
PainterManager._painter.UseTaskForAccelerate = Service.Config.UseTaskToDrawing;
});
DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawPositional,
ref Service.Config.DrawPositional, Service.Default.DrawPositional);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeRange,
ref Service.Config.DrawMeleeRange, Service.Default.DrawMeleeRange);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeOffset,
ref Service.Config.DrawMeleeOffset, Service.Default.DrawMeleeOffset);

DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_DrawingHeight, ref Service.Config.DrawingHeight, Service.Default.DrawingHeight, 0.02f, 0, 8, otherThing: () =>
{
PainterManager._painter.DrawingHeight = Service.Config.DrawingHeight;
});

DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_SampleLength, ref Service.Config.SampleLength, Service.Default.SampleLength, 0.005f, 0.05f, 3, otherThing: () =>
{
PainterManager._painter.SampleLength = Math.Max(0.05f, Service.Config.SampleLength);
});

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseTaskToDrawing,
ref Service.Config.UseTaskToDrawing, Service.Default.UseTaskToDrawing, otherThing: () =>
{
PainterManager._painter.UseTaskForAccelerate = Service.Config.UseTaskToDrawing;
});
}

ImGui.Separator();

Expand Down Expand Up @@ -255,18 +274,6 @@ private void DrawParamDisplay()

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ToastPositional,
ref Service.Config.ToastPositional, Service.Default.ToastPositional);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawPositional,
ref Service.Config.DrawPositional, Service.Default.DrawPositional);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeRange,
ref Service.Config.DrawMeleeRange, Service.Default.DrawMeleeRange);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_DrawMeleeOffset,
ref Service.Config.DrawMeleeOffset, Service.Default.DrawMeleeOffset);

DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_AlphaInFill,
ref Service.Config.AlphaInFill, Service.Default.AlphaInFill);
}

private void DrawParamAction()
Expand Down
2 changes: 1 addition & 1 deletion XIVPainter
Submodule XIVPainter updated from 150c2a to 49a8d6

0 comments on commit 4d90cb2

Please sign in to comment.