diff --git a/CHANGELOG.md b/CHANGELOG.md index a9dda5dd2..4ecb8ada4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you ### Fixed - Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37)) +- Animation offsets when GF is scared ## [0.2.3] - 2020-12-04 ### Added diff --git a/source/Character.hx b/source/Character.hx index f79dfa3d1..f775cbea6 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -41,7 +41,8 @@ class Character extends FlxSprite animation.addByIndices('sad', 'gf sad', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "", 24, false); animation.addByIndices('danceLeft', 'GF Dancing Beat', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); animation.addByIndices('danceRight', 'GF Dancing Beat', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - + animation.addByIndices('hairBlow', "GF Dancing Beat Hair blowing", [0, 1, 2, 3], "", 24); + animation.addByIndices('hairFall', "GF Dancing Beat Hair Landing", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], "", 24, false); animation.addByPrefix('scared', 'GF FEAR', 24); addOffset('cheer'); @@ -53,8 +54,10 @@ class Character extends FlxSprite addOffset("singRIGHT", 0, -20); addOffset("singLEFT", 0, -19); addOffset("singDOWN", 0, -20); + addOffset('hairBlow', 45, -8); + addOffset('hairFall', 0, -9); - addOffset('scared'); + addOffset('scared', -2, -17); playAnim('danceRight'); diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 8d6fd5a18..d1e369bd3 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -48,6 +48,13 @@ class FreeplayState extends MusicBeatState songs.push('South'); } + if (StoryMenuState.weekUnlocked[3] || isDebug) + { + songs.push('Pico'); + songs.push('Philly'); + songs.push('Blammed'); + } + // LOAD MUSIC // LOAD CHARACTERS