From 385097941c1a41f220f995bd7dcab8e53afca75f Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 2 Feb 2021 02:20:14 -0500 Subject: [PATCH] idk campaign menu shit --- source/MainMenuState.hx | 2 +- source/MenuCharacter.hx | 1 + source/MenuItem.hx | 1 + source/StoryMenuState.hx | 51 +++++++++++++++++++++++++++++++++------- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 02e40438e..e1a1db228 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -22,7 +22,7 @@ class MainMenuState extends MusicBeatState var menuItems:FlxTypedGroup; #if !switch - var optionShit:Array = ['story mode', 'freeplay', 'donate', 'options']; + var optionShit:Array = ['story mode', 'freeplay', 'donate']; #else var optionShit:Array = ['story mode', 'freeplay']; #end diff --git a/source/MenuCharacter.hx b/source/MenuCharacter.hx index f40d8d412..c8d50134d 100644 --- a/source/MenuCharacter.hx +++ b/source/MenuCharacter.hx @@ -24,6 +24,7 @@ class MenuCharacter extends FlxSprite animation.addByPrefix('pico', "Pico Idle Dance", 24); animation.addByPrefix('mom', "Mom Idle BLACK LINES", 24); animation.addByPrefix('parents-christmas', "Parent Christmas Idle", 24); + animation.addByPrefix('senpai', "SENPAI idle Black Lines", 24); // Parent Christmas Idle animation.play(character); diff --git a/source/MenuItem.hx b/source/MenuItem.hx index 1429303ff..431e8ac77 100644 --- a/source/MenuItem.hx +++ b/source/MenuItem.hx @@ -25,6 +25,7 @@ class MenuItem extends FlxSpriteGroup week.animation.addByPrefix('week3', "Week 3 press", 24); week.animation.addByPrefix('week4', "Week 4 press", 24); week.animation.addByPrefix('week5', "week 5", 24); + week.animation.addByPrefix('week6', "Week 6", 24); add(week); week.animation.play('week' + weekNum); diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 3331a54c5..d5787c526 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -24,11 +24,12 @@ class StoryMenuState extends MusicBeatState ['Spookeez', 'South'], ['Pico', 'Philly', "Blammed"], ['Satin-Panties', "High", "Milf"], - ['Cocoa', 'Eggnog', 'Winter-Horrorland'] + ['Cocoa', 'Eggnog', 'Winter-Horrorland'], + ['Senpai', 'Roses', 'Thorns'] ]; var curDifficulty:Int = 1; - public static var weekUnlocked:Array = [true, true, true, true, true, true]; + public static var weekUnlocked:Array = [true, true, true, true, true, true, true]; var weekCharacters:Array = [ ['dad', 'bf', 'gf'], @@ -36,8 +37,22 @@ class StoryMenuState extends MusicBeatState ['spooky', 'bf', 'gf'], ['pico', 'bf', 'gf'], ['mom', 'bf', 'gf'], - ['parents-christmas', 'bf', 'gf'] + ['parents-christmas', 'bf', 'gf'], + ['senpai', 'bf', 'gf'] ]; + + var weekNames:Array = [ + "", + "Daddy Dearest", + "Spooky Month", + "PICO", + "MOMMY MUST MURDER", + "RED SNOW", + "hating simulator ft. moawling" + ]; + + var txtWeekTitle:FlxText; + var curWeek:Int = 0; var txtTracklist:FlxText; @@ -65,6 +80,10 @@ class StoryMenuState extends MusicBeatState scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36); scoreText.setFormat("VCR OSD Mono", 32); + txtWeekTitle = new FlxText(FlxG.width * 0.7, 10, 0, "", 32); + txtWeekTitle.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT); + txtWeekTitle.alpha = 0.7; + var rankText:FlxText = new FlxText(0, 10); rankText.text = 'RANK: GREAT'; rankText.setFormat("assets/fonts/vcr.ttf", 32); @@ -132,11 +151,8 @@ class StoryMenuState extends MusicBeatState weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.5)); weekCharacterThing.updateHitbox(); case 'pico': - weekCharacterThing.y += 170; weekCharacterThing.flipX = true; - weekCharacterThing.x -= 40; case 'parents-christmas': - weekCharacterThing.x -= 600; weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.9)); weekCharacterThing.updateHitbox(); } @@ -185,6 +201,7 @@ class StoryMenuState extends MusicBeatState add(txtTracklist); // add(rankText); add(scoreText); + add(txtWeekTitle); updateText(); @@ -199,6 +216,10 @@ class StoryMenuState extends MusicBeatState lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.5)); scoreText.text = "WEEK SCORE:" + lerpScore; + + txtWeekTitle.text = weekNames[curWeek].toUpperCase(); + txtWeekTitle.x = FlxG.width - (txtWeekTitle.width + 10); + // FlxG.watch.addQuick('font', scoreText.font); difficultySelectors.visible = weekUnlocked[curWeek]; @@ -375,11 +396,23 @@ class StoryMenuState extends MusicBeatState switch (grpWeekCharacters.members[0].animation.curAnim.name) { case 'parents-christmas': - grpWeekCharacters.members[0].offset.x = 250; - grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 0.97)); + grpWeekCharacters.members[0].offset.set(200, 200); + grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 0.99)); + + case 'senpai': + grpWeekCharacters.members[0].offset.set(130, 0); + grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1.4)); + + case 'mom': + grpWeekCharacters.members[0].offset.set(100, 200); + grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1)); + + case 'dad': + grpWeekCharacters.members[0].offset.set(120, 200); + grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1)); default: - grpWeekCharacters.members[0].offset.x = 100; + grpWeekCharacters.members[0].offset.set(100, 100); grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1)); // grpWeekCharacters.members[0].updateHitbox(); }