From 3882de4ad8b30e39326d62ad25f9d5618e3d0458 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 24 Feb 2021 20:22:37 -0500 Subject: [PATCH] freeplay fixin shit --- source/Character.hx | 3 ++- source/FreeplayState.hx | 5 +++++ source/StoryMenuState.hx | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/Character.hx b/source/Character.hx index e13abdee9..810d21047 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -1,5 +1,6 @@ package; +import flixel.FlxG; import flixel.FlxSprite; import flixel.animation.FlxBaseAnimation; import flixel.graphics.frames.FlxAtlasFrames; @@ -18,9 +19,9 @@ class Character extends FlxSprite public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false) { - animOffsets = new Map>(); super(x, y); + animOffsets = new Map>(); curCharacter = character; this.isPlayer = isPlayer; diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index b39ebc973..32e02359d 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -50,6 +50,7 @@ class FreeplayState extends MusicBeatState { songs.push('Spookeez'); songs.push('South'); + songs.push('Monster'); } if (StoryMenuState.weekUnlocked[3] || isDebug) @@ -198,6 +199,10 @@ class FreeplayState extends MusicBeatState PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase()); PlayState.isStoryMode = false; PlayState.storyDifficulty = curDifficulty; + + // QUICK DUMB MATH + // gets story week from currently selected, will be fuckie if things are NOT in order! + PlayState.storyWeek = Math.ceil((curSelected + 1) / 3); LoadingState.loadAndSwitchState(new PlayState()); } } diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index adb9d6cb3..1156ccade 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -22,7 +22,7 @@ class StoryMenuState extends MusicBeatState var weekData:Array = [ ['Tutorial'], ['Bopeebo', 'Fresh', 'Dadbattle'], - ['Spookeez', 'South'], + ['Spookeez', 'South', "Monster"], ['Pico', 'Philly', "Blammed"], ['Satin-Panties', "High", "Milf"], ['Cocoa', 'Eggnog', 'Winter-Horrorland'],