cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-01 01:36:47 +00:00
Code Issues Releases Wiki Activity

freeplay fixin shit

Browse source
This commit is contained in:
Cameron Taylor 2021-02-24 20:22:37 -05:00
parent 3e65da6d9d
commit 3882de4ad8
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/Character.hx
View file

@ -1,5 +1,6 @@
package; package;
import flixel.FlxG;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.animation.FlxBaseAnimation; import flixel.animation.FlxBaseAnimation;
import flixel.graphics.frames.FlxAtlasFrames; 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) public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false)
{ {
animOffsets = new Map<String, Array<Dynamic>>();
super(x, y); super(x, y);
animOffsets = new Map<String, Array<Dynamic>>();
curCharacter = character; curCharacter = character;
this.isPlayer = isPlayer; this.isPlayer = isPlayer;

5
source/FreeplayState.hx
View file

@ -50,6 +50,7 @@ class FreeplayState extends MusicBeatState
{ {
songs.push('Spookeez'); songs.push('Spookeez');
songs.push('South'); songs.push('South');
songs.push('Monster');
} }
if (StoryMenuState.weekUnlocked[3] || isDebug) if (StoryMenuState.weekUnlocked[3] || isDebug)
@ -198,6 +199,10 @@ class FreeplayState extends MusicBeatState
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase()); PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase());
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty; 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()); LoadingState.loadAndSwitchState(new PlayState());
} }
} }

2
source/StoryMenuState.hx
View file

@ -22,7 +22,7 @@ class StoryMenuState extends MusicBeatState
var weekData:Array<Dynamic> = [ var weekData:Array<Dynamic> = [
['Tutorial'], ['Tutorial'],
['Bopeebo', 'Fresh', 'Dadbattle'], ['Bopeebo', 'Fresh', 'Dadbattle'],
['Spookeez', 'South'], ['Spookeez', 'South', "Monster"],
['Pico', 'Philly', "Blammed"], ['Pico', 'Philly', "Blammed"],
['Satin-Panties', "High", "Milf"], ['Satin-Panties', "High", "Milf"],
['Cocoa', 'Eggnog', 'Winter-Horrorland'], ['Cocoa', 'Eggnog', 'Winter-Horrorland'],