Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-03-24 05:39:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

CHRISTMAS UPDATE

Browse source
This commit is contained in:
Cameron Taylor 2021-01-20 05:31:43 -05:00
parent 55b5f56624
commit a92739402c
6 changed files with 28 additions and 18 deletions

3
CHANGELOG.md
View file

@ -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

2
Project.xml
View file

@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.5" company="ninjamuffin99" />
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.6" company="ninjamuffin99" />
<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />

2
source/MenuCharacter.hx
View file

@ -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();

1
source/MenuItem.hx
View file

@ -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);

28
source/PlayState.hx
View file

@ -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

10
source/StoryMenuState.hx
View file

@ -19,22 +19,24 @@ class StoryMenuState extends MusicBeatState
var scoreText:FlxText;
var weekData:Array<Dynamic> = [
['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<Bool> = [true, true, true, true, true];
public static var weekUnlocked:Array<Bool> = [true, true, true, true, true, true];
var weekCharacters:Array<Dynamic> = [
['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;