From fefa5f80519371161aa7edab9fe9af047f2901e2 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 11 Dec 2020 07:55:39 -0500
Subject: [PATCH] philly charts and hair
---
source/Character.hx | 21 ++++++++++++++++-----
source/PlayState.hx | 2 ++
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/source/Character.hx b/source/Character.hx
index f775cbea6..51d683081 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -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);
}
@@ -225,12 +232,16 @@ class Character extends FlxSprite
case 'bf':
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':
danced = !danced;
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 0f420c772..7dec60e54 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -1392,6 +1392,7 @@ class PlayState extends MusicBeatState
if (trainSound.time >= 4700)
{
startedMoving = true;
+ gf.playAnim('hairBlow');
}
if (startedMoving)
@@ -1414,6 +1415,7 @@ class PlayState extends MusicBeatState
function trainReset():Void
{
+ gf.playAnim('hairFall');
phillyTrain.x = FlxG.width + 200;
trainMoving = false;
// trainSound.stop();