From a7d4446a7d5ae7cb36a2b9d46cc40599a68cb50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com>
Date: Sat, 22 Apr 2023 21:08:15 +0800
Subject: [PATCH] fix: fixed with SAM.

---
 Directory.Build.props                            |  2 +-
 RotationSolver.Basic/Rotations/Basic/RDM_Base.cs | 11 ++++++-----
 RotationSolver.Basic/Rotations/Basic/SAM_Base.cs |  7 +++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3525207ea..0fb2da19c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>2.3.5</Version>
+		<Version>2.3.5.1</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 
diff --git a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
index d8e6b49fa..3478cdef7 100644
--- a/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/RDM_Base.cs
@@ -108,18 +108,19 @@ public abstract class RDM_Base : CustomRotation
     private sealed protected override IBaseAction Raise => Verraise;
     public static IBaseAction Verraise { get; } = new BaseAction(ActionID.Verraise, ActionOption.Friendly);
 
-    public static IBaseAction Vercure { get; } = new BaseAction(ActionID.Vercure, ActionOption.Heal)
+    public static IBaseAction Acceleration { get; } = new BaseAction(ActionID.Acceleration, ActionOption.Buff)
     {
-        StatusProvide = Swiftcast.StatusProvide.Union(Acceleration.StatusProvide).ToArray(),
+        StatusProvide = new[] { StatusID.Acceleration },
     };
 
-    public static IBaseAction MagickBarrier { get; } = new BaseAction(ActionID.MagickBarrier, ActionOption.Defense);
 
-    public static IBaseAction Acceleration { get; } = new BaseAction(ActionID.Acceleration, ActionOption.Buff)
+    public static IBaseAction Vercure { get; } = new BaseAction(ActionID.Vercure, ActionOption.Heal)
     {
-        StatusProvide = new[] { StatusID.Acceleration },
+        StatusProvide = Swiftcast.StatusProvide.Union(Acceleration.StatusProvide).ToArray(),
     };
 
+    public static IBaseAction MagickBarrier { get; } = new BaseAction(ActionID.MagickBarrier, ActionOption.Defense);
+
     public static IBaseAction Embolden { get; } = new BaseAction(ActionID.Embolden, ActionOption.Buff);
 
     public static IBaseAction Manafication { get; } = new BaseAction(ActionID.Manafication)
diff --git a/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs b/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
index b4bec7161..b4b6d2f9c 100644
--- a/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
+++ b/RotationSolver.Basic/Rotations/Basic/SAM_Base.cs
@@ -5,14 +5,13 @@ public abstract class SAM_Base : CustomRotation
     public override MedicineType MedicineType => MedicineType.Strength;
     public sealed override ClassJobID[] JobIDs => new ClassJobID[] { ClassJobID.Samurai };
 
-    [Obsolete("Please use HasMoon", true)]
-    protected static bool HaveMoon => HasMoon;
     protected static bool HasMoon => Player.HasStatus(true, StatusID.Fugetsu);
 
-    [Obsolete("Please use HasFlower", true)]
-    protected static bool HaveFlower => HasFlower;
     protected static bool HasFlower => Player.HasStatus(true, StatusID.Fuka);
 
+    protected static bool IsMoonTimeLessThanFlower
+        => Player.StatusTime(true, StatusID.Fugetsu) < Player.StatusTime(true, StatusID.Fuka);
+
     #region JobGauge
     static SAMGauge JobGauge => Service.JobGauges.Get<SAMGauge>();