From 20cbd60604c525ee088b4976e7bdaabb35eefb1e Mon Sep 17 00:00:00 2001 From: liqMix Date: Tue, 1 Apr 2025 23:10:55 -0600 Subject: [PATCH] finish adjustment from header+footer -> signage --- Extras/Offgeki/MU3.Mod/State.cs | 9 +++------ Extras/Offgeki/MU3.Sequence/patch_PlayMusic.cs | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Extras/Offgeki/MU3.Mod/State.cs b/Extras/Offgeki/MU3.Mod/State.cs index 581ccc8..ccb8917 100644 --- a/Extras/Offgeki/MU3.Mod/State.cs +++ b/Extras/Offgeki/MU3.Mod/State.cs @@ -5,8 +5,7 @@ namespace MU3.Mod; class State: Singleton { public bool RemoveBackground { get; set; } = false; public bool RemoveBackgroundFrame { get; set; } = false; - public bool RemoveHeader { get; set; } = false; - public bool RemoveFooter { get; set; } = false; + public bool RemoveSignage{ get; set; } = false; public bool RemovePlayerHealthUI { get; set; } = false; @@ -62,8 +61,7 @@ class State: Singleton { using IniFile ini = new("mu3.ini"); RemoveBackground = getValue(ini, "RemoveBackground"); RemoveBackgroundFrame = getValue(ini, "RemoveBackgroundFrame"); - RemoveHeader = getValue(ini, "RemoveHeader"); - RemoveFooter = getValue(ini, "RemoveFooter"); + RemoveSignage = getValue(ini, "RemoveSignage"); RemovePlayerHealthUI = getValue(ini, "RemovePlayerHealthUI"); RemovePlayerBattleScoreUI = getValue(ini, "RemovePlayerBattleScoreUI"); RemovePlayerScoreUI = getValue(ini, "RemovePlayerScoreUI"); @@ -89,8 +87,7 @@ class State: Singleton { return "State: \n" + "\tRemove Background: " + RemoveBackground + "\n" + "\tRemove Background Frame: " + RemoveBackgroundFrame + "\n" - + "\tRemove Header: " + RemoveHeader + "\n" - + "\tRemove Footer: " + RemoveFooter + "\n" + + "\tRemove Signage: " + RemoveSignage + "\n" + "\tRemove Player Health UI: " + RemovePlayerHealthUI + "\n" + "\tRemove Player Battle Score UI: " + RemovePlayerBattleScoreUI + "\n" + "\tRemove Player Score UI: " + RemovePlayerScoreUI + "\n" diff --git a/Extras/Offgeki/MU3.Sequence/patch_PlayMusic.cs b/Extras/Offgeki/MU3.Sequence/patch_PlayMusic.cs index 354949a..ded3fb9 100644 --- a/Extras/Offgeki/MU3.Sequence/patch_PlayMusic.cs +++ b/Extras/Offgeki/MU3.Sequence/patch_PlayMusic.cs @@ -59,15 +59,12 @@ class patch_PlayMusic : PlayMusic disableCanvases.Add("Canvas_P_FadeOut"); } - if (state.RemoveHeader) - { - disableCanvases.Add("Canvas_P_UserData"); - disableCanvases.Add("Canvas_P_Signage"); - } - if (state.RemoveFooter) + if (state.RemoveSignage) { disableCanvases = [ ..disableCanvases, + "Canvas_P_UserData", + "Canvas_P_Signage", "Canvas_P_SystemButton", "Canvas_P_ButtonGuide", "Canvas_P_Credit"