mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-01-12 15:17:57 +00:00
philly charts and hair
This commit is contained in:
parent
800513ca05
commit
abd7826851
1
assets/data/philly/philly-easy.json
Normal file
1
assets/data/philly/philly-easy.json
Normal file
File diff suppressed because one or more lines are too long
1
assets/data/philly/philly-hard.json
Normal file
1
assets/data/philly/philly-hard.json
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -210,6 +210,13 @@ class Character extends FlxSprite
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch (curCharacter)
|
||||||
|
{
|
||||||
|
case 'gf':
|
||||||
|
if (animation.curAnim.name == 'hairFall' && animation.curAnim.finished)
|
||||||
|
playAnim('danceRight');
|
||||||
|
}
|
||||||
|
|
||||||
super.update(elapsed);
|
super.update(elapsed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -225,12 +232,16 @@ class Character extends FlxSprite
|
||||||
case 'bf':
|
case 'bf':
|
||||||
|
|
||||||
case 'gf':
|
case 'gf':
|
||||||
danced = !danced;
|
if (!animation.curAnim.name.startsWith('hair'))
|
||||||
|
{
|
||||||
|
danced = !danced;
|
||||||
|
|
||||||
|
if (danced)
|
||||||
|
playAnim('danceRight');
|
||||||
|
else
|
||||||
|
playAnim('danceLeft');
|
||||||
|
}
|
||||||
|
|
||||||
if (danced)
|
|
||||||
playAnim('danceRight');
|
|
||||||
else
|
|
||||||
playAnim('danceLeft');
|
|
||||||
case 'spooky':
|
case 'spooky':
|
||||||
danced = !danced;
|
danced = !danced;
|
||||||
|
|
||||||
|
|
|
@ -1392,6 +1392,7 @@ class PlayState extends MusicBeatState
|
||||||
if (trainSound.time >= 4700)
|
if (trainSound.time >= 4700)
|
||||||
{
|
{
|
||||||
startedMoving = true;
|
startedMoving = true;
|
||||||
|
gf.playAnim('hairBlow');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (startedMoving)
|
if (startedMoving)
|
||||||
|
@ -1414,6 +1415,7 @@ class PlayState extends MusicBeatState
|
||||||
|
|
||||||
function trainReset():Void
|
function trainReset():Void
|
||||||
{
|
{
|
||||||
|
gf.playAnim('hairFall');
|
||||||
phillyTrain.x = FlxG.width + 200;
|
phillyTrain.x = FlxG.width + 200;
|
||||||
trainMoving = false;
|
trainMoving = false;
|
||||||
// trainSound.stop();
|
// trainSound.stop();
|
||||||
|
|
Loading…
Reference in a new issue