1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-16 11:53:45 +00:00

sounds and polish shit

This commit is contained in:
Cameron Taylor 2020-10-31 12:53:58 -07:00
parent b13db513f0
commit 68a170c03f
9 changed files with 43 additions and 11 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -76,9 +76,21 @@ class MainMenuState extends MusicBeatState
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
if (controls.UP_P) if (controls.UP_P)
{
FlxG.sound.play('assets/sounds/scrollMenu' + TitleState.soundExt);
changeItem(-1); changeItem(-1);
}
if (controls.DOWN_P) if (controls.DOWN_P)
{
FlxG.sound.play('assets/sounds/scrollMenu' + TitleState.soundExt);
changeItem(1); changeItem(1);
}
if (controls.BACK)
{
FlxG.switchState(new TitleState());
}
super.update(elapsed); super.update(elapsed);
@ -90,6 +102,8 @@ class MainMenuState extends MusicBeatState
} }
else else
{ {
FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt);
FlxFlicker.flicker(magenta, 1.1, 0.15, false); FlxFlicker.flicker(magenta, 1.1, 0.15, false);
menuItems.forEach(function(spr:FlxSprite) menuItems.forEach(function(spr:FlxSprite)

View file

@ -161,17 +161,25 @@ class StoryMenuState extends MusicBeatState
if (!selectedWeek) if (!selectedWeek)
{ {
if (controls.UP_P) if (controls.UP_P)
{
changeWeek(-1); changeWeek(-1);
}
if (controls.DOWN_P) if (controls.DOWN_P)
{
changeWeek(1); changeWeek(1);
}
} }
if (controls.ACCEPT) if (controls.ACCEPT)
{
selectWeek(); selectWeek();
}
} }
if (controls.BACK && !movedBack && !selectedWeek) if (controls.BACK && !movedBack && !selectedWeek)
{ {
FlxG.sound.play('assets/sounds/cancelMenu' + TitleState.soundExt);
movedBack = true; movedBack = true;
FlxG.switchState(new MainMenuState()); FlxG.switchState(new MainMenuState());
} }
@ -186,6 +194,8 @@ class StoryMenuState extends MusicBeatState
{ {
if (weekUnlocked[curWeek]) if (weekUnlocked[curWeek])
{ {
FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt);
grpWeekText.members[curWeek].week.animation.resume(); grpWeekText.members[curWeek].week.animation.resume();
grpWeekCharacters.members[1].animation.play('bfConfirm'); grpWeekCharacters.members[1].animation.play('bfConfirm');
@ -218,6 +228,8 @@ class StoryMenuState extends MusicBeatState
bullShit++; bullShit++;
} }
FlxG.sound.play('assets/sounds/scrollMenu' + TitleState.soundExt);
updateText(); updateText();
} }

View file

@ -73,13 +73,15 @@ class TitleState extends MusicBeatState
FlxTransitionableState.defaultTransOut = new TransitionData(FADE, FlxColor.BLACK, 0.7, new FlxPoint(0, 1), FlxTransitionableState.defaultTransOut = new TransitionData(FADE, FlxColor.BLACK, 0.7, new FlxPoint(0, 1),
{asset: diamond, width: 32, height: 32}, new FlxRect(0, 0, FlxG.width, FlxG.height)); {asset: diamond, width: 32, height: 32}, new FlxRect(0, 0, FlxG.width, FlxG.height));
initialized = true;
FlxTransitionableState.defaultTransIn.tileData = {asset: diamond, width: 32, height: 32}; FlxTransitionableState.defaultTransIn.tileData = {asset: diamond, width: 32, height: 32};
FlxTransitionableState.defaultTransOut.tileData = {asset: diamond, width: 32, height: 32}; FlxTransitionableState.defaultTransOut.tileData = {asset: diamond, width: 32, height: 32};
transIn = FlxTransitionableState.defaultTransIn; transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut; transOut = FlxTransitionableState.defaultTransOut;
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt, 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);
} }
persistentUpdate = true; persistentUpdate = true;
@ -126,11 +128,12 @@ class TitleState extends MusicBeatState
FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG}); FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});
if (initialized)
skipIntro();
else
initialized = true;
// credGroup.add(credTextShit); // credGroup.add(credTextShit);
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt, 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);
} }
var transitioning:Bool = false; var transitioning:Bool = false;
@ -149,14 +152,10 @@ class TitleState extends MusicBeatState
pressedEnter = true; pressedEnter = true;
} }
if (pressedEnter && !skippedIntro)
{
skipIntro();
}
if (pressedEnter && !transitioning && skippedIntro) if (pressedEnter && !transitioning && skippedIntro)
{ {
FlxG.camera.flash(FlxColor.WHITE, 1); FlxG.camera.flash(FlxColor.WHITE, 1);
FlxG.sound.play('assets/sounds/confirmMenu' + TitleState.soundExt, 0.7);
transitioning = true; transitioning = true;
// FlxG.sound.music.stop(); // FlxG.sound.music.stop();
@ -168,6 +167,11 @@ class TitleState extends MusicBeatState
// FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7); // FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7);
} }
if (pressedEnter && !skippedIntro)
{
skipIntro();
}
super.update(elapsed); super.update(elapsed);
} }
@ -265,6 +269,8 @@ class TitleState extends MusicBeatState
{ {
if (!skippedIntro) if (!skippedIntro)
{ {
remove(ngSpr);
FlxG.camera.flash(FlxColor.WHITE, 4); FlxG.camera.flash(FlxColor.WHITE, 4);
remove(credGroup); remove(credGroup);
skippedIntro = true; skippedIntro = true;