fix: cd fix for charging abilities!

Ted-Jin-Lab · Ted-Jin-Lab · commit 756c27526fcc · 2024-07-13T15:26:27.000+08:00
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1 +1 @@
-xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtVCbUG91+WQiqEsSvoxkw6i2PFHjR8TVNz+I0+visegmXpsTv3yRfWWF5v619IqpNOHrPZAlo2BefpEN8u/W/+0A0K5bC4Gl2YbuJAPdpp9/hudUHj2BEIsrEW3pFKARR6aAi5//gkJ66F0nlBjXPnz6lrprPi4OLS8watxCxxOsfGyMc0a/+M0hlrC9u2B9Aw+XugDerNKdU8hgq+Phl/t4ANacgHRdJQ==
+xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtVCbUG91+WQiKGih9UT0TicJ69NvFSJ7SUkK9DzvG5wFf+DwY1dKob7VrZekRN2YhxlsU/n3xAmWV3jX6GmyI9q1JdYlNT9CRTFMmaGdNWdc6nP9fMKMjlBrkgv3E9wDL2Vr5+jbYhtcDEktIMvK04XZEjepK9+mgx40Kh0rILurwzuFa4gpwXAR9f+QUlftS/BWSjZSKFKzI3AWJY1Qz/C6N3WUw1Fl5g==
diff --git a/Resources/TerritoryConfigs/1201.json b/Resources/TerritoryConfigs/1201.json
@@ -2,21 +2,7 @@
   "_jobConfigs": {
     "WAR": {
       "Timeline": {
-        "16": [
-          {
-            "ActionAction": {
-              "ID": 38,
-              "TargetType": 0,
-              "CanUseOption": 0
-            },
-            "Time": 3.0,
-            "Duration": 3.0,
-            "Condition": {
-              "Conditions": [],
-              "Type": 0
-            }
-          }
-        ],
+        "16": [],
         "26.3": [],
         "37.3": [],
         "38.4": [],
diff --git a/RotationSolver.Basic b/RotationSolver.Basic
@@ -1 +1 @@
-Subproject commit 8fd2429bb5dd43a5f1866f93eb488423230254d9
+Subproject commit ee2eb057fe42c71b67c71e1f05e3eecb51cb23e6
diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -574,5 +574,11 @@
   "RotationSolver.Basic.Data.CanUseOption.OnLastAbility": "Is it on the last ability",
   "RotationSolver.Basic.Data.CanUseOption.SkipClippingCheck": "Skip clipping Check",
   "RotationSolver.Basic.Data.CanUseOption.SkipAoeCheck": "Skip aoe Check",
-  "RotationSolver.Basic.Configuration.TerritoryAction.ActionActionName.CanUseOption": "Can Use Option"
+  "RotationSolver.Basic.Configuration.TerritoryAction.ActionActionName.CanUseOption": "Can Use Option",
+  "RotationSolver.Basic.Configuration.Timeline.TimelineCondition.TimelineConditionSetName.Conditions": "Conditions",
+  "RotationSolver.Basic.Configuration.Timeline.TimelineCondition.TimelineConditionSetName.Type": "Type",
+  "RotationSolver.Basic.Data.LogicalType.All": "&&",
+  "RotationSolver.Basic.Data.LogicalType.Any": " | | ",
+  "RotationSolver.Basic.Data.LogicalType.NotAll": "!&&",
+  "RotationSolver.Basic.Data.LogicalType.NotAny": "! | | "
 }
diff --git a/RotationSolver/UI/ConfigWindows/ActionsItem.cs b/RotationSolver/UI/ConfigWindows/ActionsItem.cs
@@ -263,7 +263,7 @@ static void DrawActionDebug()
 
                     ImGui.Text($"Can Use: {action.CanUse(out _, skipClippingCheck: true)} ");
                     ImGui.Text($"Why Can't: {action.WhyCant.Local()} ");
-                    ImGui.Text("IgnoreCastCheck:" + action.CanUse(out _, skipClippingCheck: true, skipCastingCheck: true).ToString());
+                    ImGui.Text("IgnoreCastCheck/Use Up:" + action.CanUse(out _, skipClippingCheck: true, skipCastingCheck: true, usedUp: true).ToString());
                     ImGui.Text($"Why Can't: {action.WhyCant.Local()} ");
                     ImGui.Text("Target Name: " + action.Target.Target?.Name ?? string.Empty);
                 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtVCbUG91+WQiqEsSvoxkw6i2PFHjR8TVNz+I0+visegmXpsTv3yRfWWF5v619IqpNOHrPZAlo2BefpEN8u/W/+0A0K5bC4Gl2YbuJAPdpp9/hudUHj2BEIsrEW3pFKARR6aAi5//gkJ66F0nlBjXPnz6lrprPi4OLS8watxCxxOsfGyMc0a/+M0hlrC9u2B9Aw+XugDerNKdU8hgq+Phl/t4ANacgHRdJQ==`
	`1`	`+xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtVCbUG91+WQiKGih9UT0TicJ69NvFSJ7SUkK9DzvG5wFf+DwY1dKob7VrZekRN2YhxlsU/n3xAmWV3jX6GmyI9q1JdYlNT9CRTFMmaGdNWdc6nP9fMKMjlBrkgv3E9wDL2Vr5+jbYhtcDEktIMvK04XZEjepK9+mgx40Kh0rILurwzuFa4gpwXAR9f+QUlftS/BWSjZSKFKzI3AWJY1Qz/C6N3WUw1Fl5g==`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ static void DrawActionDebug()`
`263`	`263`
`264`	`264`	`ImGui.Text($"Can Use: {action.CanUse(out _, skipClippingCheck: true)} ");`
`265`	`265`	`ImGui.Text($"Why Can't: {action.WhyCant.Local()} ");`
`266`		`- ImGui.Text("IgnoreCastCheck:" + action.CanUse(out _, skipClippingCheck: true, skipCastingCheck: true).ToString());`
	`266`	`+ ImGui.Text("IgnoreCastCheck/Use Up:" + action.CanUse(out _, skipClippingCheck: true, skipCastingCheck: true, usedUp: true).ToString());`
`267`	`267`	`ImGui.Text($"Why Can't: {action.WhyCant.Local()} ");`
`268`	`268`	`ImGui.Text("Target Name: " + action.Target.Target?.Name ?? string.Empty);`
`269`	`269`	`}`