diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 6b73bd07..91524b53 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -5,9 +5,9 @@ net6.0-windows true FModel.ico - 4.3.1 - 4.3.1.0 - 4.3.1.0 + 4.3.2 + 4.3.2.0 + 4.3.2.0 false true win-x64 diff --git a/FModel/ViewModels/MapViewerViewModel.cs b/FModel/ViewModels/MapViewerViewModel.cs index 1026d68d..6e8fa65d 100644 --- a/FModel/ViewModels/MapViewerViewModel.cs +++ b/FModel/ViewModels/MapViewerViewModel.cs @@ -175,7 +175,7 @@ public class MapViewerViewModel : ViewModel } private const int _widthHeight = 2048; - private const int _brRadius = 135000; + private const int _brRadius = 131000; private const int _prRadius = 51000; private int _mapIndex; public int MapIndex // 0 is BR, 1 is PR @@ -471,7 +471,7 @@ public class MapViewerViewModel : ViewModel var patrolsPathBitmap = new SKBitmap(_widthHeight, _widthHeight, SKColorType.Rgba8888, SKAlphaType.Premul); using var c = new SKCanvas(patrolsPathBitmap); - var exports = Utils.LoadExports("/NPCLibrary/LevelOverlays/Artemis_Overlay_S21_NPCLibrary"); + var exports = Utils.LoadExports("/NPCLibrary/LevelOverlays/Artemis_Overlay_S22_NPCLibrary"); foreach (var export in exports) { if (!export.ExportType.Equals("FortAthenaPatrolPath", StringComparison.OrdinalIgnoreCase) || @@ -822,7 +822,7 @@ public class MapViewerViewModel : ViewModel var bountyBoardsBitmap = new SKBitmap(_widthHeight, _widthHeight, SKColorType.Rgba8888, SKAlphaType.Premul); using var c = new SKCanvas(bountyBoardsBitmap); - var exports = Utils.LoadExports("/Bounties/Maps/BB_Overlay_S19_ServiceStations"); + var exports = Utils.LoadExports("/Bounties/Maps/BB_Overlay_ServiceStations"); foreach (var export in exports) { if (!export.ExportType.Equals("B_Bounties_Spawner_BountyBoard_C", StringComparison.OrdinalIgnoreCase)) continue; diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml index fd3b2703..77f2202e 100644 --- a/FModel/Views/SettingsView.xaml +++ b/FModel/Views/SettingsView.xaml @@ -210,13 +210,11 @@ - +