diff --git a/CUE4Parse b/CUE4Parse index 72eaf410..ce5c0258 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit 72eaf4101268bd971281f3cd8769a57be90caedb +Subproject commit ce5c025816979b5fa05d09a780787ecd70465354 diff --git a/FModel/Creator/Typefaces.cs b/FModel/Creator/Typefaces.cs index 32464916..7aa65581 100644 --- a/FModel/Creator/Typefaces.cs +++ b/FModel/Creator/Typefaces.cs @@ -71,87 +71,95 @@ public class Typefaces { case "FORTNITEGAME": { - DisplayName = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => _ASIA_ERINM, - ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK, - ELanguage.Japanese => _NOTO_SANS_JP_BOLD, - ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, - ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, - ELanguage.Chinese => _NOTO_SANS_SC_BLACK, - _ => string.Empty - } + _EXT); - - Description = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => _NOTO_SANS_KR_REGULAR, - ELanguage.Japanese => _NOTO_SANS_JP_BOLD, - ELanguage.Arabic => _NOTO_SANS_ARABIC_REGULAR, - ELanguage.TraditionalChinese => _NOTO_SANS_TC_REGULAR, - ELanguage.Chinese => _NOTO_SANS_SC_REGULAR, - _ => _NOTO_SANS_REGULAR - } + _EXT); - - Bottom = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => string.Empty, - ELanguage.Japanese => string.Empty, - ELanguage.Arabic => string.Empty, - ELanguage.TraditionalChinese => string.Empty, - ELanguage.Chinese => string.Empty, - _ => _BURBANK_SMALL_BOLD - } + _EXT, true); - - BundleNumber = OnTheFly(_FORTNITE_BASE_PATH + _BURBANK_BIG_CONDENSED_BLACK + _EXT); - - Bundle = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => _ASIA_ERINM, - ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK, - ELanguage.Japanese => _NOTO_SANS_JP_BOLD, - ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, - ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, - ELanguage.Chinese => _NOTO_SANS_SC_BLACK, - _ => string.Empty - } + _EXT, true) ?? BundleNumber; - - TandemDisplayName = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => _ASIA_ERINM, - ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK, - ELanguage.Japanese => _NOTO_SANS_JP_BOLD, - ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, - ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, - ELanguage.Chinese => _NOTO_SANS_SC_BLACK, - _ => _BURBANK_BIG_REGULAR_BLACK - } + _EXT); - - TandemGenDescription = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => _ASIA_ERINM, - ELanguage.Japanese => _NOTO_SANS_JP_BOLD, - ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, - ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, - ELanguage.Chinese => _NOTO_SANS_SC_BLACK, - _ => _BURBANK_SMALL_BLACK - } + _EXT); - - TandemAddDescription = OnTheFly(_FORTNITE_BASE_PATH + - language switch - { - ELanguage.Korean => _ASIA_ERINM, - ELanguage.Japanese => _NOTO_SANS_JP_BOLD, - ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, - ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, - ELanguage.Chinese => _NOTO_SANS_SC_BLACK, - _ => _BURBANK_SMALL_BOLD - } + _EXT); + DisplayName = Default; + Description = Default; + Bottom = Default; + BundleNumber = Default; + Bundle = Default; + TandemDisplayName = Default; + TandemGenDescription = Default; + TandemAddDescription = Default; + // DisplayName = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => _ASIA_ERINM, + // ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK, + // ELanguage.Japanese => _NOTO_SANS_JP_BOLD, + // ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, + // ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, + // ELanguage.Chinese => _NOTO_SANS_SC_BLACK, + // _ => string.Empty + // } + _EXT); + // + // Description = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => _NOTO_SANS_KR_REGULAR, + // ELanguage.Japanese => _NOTO_SANS_JP_BOLD, + // ELanguage.Arabic => _NOTO_SANS_ARABIC_REGULAR, + // ELanguage.TraditionalChinese => _NOTO_SANS_TC_REGULAR, + // ELanguage.Chinese => _NOTO_SANS_SC_REGULAR, + // _ => _NOTO_SANS_REGULAR + // } + _EXT); + // + // Bottom = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => string.Empty, + // ELanguage.Japanese => string.Empty, + // ELanguage.Arabic => string.Empty, + // ELanguage.TraditionalChinese => string.Empty, + // ELanguage.Chinese => string.Empty, + // _ => _BURBANK_SMALL_BOLD + // } + _EXT, true); + // + // BundleNumber = OnTheFly(_FORTNITE_BASE_PATH + _BURBANK_BIG_CONDENSED_BLACK + _EXT); + // + // Bundle = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => _ASIA_ERINM, + // ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK, + // ELanguage.Japanese => _NOTO_SANS_JP_BOLD, + // ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, + // ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, + // ELanguage.Chinese => _NOTO_SANS_SC_BLACK, + // _ => string.Empty + // } + _EXT, true) ?? BundleNumber; + // + // TandemDisplayName = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => _ASIA_ERINM, + // ELanguage.Russian => _BURBANK_BIG_CONDENSED_BLACK, + // ELanguage.Japanese => _NOTO_SANS_JP_BOLD, + // ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, + // ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, + // ELanguage.Chinese => _NOTO_SANS_SC_BLACK, + // _ => _BURBANK_BIG_REGULAR_BLACK + // } + _EXT); + // + // TandemGenDescription = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => _ASIA_ERINM, + // ELanguage.Japanese => _NOTO_SANS_JP_BOLD, + // ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, + // ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, + // ELanguage.Chinese => _NOTO_SANS_SC_BLACK, + // _ => _BURBANK_SMALL_BLACK + // } + _EXT); + // + // TandemAddDescription = OnTheFly(_FORTNITE_BASE_PATH + + // language switch + // { + // ELanguage.Korean => _ASIA_ERINM, + // ELanguage.Japanese => _NOTO_SANS_JP_BOLD, + // ELanguage.Arabic => _NOTO_SANS_ARABIC_BLACK, + // ELanguage.TraditionalChinese => _NOTO_SANS_TC_BLACK, + // ELanguage.Chinese => _NOTO_SANS_SC_BLACK, + // _ => _BURBANK_SMALL_BOLD + // } + _EXT); break; } case "MULTIVERSUS":