From 4243a9a290bf0807535ac13779da3d6565a01bf9 Mon Sep 17 00:00:00 2001 From: Kade M Date: Fri, 4 Jun 2021 20:33:25 -0700 Subject: [PATCH 01/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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/15] 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) From 6d70f4de3a1271412b6db20f98cb8afc7cf8c39c Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:48:24 -0700 Subject: [PATCH 12/15] fix songs with dashes for compatablitly --- assets/songs/{dad battle => dad-battle}/Inst.mp3 | Bin assets/songs/{dad battle => dad-battle}/Inst.ogg | Bin assets/songs/{dad battle => dad-battle}/Voices.mp3 | Bin assets/songs/{dad battle => dad-battle}/Voices.ogg | Bin .../songs/{satin panties => satin-panties}/Inst.mp3 | Bin .../songs/{satin panties => satin-panties}/Inst.ogg | Bin .../{satin panties => satin-panties}/Voices.mp3 | Bin .../{satin panties => satin-panties}/Voices.ogg | Bin .../Inst.mp3 | Bin .../Inst.ogg | Bin .../Voices.mp3 | Bin .../Voices.ogg | Bin source/GameplayCustomizeState.hx | 3 ++- source/Paths.hx | 4 ++++ 14 files changed, 6 insertions(+), 1 deletion(-) rename assets/songs/{dad battle => dad-battle}/Inst.mp3 (100%) rename assets/songs/{dad battle => dad-battle}/Inst.ogg (100%) rename assets/songs/{dad battle => dad-battle}/Voices.mp3 (100%) rename assets/songs/{dad battle => dad-battle}/Voices.ogg (100%) rename assets/songs/{satin panties => satin-panties}/Inst.mp3 (100%) rename assets/songs/{satin panties => satin-panties}/Inst.ogg (100%) rename assets/songs/{satin panties => satin-panties}/Voices.mp3 (100%) rename assets/songs/{satin panties => satin-panties}/Voices.ogg (100%) rename assets/songs/{winter horrorland => winter-horrorland}/Inst.mp3 (100%) rename assets/songs/{winter horrorland => winter-horrorland}/Inst.ogg (100%) rename assets/songs/{winter horrorland => winter-horrorland}/Voices.mp3 (100%) rename assets/songs/{winter horrorland => winter-horrorland}/Voices.ogg (100%) diff --git a/assets/songs/dad battle/Inst.mp3 b/assets/songs/dad-battle/Inst.mp3 similarity index 100% rename from assets/songs/dad battle/Inst.mp3 rename to assets/songs/dad-battle/Inst.mp3 diff --git a/assets/songs/dad battle/Inst.ogg b/assets/songs/dad-battle/Inst.ogg similarity index 100% rename from assets/songs/dad battle/Inst.ogg rename to assets/songs/dad-battle/Inst.ogg diff --git a/assets/songs/dad battle/Voices.mp3 b/assets/songs/dad-battle/Voices.mp3 similarity index 100% rename from assets/songs/dad battle/Voices.mp3 rename to assets/songs/dad-battle/Voices.mp3 diff --git a/assets/songs/dad battle/Voices.ogg b/assets/songs/dad-battle/Voices.ogg similarity index 100% rename from assets/songs/dad battle/Voices.ogg rename to assets/songs/dad-battle/Voices.ogg diff --git a/assets/songs/satin panties/Inst.mp3 b/assets/songs/satin-panties/Inst.mp3 similarity index 100% rename from assets/songs/satin panties/Inst.mp3 rename to assets/songs/satin-panties/Inst.mp3 diff --git a/assets/songs/satin panties/Inst.ogg b/assets/songs/satin-panties/Inst.ogg similarity index 100% rename from assets/songs/satin panties/Inst.ogg rename to assets/songs/satin-panties/Inst.ogg diff --git a/assets/songs/satin panties/Voices.mp3 b/assets/songs/satin-panties/Voices.mp3 similarity index 100% rename from assets/songs/satin panties/Voices.mp3 rename to assets/songs/satin-panties/Voices.mp3 diff --git a/assets/songs/satin panties/Voices.ogg b/assets/songs/satin-panties/Voices.ogg similarity index 100% rename from assets/songs/satin panties/Voices.ogg rename to assets/songs/satin-panties/Voices.ogg diff --git a/assets/songs/winter horrorland/Inst.mp3 b/assets/songs/winter-horrorland/Inst.mp3 similarity index 100% rename from assets/songs/winter horrorland/Inst.mp3 rename to assets/songs/winter-horrorland/Inst.mp3 diff --git a/assets/songs/winter horrorland/Inst.ogg b/assets/songs/winter-horrorland/Inst.ogg similarity index 100% rename from assets/songs/winter horrorland/Inst.ogg rename to assets/songs/winter-horrorland/Inst.ogg diff --git a/assets/songs/winter horrorland/Voices.mp3 b/assets/songs/winter-horrorland/Voices.mp3 similarity index 100% rename from assets/songs/winter horrorland/Voices.mp3 rename to assets/songs/winter-horrorland/Voices.mp3 diff --git a/assets/songs/winter horrorland/Voices.ogg b/assets/songs/winter-horrorland/Voices.ogg similarity index 100% rename from assets/songs/winter horrorland/Voices.ogg rename to assets/songs/winter-horrorland/Voices.ogg diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index b3991c8..3b61416 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; @@ -58,6 +58,7 @@ class GameplayCustomizeState extends MusicBeatState var camFollow = new FlxObject(0, 0, 1, 1); dad = new Character(100, 100, 'dad'); + bf = new Boyfriend(770, 450, 'bf'); var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y); diff --git a/source/Paths.hx b/source/Paths.hx index 9902b71..70f0020 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -97,11 +97,15 @@ class Paths inline static public function voices(song:String) { + var r = ~/\s+/g; + r.replace(song,'-'); return 'songs:assets/songs/${song.toLowerCase()}/Voices.$SOUND_EXT'; } inline static public function inst(song:String) { + var r = ~/\s+/g; + r.replace(song,'-'); return 'songs:assets/songs/${song.toLowerCase()}/Inst.$SOUND_EXT'; } From ee9949d9a4af0f2da95a160e7bfb9e5e4e11f623 Mon Sep 17 00:00:00 2001 From: Puyo <15311104+daniel11420@users.noreply.github.com> Date: Sat, 5 Jun 2021 20:52:23 +0200 Subject: [PATCH 13/15] Update Project.xml --- Project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.xml b/Project.xml index aea7884..d2cac59 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ - + From 1c495047283f89978b4fead2caae800bf8a894f1 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 12:02:06 -0700 Subject: [PATCH 14/15] some other crap --- assets/preload/data/{dad battle => dad-battle}/0.offset | 0 .../dad-battle-easy.json} | 0 .../dad-battle-hard.json} | 0 .../dad battle.json => dad-battle/dad-battle.json} | 0 assets/preload/data/{philly nice => philly-nice}/0.offset | 0 .../philly-nice-easy.json} | 0 .../philly-nice-hard.json} | 0 .../philly nice.json => philly-nice/philly-nice.json} | 0 .../preload/data/{satin panties => satin-panties}/0.offset | 0 .../satin-panties-easy.json} | 0 .../satin-panties-hard.json} | 0 .../satin panties.json => satin-panties/satin-panties.json} | 0 .../data/{winter horrorland => winter-horrorland}/0.offset | 0 .../winter-horrorland-easy.json} | 0 .../winter-horrorland-hard.json} | 0 .../winter-horrorland.json} | 0 source/FreeplayState.hx | 4 ++-- source/GameplayCustomizeState.hx | 1 - source/Paths.hx | 6 ++---- source/StoryMenuState.hx | 2 +- version.downloadMe | 3 ++- 21 files changed, 7 insertions(+), 9 deletions(-) rename assets/preload/data/{dad battle => dad-battle}/0.offset (100%) rename assets/preload/data/{dad battle/dad battle-easy.json => dad-battle/dad-battle-easy.json} (100%) rename assets/preload/data/{dad battle/dad battle-hard.json => dad-battle/dad-battle-hard.json} (100%) rename assets/preload/data/{dad battle/dad battle.json => dad-battle/dad-battle.json} (100%) rename assets/preload/data/{philly nice => philly-nice}/0.offset (100%) rename assets/preload/data/{philly nice/philly nice-easy.json => philly-nice/philly-nice-easy.json} (100%) rename assets/preload/data/{philly nice/philly nice-hard.json => philly-nice/philly-nice-hard.json} (100%) rename assets/preload/data/{philly nice/philly nice.json => philly-nice/philly-nice.json} (100%) rename assets/preload/data/{satin panties => satin-panties}/0.offset (100%) rename assets/preload/data/{satin panties/satin panties-easy.json => satin-panties/satin-panties-easy.json} (100%) rename assets/preload/data/{satin panties/satin panties-hard.json => satin-panties/satin-panties-hard.json} (100%) rename assets/preload/data/{satin panties/satin panties.json => satin-panties/satin-panties.json} (100%) rename assets/preload/data/{winter horrorland => winter-horrorland}/0.offset (100%) rename assets/preload/data/{winter horrorland/winter horrorland-easy.json => winter-horrorland/winter-horrorland-easy.json} (100%) rename assets/preload/data/{winter horrorland/winter horrorland-hard.json => winter-horrorland/winter-horrorland-hard.json} (100%) rename assets/preload/data/{winter horrorland/winter horrorland.json => winter-horrorland/winter-horrorland.json} (100%) diff --git a/assets/preload/data/dad battle/0.offset b/assets/preload/data/dad-battle/0.offset similarity index 100% rename from assets/preload/data/dad battle/0.offset rename to assets/preload/data/dad-battle/0.offset diff --git a/assets/preload/data/dad battle/dad battle-easy.json b/assets/preload/data/dad-battle/dad-battle-easy.json similarity index 100% rename from assets/preload/data/dad battle/dad battle-easy.json rename to assets/preload/data/dad-battle/dad-battle-easy.json diff --git a/assets/preload/data/dad battle/dad battle-hard.json b/assets/preload/data/dad-battle/dad-battle-hard.json similarity index 100% rename from assets/preload/data/dad battle/dad battle-hard.json rename to assets/preload/data/dad-battle/dad-battle-hard.json diff --git a/assets/preload/data/dad battle/dad battle.json b/assets/preload/data/dad-battle/dad-battle.json similarity index 100% rename from assets/preload/data/dad battle/dad battle.json rename to assets/preload/data/dad-battle/dad-battle.json diff --git a/assets/preload/data/philly nice/0.offset b/assets/preload/data/philly-nice/0.offset similarity index 100% rename from assets/preload/data/philly nice/0.offset rename to assets/preload/data/philly-nice/0.offset diff --git a/assets/preload/data/philly nice/philly nice-easy.json b/assets/preload/data/philly-nice/philly-nice-easy.json similarity index 100% rename from assets/preload/data/philly nice/philly nice-easy.json rename to assets/preload/data/philly-nice/philly-nice-easy.json diff --git a/assets/preload/data/philly nice/philly nice-hard.json b/assets/preload/data/philly-nice/philly-nice-hard.json similarity index 100% rename from assets/preload/data/philly nice/philly nice-hard.json rename to assets/preload/data/philly-nice/philly-nice-hard.json diff --git a/assets/preload/data/philly nice/philly nice.json b/assets/preload/data/philly-nice/philly-nice.json similarity index 100% rename from assets/preload/data/philly nice/philly nice.json rename to assets/preload/data/philly-nice/philly-nice.json diff --git a/assets/preload/data/satin panties/0.offset b/assets/preload/data/satin-panties/0.offset similarity index 100% rename from assets/preload/data/satin panties/0.offset rename to assets/preload/data/satin-panties/0.offset diff --git a/assets/preload/data/satin panties/satin panties-easy.json b/assets/preload/data/satin-panties/satin-panties-easy.json similarity index 100% rename from assets/preload/data/satin panties/satin panties-easy.json rename to assets/preload/data/satin-panties/satin-panties-easy.json diff --git a/assets/preload/data/satin panties/satin panties-hard.json b/assets/preload/data/satin-panties/satin-panties-hard.json similarity index 100% rename from assets/preload/data/satin panties/satin panties-hard.json rename to assets/preload/data/satin-panties/satin-panties-hard.json diff --git a/assets/preload/data/satin panties/satin panties.json b/assets/preload/data/satin-panties/satin-panties.json similarity index 100% rename from assets/preload/data/satin panties/satin panties.json rename to assets/preload/data/satin-panties/satin-panties.json diff --git a/assets/preload/data/winter horrorland/0.offset b/assets/preload/data/winter-horrorland/0.offset similarity index 100% rename from assets/preload/data/winter horrorland/0.offset rename to assets/preload/data/winter-horrorland/0.offset diff --git a/assets/preload/data/winter horrorland/winter horrorland-easy.json b/assets/preload/data/winter-horrorland/winter-horrorland-easy.json similarity index 100% rename from assets/preload/data/winter horrorland/winter horrorland-easy.json rename to assets/preload/data/winter-horrorland/winter-horrorland-easy.json diff --git a/assets/preload/data/winter horrorland/winter horrorland-hard.json b/assets/preload/data/winter-horrorland/winter-horrorland-hard.json similarity index 100% rename from assets/preload/data/winter horrorland/winter horrorland-hard.json rename to assets/preload/data/winter-horrorland/winter-horrorland-hard.json diff --git a/assets/preload/data/winter horrorland/winter horrorland.json b/assets/preload/data/winter-horrorland/winter-horrorland.json similarity index 100% rename from assets/preload/data/winter horrorland/winter horrorland.json rename to assets/preload/data/winter-horrorland/winter-horrorland.json diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 97366d3..f5ee518 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -202,11 +202,11 @@ class FreeplayState extends MusicBeatState if (accepted) { - var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty); + var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty); trace(poop); - PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase()); + PlayState.SONG = Song.loadFromJson(poop, StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase()); PlayState.isStoryMode = false; PlayState.storyDifficulty = curDifficulty; PlayState.storyWeek = songs[curSelected].week; diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index 929d509..26407b5 100644 --- a/source/GameplayCustomizeState.hx +++ b/source/GameplayCustomizeState.hx @@ -58,7 +58,6 @@ class GameplayCustomizeState extends MusicBeatState var camFollow = new FlxObject(0, 0, 1, 1); dad = new Character(100, 100, 'dad'); - bf = new Boyfriend(770, 450, 'bf'); bf = new Boyfriend(770, 450, 'bf'); diff --git a/source/Paths.hx b/source/Paths.hx index 70f0020..27cd3e4 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -97,15 +97,13 @@ class Paths inline static public function voices(song:String) { - var r = ~/\s+/g; - r.replace(song,'-'); + song = StringTools.replace(song," ", "-"); return 'songs:assets/songs/${song.toLowerCase()}/Voices.$SOUND_EXT'; } inline static public function inst(song:String) { - var r = ~/\s+/g; - r.replace(song,'-'); + song = StringTools.replace(song," ", "-"); return 'songs:assets/songs/${song.toLowerCase()}/Inst.$SOUND_EXT'; } diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 9dbafc8..501cf2b 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -297,7 +297,7 @@ class StoryMenuState extends MusicBeatState PlayState.storyDifficulty = curDifficulty; - PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + diffic, PlayState.storyPlaylist[0].toLowerCase()); + PlayState.SONG = Song.loadFromJson(StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase() + diffic, StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase()); PlayState.storyWeek = curWeek; PlayState.campaignScore = 0; new FlxTimer().start(1, function(tmr:FlxTimer) diff --git a/version.downloadMe b/version.downloadMe index add4405..65f6485 100644 --- a/version.downloadMe +++ b/version.downloadMe @@ -1,4 +1,5 @@ -1.5; +1.5.1; +- 1.5.1: Bug Fixes - Added toggle for ghost tapping - Officially support macOS (and add macOS requirements to docs) - Autoplay From 2fc06c37d4259e20a0860666ecaacee3a2d78576 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 12:36:57 -0700 Subject: [PATCH 15/15] fixed a lot of stuff here --- source/Character.hx | 7 ++-- source/GameplayCustomizeState.hx | 58 +++++++++++++++++++++++++++----- source/KadeEngineData.hx | 6 ++++ 3 files changed, 60 insertions(+), 11 deletions(-) diff --git a/source/Character.hx b/source/Character.hx index 0f8ed7c..f9df179 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -124,7 +124,7 @@ class Character extends FlxSprite case 'dad': // DAD ANIMATION LOADING CODE - tex = Paths.getSparrowAtlas('characters/DADDY_DEAREST'); + tex = Paths.getSparrowAtlas('characters/DADDY_DEAREST', 'shared'); frames = tex; animation.addByPrefix('idle', 'Dad idle dance', 24); animation.addByPrefix('singUP', 'Dad Sing Note UP', 24); @@ -267,8 +267,11 @@ class Character extends FlxSprite flipX = true; case 'bf': - var tex = Paths.getSparrowAtlas('characters/BOYFRIEND'); + var tex = Paths.getSparrowAtlas('characters/BOYFRIEND', 'shared'); frames = tex; + + trace(tex.frames.length); + animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); animation.addByPrefix('singLEFT', 'BF NOTE LEFT0', 24, false); diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index 26407b5..7bcfa31 100644 --- a/source/GameplayCustomizeState.hx +++ b/source/GameplayCustomizeState.hx @@ -1,3 +1,7 @@ +import flixel.tweens.FlxEase; +import flixel.tweens.FlxTween; +import flixel.util.FlxColor; +import flixel.text.FlxText; import flixel.math.FlxMath; import flixel.FlxCamera; import flixel.math.FlxPoint; @@ -18,11 +22,14 @@ class GameplayCustomizeState extends MusicBeatState var defaultX:Float = FlxG.width * 0.55 - 135; var defaultY:Float = FlxG.height / 2 - 50; - var background:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback','shared')); - var curt:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains','shared')); - var front:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront','shared')); + var background:FlxSprite; + var curt:FlxSprite; + var front:FlxSprite; - var sick:FlxSprite = new FlxSprite().loadGraphic(Paths.image('sick','shared')); + var sick:FlxSprite; + + var text:FlxText; + var blackBorder:FlxSprite; var bf:Boyfriend; var dad:Character; @@ -38,6 +45,12 @@ class GameplayCustomizeState extends MusicBeatState DiscordClient.changePresence("Customizing Gameplay", null); #end + sick = new FlxSprite().loadGraphic(Paths.image('sick','shared')); + sick.scrollFactor.set(); + background = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback','shared')); + curt = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains','shared')); + front = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront','shared')); + Conductor.changeBPM(102); persistentUpdate = true; @@ -77,8 +90,11 @@ class GameplayCustomizeState extends MusicBeatState FlxG.camera.zoom = 0.9; FlxG.camera.focusOn(camFollow.getPosition()); - strumLine = new FlxSprite(0, 25).makeGraphic(FlxG.width, 10); + strumLine = new FlxSprite(0, FlxG.save.data.strumline).makeGraphic(FlxG.width, 14); strumLine.scrollFactor.set(); + strumLine.alpha = 0.4; + + add(strumLine); if (FlxG.save.data.downscroll) strumLine.y = FlxG.height - 165; @@ -95,7 +111,20 @@ class GameplayCustomizeState extends MusicBeatState generateStaticArrows(0); generateStaticArrows(1); + text = new FlxText(5, FlxG.height + 40, 0, "Drag around gameplay elements, R to reset, Escape to go back.", 12); + text.scrollFactor.set(); + text.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + blackBorder = new FlxSprite(-30,FlxG.height + 40).makeGraphic((Std.int(text.width + 900)),Std.int(text.height + 600),FlxColor.BLACK); + blackBorder.alpha = 0.5; + + add(blackBorder); + + add(text); + + FlxTween.tween(text,{y: FlxG.height - 18},2,{ease: FlxEase.elasticInOut}); + FlxTween.tween(blackBorder,{y: FlxG.height - 18},2, {ease: FlxEase.elasticInOut}); + if (!FlxG.save.data.changedHit) { FlxG.save.data.changedHitX = defaultX; @@ -105,7 +134,6 @@ class GameplayCustomizeState extends MusicBeatState sick.x = FlxG.save.data.changedHitX; sick.y = FlxG.save.data.changedHitY; - sick.updateHitbox(); FlxG.mouse.visible = true; @@ -123,9 +151,14 @@ class GameplayCustomizeState extends MusicBeatState if (FlxG.mouse.overlaps(sick) && FlxG.mouse.pressed) { sick.x = FlxG.mouse.x - sick.width / 2; - sick.y = FlxG.mouse.y - sick.height / 2; + sick.y = FlxG.mouse.y - sick.height; } + for (i in playerStrums) + i.y = strumLine.y; + for (i in strumLineNotes) + i.y = strumLine.y; + if (FlxG.mouse.overlaps(sick) && FlxG.mouse.justReleased) { FlxG.save.data.changedHitX = sick.x; @@ -133,6 +166,15 @@ class GameplayCustomizeState extends MusicBeatState FlxG.save.data.changedHit = true; } + if (FlxG.keys.justPressed.R) + { + sick.x = defaultX; + sick.y = defaultY; + FlxG.save.data.changedHitX = sick.x; + FlxG.save.data.changedHitY = sick.y; + FlxG.save.data.changedHit = false; + } + if (controls.BACK) { FlxG.mouse.visible = false; @@ -201,9 +243,7 @@ class GameplayCustomizeState extends MusicBeatState babyArrow.ID = i; if (player == 1) - { playerStrums.add(babyArrow); - } babyArrow.animation.play('static'); babyArrow.x += 50; diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx index e40d71c..5ae671a 100644 --- a/source/KadeEngineData.hx +++ b/source/KadeEngineData.hx @@ -75,6 +75,12 @@ class KadeEngineData if (FlxG.save.data.cpuStrums == null) FlxG.save.data.cpuStrums = false; + if (FlxG.save.data.strumline == null) + FlxG.save.data.strumline = false; + + if (FlxG.save.data.customStrumLine == null) + FlxG.save.data.customStrumLine = 0; + Conductor.recalculateTimings(); PlayerSettings.player1.controls.loadKeyBinds(); KeyBinds.keyCheck();