fix: removed MaxPing property.

ArchiDog1998 · Apr 26, 2023 · 9a02d9f · 9a02d9f
1 parent fc545bd
commit 9a02d9f
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 14 deletions.
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.4.0</Version>
+		<Version>2.5.0</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -87,7 +87,6 @@ public class PluginConfiguration : IPluginConfiguration
     public float MeleeRangeOffset = 1;
     public bool TargetFriendly = false;
     public float AlphaInFill = 0.15f;
-    public int MaxPing = 200;
     public float MinLastAbilityAdvanced = 0.1f;
 
     public SortedSet<uint> DangerousStatus { get; set; } = new SortedSet<uint>()

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -312,8 +312,7 @@ public static float DPSTaken
     public static ActionID LastGCD { get; private set; } = 0;
 
     public static ActionID LastAbility { get; private set; } = 0;
-    public static float Ping => Math.Min(Service.Config.MaxPing, LastRTT);
-    public static float LastRTT { get; set; } = 0.1f;
+    public static float Ping { get; set; } = 0.1f;
 
     public const float MinAnimationLock = 0.6f;
     public static unsafe void AddActionRec(Action act)

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -52,7 +52,6 @@
   "ConfigWindow_Param_UseOverlayWindow": "Display Top Overlay",
   "ConfigWindow_Param_UseOverlayWindowDesc": "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc.",
   "ConfigWindow_Param_Basic": "Basic",
-  "ConfigWindow_Param_MaxPing": "Set your max Ping. If it is too low, may clip.",
   "ConfigWindow_Param_ActionAhead": "Set the time advance of using actions",
   "ConfigWindow_Param_MinLastAbilityAdvanced": "Set min the time advance of using the last 0gcd.",
   "ConfigWindow_Param_CountDownAhead": "Set the time advance of using casting actions on counting down.",

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -97,7 +97,6 @@ internal partial class Strings
     public string ConfigWindow_Param_UseOverlayWindow { get; set; } = "Display Top Overlay";
     public string ConfigWindow_Param_UseOverlayWindowDesc { get; set; } = "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc.";
     public string ConfigWindow_Param_Basic { get; set; } = "Basic";
-    public string ConfigWindow_Param_MaxPing { get; set; } = "Set your max Ping. If it is too low, may clip.";
 
     public string ConfigWindow_Param_ActionAhead { get; set; } = "Set the time advance of using actions";
     public string ConfigWindow_Param_MinLastAbilityAdvanced { get; set; } = "Set min the time advance of using the last 0gcd.";

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -56,7 +56,7 @@ private unsafe void DrawStatus()
         ImGui.Text("Hostile Near Count: " + DataCenter.NumberOfHostilesInRange.ToString());
         ImGui.Text("Hostile Near Count Max Range: " + DataCenter.NumberOfHostilesInMaxRange.ToString());
         ImGui.Text("Have Companion: " + DataCenter.HasCompanion.ToString());
-        ImGui.Text("Targetable: " + Service.Player.IsTargetable().ToString());
+        ImGui.Text("Ping: " + DataCenter.Ping.ToString());
 
         foreach (var status in Service.Player.StatusList)
         {

diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -27,12 +27,6 @@ private void DrawParamTab()
 
     private void DrawParamBasic()
     {
-        DrawIntNumber(LocalizationManager.RightLang.ConfigWindow_Param_MaxPing,
-            ref Service.Config.MaxPing, Service.Default.MaxPing, min: 100, max: 500);
-
-        ImGui.SameLine();
-        ImGui.Text($"   Ping:{DataCenter.LastRTT:F3}");
-
         DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_ActionAhead,
             ref Service.Config.ActionAhead, Service.Default.ActionAhead, max: 0.5f);
 

diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
@@ -35,7 +35,7 @@ public Watcher()
     private void UpdateRTTDetour(dynamic expando)
     {
         PluginLog.LogDebug($"LastRTT:{expando.LastRTT}");
-        DataCenter.LastRTT = (long)expando.LastRTT / 1000f;
+        DataCenter.Ping = (long)expando.LastRTT / 1000f;
     }
 
     public static string ShowStrSelf { get; private set; } = string.Empty;