diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 4371fad..4ac38e6 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -309,10 +309,10 @@ class ChartingState extends MusicBeatState shiftNotes(Std.int(stepperShiftNoteDial.value),Std.int(stepperShiftNoteDialstep.value),Std.int(stepperShiftNoteDialms.value)); }); - var characters:Array = CoolUtil.coolTextFile(Paths.txt('characterList')); - var gfVersions:Array = CoolUtil.coolTextFile(Paths.txt('gfVersionList')); - var stages:Array = CoolUtil.coolTextFile(Paths.txt('stageList')); - var noteStyles:Array = CoolUtil.coolTextFile(Paths.txt('noteStyleList')); + var characters:Array = CoolUtil.coolTextFile(Paths.txt('data/characterList')); + var gfVersions:Array = CoolUtil.coolTextFile(Paths.txt('data/gfVersionList')); + var stages:Array = CoolUtil.coolTextFile(Paths.txt('data/stageList')); + var noteStyles:Array = CoolUtil.coolTextFile(Paths.txt('data/noteStyleList')); var player1DropDown = new FlxUIDropDownMenu(10, 100, FlxUIDropDownMenu.makeStrIdLabelArray(characters, true), function(character:String) { diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 2ff4465..c3254a6 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -56,7 +56,7 @@ class FreeplayState extends MusicBeatState override function create() { - var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist')); + var initSonglist = CoolUtil.coolTextFile(Paths.txt('data/freeplaySonglist')); //var diffList = ""; diff --git a/source/Paths.hx b/source/Paths.hx index 075adbd..71b4b8b 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -67,7 +67,7 @@ class Paths inline static public function txt(key:String, ?library:String) { - return getPath('data/$key.txt', TEXT, library); + return getPath('$key.txt', TEXT, library); } inline static public function xml(key:String, ?library:String) diff --git a/source/PlayState.hx b/source/PlayState.hx index c95cae2..e359ba6 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -362,11 +362,11 @@ class PlayState extends MusicBeatState "Only then I will even CONSIDER letting you\ndate my daughter!" ]; case 'senpai': - dialogue = CoolUtil.coolTextFile(Paths.txt('senpai/senpaiDialogue')); + dialogue = CoolUtil.coolTextFile(Paths.txt('data/senpai/senpaiDialogue')); case 'roses': - dialogue = CoolUtil.coolTextFile(Paths.txt('roses/rosesDialogue')); + dialogue = CoolUtil.coolTextFile(Paths.txt('data/roses/rosesDialogue')); case 'thorns': - dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue')); + dialogue = CoolUtil.coolTextFile(Paths.txt('data/thorns/thornsDialogue')); } //defaults if no stage was found in chart diff --git a/source/TitleState.hx b/source/TitleState.hx index cbf4da5..93a0fcb 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -239,7 +239,7 @@ class TitleState extends MusicBeatState function getIntroTextShit():Array> { - var fullText:String = Assets.getText(Paths.txt('introText')); + var fullText:String = Assets.getText(Paths.txt('data/introText')); var firstArray:Array = fullText.split('\n'); var swagGoodArray:Array> = [];