FModel v4.3.2

4sval · Sep 18, 2022 · d803257 · d803257
1 parent c7f9187
commit d803257
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -5,9 +5,9 @@
  <TargetFramework>net6.0-windows</TargetFramework>
  <UseWPF>true</UseWPF>
  <ApplicationIcon>FModel.ico</ApplicationIcon>
- <Version>4.3.1</Version>
- <AssemblyVersion>4.3.1.0</AssemblyVersion>
- <FileVersion>4.3.1.0</FileVersion>
+ <Version>4.3.2</Version>
+ <AssemblyVersion>4.3.2.0</AssemblyVersion>
+ <FileVersion>4.3.2.0</FileVersion>
  <IsPackable>false</IsPackable>
  <IsPublishable>true</IsPublishable>
  <RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs
@@ -295,7 +295,7 @@ public IDictionary<FGame, string> Presets
  private IDictionary<FGame, EGame> _overridedGame = new Dictionary<FGame, EGame>
  {
  {FGame.Unknown, EGame.GAME_UE4_LATEST},
- {FGame.FortniteGame, EGame.GAME_UE5_LATEST},
+ {FGame.FortniteGame, EGame.GAME_UE5_1},
  {FGame.ShooterGame, EGame.GAME_Valorant},
  {FGame.DeadByDaylight, EGame.GAME_UE4_LATEST},
  {FGame.OakGame, EGame.GAME_Borderlands3},

diff --git a/FModel/ViewModels/MapViewerViewModel.cs b/FModel/ViewModels/MapViewerViewModel.cs
@@ -175,7 +175,7 @@ public BitmapImage LayerImage
  }
 
  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 @@ await _threadWorkerView.Begin(_ =>
  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 @@ await _threadWorkerView.Begin(_ =>
  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
@@ -210,13 +210,11 @@
  <CheckBox Grid.Row="14" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
  IsChecked="{Binding KeepDirectoryStructure, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Margin="0 5 0 10"/>
 
- <TextBlock Grid.Row="15" Grid.Column="0" Text="Overwrite Mapping File" VerticalAlignment="Center" Margin="0 0 0 5"
- DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}"
- Visibility="{Binding SettingsView.MappingEndpoint.IsValid, Converter={StaticResource BoolToVisibilityConverter}}" />
+ <TextBlock Grid.Row="15" Grid.Column="0" Text="Local Mapping File" VerticalAlignment="Center" Margin="0 0 0 5"
+ DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" />
  <CheckBox Grid.Row="15" Grid.Column="2" Margin="0 5 0 10"
  DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}"
  Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
- Visibility="{Binding SettingsView.MappingEndpoint.IsValid, Converter={StaticResource BoolToVisibilityConverter}}"
  IsChecked="{Binding SettingsView.MappingEndpoint.Overwrite, Mode=TwoWay}" />
 
  <TextBlock Grid.Row="16" Grid.Column="0" Text="Mapping File Path" VerticalAlignment="Center" Margin="0 0 0 5"