From c8e3a270448cb65d3a887dfddd4303116225f83b Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 28 Oct 2020 01:24:56 -0700 Subject: [PATCH] fix note miss bullshit --- Project.xml | 1 + assets/sounds/missnote1.ogg | Bin 11902 -> 10400 bytes source/ButtonRemapSubstate.hx | 11 +++++++++++ source/FreeplayState.hx | 13 ++++++++----- source/Main.hx | 2 +- source/MusicBeatState.hx | 4 ++++ source/PlayState.hx | 20 +++++++++----------- source/TitleState.hx | 13 +++++++++++++ 8 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 source/ButtonRemapSubstate.hx diff --git a/Project.xml b/Project.xml index dcde8dc16..3eb374045 100644 --- a/Project.xml +++ b/Project.xml @@ -92,4 +92,5 @@ + diff --git a/assets/sounds/missnote1.ogg b/assets/sounds/missnote1.ogg index 371503e91a37d8583d2dd6bd83006ff91fcf60e0..b8bfc8ea3f040d64221baf027ab403850e295a52 100644 GIT binary patch delta 6182 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 delta 7696 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 P=znwm&o%e_|F{1IEjho8 diff --git a/source/ButtonRemapSubstate.hx b/source/ButtonRemapSubstate.hx new file mode 100644 index 000000000..64ff07948 --- /dev/null +++ b/source/ButtonRemapSubstate.hx @@ -0,0 +1,11 @@ +package; + +import flixel.FlxSubState; + +class ButtonRemapSubstate extends FlxSubState +{ + public function new() + { + super(); + } +} diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 05b22123f..81366b3e1 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -40,11 +40,16 @@ class FreeplayState extends MusicBeatState override function update(elapsed:Float) { - if (FlxG.keys.justPressed.UP) + super.update(elapsed); + var upP = controls.UP_P; + var downP = controls.DOWN_P; + var accepted = controls.ACCEPT; + + if (upP) { curSelected -= 1; } - if (FlxG.keys.justPressed.DOWN) + if (downP) { curSelected += 1; } @@ -56,12 +61,10 @@ class FreeplayState extends MusicBeatState selector.y = (70 * curSelected) + 30; - if (FlxG.keys.justPressed.ENTER) + if (accepted) { PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase()); FlxG.switchState(new PlayState()); } - - super.update(elapsed); } } diff --git a/source/Main.hx b/source/Main.hx index e2e0f4dee..13376db44 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -9,7 +9,7 @@ class Main extends Sprite public function new() { super(); - addChild(new FlxGame(0, 0, FreeplayState)); + addChild(new FlxGame(0, 0, TitleState)); #if !mobile addChild(new FPS(10, 3, 0xFFFFFF)); diff --git a/source/MusicBeatState.hx b/source/MusicBeatState.hx index 321dc29c7..791cd95c7 100644 --- a/source/MusicBeatState.hx +++ b/source/MusicBeatState.hx @@ -15,6 +15,10 @@ class MusicBeatState extends FlxUIState private var curStep:Int = 0; private var curBeat:Int = 0; + private var controls(get, never):Controls; + + inline function get_controls():Controls + return PlayerSettings.player1.controls; override function create() { diff --git a/source/PlayState.hx b/source/PlayState.hx index 10bf82f2c..e560db5ab 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -69,11 +69,6 @@ class PlayState extends MusicBeatState private var camHUD:FlxCamera; private var camGame:FlxCamera; - var controls(get, never):Controls; - - inline function get_controls():Controls - return PlayerSettings.player1.controls; - override public function create() { // var gameCam:FlxCamera = FlxG.camera; @@ -86,8 +81,6 @@ class PlayState extends MusicBeatState FlxCamera.defaultCameras = [camGame]; - PlayerSettings.init(); - persistentUpdate = true; persistentDraw = true; @@ -1000,6 +993,7 @@ class PlayState extends MusicBeatState combo = 0; FlxG.sound.play('assets/sounds/missnote' + FlxG.random.int(1, 3) + TitleState.soundExt, FlxG.random.float(0.1, 0.2)); + // FlxG.sound.play('assets/sounds/missnote1' + TitleState.soundExt, 1, false); // FlxG.log.add('played imss note'); boyfriend.stunned = true; @@ -1122,11 +1116,15 @@ class PlayState extends MusicBeatState override function stepHit() { - if (vocals.time > Conductor.songPosition + Conductor.stepCrochet || vocals.time < Conductor.songPosition - Conductor.stepCrochet) + if (SONG.needsVoices) { - vocals.pause(); - vocals.time = Conductor.songPosition; - vocals.play(); + if (vocals.time > Conductor.songPosition + Conductor.stepCrochet + || vocals.time < Conductor.songPosition - Conductor.stepCrochet) + { + vocals.pause(); + vocals.time = Conductor.songPosition; + vocals.play(); + } } if (dad.curCharacter == 'spooky' && totalSteps % 4 == 2) diff --git a/source/TitleState.hx b/source/TitleState.hx index c1124ab4c..cf25c47fb 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -34,8 +34,21 @@ class TitleState extends MusicBeatState TitleState.soundExt = '.ogg'; #end + PlayerSettings.init(); + + // DEBUG BULLSHIT + super.create(); + #if SKIP_TO_PLAYSTATE + FlxG.switchState(new FreeplayState()); + #else + startIntro(); + #end + } + + function startIntro() + { if (!initialized) { var diamond:FlxGraphic = FlxGraphic.fromClass(GraphicTransTileDiamond);