From a8e1ce0ef024b1ad3b55892ea84c213ab7717ee4 Mon Sep 17 00:00:00 2001 From: Slaith Date: Thu, 24 Feb 2022 22:59:18 -0800 Subject: [PATCH 1/2] Some small stuff Changed the window title to the new name and added some full count-ins --- Assets/Scripts/GlobalGameManager.cs | 2 +- Assets/Scripts/Minigames.cs | 66 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index efa66ac28..68bf60c8b 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/Assets/Scripts/GlobalGameManager.cs @@ -49,7 +49,7 @@ namespace RhythmHeavenMania Init(); DontDestroyOnLoad(this.gameObject); instance = this; - Starpelly.OS.Windows.ChangeWindowTitle($"Rhythm Heaven Mania DEMO"); + Starpelly.OS.Windows.ChangeWindowTitle($"Heaven Studio DEMO"); } public static GameObject CreateFade() diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index c6fe4bf13..a6eb31d3c 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -106,6 +106,72 @@ namespace RhythmHeavenMania }), new Minigame("countIn", "Count-Ins", "", false, true, new List() { + new GameAction("4 beat count-in", delegate + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("count-ins/one1", eventCaller.currentEntity.beat), + new MultiSound.Sound("count-ins/two1", eventCaller.currentEntity.beat + 1f), + new MultiSound.Sound("count-ins/three1", eventCaller.currentEntity.beat + 2f), + new MultiSound.Sound("count-ins/four1", eventCaller.currentEntity.beat + 3f) + }, false); + }, 4f), + new GameAction("4 beat count-in (alt)", delegate + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("count-ins/one2", eventCaller.currentEntity.beat), + new MultiSound.Sound("count-ins/two2", eventCaller.currentEntity.beat + 1f), + new MultiSound.Sound("count-ins/three2", eventCaller.currentEntity.beat + 2f), + new MultiSound.Sound("count-ins/four2", eventCaller.currentEntity.beat + 3f) + }, false); + }, 4f), + new GameAction("4 beat count-in (cowbell)", delegate + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 1f), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 2f), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 3f) + }, false); + }, 4f), + new GameAction("8 beat count-in", delegate + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("count-ins/one1", eventCaller.currentEntity.beat), + new MultiSound.Sound("count-ins/two1", eventCaller.currentEntity.beat + 2f), + new MultiSound.Sound("count-ins/one1", eventCaller.currentEntity.beat + 4f), + new MultiSound.Sound("count-ins/two1", eventCaller.currentEntity.beat + 5f), + new MultiSound.Sound("count-ins/three1", eventCaller.currentEntity.beat + 6f), + new MultiSound.Sound("count-ins/four1", eventCaller.currentEntity.beat + 7f) + }, false); + }, 8f), + new GameAction("8 beat count-in (alt)", delegate + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("count-ins/one2", eventCaller.currentEntity.beat), + new MultiSound.Sound("count-ins/two2", eventCaller.currentEntity.beat + 2f), + new MultiSound.Sound("count-ins/one2", eventCaller.currentEntity.beat + 4f), + new MultiSound.Sound("count-ins/two2", eventCaller.currentEntity.beat + 5f), + new MultiSound.Sound("count-ins/three2", eventCaller.currentEntity.beat + 6f), + new MultiSound.Sound("count-ins/four2", eventCaller.currentEntity.beat + 7f) + }, false); + }, 8f), + new GameAction("8 beat count-in (cowbell)", delegate + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 2f), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 4f), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 5f), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 6f), + new MultiSound.Sound("count-ins/cowbell", eventCaller.currentEntity.beat + 7f) + }, false); + }, 8f), new GameAction("cowbell", delegate { Jukebox.PlayOneShot("count-ins/cowbell"); }, 1f), new GameAction("one", delegate { Jukebox.PlayOneShot("count-ins/one1"); }, 1f), new GameAction("one (alt)", delegate { Jukebox.PlayOneShot("count-ins/one2"); }, 1f), From fd748e83095ed25c60e82f3fecb918971c2bfa7f Mon Sep 17 00:00:00 2001 From: Slaith Date: Thu, 24 Feb 2022 23:01:41 -0800 Subject: [PATCH 2/2] Fixed tempo change bug Tempo changes that were deleted would still exist in some places and break the check that determines if a new change should be placed. --- Assets/Scripts/LevelEditor/Timeline/TempoTimelineObj.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Scripts/LevelEditor/Timeline/TempoTimelineObj.cs b/Assets/Scripts/LevelEditor/Timeline/TempoTimelineObj.cs index 3244b77cd..3477b06e1 100644 --- a/Assets/Scripts/LevelEditor/Timeline/TempoTimelineObj.cs +++ b/Assets/Scripts/LevelEditor/Timeline/TempoTimelineObj.cs @@ -56,6 +56,7 @@ namespace RhythmHeavenMania.Editor.Track else if (Input.GetMouseButtonDown(1)) { GameManager.instance.Beatmap.tempoChanges.Remove(tempoChange); + transform.parent.GetComponent().tempoTimelineObjs.Remove(this); Destroy(this.gameObject); }