Skip to content

Commit

Permalink
Support Extinction
Browse files Browse the repository at this point in the history
Coordinate calibration had to be eyeballed for Extinction.
Improved TheIsland calibration.

Calibrations were off because the grid in the map images are actually incorrectly placed. These new calibrations match the visual locations on the map, not the grid. This produces a better result.
  • Loading branch information
coldino committed Nov 11, 2018
1 parent 84ba9fc commit 0b396f0
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 38 deletions.
5 changes: 4 additions & 1 deletion LarkatorGUI/LarkatorGUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -239,5 +239,8 @@
<Resource Include="imgs\map_TheCenter.jpg" />
<Resource Include="imgs\map_TheIsland.jpg" />
</ItemGroup>
<ItemGroup>
<Resource Include="imgs\map_Extinction.jpg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
3 changes: 1 addition & 2 deletions LarkatorGUI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
78 changes: 43 additions & 35 deletions LarkatorGUI/calibrations.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
Binary file added LarkatorGUI/imgs/map_Extinction.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0b396f0

Please sign in to comment.