From 7190a3b47acf79a2a5c341ba8317ae477da64373 Mon Sep 17 00:00:00 2001 From: Eric Myllyoja Date: Mon, 14 Nov 2022 23:30:35 -0500 Subject: [PATCH] Pico flips you off now --- source/funkin/play/PlayState.hx | 6 ------ source/funkin/util/assets/DataAssets.hx | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 4ebc91143..73e54e238 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -2411,12 +2411,6 @@ class PlayState extends MusicBeatState if (currentStage == null) return; - // TODO: Move this to a song event. - // if (Conductor.currentBeat % 8 == 7 && currentSong.song == 'Bopeebo') - // { - // currentStage.getBoyfriend().playAnimation('hey', true); - // } - // TODO: Move this to a song event. if (Conductor.currentBeat % 16 == 15 // && currentSong.song == 'Tutorial' && currentStage.getDad().characterId == 'gf' diff --git a/source/funkin/util/assets/DataAssets.hx b/source/funkin/util/assets/DataAssets.hx index a110ecc2f..ee0699810 100644 --- a/source/funkin/util/assets/DataAssets.hx +++ b/source/funkin/util/assets/DataAssets.hx @@ -6,7 +6,7 @@ class DataAssets { static function buildDataPath(path:String):String { - return 'assets/data/${path}'; + return 'default:assets/data/${path}'; } public static function listDataFilesInPath(path:String, ?suffix:String = '.json'):Array