Merge branch 'main' of https://github.com/ArchiDog1998/RotationSolver

ArchiDog1998 · Nov 6, 2023 · ae824b5 · ae824b5
2 parents dcc8870 + c7607d2
commit ae824b5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 32 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs b/RotationSolver.Basic/Rotations/Basic/MCH_Base.cs
@@ -319,7 +319,7 @@ protected static bool OverheatedEndAfterGCD(uint gctCount = 0, float offset = 0)
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction PvP_Analysis { get; } = new BaseAction(ActionID.PvP_Analysis);
+    public static IBaseAction PvP_Analysis { get; } = new BaseAction(ActionID.PvP_Analysis,ActionOption.Buff);
 
     /// <summary>
     /// 

diff --git a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
@@ -481,7 +481,7 @@ public override void DisplayStatus()
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction PvP_RadiantAegis { get; } = new BaseAction(ActionID.PvP_RadiantAegis);
+    public static IBaseAction PvP_RadiantAegis { get; } = new BaseAction(ActionID.PvP_RadiantAegis,ActionOption.Defense);
 
     /// <summary>
     /// 

diff --git a/RotationSolver/Localization/de.json b/RotationSolver/Localization/de.json
@@ -199,12 +199,6 @@
   "ConfigWindow_List_NoHostileDesc": "Enemies that will never be targeted.",
   "ConfigWindow_List_NoProvokeDesc": "Enemies that will never be provoked.",
   "ActionSequencer_Load": "Load From folder.",
-  "ActionSequencer_Can": "Can",
-  "ActionSequencer_Cannot": "Can Not",
-  "ActionSequencer_Is": "Ist",
-  "ActionSequencer_Isnot": "Is Not",
-  "ActionSequencer_Has": "Has",
-  "ActionSequencer_HasNot": "Has not",
   "ActionSequencer_TimeOffset": "Time Offset",
   "ActionSequencer_AOECount": "AOE Count",
   "ActionSequencer_Charges": "Charges",
@@ -225,6 +219,7 @@
   "ActionSequencer_StatusSelf": "From Self",
   "ActionSequencer_StatusAll": "From All",
   "ActionSequencer_Delay_Description": "How many seconds do you want to delay its turning to true.",
+  "ActionSequencer_NotDescription": "Click to make it reverse.\nIs reversed : {0}",
   "Action_Friendly": "Support",
   "Action_Ability": "0GCD",
   "Action_Attack": "Attack",

diff --git a/RotationSolver/Localization/es.json b/RotationSolver/Localization/es.json
@@ -199,12 +199,6 @@
   "ConfigWindow_List_NoHostileDesc": "Enemies that will never be targeted.",
   "ConfigWindow_List_NoProvokeDesc": "Enemies that will never be provoked.",
   "ActionSequencer_Load": "Load From folder.",
-  "ActionSequencer_Can": "Can",
-  "ActionSequencer_Cannot": "Can Not",
-  "ActionSequencer_Is": "Is",
-  "ActionSequencer_Isnot": "Is Not",
-  "ActionSequencer_Has": "Has",
-  "ActionSequencer_HasNot": "Has not",
   "ActionSequencer_TimeOffset": "Time Offset",
   "ActionSequencer_AOECount": "AOE Count",
   "ActionSequencer_Charges": "Charges",
@@ -225,6 +219,7 @@
   "ActionSequencer_StatusSelf": "From Self",
   "ActionSequencer_StatusAll": "From All",
   "ActionSequencer_Delay_Description": "How many seconds do you want to delay its turning to true.",
+  "ActionSequencer_NotDescription": "Click to make it reverse.\nIs reversed : {0}",
   "Action_Friendly": "Support",
   "Action_Ability": "0GCD",
   "Action_Attack": "Attack",

diff --git a/RotationSolver/Localization/fr.json b/RotationSolver/Localization/fr.json
@@ -199,12 +199,6 @@
   "ConfigWindow_List_NoHostileDesc": "Enemies that will never be targeted.",
   "ConfigWindow_List_NoProvokeDesc": "Enemies that will never be provoked.",
   "ActionSequencer_Load": "Charger depuis un dossier.",
-  "ActionSequencer_Can": "Peut",
-  "ActionSequencer_Cannot": "Ne peut pas",
-  "ActionSequencer_Is": "Est",
-  "ActionSequencer_Isnot": "N'est pas",
-  "ActionSequencer_Has": "A",
-  "ActionSequencer_HasNot": "N'a pas",
   "ActionSequencer_TimeOffset": "Décalage temporel",
   "ActionSequencer_AOECount": "Décompte AOE",
   "ActionSequencer_Charges": "Charges",
@@ -225,6 +219,7 @@
   "ActionSequencer_StatusSelf": "À partir de soi",
   "ActionSequencer_StatusAll": "De tous",
   "ActionSequencer_Delay_Description": "How many seconds do you want to delay its turning to true.",
+  "ActionSequencer_NotDescription": "Click to make it reverse.\nIs reversed : {0}",
   "Action_Friendly": "Soutien",
   "Action_Ability": "0GCD",
   "Action_Attack": "Attaque",

diff --git a/RotationSolver/Localization/ja.json b/RotationSolver/Localization/ja.json
@@ -199,12 +199,6 @@
   "ConfigWindow_List_NoHostileDesc": "Enemies that will never be targeted.",
   "ConfigWindow_List_NoProvokeDesc": "Enemies that will never be provoked.",
   "ActionSequencer_Load": "Load From folder.",
-  "ActionSequencer_Can": "Can",
-  "ActionSequencer_Cannot": "Can Not",
-  "ActionSequencer_Is": "Is",
-  "ActionSequencer_Isnot": "Is Not",
-  "ActionSequencer_Has": "Has",
-  "ActionSequencer_HasNot": "Has not",
   "ActionSequencer_TimeOffset": "Time Offset",
   "ActionSequencer_AOECount": "AOE Count",
   "ActionSequencer_Charges": "Charges",
@@ -225,6 +219,7 @@
   "ActionSequencer_StatusSelf": "From Self",
   "ActionSequencer_StatusAll": "From All",
   "ActionSequencer_Delay_Description": "How many seconds do you want to delay its turning to true.",
+  "ActionSequencer_NotDescription": "Click to make it reverse.\nIs reversed : {0}",
   "Action_Friendly": "Support",
   "Action_Ability": "0GCD",
   "Action_Attack": "Attack",

diff --git a/RotationSolver/Localization/zh.json b/RotationSolver/Localization/zh.json
@@ -199,12 +199,6 @@
   "ConfigWindow_List_NoHostileDesc": "Enemies that will never be targeted.",
   "ConfigWindow_List_NoProvokeDesc": "Enemies that will never be provoked.",
   "ActionSequencer_Load": "从文件夹中加载。",
-  "ActionSequencer_Can": "能",
-  "ActionSequencer_Cannot": "不能使用",
-  "ActionSequencer_Is": "是",
-  "ActionSequencer_Isnot": "不是",
-  "ActionSequencer_Has": "有",
-  "ActionSequencer_HasNot": "没有",
   "ActionSequencer_TimeOffset": "时间偏移量",
   "ActionSequencer_AOECount": "AOE 计数",
   "ActionSequencer_Charges": "层数",
@@ -225,6 +219,7 @@
   "ActionSequencer_StatusSelf": "来自自身的",
   "ActionSequencer_StatusAll": "来自所有",
   "ActionSequencer_Delay_Description": "How many seconds do you want to delay its turning to true.",
+  "ActionSequencer_NotDescription": "Click to make it reverse.\nIs reversed : {0}",
   "Action_Friendly": "支援技能",
   "Action_Ability": "能力技",
   "Action_Attack": "攻击技能",