philly charts and hair

FunkinCrew · Dec 11, 2020 · b110f8b · b110f8b
1 parent eb017da
commit b110f8b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/assets/data/philly/philly-easy.json b/assets/data/philly/philly-easy.json
diff --git a/assets/data/philly/philly-hard.json b/assets/data/philly/philly-hard.json
diff --git a/assets/data/philly/philly.json b/assets/data/philly/philly.json
diff --git 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
@@ -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();