diff --git a/Assets/Resources/Sfx/games/airboarder/crouchCharge.ogg b/Assets/Resources/Sfx/games/airboarder/crouchCharge.ogg deleted file mode 100644 index c736ccbe9..000000000 Binary files a/Assets/Resources/Sfx/games/airboarder/crouchCharge.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/airboarder/crouchCharge.wav b/Assets/Resources/Sfx/games/airboarder/crouchCharge.wav new file mode 100644 index 000000000..ba46f4b1b Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/crouchCharge.wav differ diff --git a/Assets/Resources/Sfx/games/airboarder/start1.ogg.meta b/Assets/Resources/Sfx/games/airboarder/crouchCharge.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/airboarder/start1.ogg.meta rename to Assets/Resources/Sfx/games/airboarder/crouchCharge.wav.meta index 47398e328..84393d719 100644 --- a/Assets/Resources/Sfx/games/airboarder/start1.ogg.meta +++ b/Assets/Resources/Sfx/games/airboarder/crouchCharge.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d047a8cbdf949a24f882434c0851f646 +guid: c73fe9e4419eb29498d846b6dbb1223e AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/airboarder/jump.ogg b/Assets/Resources/Sfx/games/airboarder/jump.ogg deleted file mode 100644 index 9d8c3187b..000000000 Binary files a/Assets/Resources/Sfx/games/airboarder/jump.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/airboarder/start1.ogg b/Assets/Resources/Sfx/games/airboarder/start1.ogg deleted file mode 100644 index d3b7363e3..000000000 Binary files a/Assets/Resources/Sfx/games/airboarder/start1.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/airboarder/start1.wav b/Assets/Resources/Sfx/games/airboarder/start1.wav new file mode 100644 index 000000000..76172fafc Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/start1.wav differ diff --git a/Assets/Resources/Sfx/games/airboarder/crouchCharge.ogg.meta b/Assets/Resources/Sfx/games/airboarder/start1.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/airboarder/crouchCharge.ogg.meta rename to Assets/Resources/Sfx/games/airboarder/start1.wav.meta index f01922b32..d161818a7 100644 --- a/Assets/Resources/Sfx/games/airboarder/crouchCharge.ogg.meta +++ b/Assets/Resources/Sfx/games/airboarder/start1.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2474b4057e748c47a85d52cbf988332 +guid: 1bb4e7022962568468529adbd238b5dd AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/airboarder/start2.ogg b/Assets/Resources/Sfx/games/airboarder/start2.ogg deleted file mode 100644 index 916e38c7a..000000000 Binary files a/Assets/Resources/Sfx/games/airboarder/start2.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/airboarder/start2.wav b/Assets/Resources/Sfx/games/airboarder/start2.wav new file mode 100644 index 000000000..a749ba2ec Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/start2.wav differ diff --git a/Assets/Resources/Sfx/games/airboarder/start2.ogg.meta b/Assets/Resources/Sfx/games/airboarder/start2.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/airboarder/start2.ogg.meta rename to Assets/Resources/Sfx/games/airboarder/start2.wav.meta index 5cd81231f..f078e6548 100644 --- a/Assets/Resources/Sfx/games/airboarder/start2.ogg.meta +++ b/Assets/Resources/Sfx/games/airboarder/start2.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f882749dd96777043b9a638007b5b6b6 +guid: d0ddfe988b573bd438767ea835bf94a1 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/airboarder/start3.wav b/Assets/Resources/Sfx/games/airboarder/start3.wav new file mode 100644 index 000000000..7d556f157 Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/start3.wav differ diff --git a/Assets/Resources/Sfx/games/airboarder/jump.ogg.meta b/Assets/Resources/Sfx/games/airboarder/start3.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/airboarder/jump.ogg.meta rename to Assets/Resources/Sfx/games/airboarder/start3.wav.meta index d245d02f0..3559a5e6d 100644 --- a/Assets/Resources/Sfx/games/airboarder/jump.ogg.meta +++ b/Assets/Resources/Sfx/games/airboarder/start3.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 50cb54db5a695ca4d875a5d309598995 +guid: b6c7beb236efd7d41ad81d7c93ae81cb AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs index f21925c5e..cdbddeacf 100644 --- a/Assets/Scripts/Games/Airboarder/Airboarder.cs +++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs @@ -230,13 +230,23 @@ namespace HeavenStudio.Games else { Player.GetComponent().DoScaledAnimationAsync("duck",1f, 0, 1); + SoundByte.PlayOneShotGame("airboarder/crouch"); + BeatAction.New(this, new() { + new(currentBeat, ()=>playerCantBop = true), + new(currentBeat+1.5f, ()=>playerCantBop = false)}); } } if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease)){ - Player.GetComponent().DoScaledAnimationAsync("hold",1f, 0, 1); - playerCantBop = false;} + if (wantsCrouch) + { + Player.GetComponent().DoScaledAnimationAsync("hold",1f, 0, 1); + playerCantBop = false; + } + } + if (PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease)){ - Player.GetComponent().DoScaledAnimationAsync("hold",1f, 0, 1); + Player.GetComponent().DoScaledAnimationAsync("jump",1f, 0, 1); + SoundByte.PlayOneShotGame("airboarder/jump"); playerCantBop = false;} } @@ -308,6 +318,7 @@ namespace HeavenStudio.Games BeatAction.New(instance, new List(){ new BeatAction.Action(beat, delegate {SoundByte.PlayOneShotGame("airboarder/start1");}), new BeatAction.Action(beat + 6.5, delegate {SoundByte.PlayOneShotGame("airboarder/start2");}), + new BeatAction.Action(beat + 7, delegate {SoundByte.PlayOneShotGame("airboarder/start3");}), }); } BeatAction.New(instance, new List(){ diff --git a/Assets/Scripts/Games/Airboarder/Arch.cs b/Assets/Scripts/Games/Airboarder/Arch.cs index c5326ff15..448667dec 100644 --- a/Assets/Scripts/Games/Airboarder/Arch.cs +++ b/Assets/Scripts/Games/Airboarder/Arch.cs @@ -73,13 +73,16 @@ namespace HeavenStudio.Games.Scripts_Airboarder new BeatAction.Action(crouchBeat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}), new BeatAction.Action(crouchBeat+1, delegate {game.cpu2CantBop = true;} ), + new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}), new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}), + new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchvox");}), new BeatAction.Action(crouchBeat+1, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("charge", 1f, 0, 1);}), new BeatAction.Action(crouchBeat+1, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}), - + new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}), new BeatAction.Action(crouchBeat+2, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("charge", 1f, 0, 1);}), new BeatAction.Action(crouchBeat+2, delegate {game.Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}), - new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}) + new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}), + new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchvox");}) }); } @@ -101,12 +104,14 @@ namespace HeavenStudio.Games.Scripts_Airboarder } public void DuckSuccess(PlayerActionEvent caller, float state) - { + { + double beat = caller.startBeat + caller.timer; game.Player.GetComponent().DoScaledAnimationAsync("duck", 1f, 0, 1); SoundByte.PlayOneShotGame("airboarder/crouch"); SoundByte.PlayOneShotGame("airboarder/crouchvox"); - double beat = caller.startBeat + caller.timer; + BeatAction.New(this, new() { + new(beat, ()=>game.playerCantBop = true), new(beat+1.5f, ()=>game.playerCantBop = false)}); } @@ -116,6 +121,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder anim.DoScaledAnimationAsync("shake", 1f, 0, 0); double beat = caller.startBeat + caller.timer; BeatAction.New(this, new() { + new(beat, ()=>game.playerCantBop = true), new(beat+1.5f, ()=>game.playerCantBop = false)}); } @@ -125,8 +131,9 @@ namespace HeavenStudio.Games.Scripts_Airboarder game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1); anim.DoScaledAnimationAsync("break", 1f, 0, 0); double beat = caller.startBeat + caller.timer; - game.MissSound(beat); +// game.MissSound(beat); BeatAction.New(this, new() { + new(beat, ()=>game.playerCantBop = true), new(beat+1.5f, ()=>game.playerCantBop = false)}); @@ -135,7 +142,9 @@ namespace HeavenStudio.Games.Scripts_Airboarder public void CrouchSuccess(PlayerActionEvent caller, float state) { game.Player.GetComponent().DoScaledAnimationAsync("charge", 1f, 0, 1); + SoundByte.PlayOneShotGame("airboarder/crouch"); SoundByte.PlayOneShotGame("airboarder/crouchCharge"); + SoundByte.PlayOneShotGame("airboarder/crouchvox"); game.playerCantBop = true; } @@ -148,7 +157,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1); anim.DoScaledAnimationAsync("break", 1f, 0, 0); double beat = caller.startBeat + caller.timer; - game.MissSound(beat); + // game.MissSound(beat); } diff --git a/Assets/Scripts/Games/Airboarder/Wall.cs b/Assets/Scripts/Games/Airboarder/Wall.cs index 0318c4e1b..d1498e1bd 100644 --- a/Assets/Scripts/Games/Airboarder/Wall.cs +++ b/Assets/Scripts/Games/Airboarder/Wall.cs @@ -80,7 +80,8 @@ namespace HeavenStudio.Games.Scripts_Airboarder SoundByte.PlayOneShotGame("airboarder/jumpvox"); double beat = caller.startBeat + caller.timer; BeatAction.New(this, new() { - new(beat+1f, ()=>game.playerCantBop = false)}); + new(beat, ()=>game.playerCantBop = true), + new(beat+1.5f, ()=>game.playerCantBop = false)}); game.wantsCrouch = false; } @@ -95,7 +96,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder public void JumpEmpty(PlayerActionEvent caller){ game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1); double beat = caller.startBeat + caller.timer; - game.MissSound(beat); +// game.MissSound(beat); BeatAction.New(this, new() { new(beat+1.5f, ()=>game.playerCantBop = false)}); game.wantsCrouch = false;