fix: fixed loading and translation bugs.

ArchiDog1998 · Feb 5, 2024 · 8e0db8f · 8e0db8f
1 parent 008550d
commit 8e0db8f
Show file tree

Hide file tree

Showing 26 changed files with 291 additions and 900 deletions.
diff --git a/DefaultRotations/Duty/BozjaDefault.cs b/DefaultRotations/Duty/BozjaDefault.cs
@@ -2,7 +2,7 @@
 
 namespace DefaultRotations.Duty;
 
-[Rotation("Bozja Default")]
+[Rotation("Bozja Default",  CombatType.PvE)]
 internal class BozjaDefault : BozjaRotation
 {
     public override bool ProvokeAbility(out IAction? act)

diff --git a/DefaultRotations/Healer/AST_Default.cs b/DefaultRotations/Healer/AST_Default.cs
@@ -1,6 +1,6 @@
 namespace DefaultRotations.Healer;
 
-[Rotation(Name = "Default", GameVersion ="6.28")]
+[Rotation("Default", CombatType.PvE, GameVersion = "6.28")]
 [RotationDesc(ActionID.DivinationPvE)]
 [SourceCode(Path = "main/DefaultRotations/Healer/AST_Default.cs")]
 public sealed class AST_Default : AstrologianRotation

diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -1,5 +1,6 @@
 {
   "3": 0.6,
+  "5": 2.1,
   "9": 0.6,
   "15": 0.6,
   "16": 0.6,

diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,5 +1,5 @@
 {
-  "ClickingCount": 60431,
+  "ClickingCount": 60443,
   "SayingHelloCount": 13,
   "SaidUsers": []
 }
diff --git a/Resources/downloadList.json b/Resources/downloadList.json
@@ -1,6 +1,3 @@
 [
-  "ArchiDog1998|FFXIVRotations|DefaultRotations",
-  "IncognitoWater|IncognitoWaterRotations|IcWaRotations",
-  "thunderebolt|BoltsRotations|BoltsRotations",
-  "BrakusTapus|KirboRotations|KirboRotations"
+  "ArchiDog1998|FFXIVRotations|DefaultRotations"
 ]
diff --git a/RotationSolver.Basic/Actions/ActionSetting.cs b/RotationSolver.Basic/Actions/ActionSetting.cs
@@ -5,7 +5,7 @@
 /// </summary>
 public class ActionSetting()
 {
-    public bool TargetStatusFromSelf { get; set; } = true;
+    public bool StatusFromSelf { get; set; } = true;
     public StatusID[]? TargetStatusProvide { get; set; } = null;
     public StatusID[]? TargetStatusNeed { get; set; } = null;
     public Func<BattleChara, bool> CanTarget { get; set; } = t => true;
@@ -24,6 +24,9 @@ public class ActionSetting()
 
     public Func<bool>? ActionCheck { get; set; } = null;
 
+    public Func<ActionConfig>? CreateConfig { get; set; } = null;
+
+
     public bool IsFriendly { get; set; }
 
     private TargetType _type = TargetType.Big;

diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs
@@ -122,13 +122,13 @@ private readonly bool CheckStatus(GameObject gameObject)
         if (_action.Setting.TargetStatusProvide != null)
         {
             if (!gameObject.WillStatusEndGCD(_action.Config.StatusGcdCount, 0,
-                _action.Setting.TargetStatusFromSelf, _action.Setting.TargetStatusProvide)) return false;
+                _action.Setting.StatusFromSelf, _action.Setting.TargetStatusProvide)) return false;
         }
 
         if (_action.Setting.TargetStatusNeed != null)
         {
             if (gameObject.WillStatusEndGCD(_action.Config.StatusGcdCount, 0,
-                _action.Setting.TargetStatusFromSelf, _action.Setting.TargetStatusNeed)) return false;
+                _action.Setting.StatusFromSelf, _action.Setting.TargetStatusNeed)) return false;
         }
 
         return true;

diff --git a/RotationSolver.Basic/Actions/BaseAction.cs b/RotationSolver.Basic/Actions/BaseAction.cs
@@ -57,9 +57,10 @@ public ActionConfig Config
     {
         get
         {
-            if(!Service.Config.RotationActionConfig.TryGetValue(ID, out var value))
+            if (!Service.Config.RotationActionConfig.TryGetValue(ID, out var value))
             {
-                Service.Config.RotationActionConfig[ID] = value = new();
+                Service.Config.RotationActionConfig[ID] = value 
+                    = Setting.CreateConfig?.Invoke() ?? new();
             }
             return value;
         }

diff --git a/RotationSolver.Basic/Attributes/RotationAttribute.cs b/RotationSolver.Basic/Attributes/RotationAttribute.cs
@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RotationSolver.Basic.Attributes;
+namespace RotationSolver.Basic.Attributes;
 
 [AttributeUsage(AttributeTargets.Class)]
-public class RotationAttribute(string name) : Attribute
+public class RotationAttribute(string name, CombatType type) : Attribute
 {
     public string Name => name;
+    public CombatType Type => type;
+
     public string? Description {  get; set; }
-    public CombatType Type { get; set; } = CombatType.None;
 
     public string? GameVersion { get; set; }
 }
diff --git a/RotationSolver.Basic/Configuration/ConditionBoolean.cs b/RotationSolver.Basic/Configuration/ConditionBoolean.cs
@@ -1,7 +1,9 @@
 namespace RotationSolver.Basic.Configuration;
+
 internal class ConditionBoolean(bool defaultValue, string key)
 {
-    public bool Value { get; set; }
+    private readonly bool _defaultValue = defaultValue;
+    public bool Value { get; set; } = defaultValue;
     public bool Enable { get; set; }
     public bool Disable { get; set; }
 
@@ -10,7 +12,7 @@ internal class ConditionBoolean(bool defaultValue, string key)
 
     public void ResetValue()
     {
-        Value = defaultValue;
+        Value = _defaultValue;
     }
 
     public static implicit operator bool(ConditionBoolean condition)

diff --git a/RotationSolver.Basic/Configuration/Conditions/IConditionConverter.cs b/RotationSolver.Basic/Configuration/Conditions/IConditionConverter.cs
@@ -1,77 +1,77 @@
-//using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
-//namespace RotationSolver.Basic.Configuration.Conditions;
+namespace RotationSolver.Basic.Configuration.Conditions;
 
-//internal class IConditionConverter : JsonCreationConverter<ICondition>
-//{
-//    protected override ICondition Create(JObject jObject)
-//    {
-//        if (FieldExists(nameof(ConditionSet.Conditions), jObject))
-//        {
-//            return new ConditionSet();
-//        }
-//        else if (FieldExists(nameof(ActionCondition.ActionConditionType), jObject))
-//        {
-//            return new ActionCondition();
-//        }
-//        else if (FieldExists(nameof(TargetCondition.TargetConditionType), jObject))
-//        {
-//            return new TargetCondition();
-//        }
-//        else if (FieldExists(nameof(RotationCondition.ComboConditionType), jObject))
-//        {
-//            return new RotationCondition();
-//        }
-//        else if (FieldExists(nameof(TraitCondition.TraitID), jObject))
-//        {
-//            return new TraitCondition();
-//        }
-//        else if (FieldExists(nameof(NamedCondition.ConditionName), jObject))
-//        {
-//            return new NamedCondition();
-//        }
-//        else if (FieldExists(nameof(TerritoryCondition.TerritoryConditionType), jObject))
-//        {
-//            return new TerritoryCondition();
-//        }
-//        else
-//        {
-//            return null;
-//        }
-//    }
+internal class IConditionConverter : JsonCreationConverter<ICondition>
+{
+    protected override ICondition Create(JObject jObject)
+    {
+        if (FieldExists(nameof(ConditionSet.Conditions), jObject))
+        {
+            return new ConditionSet();
+        }
+        else if (FieldExists(nameof(ActionCondition.ActionConditionType), jObject))
+        {
+            return new ActionCondition();
+        }
+        else if (FieldExists(nameof(TargetCondition.TargetConditionType), jObject))
+        {
+            return new TargetCondition();
+        }
+        else if (FieldExists(nameof(RotationCondition.ComboConditionType), jObject))
+        {
+            return new RotationCondition();
+        }
+        else if (FieldExists(nameof(TraitCondition.TraitID), jObject))
+        {
+            return new TraitCondition();
+        }
+        else if (FieldExists(nameof(NamedCondition.ConditionName), jObject))
+        {
+            return new NamedCondition();
+        }
+        else if (FieldExists(nameof(TerritoryCondition.TerritoryConditionType), jObject))
+        {
+            return new TerritoryCondition();
+        }
+        else
+        {
+            return null;
+        }
+    }
 
-//    private static bool FieldExists(string fieldName, JObject jObject)
-//    {
-//        return jObject[fieldName] != null;
-//    }
-//}
+    private static bool FieldExists(string fieldName, JObject jObject)
+    {
+        return jObject[fieldName] != null;
+    }
+}
 
-//internal abstract class JsonCreationConverter<T> : JsonConverter
-//{
-//    protected abstract T Create(JObject jObject);
+internal abstract class JsonCreationConverter<T> : JsonConverter
+{
+    protected abstract T Create(JObject jObject);
 
-//    public override bool CanConvert(Type objectType)
-//    {
-//        return typeof(T).IsAssignableFrom(objectType);
-//    }
+    public override bool CanConvert(Type objectType)
+    {
+        return typeof(T).IsAssignableFrom(objectType);
+    }
 
-//    public override bool CanWrite => false;
+    public override bool CanWrite => false;
 
-//    public sealed override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-//    {
-//    }
+    public sealed override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+    }
 
-//    public sealed override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-//    {
-//        // Load JObject from stream
-//        JObject jObject = JObject.Load(reader);
+    public sealed override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+    {
+        // Load JObject from stream
+        JObject jObject = JObject.Load(reader);
 
-//        // Create target object based on JObject
-//        T target = Create(jObject);
+        // Create target object based on JObject
+        T target = Create(jObject);
 
-//        // Populate the object properties
-//        serializer.Populate(jObject.CreateReader(), target);
+        // Populate the object properties
+        serializer.Populate(jObject.CreateReader(), target);
 
-//        return target;
-//    }
-//}
+        return target;
+    }
+}
diff --git a/RotationSolver.Basic/Configuration/Conditions/MajorConditionSet.cs b/RotationSolver.Basic/Configuration/Conditions/MajorConditionSet.cs
@@ -124,10 +124,7 @@ public static MajorConditionSet[] Read(string folder)
 
             try
             {
-                return JsonConvert.DeserializeObject<MajorConditionSet>(str, new JsonSerializerSettings()
-                {
-                    TypeNameHandling = TypeNameHandling.Objects,
-                });
+                return JsonConvert.DeserializeObject<MajorConditionSet>(str, new IConditionConverter());
             }
             catch (Exception ex)
             {

diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -743,9 +743,6 @@ public void Save()
         Svc.Log.Information("Saved configurations.");
 #endif
         File.WriteAllText(Svc.PluginInterface.ConfigFile.FullName,
-            JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings()
-            {
-                TypeNameHandling = TypeNameHandling.Objects,
-            }));
+            JsonConvert.SerializeObject(this, Formatting.Indented));
     }
 }
diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -11,6 +11,17 @@ namespace RotationSolver.Basic.Helpers;
 /// </summary>
 public static class StatusHelper
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    public static StatusID[] RangePhysicalDefense { get;  } =
+    [
+        StatusID.Troubadour,
+        StatusID.Tactician_1951,
+        StatusID.Tactician_2177,
+        StatusID.ShieldSamba,
+    ];
+
     /// <summary>
     /// 
     /// </summary>

diff --git a/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs b/RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs
@@ -85,47 +85,47 @@ static partial void ModifyMinorArcanaPvE(ref ActionSetting setting)
     static partial void ModifyTheArrowPvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide = StatusHelper.AstCardStatus;
-        setting.TargetStatusFromSelf = false;
+        setting.StatusFromSelf = false;
         setting.TargetType = TargetType.Melee;
         setting.ActionCheck = () => DrawnCard == CardType.ARROW;
     }
 
     static partial void ModifyTheBalancePvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide = StatusHelper.AstCardStatus;
-        setting.TargetStatusFromSelf = false;
+        setting.StatusFromSelf = false;
         setting.TargetType = TargetType.Melee;
         setting.ActionCheck = () => DrawnCard == CardType.BALANCE;
     }
 
     static partial void ModifyTheBolePvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide = StatusHelper.AstCardStatus;
-        setting.TargetStatusFromSelf = false;
+        setting.StatusFromSelf = false;
         setting.TargetType = TargetType.Range;
         setting.ActionCheck = () => DrawnCard == CardType.BOLE;
     }
 
     static partial void ModifyTheEwerPvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide = StatusHelper.AstCardStatus;
-        setting.TargetStatusFromSelf = false;
+        setting.StatusFromSelf = false;
         setting.TargetType = TargetType.Range;
         setting.ActionCheck = () => DrawnCard == CardType.EWER;
     }
 
     static partial void ModifyTheSpearPvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide = StatusHelper.AstCardStatus;
-        setting.TargetStatusFromSelf = false;
+        setting.StatusFromSelf = false;
         setting.TargetType = TargetType.Melee;
         setting.ActionCheck = () => DrawnCard == CardType.SPEAR;
     }
 
     static partial void ModifyTheSpirePvE(ref ActionSetting setting)
     {
         setting.TargetStatusProvide = StatusHelper.AstCardStatus;
-        setting.TargetStatusFromSelf = false;
+        setting.StatusFromSelf = false;
         setting.TargetType = TargetType.Range;
         setting.ActionCheck = () => DrawnCard == CardType.SPIRE;
     }