diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f6b353f2..b0381fd36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [UNRELEASED] +## [0.2.6] - 2021-01-20 ### Added +- 3 NEW CHRISTMAS SONGS. 2 BY KAWAISPRITE, 1 BY BASSETFILMS!!!!! BF WITH DRIP! SANTA HANGIN OUT! - Enemy icons change when they you are winning a lot ([Thanks to pahaze for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/138)) - Holding CTRL in charting editor places notes on both sides - Q and E changes sustain lengths in note editor diff --git a/Project.xml b/Project.xml index f621d06ba..94233103a 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ - + diff --git a/art/flashFiles/campaign_menu_UI_assets.fla b/art/flashFiles/campaign_menu_UI_assets.fla index 50bf1b386..69855f810 100644 Binary files a/art/flashFiles/campaign_menu_UI_assets.fla and b/art/flashFiles/campaign_menu_UI_assets.fla differ diff --git a/assets/images/campaign_menu_UI_assets.png b/assets/images/campaign_menu_UI_assets.png index 829f07bdc..d91a96bb9 100644 Binary files a/assets/images/campaign_menu_UI_assets.png and b/assets/images/campaign_menu_UI_assets.png differ diff --git a/assets/images/campaign_menu_UI_assets.xml b/assets/images/campaign_menu_UI_assets.xml index 8de71c63c..979ac2a6d 100644 --- a/assets/images/campaign_menu_UI_assets.xml +++ b/assets/images/campaign_menu_UI_assets.xml @@ -5,12 +5,8 @@ - - - - @@ -20,9 +16,10 @@ - - - + + + + diff --git a/assets/images/campaign_menu_UI_characters.png b/assets/images/campaign_menu_UI_characters.png index 058970b03..2fc15f9b5 100644 Binary files a/assets/images/campaign_menu_UI_characters.png and b/assets/images/campaign_menu_UI_characters.png differ diff --git a/assets/images/campaign_menu_UI_characters.xml b/assets/images/campaign_menu_UI_characters.xml index 0788e9dd2..b05b2734d 100644 --- a/assets/images/campaign_menu_UI_characters.xml +++ b/assets/images/campaign_menu_UI_characters.xml @@ -100,34 +100,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/christmas/bfChristmas.png b/assets/images/christmas/bfChristmas.png index f7d0dc1ff..a5ad95dd1 100644 Binary files a/assets/images/christmas/bfChristmas.png and b/assets/images/christmas/bfChristmas.png differ diff --git a/assets/images/christmas/gfChristmas.png b/assets/images/christmas/gfChristmas.png index 2a198532b..f4fab9590 100644 Binary files a/assets/images/christmas/gfChristmas.png and b/assets/images/christmas/gfChristmas.png differ diff --git a/assets/images/christmas/mom_dad_christmas_assets.png b/assets/images/christmas/mom_dad_christmas_assets.png index 28e1d982d..674d80e1e 100644 Binary files a/assets/images/christmas/mom_dad_christmas_assets.png and b/assets/images/christmas/mom_dad_christmas_assets.png differ diff --git a/assets/images/christmas/monsterChristmas.png b/assets/images/christmas/monsterChristmas.png index e0f99df62..d333e8b24 100644 Binary files a/assets/images/christmas/monsterChristmas.png and b/assets/images/christmas/monsterChristmas.png differ diff --git a/assets/music/Monster_Inst.mp3 b/assets/music/Monster_Inst.mp3 index 7beb7ee03..16ddf5cd1 100644 Binary files a/assets/music/Monster_Inst.mp3 and b/assets/music/Monster_Inst.mp3 differ diff --git a/assets/music/Monster_Voices.mp3 b/assets/music/Monster_Voices.mp3 index 94694b78d..7db5db666 100644 Binary files a/assets/music/Monster_Voices.mp3 and b/assets/music/Monster_Voices.mp3 differ diff --git a/assets/music/Winter-Horrorland_Inst.mp3 b/assets/music/Winter-Horrorland_Inst.mp3 index 73fd7b017..e515c8d48 100644 Binary files a/assets/music/Winter-Horrorland_Inst.mp3 and b/assets/music/Winter-Horrorland_Inst.mp3 differ diff --git a/assets/music/Winter-Horrorland_Voices.mp3 b/assets/music/Winter-Horrorland_Voices.mp3 index b4ae33b2b..52ad132c9 100644 Binary files a/assets/music/Winter-Horrorland_Voices.mp3 and b/assets/music/Winter-Horrorland_Voices.mp3 differ diff --git a/source/MenuCharacter.hx b/source/MenuCharacter.hx index a621409a0..f40d8d412 100644 --- a/source/MenuCharacter.hx +++ b/source/MenuCharacter.hx @@ -23,6 +23,8 @@ class MenuCharacter extends FlxSprite animation.addByPrefix('spooky', "spooky dance idle BLACK LINES", 24); animation.addByPrefix('pico', "Pico Idle Dance", 24); animation.addByPrefix('mom', "Mom Idle BLACK LINES", 24); + animation.addByPrefix('parents-christmas', "Parent Christmas Idle", 24); + // Parent Christmas Idle animation.play(character); updateHitbox(); diff --git a/source/MenuItem.hx b/source/MenuItem.hx index e35e26a1f..1429303ff 100644 --- a/source/MenuItem.hx +++ b/source/MenuItem.hx @@ -24,6 +24,7 @@ class MenuItem extends FlxSpriteGroup week.animation.addByPrefix('week2', "week2 select", 24); week.animation.addByPrefix('week3', "Week 3 press", 24); week.animation.addByPrefix('week4', "Week 4 press", 24); + week.animation.addByPrefix('week5', "week 5", 24); add(week); week.animation.play('week' + weekNum); diff --git a/source/PlayState.hx b/source/PlayState.hx index a1d0aa8a3..d849157e5 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -329,6 +329,7 @@ class PlayState extends MusicBeatState } else { + defaultCamZoom = 0.9; curStage = 'stage'; var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic('assets/images/stageback.png'); // bg.setGraphicSize(Std.int(bg.width * 2.5)); @@ -418,17 +419,18 @@ class PlayState extends MusicBeatState switch (curStage) { case 'limo': - { - boyfriend.y -= 220; - boyfriend.x += 260; + boyfriend.y -= 220; + boyfriend.x += 260; + + resetFastCar(); + add(fastCar); - resetFastCar(); - add(fastCar); - } case 'mall': - { - boyfriend.x += 200; - } + boyfriend.x += 200; + + case 'mallEvil': + boyfriend.x += 320; + dad.y -= 80; } var doof:DialogueBox = new DialogueBox(false, dialogue); @@ -515,8 +517,9 @@ class PlayState extends MusicBeatState var blackScreen:FlxSprite = new FlxSprite(0, 0).makeGraphic(Std.int(FlxG.width * 2), Std.int(FlxG.height * 2), FlxColor.BLACK); add(blackScreen); blackScreen.scrollFactor.set(); + camHUD.visible = false; - new FlxTimer().start(1, function(tmr:FlxTimer) + new FlxTimer().start(0.1, function(tmr:FlxTimer) { remove(blackScreen); FlxG.sound.play('assets/sounds/Lights_Turn_On' + TitleState.soundExt); @@ -527,6 +530,7 @@ class PlayState extends MusicBeatState new FlxTimer().start(0.8, function(tmr:FlxTimer) { + camHUD.visible = true; remove(blackScreen); FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, 2.5, { ease: FlxEase.quadInOut, @@ -1174,8 +1178,8 @@ class PlayState extends MusicBeatState keyShit(); - if (FlxG.keys.justPressed.ONE) - endSong(); + // if (FlxG.keys.justPressed.ONE) + // endSong(); } function endSong():Void diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 419a8fc2d..eb902ada4 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -19,22 +19,24 @@ class StoryMenuState extends MusicBeatState var scoreText:FlxText; var weekData:Array = [ - ['Cocoa', 'Eggnog', 'Winter-Horrorland'], + ['Tutorial'], ['Bopeebo', 'Fresh', 'Dadbattle'], ['Spookeez', 'South'], ['Pico', 'Philly', "Blammed"], - ['Satin-Panties', "High", "Milf"] + ['Satin-Panties', "High", "Milf"], + ['Cocoa', 'Eggnog', 'Winter-Horrorland'] ]; var curDifficulty:Int = 1; - public static var weekUnlocked:Array = [true, true, true, true, true]; + public static var weekUnlocked:Array = [true, true, true, true, true, true]; var weekCharacters:Array = [ ['dad', 'bf', 'gf'], ['dad', 'bf', 'gf'], ['spooky', 'bf', 'gf'], ['pico', 'bf', 'gf'], - ['mom', 'bf', 'gf'] + ['mom', 'bf', 'gf'], + ['parents-christmas', 'bf', 'gf'] ]; var curWeek:Int = 0;