From c75fbbc66adc9f3215997d88695a501b0ca78927 Mon Sep 17 00:00:00 2001 From: akanyan Date: Thu, 9 Jan 2025 23:25:33 +0000 Subject: [PATCH] feat(AttractVideoPlayer): skip on L1 --- .../MU3.Sequence/patch_Advertise.cs | 12 ++++++------ .../AttractVideoPlayer/MU3/patch_AdvManager.cs | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Enhancements/AttractVideoPlayer/MU3.Sequence/patch_Advertise.cs b/Enhancements/AttractVideoPlayer/MU3.Sequence/patch_Advertise.cs index 5b13bcf..e95074d 100644 --- a/Enhancements/AttractVideoPlayer/MU3.Sequence/patch_Advertise.cs +++ b/Enhancements/AttractVideoPlayer/MU3.Sequence/patch_Advertise.cs @@ -3,14 +3,14 @@ namespace MU3.Sequence; class patch_Advertise: Advertise { - // Exclude Back/Left/Right + // Exclude a bunch of keys private bool anyKeyDown() { UIInput instance = Singleton.instance; - if(instance.getTriggerOn(UIInput.Key.Decision) - || instance.getTriggerOn(UIInput.Key.OptionBackward) - || instance.getTriggerOn(UIInput.Key.OptionForward) - || instance.getTriggerOn(UIInput.Key.SkipLeft) - || instance.getTriggerOn(UIInput.Key.SkipRight) + if(instance.getTriggerOn(UIInput.Key.R1) + || instance.getTriggerOn(UIInput.Key.R2) + || instance.getTriggerOn(UIInput.Key.R3) + || instance.getTriggerOn(UIInput.Key.LS) + || instance.getTriggerOn(UIInput.Key.RS) || instance.getTriggerOn(UIInput.Key.MenuLeft) || instance.getTriggerOn(UIInput.Key.MenuRight)) { return true; diff --git a/Enhancements/AttractVideoPlayer/MU3/patch_AdvManager.cs b/Enhancements/AttractVideoPlayer/MU3/patch_AdvManager.cs index cb50e21..e4d4a13 100644 --- a/Enhancements/AttractVideoPlayer/MU3/patch_AdvManager.cs +++ b/Enhancements/AttractVideoPlayer/MU3/patch_AdvManager.cs @@ -17,6 +17,8 @@ class patch_AdvManager: AdvManager { addMovieOffset(-1); } else if(Singleton.instance.getTriggerOn(UIInput.Key.L3)) { addMovieOffset(1); + } else if(Singleton.instance.getTriggerOn(UIInput.Key.L1)) { + return true; } } @@ -36,6 +38,7 @@ class patch_AdvManager: AdvManager { public extern bool orig_initMovie(); public new bool initMovie() { UIInput instance = Singleton.instance; + instance.setLedColor(UIInput.Key.L1, new Color(0.7f, 0.0f, 0f)); instance.setLedColor(UIInput.Key.L2, new Color(0f, 0.7f, 0f)); instance.setLedColor(UIInput.Key.L3, new Color(0f, 0.7f, 0f)); @@ -47,6 +50,7 @@ class patch_AdvManager: AdvManager { orig_exitMovie(); UIInput instance = Singleton.instance; + instance.setLedColor(UIInput.Key.L1, Color.black); instance.setLedColor(UIInput.Key.L2, Color.black); instance.setLedColor(UIInput.Key.L3, Color.black); }