diff --git a/Assets/Scripts/Games/Rockers/Rockers.cs b/Assets/Scripts/Games/Rockers/Rockers.cs index ed180b9b8..331f4ab51 100644 --- a/Assets/Scripts/Games/Rockers/Rockers.cs +++ b/Assets/Scripts/Games/Rockers/Rockers.cs @@ -623,7 +623,7 @@ namespace HeavenStudio.Games && PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease)) { // todo: strum - Soshi.UnHold(); + Soshi.StrumStringsLast(false, false, true); } if (PlayerInput.GetIsAction(InputAction_BasicRelease)) { diff --git a/Assets/Scripts/Games/Rockers/RockersRocker.cs b/Assets/Scripts/Games/Rockers/RockersRocker.cs index bcc5ffe53..0a72c1c18 100644 --- a/Assets/Scripts/Games/Rockers/RockersRocker.cs +++ b/Assets/Scripts/Games/Rockers/RockersRocker.cs @@ -99,9 +99,21 @@ namespace HeavenStudio.Games.Scripts_Rockers } } + private bool lastGleeClub = false; + private Rockers.PremadeSamples lastSample; + private int lastSampleTones; + + public void StrumStringsLast(bool disableStrumEffect = false, bool jump = false, bool barely = false) + { + StrumStrings(lastGleeClub, lastPitches, lastSample, lastSampleTones, disableStrumEffect, jump, barely); + } + public void StrumStrings(bool gleeClub, int[] pitches, Rockers.PremadeSamples sample, int sampleTones, bool disableStrumEffect = false, bool jump = false, bool barely = false) { if (strumming) return; + lastGleeClub = gleeClub; + lastSample = sample; + lastSampleTones = sampleTones; muted = false; strumming = true; StopSounds(); diff --git a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs index d52f072bd..ed6add323 100644 --- a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs +++ b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs @@ -199,13 +199,13 @@ namespace HeavenStudio.Games { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("sneakySpirits/moving", beat, 1f, volume1 * 0.01f), - new MultiSound.Sound("sneakySpirits/moving", beat + length, 1f, volume2 * 0.01f), - new MultiSound.Sound("sneakySpirits/moving", beat + length * 2, 1f, volume3 * 0.01f), - new MultiSound.Sound("sneakySpirits/moving", beat + length * 3, 1f, volume4 * 0.01f), - new MultiSound.Sound("sneakySpirits/moving", beat + length * 4, 1f, volume5 * 0.01f), - new MultiSound.Sound("sneakySpirits/moving", beat + length * 5, 1f, volume6 * 0.01f), - new MultiSound.Sound("sneakySpirits/moving", beat + length * 6, 1f, volume7 * 0.01f), + new MultiSound.Sound("sneakySpirits/moving", beat, 1f, volume1 * 0.01f, false, 0.019), + new MultiSound.Sound("sneakySpirits/moving", beat + length, 1f, volume2 * 0.01f, false, 0.019), + new MultiSound.Sound("sneakySpirits/moving", beat + length * 2, 1f, volume3 * 0.01f, false, 0.019), + new MultiSound.Sound("sneakySpirits/moving", beat + length * 3, 1f, volume4 * 0.01f, false, 0.019), + new MultiSound.Sound("sneakySpirits/moving", beat + length * 4, 1f, volume5 * 0.01f, false, 0.019), + new MultiSound.Sound("sneakySpirits/moving", beat + length * 5, 1f, volume6 * 0.01f, false, 0.019), + new MultiSound.Sound("sneakySpirits/moving", beat + length * 6, 1f, volume7 * 0.01f, false, 0.019), }, forcePlay: true); }