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

Commit

Permalink
fix: add AutoOff After Combat check box.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Aug 15, 2023
1 parent 09decd9 commit a68c2fe
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
5 changes: 2 additions & 3 deletions RotationSolver.Basic/Configuration/Configs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -319,11 +319,12 @@ public enum PluginConfigBool : byte

[Default(false)] AutoOpenChest,
[Default(true)] AutoCloseChestWindow,
[Default(true)] AutoOffAfterCombat,
}

public enum PluginConfigFloat : byte
{
[Default(8f, 0f, 10f)] AutoOffAfterCombat,
[Default(8f, 0f, 20f)] AutoOffAfterCombatTime,
[Default(3f, 0f, 8f)] DrawingHeight,
[Default(0.2f, 0.005f, 0.05f)] SampleLength,
[Default(0.1f)] KeyBoardNoiseTimeMin,
Expand Down Expand Up @@ -374,7 +375,6 @@ public enum PluginConfigFloat : byte

[Default(0.5f, 0f, 3f)] CountdownDelayMin,
[Default(1f)] CountdownDelayMax,

[Default(0.6f, 0.5f, 0.7f)] CountDownAhead,

[Default(24f)] MoveTargetAngle,
Expand All @@ -393,7 +393,6 @@ public enum PluginConfigFloat : byte
[Default(0.2f, 0.01f, 0.5f)] MaxPing,

[Default(1.8f)] HealthRatioDot,

}

public enum PluginConfigVector4 : byte
Expand Down
4 changes: 3 additions & 1 deletion RotationSolver/Localization/ConfigTranslation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ internal static class ConfigTranslation
PluginConfigBool.DownloadRotations => LocalizationManager.RightLang.ConfigWindow_Rotation_DownloadRotations,
PluginConfigBool.AutoUpdateRotations => LocalizationManager.RightLang.ConfigWindow_Rotation_AutoUpdateRotations,
PluginConfigBool.AutoLoadCustomRotations => LocalizationManager.RightLang.ConfigWindow_Rotations_AutoLoadCustomRotations,

PluginConfigBool.AutoOffAfterCombat => LocalizationManager.RightLang.ConfigWindow_Param_AutoOffAfterCombat,
_ => string.Empty,
};

Expand All @@ -130,7 +132,7 @@ internal static class ConfigTranslation
PluginConfigFloat.CountDownAhead => LocalizationManager.RightLang.ConfigWindow_Param_CountDownAhead,
PluginConfigFloat.SpecialDuration => LocalizationManager.RightLang.ConfigWindow_Param_SpecialDuration,
PluginConfigFloat.MaxPing => LocalizationManager.RightLang.ConfigWindow_Param_MaxPing,
PluginConfigFloat.AutoOffAfterCombat => LocalizationManager.RightLang.ConfigWindow_Param_AutoOffAfterCombat,
PluginConfigFloat.AutoOffAfterCombatTime => LocalizationManager.RightLang.ConfigWindow_Param_AutoOffAfterCombatTime,
PluginConfigFloat.WeaponDelayMin => LocalizationManager.RightLang.ConfigWindow_Param_WeaponDelay,
PluginConfigFloat.HostileDelayMin => LocalizationManager.RightLang.ConfigWindow_Param_HostileDelay,
PluginConfigFloat.InterruptDelayMin => LocalizationManager.RightLang.ConfigWindow_Param_InterruptDelay,
Expand Down
1 change: 1 addition & 0 deletions RotationSolver/Localization/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ internal partial class Strings
public string ConfigWindow_Param_AddDotGCDCount { get; set; } = "Set GCD advance of DOT refresh";
public string ConfigWindow_Param_MaxPing { get; set; } = "Set the Max Ping that RS can get.";
public string ConfigWindow_Param_AutoOffAfterCombat { get; set; } = "Auto turn off when combat is over more than several seconds.";
public string ConfigWindow_Param_AutoOffAfterCombatTime { get; set; } = "seconds.";
public string ConfigWindow_Param_AutoOffBetweenArea { get; set; } = "Auto turn off when player is between area.";

public string ConfigWindow_Param_AutoOffCutScene { get; set; } = "Auto turn off during cut scene.";
Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/UI/RotationConfigWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1517,11 +1517,11 @@ private static void DrawActionsList(string name, HashSet<uint> actions)
foreach (var action in AllActions.OrderBy(s => Math.Min(StringComparer.Distance(s.Name, _actionSearching)
, StringComparer.Distance(s.RowId.ToString(), _actionSearching))))
{
ImGui.Selectable($"{action.Name} ({action.RowId})");
var selected = ImGui.Selectable($"{action.Name} ({action.RowId})");
if (ImGui.IsItemHovered())
{
ImguiTooltips.ShowTooltip($"{action.Name} ({action.RowId})");
if(ImGui.IsMouseClicked(ImGuiMouseButton.Left))
if(selected)
{
actions.Add(action.RowId);
OtherConfiguration.Save();
Expand Down
4 changes: 1 addition & 3 deletions RotationSolver/UI/RotationConfigWindowTab.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using static RotationSolver.UI.RotationConfigWindow;

namespace RotationSolver.UI;
namespace RotationSolver.UI;

[AttributeUsage(AttributeTargets.Field)]
internal class TabSkipAttribute : Attribute
Expand Down
3 changes: 2 additions & 1 deletion RotationSolver/UI/RotationConfigWindow_Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ private static void DrawBasicAutoSwitch()
new CheckBoxSearchPlugin(PluginConfigBool.AutoOffBetweenArea),
new CheckBoxSearchPlugin(PluginConfigBool.AutoOffCutScene),
new CheckBoxSearchPlugin(PluginConfigBool.AutoOffWhenDead),
new DragFloatSearchPlugin(PluginConfigFloat.AutoOffAfterCombat, 1f),
new CheckBoxSearchPlugin(PluginConfigBool.AutoOffAfterCombat,
new DragFloatSearchPlugin(PluginConfigFloat.AutoOffAfterCombatTime, 1f)),
};
#endregion

Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/Updaters/ActionUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ private static void UpdateCombatTime()
else if (last && !DataCenter.InCombat)
{
_startCombatTime = DateTime.MinValue;
if (Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombat) > 0)
if (Service.Config.GetValue(PluginConfigBool.AutoOffAfterCombat))
{
_cancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombat));
_cancelTime = DateTime.Now.AddSeconds(Service.Config.GetValue(PluginConfigFloat.AutoOffAfterCombatTime));
}
}

Expand Down

0 comments on commit a68c2fe

Please sign in to comment.