From 6d70f4de3a1271412b6db20f98cb8afc7cf8c39c Mon Sep 17 00:00:00 2001 From: Kade M Date: Sat, 5 Jun 2021 11:48:24 -0700 Subject: [PATCH] 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'; }