Merge pull request #15 from oneeyeddeacon/master

Update Knight Routes. Make 240% counter out of 240% instead of 100%. Fix bug with Origins Crimes.
ShikenNuggets · Aug 17, 2020 · 7934d7f · 7934d7f
2 parents d64add7 + faf751f
commit 7934d7f
Show file tree

Hide file tree

Showing 7 changed files with 883 additions and 871 deletions.
diff --git a/ArkhamDisplay/BaseWindow.cs b/ArkhamDisplay/BaseWindow.cs
@@ -18,13 +18,13 @@ public abstract class BaseWindow : Window{
 
 		protected string currentRoute = "";
 		protected string currentSecondaryRoute = "";
+		protected TextBlock progressCounter;
+		protected TextBlock riddleCounter;
 
 		private Button stopButton;
 		private Button startButton;
 		private Grid displayGrid;
 		private ScrollViewer gridScroll;
-		private TextBlock progressCounter;
-		private TextBlock riddleCounter;
 		private MenuItem asylumMenuItem;
 		private MenuItem cityMenuItem;
 		private MenuItem originsMenuItem;
@@ -312,7 +312,10 @@ protected virtual void UpdateRouteWindow(){
 				int scrollHeight = (firstNotDone - 4) * (ROW_HEIGHT);
 				gridScroll.ScrollToVerticalOffset(scrollHeight);
 			}
-
+			UpdatePercent(doneEntries, totalEntries);
+		}
+		protected virtual void UpdatePercent(int doneEntries, int totalEntries)
+		{
 			double percentDone = 100.0 * doneEntries / totalEntries;
 			progressCounter.Text = string.Format("{0:0.0}", percentDone) + "%";
 			riddleCounter.Text = UpdateRiddleCount();

diff --git a/ArkhamDisplay/KnightWindow.xaml.cs b/ArkhamDisplay/KnightWindow.xaml.cs
@@ -69,5 +69,20 @@ protected override void UpdatePreferences(object sender = null, RoutedEventArgs
 
 			base.UpdatePreferences(sender, e);
 		}
+
+		protected override void UpdatePercent(int doneEntries, int totalEntries)
+		{
+			double percentDone = 100.0 * doneEntries / totalEntries;
+			if (TwoFortyPercentMenuItem.IsChecked)
+			{
+				percentDone = 1.2 * percentDone;
+				if ("KnightNG+120".Equals(currentRoute))
+				{
+					percentDone += 120.0;
+				}
+			}
+			progressCounter.Text = string.Format("{0:0.0}", percentDone) + "%";
+			riddleCounter.Text = UpdateRiddleCount();
+		}
 	}
 }
diff --git a/ArkhamDisplay/Routes/Knight-120.tsv b/ArkhamDisplay/Routes/Knight-120.tsv
diff --git a/ArkhamDisplay/Routes/Knight-NGPlus.tsv b/ArkhamDisplay/Routes/Knight-NGPlus.tsv
diff --git a/ArkhamDisplay/Routes/Knight-NGPlus120.tsv b/ArkhamDisplay/Routes/Knight-NGPlus120.tsv
diff --git a/ArkhamDisplay/Routes/Knight.tsv b/ArkhamDisplay/Routes/Knight.tsv
diff --git a/ArkhamDisplay/Routes/routes.json b/ArkhamDisplay/Routes/routes.json
@@ -4,7 +4,7 @@
   "CityCatwoman": "Routes/City-Catwoman.tsv",
   "CityPrisoners": "Routes/City-Prisoners.tsv",
   "OriginsDefault": "Routes/Origins.tsv",
-  "OriginsCrime": "Routes/OriginsCrime.tsv",
+  "OriginsCrime": "Routes/Origins-Crimes.tsv",
   "KnightDefault": "Routes/Knight.tsv",
   "KnightNG+": "Routes/Knight-NGPlus.tsv",
   "KnightFirstEnding": "Routes/Knight-FirstEnding.tsv",