AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #160 from CyndaquilDAC/story-menu-gf-tutorial-fix-shit

Browse Source 
gf aint flipped on tutorial's story mode select anymore and now she stays where she should
This commit is contained in:
Kade M 2021-04-06 17:20:11 -07:00 committed by GitHub
commit 4579305755
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/ChartingState.hx
View File

@ -90,29 +90,13 @@ class ChartingState extends MusicBeatState
override function create() override function create()
{ {
if (PlayState.SONG != null)
_song = PlayState.SONG;
else
{
_song = {
song: 'Test',
notes: [],
bpm: 150,
needsVoices: true,
player1: 'bf',
player2: 'dad',
speed: 1,
validScore: false
};
}
curSection = lastSection; curSection = lastSection;
gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16);
add(gridBG); add(gridBG);
leftIcon = new HealthIcon(PlayState.SONG.player1); leftIcon = new HealthIcon('bf');
rightIcon = new HealthIcon(PlayState.SONG.player2); rightIcon = new HealthIcon('dad');
leftIcon.scrollFactor.set(1, 1); leftIcon.scrollFactor.set(1, 1);
rightIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1);
@ -131,6 +115,22 @@ class ChartingState extends MusicBeatState
curRenderedNotes = new FlxTypedGroup<Note>(); curRenderedNotes = new FlxTypedGroup<Note>();
curRenderedSustains = new FlxTypedGroup<FlxSprite>(); curRenderedSustains = new FlxTypedGroup<FlxSprite>();
if (PlayState.SONG != null)
_song = PlayState.SONG;
else
{
_song = {
song: 'Test',
notes: [],
bpm: 150,
needsVoices: true,
player1: 'bf',
player2: 'dad',
speed: 1,
validScore: false
};
}
FlxG.mouse.visible = true; FlxG.mouse.visible = true;
FlxG.save.bind('funkin', 'ninjamuffin99'); FlxG.save.bind('funkin', 'ninjamuffin99');

6
source/StoryMenuState.hx
View File

@ -37,7 +37,7 @@ class StoryMenuState extends MusicBeatState
public static var weekUnlocked:Array<Bool> = [true, true, true, true, true, true, true]; public static var weekUnlocked:Array<Bool> = [true, true, true, true, true, true, true];
var weekCharacters:Array<Dynamic> = [ var weekCharacters:Array<Dynamic> = [
['gf', 'bf', ''], ['', 'bf', 'gf'],
['dad', 'bf', 'gf'], ['dad', 'bf', 'gf'],
['spooky', 'bf', 'gf'], ['spooky', 'bf', 'gf'],
['pico', 'bf', 'gf'], ['pico', 'bf', 'gf'],
@ -47,13 +47,13 @@ class StoryMenuState extends MusicBeatState
]; ];
var weekNames:Array<String> = [ var weekNames:Array<String> = [
"", "How to Funk",
"Daddy Dearest", "Daddy Dearest",
"Spooky Month", "Spooky Month",
"PICO", "PICO",
"MOMMY MUST MURDER", "MOMMY MUST MURDER",
"RED SNOW", "RED SNOW",
"hating simulator ft. moawling" "Hating Simulator ft. Moawling"
]; ];
var txtWeekTitle:FlxText; var txtWeekTitle:FlxText;