cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-04 11:05:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #16 from FunkinCrew/feature/pico-flipping-off

Browse source 
Pico flips you off now
This commit is contained in:
Eric Myllyoja 2022-11-14 23:32:52 -05:00 committed by GitHub
parent 709cfab6a7 7190a3b47a
commit 72b433b547
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/funkin/play/PlayState.hx
View file

@ -2411,12 +2411,6 @@ class PlayState extends MusicBeatState
if (currentStage == null) if (currentStage == null)
return; 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. // TODO: Move this to a song event.
if (Conductor.currentBeat % 16 == 15 // && currentSong.song == 'Tutorial' if (Conductor.currentBeat % 16 == 15 // && currentSong.song == 'Tutorial'
&& currentStage.getDad().characterId == 'gf' && currentStage.getDad().characterId == 'gf'

2
source/funkin/util/assets/DataAssets.hx
View file

@ -6,7 +6,7 @@ class DataAssets
{ {
static function buildDataPath(path:String):String 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<String> public static function listDataFilesInPath(path:String, ?suffix:String = '.json'):Array<String>