Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-22 23:57:50 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #666 from FunkinCrew/anysad/tutorial-hey-events

Browse source 
[PUBLIC PR] Un-hardcode animation events from Tutorial.
This commit is contained in:
Cameron Taylor 2024-07-18 15:12:15 -04:00 committed by GitHub
commit 3f242eb96c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 005c96f85f4304865acb196e7cc4d6d83f9d76d8 Subproject commit 81e61c287670f6aa8b7faf2c27561df57361f1ad

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

@ -1450,9 +1450,6 @@ class PlayState extends MusicBeatSubState
if (playerStrumline != null) playerStrumline.onBeatHit(); if (playerStrumline != null) playerStrumline.onBeatHit();
if (opponentStrumline != null) opponentStrumline.onBeatHit(); if (opponentStrumline != null) opponentStrumline.onBeatHit();
// Make the characters dance on the beat
danceOnBeat();
return true; return true;
} }
@ -1463,26 +1460,6 @@ class PlayState extends MusicBeatSubState
super.destroy(); super.destroy();
} }
/**
* Handles characters dancing to the beat of the current song.
*
* TODO: Move some of this logic into `Bopper.hx`, or individual character scripts.
*/
function danceOnBeat():Void
{
if (currentStage == null) return;
// TODO: Add HEY! song events to Tutorial.
if (Conductor.instance.currentBeat % 16 == 15
&& currentStage.getDad().characterId == 'gf'
&& Conductor.instance.currentBeat > 16
&& Conductor.instance.currentBeat < 48)
{
currentStage.getBoyfriend().playAnimation('hey', true);
currentStage.getDad().playAnimation('cheer', true);
}
}
/** /**
* Initializes the game and HUD cameras. * Initializes the game and HUD cameras.
*/ */