diff --git a/LarkatorGUI/LarkatorGUI.csproj b/LarkatorGUI/LarkatorGUI.csproj
index 4501ade..7d1fb0b 100644
--- a/LarkatorGUI/LarkatorGUI.csproj
+++ b/LarkatorGUI/LarkatorGUI.csproj
@@ -239,5 +239,8 @@
+
+
+
-
\ No newline at end of file
+
diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
index ab8bbce..c77c675 100644
--- a/LarkatorGUI/MainWindow.xaml.cs
+++ b/LarkatorGUI/MainWindow.xaml.cs
@@ -429,8 +429,7 @@ private void Dev_DummyData_Click(object sender, MouseButtonEventArgs e)
ListResults.Add(vm);
}
- var cv = (CollectionView)CollectionViewSource.GetDefaultView(ListResults);
- cv.Refresh();
+ ((CollectionViewSource)Resources["OrderedResults"]).View.Refresh();
}
private async void SaveSearch_Click(object sender, RoutedEventArgs e)
diff --git a/LarkatorGUI/calibrations.json b/LarkatorGUI/calibrations.json
index c900182..2e307ac 100644
--- a/LarkatorGUI/calibrations.json
+++ b/LarkatorGUI/calibrations.json
@@ -1,37 +1,45 @@
[
- {
- "Filename": "TheIsland",
- "OffsetX": 13.75,
- "OffsetY": 23.75,
- "ScaleX": 9.8875,
- "ScaleY": 9.625
- },
- {
- "Filename": "TheCenter",
- "OffsetX": 14.0,
- "OffsetY": 23.75,
- "ScaleX": 9.9,
- "ScaleY": 9.625
- },
- {
- "Filename": "Aberration",
- "OffsetX": 15.125,
- "OffsetY": 19.0,
- "ScaleX": 9.8875,
- "ScaleY": 9.7
- },
- {
- "Filename": "Ragnarok",
- "OffsetX": 15.125,
- "OffsetY": 18.875,
- "ScaleX": 9.8875,
- "ScaleY": 9.7125
- },
- {
- "Filename": "ScorchedEarth",
- "OffsetX": 13.875,
- "OffsetY": 21.125,
- "ScaleX": 9.9125,
- "ScaleY": 9.6875
- }
+
+ {
+ "Filename": "TheIsland",
+ "OffsetX": "17.25",
+ "OffsetY": "23.75",
+ "ScaleX": "9.575",
+ "ScaleY": "9.625"
+ },
+ {
+ "Filename": "TheCenter",
+ "OffsetX": 14.0,
+ "OffsetY": 23.75,
+ "ScaleX": 9.9,
+ "ScaleY": 9.625
+ },
+ {
+ "Filename": "Aberration",
+ "OffsetX": 15.125,
+ "OffsetY": 19.0,
+ "ScaleX": 9.8875,
+ "ScaleY": 9.7
+ },
+ {
+ "Filename": "Ragnarok",
+ "OffsetX": 15.125,
+ "OffsetY": 18.875,
+ "ScaleX": 9.8875,
+ "ScaleY": 9.7125
+ },
+ {
+ "Filename": "ScorchedEarth",
+ "OffsetX": 13.875,
+ "OffsetY": 21.125,
+ "ScaleX": 9.9125,
+ "ScaleY": 9.6875
+ },
+ {
+ "Filename": "Extinction",
+ "OffsetX": "92.375",
+ "OffsetY": "86.125",
+ "ScaleX": "8.4625",
+ "ScaleY": "8.2875"
+ }
]
\ No newline at end of file
diff --git a/LarkatorGUI/imgs/map_Extinction.jpg b/LarkatorGUI/imgs/map_Extinction.jpg
new file mode 100644
index 0000000..7895261
Binary files /dev/null and b/LarkatorGUI/imgs/map_Extinction.jpg differ