fix: add an TerritoryContentType property for rotation.

ArchiDog1998 · Apr 9, 2023 · 8b983a6 · 8b983a6
1 parent 7f453af
commit 8b983a6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Data/TerritoryContentType.cs b/RotationSolver.Basic/Data/TerritoryContentType.cs
@@ -0,0 +1,32 @@
+namespace RotationSolver.Basic.Data;
+
+public enum TerritoryContentType : uint
+{
+    None = 0,
+    DutyRoulette = 1,
+    Dungeons = 2,
+    Guildhests = 3,
+    Trials = 4,
+    Raids = 5,
+    PvP = 6,
+    QuestBattles = 7,
+    FATEs = 8,
+    TreasureHunt = 9,
+    Levequests = 10,
+    GrandCompany = 11,
+    Companions = 12,
+    TribalQuests = 13,
+    OverallCompletion = 14,
+    PlayerCommendation = 15,
+    DisciplesOfTheLand = 16,
+    DisciplesOfTheHand = 17,
+    RetainerVentures = 18,
+    GoldSaucer = 19,
+    DeepDungeons = 21,
+    WondrousTails = 24,
+    CustomDeliveries = 25,
+    Eureka = 26,
+    UltimateRaids = 28,
+    VCDungeonFinder = 30,
+\
+}
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -12,6 +12,8 @@ namespace RotationSolver.Basic;
 public static class DataCenter
 {
     public static bool InHighEndDuty { get; set; } = false;
+    public static TerritoryContentType TerritoryContentType { get; set; } = TerritoryContentType.None;
+
     public static AutoStatus AutoStatus { get; private set; } = AutoStatus.None;
     public static bool SetAutoStatus(AutoStatus status, bool keep)
     {

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs b/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
@@ -122,6 +122,7 @@ public abstract partial class CustomRotation
     #endregion
 
     protected static ClientLanguage Language => Service.Language;
+    protected static TerritoryContentType TerritoryContentType => DataCenter.TerritoryContentType;
 
 
     public static uint AdjustId(uint id) => Service.GetAdjustedActionId(id);

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -40,6 +40,7 @@ private unsafe void DrawStatus()
         {
             ImGui.Text("Fate: " + DataCenter.FateId.ToString());
         }
+        ImGui.Text("TerritoryType: " + DataCenter.TerritoryContentType.ToString());
 
         ImGui.Text("Have pet: " + DataCenter.HasPet.ToString());
         ImGui.Text("Hostile Near: " + DataCenter.HasHostilesInRange.ToString());

diff --git a/RotationSolver/Updaters/InputUpdater.cs b/RotationSolver/Updaters/InputUpdater.cs
@@ -90,7 +90,7 @@ private static void KeyDown(KeyRecord key)
             return;
         }
 
-        if (!Service.Config.UseKeyboardCommand || SocialUpdater.InPvp) return;
+        if (!Service.Config.UseKeyboardCommand) return;
 
         if (Service.Config.KeyState.ContainsValue(key))
         {
@@ -128,7 +128,7 @@ private static void ButtonDown(ButtonRecord button)
             return;
         }
 
-        if (!Service.Config.UseGamepadCommand || SocialUpdater.InPvp) return;
+        if (!Service.Config.UseGamepadCommand) return;
 
         if (Service.Config.ButtonState.ContainsValue(button))
         {

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -6,7 +6,7 @@ namespace RotationSolver.Updaters;
 
 internal static class MajorUpdater
 {
-    public static bool IsValid => Service.Conditions.Any() && Service.Player != null;
+    public static bool IsValid => Service.Conditions.Any() && Service.Player != null && !SocialUpdater.InPvp;
 
 #if DEBUG
     private static readonly Dictionary<int, bool> _valus = new Dictionary<int, bool>();

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -75,6 +75,7 @@ static void ClientState_TerritoryChanged(object sender, ushort e)
             _canSaying = true;
         }
         InPvp = territory.IsPvpZone;
+        DataCenter.TerritoryContentType = (TerritoryContentType)(territory?.ContentFinderCondition?.Value?.ContentType?.Value?.RowId ?? 0);
         DataCenter.InHighEndDuty = HighEndDuties.Any(t => t.RowId == territory.RowId);
     }