cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-23 10:29:29 +00:00
Code Issues Releases Wiki Activity

odds and ends

Browse source
This commit is contained in:
Cameron Taylor 2021-09-10 10:07:55 -04:00
parent 3c03e06a39
commit 2bd4a91e7e
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/FreeplayState.hx
View file

@ -98,7 +98,7 @@ class FreeplayState extends MusicBeatState
if (StoryMenuState.weekUnlocked[7] || isDebug) if (StoryMenuState.weekUnlocked[7] || isDebug)
addWeek(['Ugh', 'Guns', 'Stress'], 7, ['tankman']); addWeek(['Ugh', 'Guns', 'Stress'], 7, ['tankman']);
// addWeek(["Darnell"], 8, ['darnell']); addWeek(["Darnell"], 8, ['darnell']);
// LOAD MUSIC // LOAD MUSIC
@ -362,7 +362,18 @@ class FreeplayState extends MusicBeatState
if (accepted) if (accepted)
{ {
// if (Assets.exists())
var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty); var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty);
if (!Assets.exists(Paths.json(songs[curSelected].songName + '/' + poop)))
{
// defaults to normal if HARD / EASY doesn't exist
// does not account if NORMAL doesn't exist!
FlxG.log.warn("CURRENT DIFFICULTY IS NOT CHARTED, DEFAULTING TO NORMAL!");
poop = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), 1);
curDifficulty = 1;
}
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase()); PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase());
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty; PlayState.storyDifficulty = curDifficulty;

17
source/InitState.hx
View file

@ -11,6 +11,8 @@ import openfl.display.BitmapData;
import ui.PreferencesMenu; import ui.PreferencesMenu;
import ui.stageBuildShit.StageBuilderState; import ui.stageBuildShit.StageBuilderState;
using StringTools;
#if colyseus #if colyseus
import io.colyseus.Client; import io.colyseus.Client;
import io.colyseus.Room; import io.colyseus.Room;
@ -24,8 +26,6 @@ import sys.io.File;
import sys.thread.Thread; import sys.thread.Thread;
#end #end
using StringTools;
class InitState extends FlxTransitionableState class InitState extends FlxTransitionableState
{ {
override public function create():Void override public function create():Void
@ -39,15 +39,18 @@ class InitState extends FlxTransitionableState
#if discord_rpc #if discord_rpc
DiscordClient.initialize(); DiscordClient.initialize();
Application.current.onExit.add(function(exitCode){ Application.current.onExit.add(function(exitCode)
{
DiscordClient.shutdown(); DiscordClient.shutdown();
}); });
#end #end
// ==== flixel shit ==== // // ==== flixel shit ==== //
FlxG.debugger.addButton(LEFT, new BitmapData(200, 200), function(){ // This big obnoxious white button is for MOBILE, so that you can press it
// easily with your finger when debug bullshit pops up during testing lol!
FlxG.debugger.addButton(LEFT, new BitmapData(200, 200), function()
{
FlxG.debugger.visible = false; FlxG.debugger.visible = false;
}); });
@ -63,8 +66,8 @@ class InitState extends FlxTransitionableState
FlxTransitionableState.defaultTransIn = new TransitionData(FADE, FlxColor.BLACK, 1, new FlxPoint(0, -1), {asset: diamond, width: 32, height: 32}, FlxTransitionableState.defaultTransIn = new TransitionData(FADE, FlxColor.BLACK, 1, new FlxPoint(0, -1), {asset: diamond, width: 32, height: 32},
new FlxRect(-200, -200, FlxG.width * 1.4, FlxG.height * 1.4)); new FlxRect(-200, -200, FlxG.width * 1.4, FlxG.height * 1.4));
FlxTransitionableState.defaultTransOut = new TransitionData(FADE, FlxColor.BLACK, 0.7, new FlxPoint(0, 1), FlxTransitionableState.defaultTransOut = new TransitionData(FADE, FlxColor.BLACK, 0.7, new FlxPoint(0, 1), {asset: diamond, width: 32, height: 32},
{asset: diamond, width: 32, height: 32}, new FlxRect(-200, -200, FlxG.width * 1.4, FlxG.height * 1.4)); new FlxRect(-200, -200, FlxG.width * 1.4, FlxG.height * 1.4));
// ===== save shit ===== // // ===== save shit ===== //

5
source/PlayState.hx
View file

@ -506,7 +506,7 @@ class PlayState extends MusicBeatState
var fgTank3:BGSprite = new BGSprite('tank3', 1300, 1200, 3.5, 2.5, ['fg']); var fgTank3:BGSprite = new BGSprite('tank3', 1300, 1200, 3.5, 2.5, ['fg']);
foregroundSprites.add(fgTank3); foregroundSprites.add(fgTank3);
case "week8Lol": case "darnell":
loadStage('phillyStreets'); loadStage('phillyStreets');
default: default:
@ -1922,6 +1922,9 @@ class PlayState extends MusicBeatState
#end #end
} }
if (FlxG.keys.justPressed.EIGHT)
FlxG.switchState(new ui.animDebugShit.DebugBoundingState());
if (FlxG.keys.justPressed.NINE) if (FlxG.keys.justPressed.NINE)
iconP1.swapOldIcon(); iconP1.swapOldIcon();