fix: new rpr base file.

ArchiDog1998 · Aug 10, 2024 · a2b295f · a2b295f
1 parent 823d24e
commit a2b295f
Show file tree

Hide file tree

Showing 8 changed files with 141 additions and 6 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -413,7 +413,7 @@
   "16556": 0.6,
   "16557": 0.6,
   "16559": 0.6,
-  "16766": 0.1,
+  "16766": 0.6,
   "16926": 0.1,
   "17209": 0.6,
   "17215": 0.1,
@@ -687,7 +687,10 @@
   "36623": 0.1,
   "36923": 0.6,
   "36924": 0.6,
+  "36969": 0.6,
   "36975": 0.6,
+  "36979": 0.6,
+  "36980": 0.6,
   "37005": 0.6,
   "37007": 0.6,
   "37008": 0.70000005,

diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1 +1 @@
-xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtanK2txymJ/1Gip+p6/iLaEsIUkyws0lDVhTPN84zgFAUVeNpKf6bILxsTTB1WNioe1y76LBFo+06V4HmXkCSFNQsTleuWddPJWH3oMHo1mRrn45CV0XS/K7/r6c8MpH/bWPCY/mXYGXdebOpAsLw/f96sgtjedHFe5YoYmUGaKVaTEzQ6QDzEjgTKLO/fyiZ8TiUgf96dKUaKXiZFxlFI+IeW6QeutAzw==
+xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtanK2txymJ/1ZBRZKwOFEfs7yShVUM8eFZ9UsIVNVcStNuvmUGKtQwxLjZLSIzuMnrcEziHNOIQQPW0mrTBWCh11YOYLQEThqY0Cxo+06+/GOjYzVoXkwfLYnbJhOmz533oDsdfaGXgl+I11ibws34sV41RkLUZ2h/EbSRgcvn9XBajCxJuGx8x4w/9iBKdCqbndwkaUOVfoDy0mbd+/BukCNUqByMQfFQ==
diff --git a/Resources/StatusProvide.json b/Resources/StatusProvide.json
@@ -205,5 +205,82 @@
   "137": [],
   "37010": [],
   "3": [],
-  "25762": []
+  "25762": [],
+  "16500": [],
+  "36980": [],
+  "36979": [],
+  "16498": [],
+  "7411": [],
+  "7412": [],
+  "7413": [],
+  "2876": [],
+  "25788": [
+    3865
+  ],
+  "16501": [],
+  "7414": [
+    3864
+  ],
+  "2878": [
+    1946
+  ],
+  "16766": [],
+  "17209": [
+    2688
+  ],
+  "36978": [],
+  "16497": [],
+  "24373": [],
+  "24374": [],
+  "24375": [],
+  "24378": [],
+  "24380": [],
+  "24389": [
+    2587
+  ],
+  "24383": [
+    2588
+  ],
+  "24390": [
+    2587
+  ],
+  "24382": [
+    2589
+  ],
+  "24387": [
+    2594
+  ],
+  "24405": [
+    2972
+  ],
+  "24393": [
+    3858
+  ],
+  "36970": [
+    2589
+  ],
+  "36971": [
+    2588
+  ],
+  "24385": [
+    3905
+  ],
+  "24394": [
+    3857
+  ],
+  "24396": [],
+  "24395": [],
+  "24398": [
+    3860
+  ],
+  "24392": [
+    2587
+  ],
+  "24399": [],
+  "24391": [
+    2587
+  ],
+  "36969": [],
+  "36973": [],
+  "24386": []
 }
diff --git a/Resources/TargetStatusProvide.json b/Resources/TargetStatusProvide.json
@@ -173,5 +173,52 @@
   "3": [
     50
   ],
-  "25762": []
+  "25762": [],
+  "16500": [],
+  "36980": [],
+  "36979": [],
+  "16498": [],
+  "7411": [],
+  "7412": [],
+  "7413": [],
+  "2876": [
+    851
+  ],
+  "25788": [],
+  "16501": [],
+  "7414": [],
+  "2878": [
+    861
+  ],
+  "16766": [],
+  "17209": [],
+  "36978": [],
+  "16497": [],
+  "24373": [],
+  "24374": [],
+  "24375": [],
+  "24378": [],
+  "24380": [],
+  "24389": [],
+  "24383": [],
+  "24390": [],
+  "24382": [],
+  "24387": [],
+  "24405": [
+    2599
+  ],
+  "24393": [],
+  "36970": [],
+  "36971": [],
+  "24385": [],
+  "24394": [],
+  "24396": [],
+  "24395": [],
+  "24398": [],
+  "24392": [],
+  "24399": [],
+  "24391": [],
+  "36969": [],
+  "36973": [],
+  "24386": []
 }
diff --git a/Resources/TerritoryConfigs/952.json b/Resources/TerritoryConfigs/952.json
@@ -23,6 +23,10 @@
     "RDM": {
       "Timeline": {},
       "Trigger": []
+    },
+    "RPR": {
+      "Timeline": {},
+      "Trigger": []
     }
   },
   "NoHostileNames": [],

diff --git a/RotationSolver.Basic b/RotationSolver.Basic
diff --git a/RotationSolver/UI/ConfigWindows/ActionsItem.cs b/RotationSolver/UI/ConfigWindows/ActionsItem.cs
@@ -261,6 +261,10 @@ static void DrawActionDebug()
                     ImGui.Text("Recast Elapsed: " + action.CD.RecastTimeElapsedRaw.ToString());
                     ImGui.Text($"Charges: {action.CD.CurrentCharges} / {action.CD.MaxCharges}");
 
+                    ImGui.Text("Status Need: " + string.Join(", ", action.Info.TargetStatusNeed));
+                    ImGui.Text("Status Provide: " + string.Join(", ", action.Info.StatusProvide));
+                    ImGui.Text("Status Target Provide: " + string.Join(", ", action.Info.TargetStatusProvide));
+
                     ImGui.Text($"Can Use: {action.CanUse(out _, skipClippingCheck: true)} ");
                     ImGui.Text($"Why Can't: {action.WhyCant.Local()} ");
                     ImGui.Text("IgnoreCastCheck/Use Up:" + action.CanUse(out _, skipClippingCheck: true, skipCastingCheck: true, usedUp: true).ToString());

diff --git a/RotationSolver/UI/PainterManager.cs b/RotationSolver/UI/PainterManager.cs
@@ -79,7 +79,7 @@ public static Vector4 HighlightColor
         }
     }
 
-    private const float omenHeight = 1;
+    private const float omenHeight = 5;
 
     private static StaticVfx? _meleeWarning, _movePosition;
     private readonly static Drawing3DText[] TargetTexts = new Drawing3DText[64];
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtanK2txymJ/1Gip+p6/iLaEsIUkyws0lDVhTPN84zgFAUVeNpKf6bILxsTTB1WNioe1y76LBFo+06V4HmXkCSFNQsTleuWddPJWH3oMHo1mRrn45CV0XS/K7/r6c8MpH/bWPCY/mXYGXdebOpAsLw/f96sgtjedHFe5YoYmUGaKVaTEzQ6QDzEjgTKLO/fyiZ8TiUgf96dKUaKXiZFxlFI+IeW6QeutAzw==
		xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtanK2txymJ/1ZBRZKwOFEfs7yShVUM8eFZ9UsIVNVcStNuvmUGKtQwxLjZLSIzuMnrcEziHNOIQQPW0mrTBWCh11YOYLQEThqY0Cxo+06+/GOjYzVoXkwfLYnbJhOmz533oDsdfaGXgl+I11ibws34sV41RkLUZ2h/EbSRgcvn9XBajCxJuGx8x4w/9iBKdCqbndwkaUOVfoDy0mbd+/BukCNUqByMQfFQ==
+27 −14		RotationSolver.Basic/Actions/ActionBasicInfo.cs
+20 −15		RotationSolver.Basic/Actions/ActionConfig.cs
+8 −1		RotationSolver.Basic/Actions/ActionSetting.cs
+9 −10		RotationSolver.Basic/Actions/BaseAction.cs
+4 −1		RotationSolver.Basic/Actions/IBaseAction.cs
+1 −1		RotationSolver.Basic/Configuration/Target/TargetingItem.cs
+3 −1		RotationSolver.Basic/Helpers/SpeechHelper.cs
+1 −1		RotationSolver.Basic/RotationSolver.Basic.csproj
+72 −24		RotationSolver.Basic/Rotations/Basic/MachinistRotation.cs
+178 −112		RotationSolver.Basic/Rotations/Basic/ReaperRotation.cs
+1 −1		RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs
+3 −2		RotationSolver.Basic/Rotations/CustomRotation_Items.cs