fix: targe CutScene as between area

ArchiDog1998 · Mar 6, 2023 · 0a0333c · 0a0333c
1 parent b0ee44e
commit 0a0333c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -62,14 +62,14 @@ internal static void CancelState()
         internal static void UpdateRotationState()
         {
             if (Service.ClientState.LocalPlayer.CurrentHp == 0
-                || Service.Conditions[ConditionFlag.LoggingOut]
-                || Service.Conditions[ConditionFlag.OccupiedInCutSceneEvent])
+                || Service.Conditions[ConditionFlag.LoggingOut])
             {
                 CancelState();
             }
             else if (Service.Configuration.AutoOffBetweenArea && (
                 Service.Conditions[ConditionFlag.BetweenAreas]
-                || Service.Conditions[ConditionFlag.BetweenAreas51]))
+                || Service.Conditions[ConditionFlag.BetweenAreas51])
+                || Service.Conditions[ConditionFlag.OccupiedInCutSceneEvent])
             {
                 CancelState();
             }

diff --git a/RotationSolver/Rotations/Tank/PLD/PLD_Default.cs b/RotationSolver/Rotations/Tank/PLD/PLD_Default.cs
@@ -12,9 +12,9 @@ namespace RotationSolver.Rotations.Tank.PLD;
 internal class PLD_Default : PLD_Base
 {
     public override string GameVersion => "6.31";
-    public override string RotationName => "Default";
+    public override string RotationName => "Tentative v1.2";
 
-    public override string Description => "Tentative v1.2\nPlease work well!";
+    public override string Description => "Please work well!";
 
     private protected override IRotationConfigSet CreateConfiguration()
     {

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -57,6 +57,9 @@ internal static void Enable()
     static async void DutyState_DutyCompleted(object sender, ushort e)
     {
         RSCommands.CancelState();
+
+        if (TargetUpdater.PartyMembers.Count() < 2) return;
+
         await Task.Delay(new Random().Next(4000, 6000));
 
         Service.Configuration.DutyEnd.AddMacro();
@@ -80,7 +83,7 @@ internal static void Disable()
 
     internal static async void UpdateSocial()
     {
-        if (ActionUpdater.InCombat) return;
+        if (ActionUpdater.InCombat || TargetUpdater.PartyMembers.Count() < 2) return;
         if (CanSaying && CanSocial)
         {
             CanSaying = false;