From 3b24be37d2fa4f5cf9c39a3fe7b35a4f479f2155 Mon Sep 17 00:00:00 2001 From: AllyJaxx Date: Tue, 13 May 2025 09:55:51 -0400 Subject: [PATCH] support for Cataba --- FModel/Creator/Bases/FN/BaseCommunity.cs | 9 ++++++++- FModel/Creator/Bases/FN/BaseIcon.cs | 14 +++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/FModel/Creator/Bases/FN/BaseCommunity.cs b/FModel/Creator/Bases/FN/BaseCommunity.cs index 8ac06a9d..2492426d 100644 --- a/FModel/Creator/Bases/FN/BaseCommunity.cs +++ b/FModel/Creator/Bases/FN/BaseCommunity.cs @@ -124,7 +124,14 @@ public class BaseCommunity : BaseIcon if (!bShort) return base.GetCosmeticSeason(seasonNumber); var s = seasonNumber["Cosmetics.Filter.Season.".Length..]; (int chapterIdx, int seasonIdx) = GetInternalSID(int.Parse(s)); - return $"C{chapterIdx} S{seasonIdx}"; + return s switch + { + "10" => $"C{chapterIdx} SX", + "27" => $"Fortnite: OG", + "32" => $"Fortnite: Remix", + "35" => $"C{chapterIdx} MS1", + _ => $"C{chapterIdx} S{seasonIdx}" + }; } private new void DrawBackground(SKCanvas c) diff --git a/FModel/Creator/Bases/FN/BaseIcon.cs b/FModel/Creator/Bases/FN/BaseIcon.cs index 20ed2a65..e131f358 100644 --- a/FModel/Creator/Bases/FN/BaseIcon.cs +++ b/FModel/Creator/Bases/FN/BaseIcon.cs @@ -256,19 +256,19 @@ public class BaseIcon : UCreator (int chapterIdx, int seasonIdx) = GetInternalSID(initial); var season = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "SeasonTextFormat", "Season {0}"); - var introduced = Utils.GetLocalizedResource("Fort.Cosmetics", "CosmeticItemDescription_Season", "\nIntroduced in {0}."); + var introduced = Utils.GetLocalizedResource("Fort.Cosmetics", "CosmeticItemDescription_Season", "\nIntroduced in {0}."); if (s == "10") return Utils.RemoveHtmlTags(string.Format(introduced, string.Format(season, "X"))); if (initial <= 10) return Utils.RemoveHtmlTags(string.Format(introduced, string.Format(season, s))); var chapter = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "ChapterTextFormat", "Chapter {0}"); var chapterFormat = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "ChapterSeasonTextFormat", "{0}, {1}"); - var d = string.Format(chapterFormat, string.Format(chapter, chapterIdx), string.Format(season, seasonIdx)); - return s switch - { - "27" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format("Fortnite: OG"))), - "32" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format("Fortnite: Remix"))), + var d = string.Format(chapterFormat, string.Format(chapter, chapterIdx), string.Format(season, seasonIdx)); + return s switch + { + "27" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format("Fortnite: OG"))), + "32" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format("Fortnite: Remix"))), "35" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format(chapterFormat, string.Format(chapter, chapterIdx), string.Format("MS1")))), - _ => Utils.RemoveHtmlTags(string.Format(introduced, d)) + _ => Utils.RemoveHtmlTags(string.Format(introduced, d)) }; }