fixes

4sval · Aug 26, 2023 · 53bfbed · 53bfbed
1 parent ee9f3fe
commit 53bfbed
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 1,112 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/Creator/Bases/FN/BaseIconStats.cs b/FModel/Creator/Bases/FN/BaseIconStats.cs
@@ -52,7 +52,7 @@ public override void ParseForInfo()
  foreach (var poi in challengeMapPoiData)
  {
  if (!poi.TryGetValue(out FStructFallback locationTag, "LocationTag") || !locationTag.TryGetValue(out FName tagName, "TagName") ||
- !tagName.Text.Equals(location.Text, StringComparison.OrdinalIgnoreCase) || !poi.TryGetValue(out FText text, "Text")) continue;
+ tagName != location.TagName || !poi.TryGetValue(out FText text, "Text")) continue;
 
  locationName = text.Text;
  break;
@@ -92,7 +92,11 @@ public override void ParseForInfo()
  _statistics.Add(new IconStat(Utils.GetLocalizedResource("", "35D04D1B45737BEA25B69686D9E085B9", "Damage"), dmgPb * multiplier, 200));
  }
 
- if (weaponRowValue.TryGetValue(out float dmgCritical, "DamageZone_Critical"))
+ if (weaponRowValue.TryGetValue(out float mdpc, "MaxDamagePerCartridge") && mdpc >= 0f)
+ {
+ _statistics.Add(new IconStat(Utils.GetLocalizedResource("", "0DEF2455463B008C4499FEA03D149EDF", "Headshot Damage"), mdpc, 200));
+ }
+ else if (weaponRowValue.TryGetValue(out float dmgCritical, "DamageZone_Critical"))
  {
  _statistics.Add(new IconStat(Utils.GetLocalizedResource("", "0DEF2455463B008C4499FEA03D149EDF", "Headshot Damage"), dmgPb * dmgCritical * multiplier, 200));
  }

diff --git a/FModel/Creator/Typefaces.cs b/FModel/Creator/Typefaces.cs
@@ -21,7 +21,6 @@ public class Typefaces
  private const string _BURBANK_BIG_REGULAR_BOLD = "BurbankBigRegular-Bold"; // official fortnite ig
  private const string _BURBANK_SMALL_MEDIUM = "BurbankSmall-Medium";
  private const string _DROID_SANS_FORTNITE_SUBSET = "DroidSans-Fortnite-Subset";
- private const string _NIS_JYAU = "NIS_JYAU"; // japanese fortnite
  private const string _NOTO_COLOR_EMOJI = "NotoColorEmoji";
  private const string _NOTO_SANS_BOLD = "NotoSans-Bold";
  private const string _NOTO_SANS_FORTNITE_BOLD = "NotoSans-Fortnite-Bold";
@@ -32,7 +31,7 @@ public class Typefaces
  private const string _NOTO_SANS_ARABIC_BLACK = "NotoSansArabic-Black"; // arabic fortnite
  private const string _NOTO_SANS_ARABIC_BOLD = "NotoSansArabic-Bold";
  private const string _NOTO_SANS_ARABIC_REGULAR = "NotoSansArabic-Regular";
- private const string _NOTO_SANS_JP_BOLD = "NotoSansJP-Bold";
+ private const string _NOTO_SANS_JP_BOLD = "NotoSansJP-Bold"; // japanese fortnite
  private const string _NOTO_SANS_KR_REGULAR = "NotoSansKR-Regular";
  private const string _NOTO_SANS_SC_BLACK = "NotoSansSC-Black"; // simplified chinese fortnite
  private const string _NOTO_SANS_SC_REGULAR = "NotoSansSC-Regular";
@@ -77,7 +76,7 @@ public Typefaces(CUE4ParseViewModel viewModel)
  {
  ELanguage.Korean => _ASIA_ERINM,
  ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK,
- ELanguage.Japanese => _NIS_JYAU,
+ ELanguage.Japanese => _NOTO_SANS_JP_BOLD,
  ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK,
  ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK,
  ELanguage.Chinese => _NOTO_SANS_SC_BLACK,
@@ -113,7 +112,7 @@ public Typefaces(CUE4ParseViewModel viewModel)
  {
  ELanguage.Korean => _ASIA_ERINM,
  ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK,
- ELanguage.Japanese => _NIS_JYAU,
+ ELanguage.Japanese => _NOTO_SANS_JP_BOLD,
  ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK,
  ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK,
  ELanguage.Chinese => _NOTO_SANS_SC_BLACK,
@@ -125,7 +124,7 @@ public Typefaces(CUE4ParseViewModel viewModel)
  {
  ELanguage.Korean => _ASIA_ERINM,
  ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK,
- ELanguage.Japanese => _NIS_JYAU,
+ ELanguage.Japanese => _NOTO_SANS_JP_BOLD,
  ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK,
  ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK,
  ELanguage.Chinese => _NOTO_SANS_SC_BLACK,
@@ -136,7 +135,7 @@ public Typefaces(CUE4ParseViewModel viewModel)
  language switch
  {
  ELanguage.Korean => _ASIA_ERINM,
- ELanguage.Japanese => _NIS_JYAU,
+ ELanguage.Japanese => _NOTO_SANS_JP_BOLD,
  ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK,
  ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK,
  ELanguage.Chinese => _NOTO_SANS_SC_BLACK,
@@ -147,7 +146,7 @@ public Typefaces(CUE4ParseViewModel viewModel)
  language switch
  {
  ELanguage.Korean => _ASIA_ERINM,
- ELanguage.Japanese => _NIS_JYAU,
+ ELanguage.Japanese => _NOTO_SANS_JP_BOLD,
  ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK,
  ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK,
  ELanguage.Chinese => _NOTO_SANS_SC_BLACK,

diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
@@ -126,25 +126,6 @@
  </Viewbox>
  </MenuItem.Icon>
  </MenuItem>
- <!-- <MenuItem Header="Map Viewer" Command="{Binding MenuCommand}" CommandParameter="Views_MapViewer" IsEnabled="{Binding Status.IsReady}"> -->
- <!-- <MenuItem.Icon> -->
- <!-- <Viewbox Width="16" Height="16"> -->
- <!-- <Canvas Width="24" Height="24"> -->
- <!-- <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.AccentForegroundBrush}}" Data="{StaticResource MapIcon}" /> -->
- <!-- </Canvas> -->
- <!-- </Viewbox> -->
- <!-- </MenuItem.Icon> -->
- <!-- <MenuItem.Style> -->
- <!-- <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Type MenuItem}}"> -->
- <!-- <Setter Property="Visibility" Value="Collapsed"/> -->
- <!-- <Style.Triggers> -->
- <!-- <DataTrigger Binding="{Binding CUE4Parse.InternalGameName, Converter={x:Static converters:CaseInsensitiveStringEqualsConverter.Instance}, ConverterParameter='FortniteGame'}" Value="True"> -->
- <!-- <Setter Property="Visibility" Value="Visible" /> -->
- <!-- </DataTrigger> -->
- <!-- </Style.Triggers> -->
- <!-- </Style> -->
- <!-- </MenuItem.Style> -->
- <!-- </MenuItem> -->
  <MenuItem Header="Image Merger" Command="{Binding MenuCommand}" CommandParameter="Views_ImageMerger">
  <MenuItem.Icon>
  <Viewbox Width="16" Height="16">

diff --git a/FModel/ViewModels/Commands/MenuCommand.cs b/FModel/ViewModels/Commands/MenuCommand.cs
@@ -42,9 +42,6 @@ public override async void Execute(ApplicationViewModel contextViewModel, object
  case "Views_AudioPlayer":
  Helper.OpenWindow<AdonisWindow>("Audio Player", () => new AudioPlayer().Show());
  break;
- case "Views_MapViewer":
- Helper.OpenWindow<AdonisWindow>("Map Viewer", () => new MapViewer().Show());
- break;
  case "Views_ImageMerger":
  Helper.OpenWindow<AdonisWindow>("Image Merger", () => new ImageMerger().Show());
  break;