From 9d9e5542262129cbea3a81e9bbccdc07b5e1fe5e Mon Sep 17 00:00:00 2001 From: Awesomeangotti Date: Sun, 26 Apr 2026 11:55:31 -0400 Subject: [PATCH] This works*. Make splash consistent across appearences. --- ...artupTextHelper.cs => SplashTextHelper.cs} | 20 ++++++++++++++++--- src/Ryujinx/Program.cs | 2 +- src/Ryujinx/UI/RyujinxApp.axaml.cs | 4 ++-- .../UI/ViewModels/MainWindowViewModel.cs | 3 ++- 4 files changed, 22 insertions(+), 7 deletions(-) rename src/Ryujinx/Common/{StartupTextHelper.cs => SplashTextHelper.cs} (87%) diff --git a/src/Ryujinx/Common/StartupTextHelper.cs b/src/Ryujinx/Common/SplashTextHelper.cs similarity index 87% rename from src/Ryujinx/Common/StartupTextHelper.cs rename to src/Ryujinx/Common/SplashTextHelper.cs index c36eff081..37fe5ada1 100644 --- a/src/Ryujinx/Common/StartupTextHelper.cs +++ b/src/Ryujinx/Common/SplashTextHelper.cs @@ -5,7 +5,7 @@ using Gommon; namespace Ryujinx.Common { // My code is crappy and I know it. Props to VewDev for assisting me in these shenanigans. - Awesomeangotti - public class StartupTextHelper + public class SplashTextHelper { public static void PrintSplash() { @@ -16,12 +16,24 @@ namespace Ryujinx.Common Logger.Notice.Print(LogClass.Application, " /___/ /___/ "); Logger.Notice.Print(LogClass.Application, ""); - Logger.Notice.Print(LogClass.Application, MainSplashes.GetRandomElement()); + Logger.Notice.Print(LogClass.Application, GetSplash()); Logger.Notice.Print(LogClass.Application, ""); } + + private static string _Final_Splash = ""; + + public static string GetSplash() + { + if (string.IsNullOrEmpty(_Final_Splash)) + { + _Final_Splash = _Main_Splashes.GetRandomElement(); + } + + return _Final_Splash; + } // This list contains all splashes. Additions are welcome to this list : ) - Awesomeangotti - public static List MainSplashes = new() + private static List _Main_Splashes = new() { "Ryubing is my middle name", "Giving it 110 percent!", @@ -81,8 +93,10 @@ namespace Ryujinx.Common ":3", "Please connect a controller!", "Never gonna give you up!", + "The game was rigged from the start", }; + } } diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs index 9b0f5830b..5011cd664 100644 --- a/src/Ryujinx/Program.cs +++ b/src/Ryujinx/Program.cs @@ -438,7 +438,7 @@ namespace Ryujinx.Ava internal static void PrintSystemInfo() { // Print the ryubing logo + joke splash - StartupTextHelper.PrintSplash(); + SplashTextHelper.PrintSplash(); Logger.Notice.Print(LogClass.Application, $"{RyujinxApp.FullAppName} Version: {Version}"); Logger.Notice.Print(LogClass.Application, $".NET Runtime: {RuntimeInformation.FrameworkDescription}"); diff --git a/src/Ryujinx/UI/RyujinxApp.axaml.cs b/src/Ryujinx/UI/RyujinxApp.axaml.cs index 885338250..7d01c9a3d 100644 --- a/src/Ryujinx/UI/RyujinxApp.axaml.cs +++ b/src/Ryujinx/UI/RyujinxApp.axaml.cs @@ -28,8 +28,8 @@ namespace Ryujinx.Ava internal static string FormatTitle(LocaleKeys? windowTitleKey = null, bool includeVersion = true) => windowTitleKey is null - ? $"{FullAppName}{(includeVersion ? $" {Program.Version}" : string.Empty)} - {StartupTextHelper.MainSplashes.GetRandomElement()}" - : $"{FullAppName}{(includeVersion ? $" {Program.Version}" : string.Empty)} - {LocaleManager.Instance[windowTitleKey.Value]} - {StartupTextHelper.MainSplashes.GetRandomElement()}"; + ? $"{FullAppName}{(includeVersion ? $" {Program.Version}" : string.Empty)} - {SplashTextHelper.GetSplash()}" + : $"{FullAppName}{(includeVersion ? $" {Program.Version}" : string.Empty)} - {LocaleManager.Instance[windowTitleKey.Value]} - {SplashTextHelper.GetSplash}"; public static readonly string FullAppName = string.Intern(ReleaseInformation.IsCanaryBuild ? "Ryujinx Canary" : "Ryujinx"); diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 0531fab9c..6d1e5be09 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -1198,7 +1198,8 @@ namespace Ryujinx.Ava.UI.ViewModels { case ShaderCacheLoadingState.Start: case ShaderCacheLoadingState.Loading: - LoadHeading = LocaleManager.Instance[LocaleKeys.CompilingShaders]; + //LoadHeading = LocaleManager.Instance[LocaleKeys.CompilingShaders]; This is the original line. Leaving it here until done. + LoadHeading = $"{LocaleManager.Instance[LocaleKeys.CompilingShaders]} - {SplashTextHelper.GetSplash()}"; IsLoadingIndeterminate = false; break; case ShaderCacheLoadingState.Packaging: