From 84d63ae4d739714469d0aedcfba076a54aa8b37e Mon Sep 17 00:00:00 2001 From: Asriel Camora Date: Thu, 29 Jun 2023 12:45:58 -0700 Subject: [PATCH] Add macro wait times --- Simulator/Actions/BaseAction.cs | 4 +++- Simulator/Actions/BaseBuffAction.cs | 1 + Simulator/Actions/CarefulObservation.cs | 1 + Simulator/Actions/HeartAndSoul.cs | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Simulator/Actions/BaseAction.cs b/Simulator/Actions/BaseAction.cs index 4ef782f..4fc63a3 100644 --- a/Simulator/Actions/BaseAction.cs +++ b/Simulator/Actions/BaseAction.cs @@ -11,6 +11,8 @@ public abstract class BaseAction public abstract int Level { get; } // Doesn't matter from which class, we'll use the sheet to extrapolate the rest public abstract uint ActionId { get; } + // Seconds + public virtual int MacroWaitTime => 3; // Action properties public virtual bool IncreasesProgress => false; @@ -75,7 +77,7 @@ public abstract class BaseAction if (!IncreasesStepCount) builder.AppendLine($"Does Not Increase Step Count"); if (SuccessRate(s) != 1f) - builder.AppendLine($"{s.CalculateSuccessRate(SuccessRate(s)) * 100}%% Success Rate"); + builder.AppendLine($"{s.CalculateSuccessRate(SuccessRate(s)) * 100:##}%% Success Rate"); return builder.ToString(); } } diff --git a/Simulator/Actions/BaseBuffAction.cs b/Simulator/Actions/BaseBuffAction.cs index 72897d0..09458b6 100644 --- a/Simulator/Actions/BaseBuffAction.cs +++ b/Simulator/Actions/BaseBuffAction.cs @@ -7,6 +7,7 @@ internal abstract class BaseBuffAction : BaseAction // Non-instanced properties public abstract EffectType Effect { get; } public virtual byte Duration => 1; + public override int MacroWaitTime => 2; public sealed override int DurabilityCost => 0; diff --git a/Simulator/Actions/CarefulObservation.cs b/Simulator/Actions/CarefulObservation.cs index 8e476a2..67ee00f 100644 --- a/Simulator/Actions/CarefulObservation.cs +++ b/Simulator/Actions/CarefulObservation.cs @@ -5,6 +5,7 @@ internal sealed class CarefulObservation : BaseAction public override ActionCategory Category => ActionCategory.Other; public override int Level => 55; public override uint ActionId => 100395; + public override int MacroWaitTime => 3; public override int DurabilityCost => 0; public override bool IncreasesStepCount => false; diff --git a/Simulator/Actions/HeartAndSoul.cs b/Simulator/Actions/HeartAndSoul.cs index 364c1e9..9e662ca 100644 --- a/Simulator/Actions/HeartAndSoul.cs +++ b/Simulator/Actions/HeartAndSoul.cs @@ -5,6 +5,7 @@ internal sealed class HeartAndSoul : BaseBuffAction public override ActionCategory Category => ActionCategory.Other; public override int Level => 86; public override uint ActionId => 100419; + public override int MacroWaitTime => 3; public override bool IncreasesStepCount => false;