From 9e86bc27e0be43e78e802deb92aaeecac33657ae Mon Sep 17 00:00:00 2001 From: wookywok <62037083+wookywok@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:31:06 -0500 Subject: [PATCH] Added Legacy Scroll Speed --- .../Games/NailCarpenter/NailCarpenter.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs index 3ebe2e30c..37cbd2ce0 100644 --- a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs +++ b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs @@ -146,6 +146,7 @@ namespace HeavenStudio.Games [SerializeField] ObjectPatternItem[] cakePatternOld; [SerializeField] ObjectPatternItem[] cakeLongPatternOld; [SerializeField] float scrollMetresPerBeat = 4f; + [SerializeField] float legacyScrollMultiplier = 2; [SerializeField] float boardWidth = 19.2f; public GameObject baseNail; @@ -290,6 +291,7 @@ namespace HeavenStudio.Games cachedPatternLengthCherryOld = cherryPatternOld[^1].beat; cachedPatternLengthCakeOld = cakePatternOld[^1].beat; cachedPatternLengthCakeLongOld = cakeLongPatternOld[^1].beat; + float legacyScrollSpeed = (scrollMetresPerBeat*legacyScrollMultiplier); double endBeat = double.MaxValue; var entities = gameManager.Beatmap.Entities; @@ -301,8 +303,12 @@ namespace HeavenStudio.Games endBeat = firstEnd?.beat ?? endBeat; List events = entities.FindAll(v => (v.datamodel is "nailCarpenter/puddingNail" or "nailCarpenter/cherryNail" or "nailCarpenter/cakeNail" or "nailCarpenter/cakeLongNail" or "nailCarpenter/puddingNailNew" or "nailCarpenter/cherryNailNew" or "nailCarpenter/cakeNailNew" or "nailCarpenter/cakeLongNailNew") && v.beat >= gameStartBeat && v.beat < endBeat); + scheduledPatterns.Clear(); patternIndex = 0; + bool hasChecked = false; + + foreach (var evt in events) { if (evt.length == 0) continue; @@ -329,7 +335,19 @@ namespace HeavenStudio.Games }; scheduledPatterns.Add(pattern); } + if (evt.datamodel is "nailCarpenter/puddingNail" or "nailCarpenter/cherryNail" or "nailCarpenter/cakeNail" or "nailCarpenter/cakeLongNail") + { + if (hasChecked == false) + { + scrollMetresPerBeat = legacyScrollSpeed; + hasChecked = true; + } + } + } + + + } public override void OnPlay(double beat)