From 4243a9a290bf0807535ac13779da3d6565a01bf9 Mon Sep 17 00:00:00 2001 From: Kade M Date: Fri, 4 Jun 2021 20:33:25 -0700 Subject: [PATCH 01/11] do this --- source/KeyBindMenu.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/KeyBindMenu.hx b/source/KeyBindMenu.hx index 847db3b..ee1f914 100644 --- a/source/KeyBindMenu.hx +++ b/source/KeyBindMenu.hx @@ -249,11 +249,11 @@ class KeyBindMenu extends FlxSubState if(shouldReturn){ keys[curSelected] = r; - FlxG.sound.play(Paths.sound('Hover','clown')); + FlxG.sound.play(Paths.sound('scrollMenu')); } else{ keys[curSelected] = tempKey; - FlxG.sound.play(Paths.sound('confirm','clown')); + FlxG.sound.play(Paths.sound('scrollMenu')); keyWarning.alpha = 1; warningTween.cancel(); warningTween = FlxTween.tween(keyWarning, {alpha: 0}, 0.5, {ease: FlxEase.circOut, startDelay: 2}); From 39d52b9e0b9de55e05a36fa2306a3ec51aa748dc Mon Sep 17 00:00:00 2001 From: Kade M Date: Fri, 4 Jun 2021 21:47:01 -0700 Subject: [PATCH 02/11] make so stupids can't bind this shit lol! --- source/KeyBindMenu.hx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/KeyBindMenu.hx b/source/KeyBindMenu.hx index ee1f914..7721920 100644 --- a/source/KeyBindMenu.hx +++ b/source/KeyBindMenu.hx @@ -236,7 +236,6 @@ class KeyBindMenu extends FlxSubState } } - else {for(x in keyText){notAllowed.push(x);}} trace(notAllowed); @@ -245,6 +244,8 @@ class KeyBindMenu extends FlxSubState var oK = keys[x]; if(oK == r) keys[x] = null; + if (notAllowed.contains(oK)) + return; } if(shouldReturn){ From 9956c74e68cbc4ce58f15c75fe9e2c197a4ec53e Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 10:52:56 -0700 Subject: [PATCH 03/11] fix score --- source/GameplayCustomizeState.hx | 4 +++- source/PlayState.hx | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index b3991c8..26407b5 100644 --- a/source/GameplayCustomizeState.hx +++ b/source/GameplayCustomizeState.hx @@ -24,7 +24,7 @@ class GameplayCustomizeState extends MusicBeatState var sick:FlxSprite = new FlxSprite().loadGraphic(Paths.image('sick','shared')); - var bf:Boyfriend = new Boyfriend(770, 450, 'bf'); + var bf:Boyfriend; var dad:Character; var strumLine:FlxSprite; @@ -59,6 +59,8 @@ class GameplayCustomizeState extends MusicBeatState dad = new Character(100, 100, 'dad'); + bf = new Boyfriend(770, 450, 'bf'); + var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y); camFollow.setPosition(camPos.x, camPos.y); diff --git a/source/PlayState.hx b/source/PlayState.hx index 2d82860..b521a86 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1786,6 +1786,8 @@ class PlayState extends MusicBeatState super.update(elapsed); scoreTxt.text = Ratings.CalculateRanking(songScore,songScoreDef,nps,maxNPS,accuracy); + if (FlxG.save.data.accuracyDisplay) + scoreTxt.text = "Score: " + songScore; if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause) { persistentUpdate = false; From d707c5efc6057b5221c974459ddb125dbbf24c03 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:12:10 -0700 Subject: [PATCH 04/11] fix spooky kids dance --- source/Character.hx | 1 + source/PlayState.hx | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/source/Character.hx b/source/Character.hx index 3e8367c..0f8ed7c 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -537,6 +537,7 @@ class Character extends FlxSprite dadVar = 6.1; if (holdTimer >= Conductor.stepCrochet * dadVar * 0.001) { + trace('dance'); dance(); holdTimer = 0; } diff --git a/source/PlayState.hx b/source/PlayState.hx index b521a86..b1b47ca 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1788,6 +1788,7 @@ class PlayState extends MusicBeatState scoreTxt.text = Ratings.CalculateRanking(songScore,songScoreDef,nps,maxNPS,accuracy); if (FlxG.save.data.accuracyDisplay) scoreTxt.text = "Score: " + songScore; + if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause) { persistentUpdate = false; @@ -3317,6 +3318,8 @@ class PlayState extends MusicBeatState gf.playAnim('scared', true); } + var danced:Bool = false; + override function stepHit() { super.stepHit(); @@ -3333,10 +3336,6 @@ class PlayState extends MusicBeatState } #end - if (dad.curCharacter == 'spooky' && curStep % 4 == 2) - { - // dad.dance(); - } // yes this updates every step. @@ -3425,10 +3424,6 @@ class PlayState extends MusicBeatState boyfriend.playAnim('idle'); } - if (!dad.animation.curAnim.name.startsWith("sing")) - { - dad.dance(); - } if (curBeat % 8 == 7 && curSong == 'Bopeebo') { From ca4c620a6d6463fa7bbb0e3b3db95b55027a1b44 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:12:35 -0700 Subject: [PATCH 05/11] forgot dis one --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index b1b47ca..b0eb396 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1786,7 +1786,7 @@ class PlayState extends MusicBeatState super.update(elapsed); scoreTxt.text = Ratings.CalculateRanking(songScore,songScoreDef,nps,maxNPS,accuracy); - if (FlxG.save.data.accuracyDisplay) + if (!FlxG.save.data.accuracyDisplay) scoreTxt.text = "Score: " + songScore; if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause) From 3bd5a2d3125214bb09d54fc7c219f1893a1b4561 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:15:21 -0700 Subject: [PATCH 06/11] fix some sprite issues --- source/BackgroundDancer.hx | 2 +- source/BackgroundGirls.hx | 2 +- source/PlayState.hx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/BackgroundDancer.hx b/source/BackgroundDancer.hx index a619dac..c572c1e 100644 --- a/source/BackgroundDancer.hx +++ b/source/BackgroundDancer.hx @@ -9,7 +9,7 @@ class BackgroundDancer extends FlxSprite { super(x, y); - frames = Paths.getSparrowAtlas("limo/limoDancer"); + frames = Paths.getSparrowAtlas("limo/limoDancer",'week4'); animation.addByIndices('danceLeft', 'bg dancer sketch PINK', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); animation.play('danceLeft'); diff --git a/source/BackgroundGirls.hx b/source/BackgroundGirls.hx index c37b16f..8a84699 100644 --- a/source/BackgroundGirls.hx +++ b/source/BackgroundGirls.hx @@ -10,7 +10,7 @@ class BackgroundGirls extends FlxSprite super(x, y); // BG fangirls dissuaded - frames = Paths.getSparrowAtlas('weeb/bgFreaks'); + frames = Paths.getSparrowAtlas('weeb/bgFreaks','week6'); animation.addByIndices('danceLeft', 'BG girls group', CoolUtil.numberArray(14), "", 24, false); animation.addByIndices('danceRight', 'BG girls group', CoolUtil.numberArray(30, 15), "", 24, false); diff --git a/source/PlayState.hx b/source/PlayState.hx index b0eb396..a5fe2e0 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3255,9 +3255,9 @@ class PlayState extends MusicBeatState function trainStart():Void { if(FlxG.save.data.distractions){ - trainMoving = true; - if (!trainSound.playing) - trainSound.play(true); + trainMoving = true; + if (!trainSound.playing) + trainSound.play(true); } } From de35797a37acbb4cff43d8c639f74c43a494f0fa Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:17:33 -0700 Subject: [PATCH 07/11] fixed stupid & sign --- assets/preload/images/alphabet.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/assets/preload/images/alphabet.xml b/assets/preload/images/alphabet.xml index dd5ed82..6c31651 100644 --- a/assets/preload/images/alphabet.xml +++ b/assets/preload/images/alphabet.xml @@ -14,10 +14,6 @@ - - - - From 76537aa03b1c6d81033917b932270f2ebe6a4073 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:21:13 -0700 Subject: [PATCH 08/11] this will reset your guy's save --- Project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.xml b/Project.xml index c8525b7..6bd2a3b 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ - + From d3488b901d7b47750395bab46fa270730921b182 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:21:42 -0700 Subject: [PATCH 09/11] change the name too --- Project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.xml b/Project.xml index 6bd2a3b..aea7884 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ - + From cbc490da6e0d4db18b107b99896948c8e6387d9b Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:23:27 -0700 Subject: [PATCH 10/11] hehehe --- source/MainMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index c157067..2d66525 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -37,7 +37,7 @@ class MainMenuState extends MusicBeatState var newGaming2:FlxText; public static var firstStart:Bool = true; - public static var nightly:String = ""; + public static var nightly:String = "-nightly-development"; public static var kadeEngineVer:String = "1.5" + nightly; public static var gameVer:String = "0.2.7.1"; From 28699426a42b683d9d09b1d5e165a79539349580 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:29:48 -0700 Subject: [PATCH 11/11] oops --- source/KeyBindMenu.hx | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/source/KeyBindMenu.hx b/source/KeyBindMenu.hx index 7721920..1d3f6e4 100644 --- a/source/KeyBindMenu.hx +++ b/source/KeyBindMenu.hx @@ -223,20 +223,8 @@ class KeyBindMenu extends FlxSubState var notAllowed:Array = []; - for(x in keys){ - if(x != tempKey){notAllowed.push(x);} - } - for(x in blacklist){notAllowed.push(x);} - if(curSelected != 4){ - - for(x in keyText){ - if(x != keyText[curSelected]){notAllowed.push(x);} - } - - } - trace(notAllowed); for(x in 0...keys.length)