change back to old method of getting remainingJumpsInRoute

Author: mhwlng

Elite/Buttons/Hyperspace.cs

@@ -171,9 +171,9 @@ private async Task HandleDisplay()
 
             if (_primaryImage != null)
             {
-                var remainingJumpsInRoute = EliteData.RouteList?.Count ?? 0;
+                var remainingJumpsInRoute = /*EliteData.RouteList?.Count ?? 0;*/ EliteData.RemainingJumpsInRoute;
 
-                if (!bitmapImageIsGif && settings.Function != "SUPERCRUISE" && /*EliteData.StarSystem != EliteData.FsdTargetName &&*/ remainingJumpsInRoute > 0  && textHtmlColor != "#ff00ff")
+                if (!bitmapImageIsGif && settings.Function != "SUPERCRUISE" && EliteData.StarSystem != EliteData.FsdTargetName && remainingJumpsInRoute > 0  && textHtmlColor != "#ff00ff")
                 {
                     try
                     {

Elite/Buttons/Route.cs

@@ -83,7 +83,7 @@ private async Task HandleDisplay()
             var textBrush = _primaryBrush;
             var textHtmlColor = settings.PrimaryColor;
 
-            var remainingJumpsInRoute = EliteData.RouteList?.Count ?? 0;
+            var remainingJumpsInRoute = /*EliteData.RouteList?.Count ?? 0*/ EliteData.RemainingJumpsInRoute;
 
 
             var isDisabled = remainingJumpsInRoute == 0;
@@ -100,7 +100,7 @@ private async Task HandleDisplay()
 
             if (_primaryImage != null)
             {
-                if (!bitmapImageIsGif && /*EliteData.StarSystem != EliteData.FsdTargetName &&*/ remainingJumpsInRoute > 0  && textHtmlColor != "#ff00ff")
+                if (!bitmapImageIsGif && EliteData.StarSystem != EliteData.FsdTargetName && remainingJumpsInRoute > 0  && textHtmlColor != "#ff00ff")
                 {
                     try
                     {
@@ -191,7 +191,7 @@ public override void KeyPressed(KeyPayload payload)
 
             StreamDeckCommon.ForceStop = false;
 
-            var remainingJumpsInRoute = EliteData.RouteList?.Count ?? 0;
+            var remainingJumpsInRoute = /*EliteData.RouteList?.Count ?? 0*/ EliteData.RemainingJumpsInRoute;
 
             var isDisabled = remainingJumpsInRoute == 0;
 

Elite/EliteData.cs

@@ -12,9 +12,9 @@ public class EliteData
 
         public static bool UnderAttack = false;
         public static DateTime LastUnderAttackEvent = DateTime.Now;
-        //public static string FsdTargetName { get; set; }
-        //public static int RemainingJumpsInRoute { get; set; }
-        //public static string StarClass { get; set; }
+        public static string FsdTargetName { get; set; }
+        public static int RemainingJumpsInRoute { get; set; }
+        public static string StarClass { get; set; }
         public static string StarSystem { get; set; }
 
         public static List<RouteItem> RouteList = new List<RouteItem>();
@@ -276,13 +276,13 @@ public static void HandleEliteEvents(object sender, JournalEventArgs e)
 
                 case "FSDTarget":
                     //When written: when selecting a star system to jump to
-                    //var fsdTargetInfo = (FSDTargetEvent.FSDTargetEventArgs)e;
+                    var fsdTargetInfo = (FSDTargetEvent.FSDTargetEventArgs)e;
 
-                    //EliteData.FsdTargetName = fsdTargetInfo.Name;
+                    EliteData.FsdTargetName = fsdTargetInfo.Name;
 
-                    //EliteData.RemainingJumpsInRoute = fsdTargetInfo.RemainingJumpsInRoute;
+                    EliteData.RemainingJumpsInRoute = fsdTargetInfo.RemainingJumpsInRoute;
 
-                    //EliteData.StarClass = fsdTargetInfo.StarClass;
+                    EliteData.StarClass = fsdTargetInfo.StarClass;
 
                     break;
 
@@ -330,6 +330,7 @@ public static void HandleEliteEvents(object sender, JournalEventArgs e)
                 case "NavRouteClear":
 
                     EliteData.RouteList = new List<RouteItem>();
+                    EliteData.RemainingJumpsInRoute = 0;
 
                     break;
 

Elite/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.2.0")]
-[assembly: AssemblyFileVersion("2.7.2.0")]
+[assembly: AssemblyVersion("2.7.3.0")]
+[assembly: AssemblyFileVersion("2.7.3.0")]

Elite/manifest.json

@@ -192,7 +192,7 @@
   "Name": "Elite Dangerous",
   "Icon": "Images/pluginIcon",
   "URL": "https://github.com/mhwlng/streamdeck-elite",
-  "Version": "2.7.2",
+  "Version": "2.7.3",
   "CodePath": "com.mhwlng.elite",
   "Category": "Elite Dangerous",
   "CategoryIcon": "Images/categoryIcon",