Merge branch 'ArchiDog1998:main' into dev-testing

ArchiDog1998 · May 16, 2023 · a6145df · a6145df
2 parents d3ed73e + d4ebd49
commit a6145df
Show file tree

Hide file tree

Showing 18 changed files with 467 additions and 459 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,13 @@
 .vs/
 bin/
+!RotationSolver/bin/
+RotationSolver/bin/*
+!RotationSolver/bin/Release/
+RotationSolver/bin/Release/*
+!RotationSolver/bin/Release/net7.0-windows/
+RotationSolver/bin/Release/net7.0-windows/*
+!RotationSolver/bin/Release/net7.0-windows/RotationSolver/
+RotationSolver/bin/Release/net7.0-windows/RotationSolver/*
+!RotationSolver/bin/Release/net7.0-windows/RotationSolver/latest.zip
 obj/
-/lib/
-gifs/
+lib/
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>2.8.1</Version>
+		<Version>2.9.0</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -87,7 +87,7 @@
   "3593": 0.6,
   "3594": 0.1,
   "3595": 0.6,
-  "3596": 0.6,
+  "3596": 0.1,
   "3598": 0.1,
   "3599": 0.6,
   "3600": 0.1,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -4,6 +4,7 @@
   2225,
   2375,
   2398,
+  3282,
   3416,
   3519,
   3676,
@@ -27,6 +28,11 @@
   6607,
   6613,
   6887,
+  7353,
+  7356,
+  7363,
+  7364,
+  7370,
   8023,
   8024,
   8025,

diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -204,7 +204,6 @@ public class PluginConfiguration : IPluginConfiguration
     public float DistanceForMoving = 1.2f;
     public int MaxPing = 300;
 
-    public bool ShowStatusWindow = false;
     public bool AutoLoadCustomRotations = false;
 
     public void Save()

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -165,8 +165,6 @@ internal partial class Strings
     public string ConfigWindow_Params_LocationWrongTextDesc { get; set; } = "How do you want to be scolded if you have a positional error ?!";
     public string ConfigWindow_Param_SayOutStateChanged { get; set; } = "Saying the state changes out";
     public string ConfigWindow_Param_ShowInfoOnDtr { get; set; } = "Display plugin state on server info";
-    public string ConfigWindow_Param_ShowStatusWindow { get; set; } = "Display plugin state in a window.";
-
     public string ConfigWindow_Param_ShowInfoOnToast { get; set; } = "Display plugin state on toast";
     public string ConfigWindow_Param_NamePlateIconId { get; set; } = "Player's name plate icon id when state is on. Recommend 61435, 61437";
     public string ConfigWindow_Param_Action { get; set; } = "Action";

diff --git a/RotationSolver/Localization/de.json b/RotationSolver/Localization/de.json
@@ -55,6 +55,7 @@
   "ConfigWindow_Param_CountDownAhead": "Set the time advance of using casting actions on counting down.",
   "ConfigWindow_Param_SpecialDuration": "Set the duration of special windows set by commands",
   "ConfigWindow_Param_AddDotGCDCount": "Set GCD advance of DOT refresh",
+  "ConfigWindow_Param_MaxPing": "Set the Max Ping that RS can get.",
   "ConfigWindow_Param_AutoOffBetweenArea": "Auto turn off when player is between area.",
   "ConfigWindow_Param_AutoOffCutScene": "Auto turn off during cut scene.",
   "ConfigWindow_Param_AutoOffWhenDead": "Auto turn off when dead.",
@@ -74,7 +75,7 @@
   "ConfigWindow_Param_StopCastingDelay": "Set the range of random delay for stopping casting when target is no need to cast in second.",
   "ConfigWindow_Param_Display": "Display",
   "ConfigWindow_Param_Advanced": "Advanced",
-  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting.",
+  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting or has TenChiJin or PhantomFlurry status.",
   "ConfigWindow_Param_UseStopCasting": "Use stopping casting when target is dead.",
   "ConfigWindow_Param_ShowActionFlag": "Show action flag.",
   "ConfigWindow_Param_InDebug": "Debug Mode",

diff --git a/RotationSolver/Localization/es.json b/RotationSolver/Localization/es.json
@@ -55,6 +55,7 @@
   "ConfigWindow_Param_CountDownAhead": "Set the time advance of using casting actions on counting down.",
   "ConfigWindow_Param_SpecialDuration": "Set the duration of special windows set by commands",
   "ConfigWindow_Param_AddDotGCDCount": "Set GCD advance of DOT refresh",
+  "ConfigWindow_Param_MaxPing": "Set the Max Ping that RS can get.",
   "ConfigWindow_Param_AutoOffBetweenArea": "Auto turn off when player is between area.",
   "ConfigWindow_Param_AutoOffCutScene": "Auto turn off during cut scene.",
   "ConfigWindow_Param_AutoOffWhenDead": "Auto turn off when dead.",
@@ -74,7 +75,7 @@
   "ConfigWindow_Param_StopCastingDelay": "Set the range of random delay for stopping casting when target is no need to cast in second.",
   "ConfigWindow_Param_Display": "Display",
   "ConfigWindow_Param_Advanced": "Advanced",
-  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting.",
+  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting or has TenChiJin or PhantomFlurry status.",
   "ConfigWindow_Param_UseStopCasting": "Use stopping casting when target is dead.",
   "ConfigWindow_Param_ShowActionFlag": "Show action flag.",
   "ConfigWindow_Param_InDebug": "Debug Mode",

diff --git a/RotationSolver/Localization/fr.json b/RotationSolver/Localization/fr.json
@@ -55,6 +55,7 @@
   "ConfigWindow_Param_CountDownAhead": "Set the time advance of using casting actions on counting down.",
   "ConfigWindow_Param_SpecialDuration": "Set the duration of special windows set by commands",
   "ConfigWindow_Param_AddDotGCDCount": "Set GCD advance of DOT refresh",
+  "ConfigWindow_Param_MaxPing": "Set the Max Ping that RS can get.",
   "ConfigWindow_Param_AutoOffBetweenArea": "Auto turn off when player is between area.",
   "ConfigWindow_Param_AutoOffCutScene": "Auto turn off during cut scene.",
   "ConfigWindow_Param_AutoOffWhenDead": "Auto turn off when dead.",
@@ -74,7 +75,7 @@
   "ConfigWindow_Param_StopCastingDelay": "Set the range of random delay for stopping casting when target is no need to cast in second.",
   "ConfigWindow_Param_Display": "Display",
   "ConfigWindow_Param_Advanced": "Advanced",
-  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting.",
+  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting or has TenChiJin or PhantomFlurry status.",
   "ConfigWindow_Param_UseStopCasting": "Use stopping casting when target is dead.",
   "ConfigWindow_Param_ShowActionFlag": "Show action flag.",
   "ConfigWindow_Param_InDebug": "Debug Mode",

diff --git a/RotationSolver/Localization/ja.json b/RotationSolver/Localization/ja.json
@@ -55,6 +55,7 @@
   "ConfigWindow_Param_CountDownAhead": "Set the time advance of using casting actions on counting down.",
   "ConfigWindow_Param_SpecialDuration": "Set the duration of special windows set by commands",
   "ConfigWindow_Param_AddDotGCDCount": "Set GCD advance of DOT refresh",
+  "ConfigWindow_Param_MaxPing": "Set the Max Ping that RS can get.",
   "ConfigWindow_Param_AutoOffBetweenArea": "Auto turn off when player is between area.",
   "ConfigWindow_Param_AutoOffCutScene": "Auto turn off during cut scene.",
   "ConfigWindow_Param_AutoOffWhenDead": "Auto turn off when dead.",
@@ -74,7 +75,7 @@
   "ConfigWindow_Param_StopCastingDelay": "Set the range of random delay for stopping casting when target is no need to cast in second.",
   "ConfigWindow_Param_Display": "Display",
   "ConfigWindow_Param_Advanced": "Advanced",
-  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting.",
+  "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting or has TenChiJin or PhantomFlurry status.",
   "ConfigWindow_Param_UseStopCasting": "Use stopping casting when target is dead.",
   "ConfigWindow_Param_ShowActionFlag": "Show action flag.",
   "ConfigWindow_Param_InDebug": "Debug Mode",
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -27,6 +28,11 @@ @@
 ,
 ,
 ,
+,
+,
+,
+,
+,
 ,
 ,
 ,
@@ Expand Down @@