CHRISTMAS UPDATE

This commit is contained in:
Cameron Taylor
2021-01-20 05:31:43 -05:00
parent 11414df109
commit 50a7d25304
19 changed files with 60 additions and 55 deletions

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

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

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

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;