fix: add sage shield status.

ArchiDog1998 · Feb 20, 2024 · b51e1ae · b51e1ae
1 parent eb86c34
commit b51e1ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -177,9 +177,8 @@ public static unsafe bool IsEnemy(this GameObject obj)
     /// <returns></returns>
     public static unsafe bool IsAlliance(this GameObject obj)
         => obj != null && obj.ObjectId is not 0 and not GameObject.InvalidGameObjectId
-        && ((DataCenter.Territory?.IsPvpZone ?? false)
-        ? ActionManager.CanUseActionOnTarget((uint)ActionID.CurePvE, obj.Struct())
-        : obj is PlayerCharacter);
+        && (!(DataCenter.Territory?.IsPvpZone ?? false) && obj is PlayerCharacter 
+        || ActionManager.CanUseActionOnTarget((uint)ActionID.CurePvE, obj.Struct()));
 
     public static bool IsParty(this GameObject gameObject)
     {

diff --git a/RotationSolver.Basic/Rotations/Basic/SageRotation.cs b/RotationSolver.Basic/Rotations/Basic/SageRotation.cs
@@ -46,6 +46,11 @@ protected static bool AddersgallEndAfterGCD(uint gctCount = 0, float offset = 0)
     #endregion
     private protected sealed override IBaseAction Raise => EgeiroPvE;
 
+    static partial void ModifyEukrasianDiagnosisPvE(ref ActionSetting setting)
+    {
+        setting.TargetType = TargetType.BeAttacked;
+    }
+
     static partial void ModifyEukrasianDosisPvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide =

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -16,9 +16,9 @@
   "RotationSolver.Data.UiString.ConfigWindow_About_Links": "Links",
   "RotationSolver.UI.RotationConfigWindowTab.Debug": "Debug",
   "InDebugName": "Debug Mode",
-  "InDebugDescription": "",
-  "RotationSolver.UI.RotationConfigWindowTab.Basic": "Basic settings",
-  "RotationSolver.UI.RotationConfigWindowTab.Rotations": "All rotations that RS has loaded.",
+  "RotationSolver.UI.RotationConfigWindowTab.Extra": "Some features that shouldn't be included in RS but help you.",
   "RotationSolver.UI.RotationConfigWindowTab.Target": "The way to find the targets, hostiles or friends.",
-  "RotationSolver.UI.RotationConfigWindowTab.UI": "Settings about the user interface."
+  "RotationSolver.UI.RotationConfigWindowTab.UI": "Settings about the user interface.",
+  "RotationSolver.UI.RotationConfigWindowTab.Basic": "Basic settings",
+  "RotationSolver.UI.RotationConfigWindowTab.Auto": "About some general actions usage and conditions."
 }