From 312664daf3e20ca148e7f1479c71b8e68845f76d Mon Sep 17 00:00:00 2001
From: akanyan <alicechecker01@proton.me>
Date: Sun, 26 Jan 2025 21:33:32 +0000
Subject: [PATCH] fix(SkipCutscenes): revert full postgame skip

---
 .../MU3.Sequence/patch_PlayMusic.cs           |  4 +---
 .../MU3/patch_Scene_37_Result.cs              | 23 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 Extras/SkipCutscenes/MU3/patch_Scene_37_Result.cs

diff --git a/Enhancements/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs b/Enhancements/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs
index 4e7e2e0..ae446fe 100644
--- a/Enhancements/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs
+++ b/Enhancements/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs
@@ -139,9 +139,7 @@ class patch_PlayMusic: PlayMusic {
         var playerPos = control._playPosition;
         var rollingStartFrame = ntMgr.getCurrentFrame();
         var rollingStartTime = CustomDateTime.Now;
-        var rollDuration = TimeSpan.FromSeconds(
-            Math.Max(0.5, Math.Sqrt(Math.Abs(rollingStartFrame - TargetFrame) * 16.6666667) / 300.0)
-        );
+        var rollDuration = TimeSpan.FromSeconds(0.5);
 
         while(_isRolling) {
             TimeSpan timeSpan = CustomDateTime.Now - rollingStartTime;
diff --git a/Extras/SkipCutscenes/MU3/patch_Scene_37_Result.cs b/Extras/SkipCutscenes/MU3/patch_Scene_37_Result.cs
deleted file mode 100644
index 4f3ab8a..0000000
--- a/Extras/SkipCutscenes/MU3/patch_Scene_37_Result.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using MonoMod;
-using MU3.Util;
-
-namespace MU3;
-
-class patch_Scene_37_Result: Scene_37_Result {
-    [MonoModIgnore]
-    private enum State { End = 11 };
-
-    private Mode<Scene_37_Result, State> mode_;
-
-    private extern void orig_Assignment_Init();
-    private void Assignment_Init() {
-        if(Singleton<Mod.State>.instance.SkipMusicOutro) {
-            SystemUI instance = SingletonMonoBehaviour<SystemUI>.instance;
-            instance.removeCanvas(Graphics.Const.SortOrder.Dialog);
-            Singleton<Mod.State>.instance.SkipMusicOutro = false;
-            mode_.set(State.End);
-        } else {
-            orig_Assignment_Init();
-        }
-    }
-}