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

Commit

Permalink
fix: add delay for count down.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jun 30, 2023
1 parent 04923a3 commit 9d6e228
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
8 changes: 6 additions & 2 deletions RotationSolver.Basic/Configuration/PluginConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ public class PluginConfiguration : IPluginConfiguration
public float WeaponDelayMin = 0;
public float WeaponDelayMax = 0;

public float DeathDelayMin = 0.5f;
public float DeathDelayMax = 1;
public float DeathDelayMin = 1;
public float DeathDelayMax = 1.5f;

public float WeakenDelayMin = 0.5f;
public float WeakenDelayMax = 1;
Expand All @@ -145,6 +145,7 @@ public class PluginConfiguration : IPluginConfiguration

public float HealDelayMin = 0;
public float HealDelayMax = 0;

public float StopCastingDelayMin = 0.5f;
public float StopCastingDelayMax = 1;

Expand All @@ -157,6 +158,9 @@ public class PluginConfiguration : IPluginConfiguration
public float ClickingDelayMin = 0.1f;
public float ClickingDelayMax = 0.15f;

public float CountdownDelayMin = 0.5f;
public float CountdownDelayMax = 1;

public bool UseWorkTask = true;

public bool UseStopCasting = false;
Expand Down
4 changes: 3 additions & 1 deletion RotationSolver.Basic/Data/Countdown.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ public unsafe struct Countdown

public static unsafe Countdown* Instance => (Countdown*)Framework.Instance()->GetUiModule()->GetAgentModule()->GetAgentByInternalId(AgentId.CountDownSettingDialog);

static RandomDelay _delay = new RandomDelay(()=>(Service.Config.CountdownDelayMin, Service.Config.CountdownDelayMax));

public static float TimeRemaining
{
get
{
var inst = Instance;
return inst->Active != 0 ? inst->Timer : 0;
return _delay.Delay(inst->Active != 0) ? inst->Timer : 0;
}
}
}
3 changes: 2 additions & 1 deletion RotationSolver/Localization/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal partial class Strings
public string ConfigWindow_ParamItem { get; set; } = "Param";
public string ConfigWindow_ListItem { get; set; } = "List";
public string ConfigWindow_EventItem { get; set; } = "Event";
public string ConfigWindow_ActionItem { get; set; } = "Action";
public string ConfigWindow_ActionItem { get; set; } = "Action Rules";
public string ConfigWindow_ControlItem { get; set; } = "Control";
public string ConfigWindow_HelpItem { get; set; } = "Help";
public string ConfigWindow_ActionItem_Description { get; set; }
Expand Down Expand Up @@ -125,6 +125,7 @@ internal partial class Strings

public string ConfigWindow_Param_HealDelay { get; set; } = "Set the range of random delay for healing people in second.";

public string ConfigWindow_Param_CountdownDelay { get; set; } = "Set the range of random delay for count down in the party.";
public string ConfigWindow_Param_NotInCombatDelay { get; set; } = "Set the range of random delay for Not In Combat in second.";

public string ConfigWindow_Param_ClickingDelay { get; set; } = "Set the range of random delay for the interval of clicking actions.";
Expand Down
4 changes: 4 additions & 0 deletions RotationSolver/UI/RotationConfigWindow_Param.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ private void DrawParamDelay()
ref Service.Config.HealDelayMin, ref Service.Config.HealDelayMax,
Service.Default.HealDelayMin, Service.Default.HealDelayMax);

DrawRangedFloat(LocalizationManager.RightLang.ConfigWindow_Param_CountdownDelay,
ref Service.Config.CountdownDelayMin, ref Service.Config.CountdownDelayMax,
Service.Default.CountdownDelayMin, Service.Default.CountdownDelayMax);

DrawRangedFloat(LocalizationManager.RightLang.ConfigWindow_Param_NotInCombatDelay,
ref Service.Config.NotInCombatDelayMin, ref Service.Config.NotInCombatDelayMax,
Service.Default.NotInCombatDelayMin, Service.Default.NotInCombatDelayMax);
Expand Down

0 comments on commit 9d6e228

Please sign in to comment.