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

Validated formatting of 203 HX files.

Browse source
This commit is contained in:
EliteMasterEric 2023-06-08 16:30:45 -04:00
parent 9a04678399
commit e68f9ca9a1
86 changed files with 310 additions and 419 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/funkin/Alphabet.hx
View file

@ -125,8 +125,7 @@ class Alphabet extends FlxSpriteGroup
var xPos:Float = 0; var xPos:Float = 0;
var curRow:Int = 0; var curRow:Int = 0;
new FlxTimer().start(0.05, function(tmr:FlxTimer) new FlxTimer().start(0.05, function(tmr:FlxTimer) {
{
// trace(_finalText.fastCodeAt(loopNum) + " " + _finalText.charAt(loopNum)); // trace(_finalText.fastCodeAt(loopNum) + " " + _finalText.charAt(loopNum));
if (_finalText.fastCodeAt(loopNum) == "\n".code) if (_finalText.fastCodeAt(loopNum) == "\n".code)
{ {

12
source/funkin/ComboCounter.hx
View file

@ -27,8 +27,7 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
effectStuff.animation.addByPrefix('funny', 'NOTE COMBO animation', 24, false); effectStuff.animation.addByPrefix('funny', 'NOTE COMBO animation', 24, false);
effectStuff.animation.play('funny'); effectStuff.animation.play('funny');
effectStuff.antialiasing = true; effectStuff.antialiasing = true;
effectStuff.animation.finishCallback = function(nameThing) effectStuff.animation.finishCallback = function(nameThing) {
{
kill(); kill();
}; };
effectStuff.setGraphicSize(Std.int(effectStuff.width * 0.7)); effectStuff.setGraphicSize(Std.int(effectStuff.width * 0.7));
@ -42,8 +41,7 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
{ {
if (onScreenTime < 0.9) if (onScreenTime < 0.9)
{ {
new FlxTimer().start((Conductor.crochet / 1000) * 0.25, function(tmr) new FlxTimer().start((Conductor.crochet / 1000) * 0.25, function(tmr) {
{
forceFinish(); forceFinish();
}); });
} }
@ -64,16 +62,14 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
if (effectStuff.animation.curAnim.curFrame == 18) if (effectStuff.animation.curAnim.curFrame == 18)
{ {
grpNumbers.forEach(function(spr:ComboNumber) grpNumbers.forEach(function(spr:ComboNumber) {
{
spr.animation.reset(); spr.animation.reset();
}); });
} }
if (effectStuff.animation.curAnim.curFrame == 20) if (effectStuff.animation.curAnim.curFrame == 20)
{ {
grpNumbers.forEach(function(spr:ComboNumber) grpNumbers.forEach(function(spr:ComboNumber) {
{
spr.kill(); spr.kill();
}); });
} }

3
source/funkin/CoolUtil.hx
View file

@ -119,8 +119,7 @@ class CoolUtil
FlxTween.tween(screenWipeShit, {daAlphaShit: 1}, time, FlxTween.tween(screenWipeShit, {daAlphaShit: 1}, time,
{ {
ease: FlxEase.quadInOut, ease: FlxEase.quadInOut,
onComplete: function(twn) onComplete: function(twn) {
{
screenShit.destroy(); screenShit.destroy();
FlxG.switchState(new MainMenuState()); FlxG.switchState(new MainMenuState());
} }

3
source/funkin/CutsceneCharacter.hx
View file

@ -52,8 +52,7 @@ class CutsceneCharacter extends FlxTypedGroup<FlxSprite>
cutScene.animation.play('weed'); cutScene.animation.play('weed');
cutScene.antialiasing = true; cutScene.antialiasing = true;
cutScene.animation.finishCallback = function(anim:String) cutScene.animation.finishCallback = function(anim:String) {
{
cutScene.kill(); cutScene.kill();
cutScene.destroy(); cutScene.destroy();
cutScene = null; cutScene = null;

12
source/funkin/DialogueBox.hx
View file

@ -53,8 +53,7 @@ class DialogueBox extends FlxSpriteGroup
bgFade.alpha = 0; bgFade.alpha = 0;
add(bgFade); add(bgFade);
new FlxTimer().start(0.83, function(tmr:FlxTimer) new FlxTimer().start(0.83, function(tmr:FlxTimer) {
{
bgFade.alpha += (1 / 5) * 0.7; bgFade.alpha += (1 / 5) * 0.7;
if (bgFade.alpha > 0.7) bgFade.alpha = 0.7; if (bgFade.alpha > 0.7) bgFade.alpha = 0.7;
}, 5); }, 5);
@ -192,8 +191,7 @@ class DialogueBox extends FlxSpriteGroup
if (PlayState.currentSong.song.toLowerCase() == 'senpai' if (PlayState.currentSong.song.toLowerCase() == 'senpai'
|| PlayState.currentSong.song.toLowerCase() == 'thorns') FlxG.sound.music.fadeOut(2.2, 0); || PlayState.currentSong.song.toLowerCase() == 'thorns') FlxG.sound.music.fadeOut(2.2, 0);
new FlxTimer().start(0.2, function(tmr:FlxTimer) new FlxTimer().start(0.2, function(tmr:FlxTimer) {
{
box.alpha -= 1 / 5; box.alpha -= 1 / 5;
bgFade.alpha -= 1 / 5 * 0.7; bgFade.alpha -= 1 / 5 * 0.7;
portraitLeft.visible = false; portraitLeft.visible = false;
@ -203,8 +201,7 @@ class DialogueBox extends FlxSpriteGroup
dropText.alpha = swagDialogue.alpha; dropText.alpha = swagDialogue.alpha;
}, 5); }, 5);
new FlxTimer().start(1.2, function(tmr:FlxTimer) new FlxTimer().start(1.2, function(tmr:FlxTimer) {
{
finishThing(); finishThing();
kill(); kill();
}); });
@ -233,8 +230,7 @@ class DialogueBox extends FlxSpriteGroup
// swagDialogue.text = ; // swagDialogue.text = ;
swagDialogue.resetText(dialogueList[0]); swagDialogue.resetText(dialogueList[0]);
swagDialogue.start(0.04); swagDialogue.start(0.04);
swagDialogue.completeCallback = function() swagDialogue.completeCallback = function() {
{
trace('dialogue finish'); trace('dialogue finish');
handSelect.visible = true; handSelect.visible = true;
dialogueEnded = true; dialogueEnded = true;

3
source/funkin/Discord.hx
View file

@ -58,8 +58,7 @@ class DiscordClient
public static function initialize() public static function initialize()
{ {
var DiscordDaemon = sys.thread.Thread.create(() -> var DiscordDaemon = sys.thread.Thread.create(() -> {
{
new DiscordClient(); new DiscordClient();
}); });
trace("Discord Client initialized"); trace("Discord Client initialized");

20
source/funkin/LoadingState.hx
View file

@ -50,8 +50,7 @@ class LoadingState extends MusicBeatState
loadBar.screenCenter(X); loadBar.screenCenter(X);
add(loadBar); add(loadBar);
initSongsManifest().onComplete(function(lib) initSongsManifest().onComplete(function(lib) {
{
callbacks = new MultiCallback(onLoad); callbacks = new MultiCallback(onLoad);
var introComplete = callbacks.add("introComplete"); var introComplete = callbacks.add("introComplete");
checkLoadSong(getSongPath()); checkLoadSong(getSongPath());
@ -89,8 +88,7 @@ class LoadingState extends MusicBeatState
// @:privateAccess // @:privateAccess
// library.pathGroups.set(symbolPath, [library.__cacheBreak(symbolPath)]); // library.pathGroups.set(symbolPath, [library.__cacheBreak(symbolPath)]);
var callback = callbacks.add("song:" + path); var callback = callbacks.add("song:" + path);
Assets.loadSound(path).onComplete(function(_) Assets.loadSound(path).onComplete(function(_) {
{
callback(); callback();
}); });
} }
@ -105,8 +103,7 @@ class LoadingState extends MusicBeatState
if (!LimeAssets.libraryPaths.exists(library)) throw "Missing library: " + library; if (!LimeAssets.libraryPaths.exists(library)) throw "Missing library: " + library;
var callback = callbacks.add("library:" + library); var callback = callbacks.add("library:" + library);
Assets.loadLibrary(library).onComplete(function(_) Assets.loadLibrary(library).onComplete(function(_) {
{
callback(); callback();
}); });
} }
@ -259,8 +256,7 @@ class LoadingState extends MusicBeatState
path = LimeAssets.__cacheBreak(path); path = LimeAssets.__cacheBreak(path);
} }
AssetManifest.loadFromFile(path, rootPath).onComplete(function(manifest) AssetManifest.loadFromFile(path, rootPath).onComplete(function(manifest) {
{
if (manifest == null) if (manifest == null)
{ {
promise.error("Cannot parse asset manifest for library \"" + id + "\""); promise.error("Cannot parse asset manifest for library \"" + id + "\"");
@ -280,9 +276,8 @@ class LoadingState extends MusicBeatState
library.onChange.add(LimeAssets.onChange.dispatch); library.onChange.add(LimeAssets.onChange.dispatch);
promise.completeWith(Future.withValue(library)); promise.completeWith(Future.withValue(library));
} }
}).onError(function(_) }).onError(function(_) {
{ promise.error("There is no asset library with an ID of \"" + id + "\"");
promise.error("There is no asset library with an ID of \"" + id + "\"");
}); });
return promise.future; return promise.future;
@ -311,8 +306,7 @@ class MultiCallback
length++; length++;
numRemaining++; numRemaining++;
var func:Void->Void = null; var func:Void->Void = null;
func = function() func = function() {
{
if (unfired.exists(id)) if (unfired.exists(id))
{ {
unfired.remove(id); unfired.remove(id);

3
source/funkin/MemoryCounter.hx
View file

@ -24,8 +24,7 @@ class MemoryCounter extends TextField
text = "RAM: "; text = "RAM: ";
#if flash #if flash
addEventListener(Event.ENTER_FRAME, function(e) addEventListener(Event.ENTER_FRAME, function(e) {
{
var time = Lib.getTimer(); var time = Lib.getTimer();
__enterFrame(time - currentTime); __enterFrame(time - currentTime);
}); });

6
source/funkin/NGio.hx
View file

@ -49,8 +49,7 @@ class NGio
trace('checking NG.io version'); trace('checking NG.io version');
GAME_VER = "v" + Application.current.meta.get('version'); GAME_VER = "v" + Application.current.meta.get('version');
NG.core.calls.app.getCurrentVersion(GAME_VER).addDataHandler(function(response) NG.core.calls.app.getCurrentVersion(GAME_VER).addDataHandler(function(response) {
{
GAME_VER = response.result.data.currentVersion; GAME_VER = response.result.data.currentVersion;
trace('CURRENT NG VERSION: ' + GAME_VER); trace('CURRENT NG VERSION: ' + GAME_VER);
callback(GAME_VER); callback(GAME_VER);
@ -141,8 +140,7 @@ class NGio
var onCancel:Void->Void = null; var onCancel:Void->Void = null;
if (onComplete != null) if (onComplete != null)
{ {
onSuccess = function() onSuccess = function() {
{
onNGLogin(); onNGLogin();
onComplete(Success); onComplete(Success);
} }

3
source/funkin/NoteSplash.hx
View file

@ -34,8 +34,7 @@ class NoteSplash extends FlxSprite
animation.play('note' + noteData + '-' + FlxG.random.int(0, 1), true); animation.play('note' + noteData + '-' + FlxG.random.int(0, 1), true);
animation.curAnim.frameRate = 24 + FlxG.random.int(-2, 2); animation.curAnim.frameRate = 24 + FlxG.random.int(-2, 2);
animation.finishCallback = function(name) animation.finishCallback = function(name) {
{
kill(); kill();
}; };
updateHitbox(); updateHitbox();

9
source/funkin/TitleState.hx
View file

@ -84,8 +84,7 @@ class TitleState extends MusicBeatState
*/ */
// netConnection.addEventListener(MouseEvent.MOUSE_DOWN, overlay_onMouseDown); // netConnection.addEventListener(MouseEvent.MOUSE_DOWN, overlay_onMouseDown);
new FlxTimer().start(1, function(tmr:FlxTimer) new FlxTimer().start(1, function(tmr:FlxTimer) {
{
startIntro(); startIntro();
}); });
} }
@ -373,8 +372,7 @@ class TitleState extends MusicBeatState
#if newgrounds #if newgrounds
if (!OutdatedSubState.leftState) if (!OutdatedSubState.leftState)
{ {
NGio.checkVersion(function(version) NGio.checkVersion(function(version) {
{
// Check if version is outdated // Check if version is outdated
var localVersion:String = "v" + Application.current.meta.get('version'); var localVersion:String = "v" + Application.current.meta.get('version');
var onlineVersion = version.split(" ")[0].trim(); var onlineVersion = version.split(" ")[0].trim();
@ -391,8 +389,7 @@ class TitleState extends MusicBeatState
}); });
} }
#end #end
new FlxTimer().start(2, function(tmr:FlxTimer) new FlxTimer().start(2, function(tmr:FlxTimer) {
{
// These assets are very unlikely to be used for the rest of gameplay, so it unloads them from cache/memory // These assets are very unlikely to be used for the rest of gameplay, so it unloads them from cache/memory
// Saves about 50mb of RAM or so??? // Saves about 50mb of RAM or so???
Assets.cache.clear(Paths.image('gfDanceTitle')); Assets.cache.clear(Paths.image('gfDanceTitle'));

9
source/funkin/api/newgrounds/NgPrompt.hx
View file

@ -36,14 +36,12 @@ class NgPrompt extends Prompt
#if web #if web
prompt.buttons.getItem("yes").fireInstantly = true; prompt.buttons.getItem("yes").fireInstantly = true;
#end #end
prompt.onYes = function() prompt.onYes = function() {
{
prompt.setText("Connecting..." #if web + "\n(check your popup blocker)" #end); prompt.setText("Connecting..." #if web + "\n(check your popup blocker)" #end);
prompt.setButtons(None); prompt.setButtons(None);
openPassportUrl(); openPassportUrl();
}; };
prompt.onNo = function() prompt.onNo = function() {
{
prompt.close(); prompt.close();
prompt = null; prompt = null;
NGio.cancelLogin(); NGio.cancelLogin();
@ -92,8 +90,7 @@ class NgPrompt extends Prompt
{ {
var user = io.newgrounds.NG.core.user.name; var user = io.newgrounds.NG.core.user.name;
var prompt = new NgPrompt('Log out of $user?', Yes_No); var prompt = new NgPrompt('Log out of $user?', Yes_No);
prompt.onYes = function() prompt.onYes = function() {
{
NGio.logout(); NGio.logout();
prompt.close(); prompt.close();
}; };

6
source/funkin/freeplayStuff/BGScrollingText.hx
View file

@ -48,8 +48,7 @@ class BGScrollingText extends FlxSpriteGroup
function set_funnyColor(col:Int):Int function set_funnyColor(col:Int):Int
{ {
grpTexts.forEach(function(txt) grpTexts.forEach(function(txt) {
{
txt.color = col; txt.color = col;
}); });
@ -85,8 +84,7 @@ class BGScrollingText extends FlxSpriteGroup
function sortTextShit():Void function sortTextShit():Void
{ {
grpTexts.sort(function(Order:Int, Obj1:FlxObject, Obj2:FlxObject) grpTexts.sort(function(Order:Int, Obj1:FlxObject, Obj2:FlxObject) {
{
return FlxSort.byValues(Order, Obj1.x, Obj2.x); return FlxSort.byValues(Order, Obj1.x, Obj2.x);
}); });
} }

27
source/funkin/input/Cursor.hx
View file

@ -123,8 +123,7 @@ class Cursor
if (assetCursorDefault == null) if (assetCursorDefault == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_DEFAULT_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_DEFAULT_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorDefault = bitmapData; assetCursorDefault = bitmapData;
applyCursorParams(assetCursorDefault, CURSOR_DEFAULT_PARAMS); applyCursorParams(assetCursorDefault, CURSOR_DEFAULT_PARAMS);
}); });
@ -138,8 +137,7 @@ class Cursor
if (assetCursorCross == null) if (assetCursorCross == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_CROSS_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_CROSS_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorCross = bitmapData; assetCursorCross = bitmapData;
applyCursorParams(assetCursorCross, CURSOR_CROSS_PARAMS); applyCursorParams(assetCursorCross, CURSOR_CROSS_PARAMS);
}); });
@ -153,8 +151,7 @@ class Cursor
if (assetCursorEraser == null) if (assetCursorEraser == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_ERASER_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_ERASER_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorEraser = bitmapData; assetCursorEraser = bitmapData;
applyCursorParams(assetCursorEraser, CURSOR_ERASER_PARAMS); applyCursorParams(assetCursorEraser, CURSOR_ERASER_PARAMS);
}); });
@ -168,8 +165,7 @@ class Cursor
if (assetCursorGrabbing == null) if (assetCursorGrabbing == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_GRABBING_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_GRABBING_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorGrabbing = bitmapData; assetCursorGrabbing = bitmapData;
applyCursorParams(assetCursorGrabbing, CURSOR_GRABBING_PARAMS); applyCursorParams(assetCursorGrabbing, CURSOR_GRABBING_PARAMS);
}); });
@ -183,8 +179,7 @@ class Cursor
if (assetCursorHourglass == null) if (assetCursorHourglass == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_HOURGLASS_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_HOURGLASS_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorHourglass = bitmapData; assetCursorHourglass = bitmapData;
applyCursorParams(assetCursorHourglass, CURSOR_HOURGLASS_PARAMS); applyCursorParams(assetCursorHourglass, CURSOR_HOURGLASS_PARAMS);
}); });
@ -198,8 +193,7 @@ class Cursor
if (assetCursorPointer == null) if (assetCursorPointer == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_POINTER_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_POINTER_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorPointer = bitmapData; assetCursorPointer = bitmapData;
applyCursorParams(assetCursorPointer, CURSOR_POINTER_PARAMS); applyCursorParams(assetCursorPointer, CURSOR_POINTER_PARAMS);
}); });
@ -213,8 +207,7 @@ class Cursor
if (assetCursorText == null) if (assetCursorText == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_TEXT_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_TEXT_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorText = bitmapData; assetCursorText = bitmapData;
applyCursorParams(assetCursorText, CURSOR_TEXT_PARAMS); applyCursorParams(assetCursorText, CURSOR_TEXT_PARAMS);
}); });
@ -228,8 +221,7 @@ class Cursor
if (assetCursorZoomIn == null) if (assetCursorZoomIn == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_ZOOM_IN_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_ZOOM_IN_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorZoomIn = bitmapData; assetCursorZoomIn = bitmapData;
applyCursorParams(assetCursorZoomIn, CURSOR_ZOOM_IN_PARAMS); applyCursorParams(assetCursorZoomIn, CURSOR_ZOOM_IN_PARAMS);
}); });
@ -243,8 +235,7 @@ class Cursor
if (assetCursorZoomOut == null) if (assetCursorZoomOut == null)
{ {
var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_ZOOM_OUT_PARAMS.graphic); var future:Future<BitmapData> = Assets.loadBitmapData(CURSOR_ZOOM_OUT_PARAMS.graphic);
future.onComplete(function(bitmapData:BitmapData) future.onComplete(function(bitmapData:BitmapData) {
{
assetCursorZoomOut = bitmapData; assetCursorZoomOut = bitmapData;
applyCursorParams(assetCursorZoomOut, CURSOR_ZOOM_OUT_PARAMS); applyCursorParams(assetCursorZoomOut, CURSOR_ZOOM_OUT_PARAMS);
}); });

3
source/funkin/modding/module/ModuleHandler.hx
View file

@ -66,8 +66,7 @@ class ModuleHandler
{ {
modulePriorityOrder = moduleCache.keys().array(); modulePriorityOrder = moduleCache.keys().array();
modulePriorityOrder.sort(function(a:String, b:String):Int modulePriorityOrder.sort(function(a:String, b:String):Int {
{
var aModule:Module = moduleCache.get(a); var aModule:Module = moduleCache.get(a);
var bModule:Module = moduleCache.get(b); var bModule:Module = moduleCache.get(b);

6
source/funkin/play/Countdown.hx
View file

@ -46,8 +46,7 @@ class Countdown
// The timer function gets called based on the beat of the song. // The timer function gets called based on the beat of the song.
countdownTimer = new FlxTimer(); countdownTimer = new FlxTimer();
countdownTimer.start(Conductor.crochet / 1000, function(tmr:FlxTimer) countdownTimer.start(Conductor.crochet / 1000, function(tmr:FlxTimer) {
{
countdownStep = decrement(countdownStep); countdownStep = decrement(countdownStep);
// Handle onBeatHit events manually // Handle onBeatHit events manually
@ -216,8 +215,7 @@ class Countdown
FlxTween.tween(countdownSprite, {y: countdownSprite.y += 100, alpha: 0}, Conductor.crochet / 1000, FlxTween.tween(countdownSprite, {y: countdownSprite.y += 100, alpha: 0}, Conductor.crochet / 1000,
{ {
ease: FlxEase.cubeInOut, ease: FlxEase.cubeInOut,
onComplete: function(twn:FlxTween) onComplete: function(twn:FlxTween) {
{
countdownSprite.destroy(); countdownSprite.destroy();
} }
}); });

3
source/funkin/play/event/SongEvent.hx
View file

@ -184,8 +184,7 @@ class SongEventParser
*/ */
public static function queryEvents(events:Array<SongEventData>, currentTime:Float):Array<SongEventData> public static function queryEvents(events:Array<SongEventData>, currentTime:Float):Array<SongEventData>
{ {
return events.filter(function(event:SongEventData):Bool return events.filter(function(event:SongEventData):Bool {
{
// If the event is already activated, don't activate it again. // If the event is already activated, don't activate it again.
if (event.activated) return false; if (event.activated) return false;

33
source/funkin/play/song/SongDataUtils.hx
View file

@ -20,8 +20,7 @@ class SongDataUtils
*/ */
public static function offsetSongNoteData(notes:Array<SongNoteData>, offset:Int):Array<SongNoteData> public static function offsetSongNoteData(notes:Array<SongNoteData>, offset:Int):Array<SongNoteData>
{ {
return notes.map(function(note:SongNoteData):SongNoteData return notes.map(function(note:SongNoteData):SongNoteData {
{
return new SongNoteData(note.time + offset, note.data, note.length, note.kind); return new SongNoteData(note.time + offset, note.data, note.length, note.kind);
}); });
} }
@ -36,8 +35,7 @@ class SongDataUtils
*/ */
public static function offsetSongEventData(events:Array<SongEventData>, offset:Int):Array<SongEventData> public static function offsetSongEventData(events:Array<SongEventData>, offset:Int):Array<SongEventData>
{ {
return events.map(function(event:SongEventData):SongEventData return events.map(function(event:SongEventData):SongEventData {
{
return new SongEventData(event.time + offset, event.event, event.value); return new SongEventData(event.time + offset, event.event, event.value);
}); });
} }
@ -53,8 +51,7 @@ class SongDataUtils
{ {
if (notes.length == 0 || subtrahend.length == 0) return notes; if (notes.length == 0 || subtrahend.length == 0) return notes;
var result = notes.filter(function(note:SongNoteData):Bool var result = notes.filter(function(note:SongNoteData):Bool {
{
for (x in subtrahend) for (x in subtrahend)
// SongNoteData's == operation has been overridden so that this will work. // SongNoteData's == operation has been overridden so that this will work.
if (x == note) return false; if (x == note) return false;
@ -76,8 +73,7 @@ class SongDataUtils
{ {
if (events.length == 0 || subtrahend.length == 0) return events; if (events.length == 0 || subtrahend.length == 0) return events;
return events.filter(function(event:SongEventData):Bool return events.filter(function(event:SongEventData):Bool {
{
// SongEventData's == operation has been overridden so that this will work. // SongEventData's == operation has been overridden so that this will work.
return !subtrahend.has(event); return !subtrahend.has(event);
}); });
@ -89,8 +85,7 @@ class SongDataUtils
*/ */
public static function flipNotes(notes:Array<SongNoteData>, ?strumlineSize:Int = 4):Array<SongNoteData> public static function flipNotes(notes:Array<SongNoteData>, ?strumlineSize:Int = 4):Array<SongNoteData>
{ {
return notes.map(function(note:SongNoteData):SongNoteData return notes.map(function(note:SongNoteData):SongNoteData {
{
var newData = note.data; var newData = note.data;
if (newData < strumlineSize) newData += strumlineSize; if (newData < strumlineSize) newData += strumlineSize;
@ -127,8 +122,7 @@ class SongDataUtils
public static function sortNotes(notes:Array<SongNoteData>, ?desc:Bool = false):Array<SongNoteData> public static function sortNotes(notes:Array<SongNoteData>, ?desc:Bool = false):Array<SongNoteData>
{ {
// TODO: Modifies the array in place. Is this okay? // TODO: Modifies the array in place. Is this okay?
notes.sort(function(a:SongNoteData, b:SongNoteData):Int notes.sort(function(a:SongNoteData, b:SongNoteData):Int {
{
return FlxSort.byValues(desc ? FlxSort.DESCENDING : FlxSort.ASCENDING, a.time, b.time); return FlxSort.byValues(desc ? FlxSort.DESCENDING : FlxSort.ASCENDING, a.time, b.time);
}); });
return notes; return notes;
@ -140,8 +134,7 @@ class SongDataUtils
public static function sortEvents(events:Array<SongEventData>, ?desc:Bool = false):Array<SongEventData> public static function sortEvents(events:Array<SongEventData>, ?desc:Bool = false):Array<SongEventData>
{ {
// TODO: Modifies the array in place. Is this okay? // TODO: Modifies the array in place. Is this okay?
events.sort(function(a:SongEventData, b:SongEventData):Int events.sort(function(a:SongEventData, b:SongEventData):Int {
{
return FlxSort.byValues(desc ? FlxSort.DESCENDING : FlxSort.ASCENDING, a.time, b.time); return FlxSort.byValues(desc ? FlxSort.DESCENDING : FlxSort.ASCENDING, a.time, b.time);
}); });
return events; return events;
@ -192,8 +185,7 @@ class SongDataUtils
*/ */
public static function getNotesInTimeRange(notes:Array<SongNoteData>, start:Float, end:Float):Array<SongNoteData> public static function getNotesInTimeRange(notes:Array<SongNoteData>, start:Float, end:Float):Array<SongNoteData>
{ {
return notes.filter(function(note:SongNoteData):Bool return notes.filter(function(note:SongNoteData):Bool {
{
return note.time >= start && note.time <= end; return note.time >= start && note.time <= end;
}); });
} }
@ -203,8 +195,7 @@ class SongDataUtils
*/ */
public static function getEventsInTimeRange(events:Array<SongEventData>, start:Float, end:Float):Array<SongEventData> public static function getEventsInTimeRange(events:Array<SongEventData>, start:Float, end:Float):Array<SongEventData>
{ {
return events.filter(function(event:SongEventData):Bool return events.filter(function(event:SongEventData):Bool {
{
return event.time >= start && event.time <= end; return event.time >= start && event.time <= end;
}); });
} }
@ -214,8 +205,7 @@ class SongDataUtils
*/ */
public static function getNotesInDataRange(notes:Array<SongNoteData>, start:Int, end:Int):Array<SongNoteData> public static function getNotesInDataRange(notes:Array<SongNoteData>, start:Int, end:Int):Array<SongNoteData>
{ {
return notes.filter(function(note:SongNoteData):Bool return notes.filter(function(note:SongNoteData):Bool {
{
return note.data >= start && note.data <= end; return note.data >= start && note.data <= end;
}); });
} }
@ -225,8 +215,7 @@ class SongDataUtils
*/ */
public static function getNotesWithData(notes:Array<SongNoteData>, data:Array<Int>):Array<SongNoteData> public static function getNotesWithData(notes:Array<SongNoteData>, data:Array<Int>):Array<SongNoteData>
{ {
return notes.filter(function(note:SongNoteData):Bool return notes.filter(function(note:SongNoteData):Bool {
{
return data.indexOf(note.data) != -1; return data.indexOf(note.data) != -1;
}); });
} }

21
source/funkin/play/song/SongSerializer.hx
View file

@ -50,8 +50,7 @@ class SongSerializer
*/ */
public static function importSongChartDataAsync(callback:SongChartData->Void):Void public static function importSongChartDataAsync(callback:SongChartData->Void):Void
{ {
browseFileReference(function(fileReference:FileReference) browseFileReference(function(fileReference:FileReference) {
{
var data = fileReference.data.toString(); var data = fileReference.data.toString();
if (data == null) return; if (data == null) return;
@ -68,8 +67,7 @@ class SongSerializer
*/ */
public static function importSongMetadataAsync(callback:SongMetadata->Void):Void public static function importSongMetadataAsync(callback:SongMetadata->Void):Void
{ {
browseFileReference(function(fileReference:FileReference) browseFileReference(function(fileReference:FileReference) {
{
var data = fileReference.data.toString(); var data = fileReference.data.toString();
if (data == null) return; if (data == null) return;
@ -170,12 +168,10 @@ class SongSerializer
{ {
var file = new FileReference(); var file = new FileReference();
file.addEventListener(Event.SELECT, function(e) file.addEventListener(Event.SELECT, function(e) {
{
var selectedFileRef:FileReference = e.target; var selectedFileRef:FileReference = e.target;
trace('Selected file: ' + selectedFileRef.name); trace('Selected file: ' + selectedFileRef.name);
selectedFileRef.addEventListener(Event.COMPLETE, function(e) selectedFileRef.addEventListener(Event.COMPLETE, function(e) {
{
var loadedFileRef:FileReference = e.target; var loadedFileRef:FileReference = e.target;
trace('Loaded file: ' + loadedFileRef.name); trace('Loaded file: ' + loadedFileRef.name);
callback(loadedFileRef); callback(loadedFileRef);
@ -192,16 +188,13 @@ class SongSerializer
static function writeFileReference(path:String, data:String) static function writeFileReference(path:String, data:String)
{ {
var file = new FileReference(); var file = new FileReference();
file.addEventListener(Event.COMPLETE, function(e:Event) file.addEventListener(Event.COMPLETE, function(e:Event) {
{
trace('Successfully wrote file.'); trace('Successfully wrote file.');
}); });
file.addEventListener(Event.CANCEL, function(e:Event) file.addEventListener(Event.CANCEL, function(e:Event) {
{
trace('Cancelled writing file.'); trace('Cancelled writing file.');
}); });
file.addEventListener(IOErrorEvent.IO_ERROR, function(e:IOErrorEvent) file.addEventListener(IOErrorEvent.IO_ERROR, function(e:IOErrorEvent) {
{
trace('IO error writing file.'); trace('IO error writing file.');
}); });
file.save(data, path); file.save(data, path);

3
source/funkin/play/stage/StageData.hx
View file

@ -68,8 +68,7 @@ class StageDataParser
// UNSCRIPTED STAGES // UNSCRIPTED STAGES
// //
var stageIdList:Array<String> = DataAssets.listDataFilesInPath('stages/'); var stageIdList:Array<String> = DataAssets.listDataFilesInPath('stages/');
var unscriptedStageIds:Array<String> = stageIdList.filter(function(stageId:String):Bool var unscriptedStageIds:Array<String> = stageIdList.filter(function(stageId:String):Bool {
{
return !stageCache.exists(stageId); return !stageCache.exists(stageId);
}); });
trace(' Instantiating ${unscriptedStageIds.length} non-scripted stages...'); trace(' Instantiating ${unscriptedStageIds.length} non-scripted stages...');

3
source/funkin/ui/ControlsMenu.hx
View file

@ -121,8 +121,7 @@ class ControlsMenu extends funkin.ui.OptionsState.Page
var margin = 100; var margin = 100;
menuCamera.deadzone.set(0, margin, menuCamera.width, menuCamera.height - margin * 2); menuCamera.deadzone.set(0, margin, menuCamera.width, menuCamera.height - margin * 2);
menuCamera.minScrollY = 0; menuCamera.minScrollY = 0;
controlGrid.onChange.add(function(selected) controlGrid.onChange.add(function(selected) {
{
camFollow.y = selected.y; camFollow.y = selected.y;
labels.forEach((label) -> label.alpha = 0.6); labels.forEach((label) -> label.alpha = 0.6);

3
source/funkin/ui/MenuList.hx
View file

@ -164,8 +164,7 @@ class MenuTypedList<T:MenuItem> extends FlxTypedGroup<T>
{ {
busy = true; busy = true;
FlxG.sound.play(Paths.sound('confirmMenu')); FlxG.sound.play(Paths.sound('confirmMenu'));
FlxFlicker.flicker(selected, 1, 0.06, true, false, function(_) FlxFlicker.flicker(selected, 1, 0.06, true, false, function(_) {
{
busy = false; busy = false;
selected.callback(); selected.callback();
}); });

9
source/funkin/ui/NgPrompt.hx
View file

@ -36,14 +36,12 @@ class NgPrompt extends Prompt
#if web #if web
prompt.buttons.getItem("yes").fireInstantly = true; prompt.buttons.getItem("yes").fireInstantly = true;
#end #end
prompt.onYes = function() prompt.onYes = function() {
{
prompt.setText("Connecting..." #if web + "\n(check your popup blocker)" #end); prompt.setText("Connecting..." #if web + "\n(check your popup blocker)" #end);
prompt.setButtons(None); prompt.setButtons(None);
openPassportUrl(); openPassportUrl();
}; };
prompt.onNo = function() prompt.onNo = function() {
{
prompt.close(); prompt.close();
prompt = null; prompt = null;
NGio.cancelLogin(); NGio.cancelLogin();
@ -92,8 +90,7 @@ class NgPrompt extends Prompt
{ {
var user = io.newgrounds.NG.core.user.name; var user = io.newgrounds.NG.core.user.name;
var prompt = new NgPrompt('Log out of $user?', Yes_No); var prompt = new NgPrompt('Log out of $user?', Yes_No);
prompt.onYes = function() prompt.onYes = function() {
{
NGio.logout(); NGio.logout();
prompt.close(); prompt.close();
}; };

6
source/funkin/ui/OptionsState.hx
View file

@ -145,8 +145,7 @@ class Page extends FlxGroup
function openPrompt(prompt:Prompt, onClose:Void->Void) function openPrompt(prompt:Prompt, onClose:Void->Void)
{ {
enabled = false; enabled = false;
prompt.closeCallback = function() prompt.closeCallback = function() {
{
enabled = true; enabled = true;
if (onClose != null) onClose(); if (onClose != null) onClose();
} }
@ -225,8 +224,7 @@ class OptionsMenu extends Page
var onPromptClose = checkLoginStatus; var onPromptClose = checkLoginStatus;
if (onClose != null) if (onClose != null)
{ {
onPromptClose = function() onPromptClose = function() {
{
checkLoginStatus(); checkLoginStatus();
onClose(); onClose();
} }

9
source/funkin/ui/PopUpStuff.hx
View file

@ -55,8 +55,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
FlxTween.tween(rating, {alpha: 0}, 0.2, FlxTween.tween(rating, {alpha: 0}, 0.2,
{ {
onComplete: function(tween:FlxTween) onComplete: function(tween:FlxTween) {
{
remove(rating, true); remove(rating, true);
rating.destroy(); rating.destroy();
}, },
@ -106,8 +105,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
FlxTween.tween(comboSpr, {alpha: 0}, 0.2, FlxTween.tween(comboSpr, {alpha: 0}, 0.2,
{ {
onComplete: function(tween:FlxTween) onComplete: function(tween:FlxTween) {
{
remove(comboSpr, true); remove(comboSpr, true);
comboSpr.destroy(); comboSpr.destroy();
}, },
@ -153,8 +151,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
FlxTween.tween(numScore, {alpha: 0}, 0.2, FlxTween.tween(numScore, {alpha: 0}, 0.2,
{ {
onComplete: function(tween:FlxTween) onComplete: function(tween:FlxTween) {
{
remove(numScore, true); remove(numScore, true);
numScore.destroy(); numScore.destroy();
}, },

9
source/funkin/ui/PreferencesMenu.hx
View file

@ -43,8 +43,7 @@ class PreferencesMenu extends Page
menuCamera.deadzone.set(0, margin, menuCamera.width, 40); menuCamera.deadzone.set(0, margin, menuCamera.width, 40);
menuCamera.minScrollY = 0; menuCamera.minScrollY = 0;
items.onChange.add(function(selected) items.onChange.add(function(selected) {
{
camFollow.y = selected.y; camFollow.y = selected.y;
}); });
} }
@ -82,8 +81,7 @@ class PreferencesMenu extends Page
function createPrefItem(prefName:String, prefString:String, prefValue:Dynamic):Void function createPrefItem(prefName:String, prefString:String, prefValue:Dynamic):Void
{ {
items.createItem(120, (120 * items.length) + 30, prefName, AtlasFont.BOLD, function() items.createItem(120, (120 * items.length) + 30, prefName, AtlasFont.BOLD, function() {
{
preferenceCheck(prefString, prefValue); preferenceCheck(prefString, prefValue);
switch (Type.typeof(prefValue).getName()) switch (Type.typeof(prefValue).getName())
@ -145,8 +143,7 @@ class PreferencesMenu extends Page
// menuCamera.followLerp = CoolUtil.camLerpShit(0.05); // menuCamera.followLerp = CoolUtil.camLerpShit(0.05);
items.forEach(function(daItem:TextMenuItem) items.forEach(function(daItem:TextMenuItem) {
{
if (items.selectedItem == daItem) daItem.x = 150; if (items.selectedItem == daItem) daItem.x = 150;
else else
daItem.x = 120; daItem.x = 120;

78
source/funkin/ui/debug/charting/ChartEditorToolboxHandler.hx
View file

@ -133,8 +133,7 @@ class ChartEditorToolboxHandler
toolbox.x = 50; toolbox.x = 50;
toolbox.y = 50; toolbox.y = 50;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxTools', false); state.setUICheckboxSelected('menubarItemToggleToolboxTools', false);
} }
@ -142,8 +141,7 @@ class ChartEditorToolboxHandler
if (toolsGroup == null) return null; if (toolsGroup == null) return null;
toolsGroup.onChange = (event:UIEvent) -> toolsGroup.onChange = (event:UIEvent) -> {
{
switch (event.target.id) switch (event.target.id)
{ {
case 'toolboxToolsGroupSelect': case 'toolboxToolsGroupSelect':
@ -168,8 +166,7 @@ class ChartEditorToolboxHandler
toolbox.x = 75; toolbox.x = 75;
toolbox.y = 100; toolbox.y = 100;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxNotes', false); state.setUICheckboxSelected('menubarItemToggleToolboxNotes', false);
} }
@ -177,8 +174,7 @@ class ChartEditorToolboxHandler
var toolboxNotesCustomKindLabel:Label = toolbox.findComponent("toolboxNotesCustomKindLabel", Label); var toolboxNotesCustomKindLabel:Label = toolbox.findComponent("toolboxNotesCustomKindLabel", Label);
var toolboxNotesCustomKind:TextField = toolbox.findComponent("toolboxNotesCustomKind", TextField); var toolboxNotesCustomKind:TextField = toolbox.findComponent("toolboxNotesCustomKind", TextField);
toolboxNotesNoteKind.onChange = (event:UIEvent) -> toolboxNotesNoteKind.onChange = (event:UIEvent) -> {
{
var isCustom = (event.data.id == '~CUSTOM~'); var isCustom = (event.data.id == '~CUSTOM~');
if (isCustom) if (isCustom)
@ -197,8 +193,7 @@ class ChartEditorToolboxHandler
} }
} }
toolboxNotesCustomKind.onChange = (event:UIEvent) -> toolboxNotesCustomKind.onChange = (event:UIEvent) -> {
{
state.selectedNoteKind = toolboxNotesCustomKind.text; state.selectedNoteKind = toolboxNotesCustomKind.text;
} }
@ -215,8 +210,7 @@ class ChartEditorToolboxHandler
toolbox.x = 100; toolbox.x = 100;
toolbox.y = 150; toolbox.y = 150;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxEvents', false); state.setUICheckboxSelected('menubarItemToggleToolboxEvents', false);
} }
@ -232,8 +226,7 @@ class ChartEditorToolboxHandler
toolboxEventsEventKind.dataSource.add({text: event.getTitle(), value: event.id}); toolboxEventsEventKind.dataSource.add({text: event.getTitle(), value: event.id});
} }
toolboxEventsEventKind.onChange = (event:UIEvent) -> toolboxEventsEventKind.onChange = (event:UIEvent) -> {
{
var eventType:String = event.data.value; var eventType:String = event.data.value;
trace('ChartEditorToolboxHandler.buildToolboxEventDataLayout() - Event type changed: $eventType'); trace('ChartEditorToolboxHandler.buildToolboxEventDataLayout() - Event type changed: $eventType');
@ -320,8 +313,7 @@ class ChartEditorToolboxHandler
target.addComponent(input); target.addComponent(input);
input.onChange = (event:UIEvent) -> input.onChange = (event:UIEvent) -> {
{
trace('ChartEditorToolboxHandler.buildEventDataFormFromSchema() - ${event.target.id} = ${event.target.value}'); trace('ChartEditorToolboxHandler.buildEventDataFormFromSchema() - ${event.target.id} = ${event.target.value}');
if (event.target.value == null) state.selectedEventData.remove(event.target.id); if (event.target.value == null) state.selectedEventData.remove(event.target.id);
@ -341,8 +333,7 @@ class ChartEditorToolboxHandler
toolbox.x = 125; toolbox.x = 125;
toolbox.y = 200; toolbox.y = 200;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxDifficulty', false); state.setUICheckboxSelected('menubarItemToggleToolboxDifficulty', false);
} }
@ -352,35 +343,28 @@ class ChartEditorToolboxHandler
var difficultyToolboxLoadMetadata:Button = toolbox.findComponent("difficultyToolboxLoadMetadata", Button); var difficultyToolboxLoadMetadata:Button = toolbox.findComponent("difficultyToolboxLoadMetadata", Button);
var difficultyToolboxLoadChart:Button = toolbox.findComponent("difficultyToolboxLoadChart", Button); var difficultyToolboxLoadChart:Button = toolbox.findComponent("difficultyToolboxLoadChart", Button);
difficultyToolboxSaveMetadata.onClick = (event:UIEvent) -> difficultyToolboxSaveMetadata.onClick = (event:UIEvent) -> {
{
SongSerializer.exportSongMetadata(state.currentSongMetadata); SongSerializer.exportSongMetadata(state.currentSongMetadata);
}; };
difficultyToolboxSaveChart.onClick = (event:UIEvent) -> difficultyToolboxSaveChart.onClick = (event:UIEvent) -> {
{
SongSerializer.exportSongChartData(state.currentSongChartData); SongSerializer.exportSongChartData(state.currentSongChartData);
}; };
difficultyToolboxSaveAll.onClick = (event:UIEvent) -> difficultyToolboxSaveAll.onClick = (event:UIEvent) -> {
{
state.exportAllSongData(); state.exportAllSongData();
}; };
difficultyToolboxLoadMetadata.onClick = (event:UIEvent) -> difficultyToolboxLoadMetadata.onClick = (event:UIEvent) -> {
{
// Replace metadata for current variation. // Replace metadata for current variation.
SongSerializer.importSongMetadataAsync(function(songMetadata) SongSerializer.importSongMetadataAsync(function(songMetadata) {
{
state.currentSongMetadata = songMetadata; state.currentSongMetadata = songMetadata;
}); });
}; };
difficultyToolboxLoadChart.onClick = (event:UIEvent) -> difficultyToolboxLoadChart.onClick = (event:UIEvent) -> {
{
// Replace chart data for current variation. // Replace chart data for current variation.
SongSerializer.importSongChartDataAsync(function(songChartData) SongSerializer.importSongChartDataAsync(function(songChartData) {
{
state.currentSongChartData = songChartData; state.currentSongChartData = songChartData;
state.noteDisplayDirty = true; state.noteDisplayDirty = true;
}); });
@ -401,14 +385,12 @@ class ChartEditorToolboxHandler
toolbox.x = 150; toolbox.x = 150;
toolbox.y = 250; toolbox.y = 250;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxMetadata', false); state.setUICheckboxSelected('menubarItemToggleToolboxMetadata', false);
} }
var inputSongName:TextField = toolbox.findComponent('inputSongName', TextField); var inputSongName:TextField = toolbox.findComponent('inputSongName', TextField);
inputSongName.onChange = (event:UIEvent) -> inputSongName.onChange = (event:UIEvent) -> {
{
var valid = event.target.text != null && event.target.text != ""; var valid = event.target.text != null && event.target.text != "";
if (valid) if (valid)
@ -423,8 +405,7 @@ class ChartEditorToolboxHandler
}; };
var inputSongArtist:TextField = toolbox.findComponent('inputSongArtist', TextField); var inputSongArtist:TextField = toolbox.findComponent('inputSongArtist', TextField);
inputSongArtist.onChange = (event:UIEvent) -> inputSongArtist.onChange = (event:UIEvent) -> {
{
var valid = event.target.text != null && event.target.text != ""; var valid = event.target.text != null && event.target.text != "";
if (valid) if (valid)
@ -439,8 +420,7 @@ class ChartEditorToolboxHandler
}; };
var inputStage:DropDown = toolbox.findComponent('inputStage', DropDown); var inputStage:DropDown = toolbox.findComponent('inputStage', DropDown);
inputStage.onChange = (event:UIEvent) -> inputStage.onChange = (event:UIEvent) -> {
{
var valid = event.data != null && event.data.id != null; var valid = event.data != null && event.data.id != null;
if (valid) if (valid)
@ -450,15 +430,13 @@ class ChartEditorToolboxHandler
}; };
var inputNoteSkin:DropDown = toolbox.findComponent('inputNoteSkin', DropDown); var inputNoteSkin:DropDown = toolbox.findComponent('inputNoteSkin', DropDown);
inputNoteSkin.onChange = (event:UIEvent) -> inputNoteSkin.onChange = (event:UIEvent) -> {
{
if (event.data.id == null) return; if (event.data.id == null) return;
state.currentSongMetadata.playData.noteSkin = event.data.id; state.currentSongMetadata.playData.noteSkin = event.data.id;
}; };
var inputBPM:NumberStepper = toolbox.findComponent('inputBPM', NumberStepper); var inputBPM:NumberStepper = toolbox.findComponent('inputBPM', NumberStepper);
inputBPM.onChange = (event:UIEvent) -> inputBPM.onChange = (event:UIEvent) -> {
{
if (event.value == null || event.value <= 0) return; if (event.value == null || event.value <= 0) return;
var timeChanges = state.currentSongMetadata.timeChanges; var timeChanges = state.currentSongMetadata.timeChanges;
@ -477,8 +455,7 @@ class ChartEditorToolboxHandler
}; };
var inputScrollSpeed:Slider = toolbox.findComponent('inputScrollSpeed', Slider); var inputScrollSpeed:Slider = toolbox.findComponent('inputScrollSpeed', Slider);
inputScrollSpeed.onChange = (event:UIEvent) -> inputScrollSpeed.onChange = (event:UIEvent) -> {
{
var valid = event.target.value != null && event.target.value > 0; var valid = event.target.value != null && event.target.value > 0;
if (valid) if (valid)
@ -505,8 +482,7 @@ class ChartEditorToolboxHandler
toolbox.x = 175; toolbox.x = 175;
toolbox.y = 300; toolbox.y = 300;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxCharacters', false); state.setUICheckboxSelected('menubarItemToggleToolboxCharacters', false);
} }
@ -523,8 +499,7 @@ class ChartEditorToolboxHandler
toolbox.x = 200; toolbox.x = 200;
toolbox.y = 350; toolbox.y = 350;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxPlayerPreview', false); state.setUICheckboxSelected('menubarItemToggleToolboxPlayerPreview', false);
} }
@ -548,8 +523,7 @@ class ChartEditorToolboxHandler
toolbox.x = 200; toolbox.x = 200;
toolbox.y = 350; toolbox.y = 350;
toolbox.onDialogClosed = (event:DialogEvent) -> toolbox.onDialogClosed = (event:DialogEvent) -> {
{
state.setUICheckboxSelected('menubarItemToggleToolboxOpponentPreview', false); state.setUICheckboxSelected('menubarItemToggleToolboxOpponentPreview', false);
} }

6
source/funkin/ui/haxeui/components/CharacterPlayer.hx
View file

@ -119,14 +119,12 @@ class CharacterPlayer extends Box
character.scale.x *= _scale; character.scale.x *= _scale;
character.scale.y *= _scale; character.scale.y *= _scale;
character.animation.callback = function(name:String = "", frameNumber:Int = -1, frameIndex:Int = -1) character.animation.callback = function(name:String = "", frameNumber:Int = -1, frameIndex:Int = -1) {
{
@:privateAccess @:privateAccess
character.onAnimationFrame(name, frameNumber, frameIndex); character.onAnimationFrame(name, frameNumber, frameIndex);
dispatch(new AnimationEvent(AnimationEvent.FRAME)); dispatch(new AnimationEvent(AnimationEvent.FRAME));
}; };
character.animation.finishCallback = function(name:String = "") character.animation.finishCallback = function(name:String = "") {
{
@:privateAccess @:privateAccess
character.onAnimationFinished(name); character.onAnimationFinished(name);
dispatch(new AnimationEvent(AnimationEvent.END)); dispatch(new AnimationEvent(AnimationEvent.END));

6
source/funkin/ui/haxeui/components/Notifbar.hx
View file

@ -44,8 +44,7 @@ class Notifbar extends SideBar
this.action.text = actionText; this.action.text = actionText;
this.action.visible = true; this.action.visible = true;
this.action.disabled = false; this.action.disabled = false;
this.action.onClick = (_) -> this.action.onClick = (_) -> {
{
actionCallback(); actionCallback();
}; };
} }
@ -98,8 +97,7 @@ class Notifbar extends SideBar
action = outerContainer.findComponent('notifbarAction', Button); action = outerContainer.findComponent('notifbarAction', Button);
dismiss = outerContainer.findComponent('notifbarDismiss', Button); dismiss = outerContainer.findComponent('notifbarDismiss', Button);
dismiss.onClick = (_) -> dismiss.onClick = (_) -> {
{
dismissNotification(); dismissNotification();
}; };
} }

6
source/funkin/ui/stageBuildShit/SprStage.hx
View file

@ -18,11 +18,9 @@ class SprStage extends FlxSprite
{ {
super(x, y); super(x, y);
FlxMouseEvent.add(this, dragShitFunc, null, function(spr:SprStage) FlxMouseEvent.add(this, dragShitFunc, null, function(spr:SprStage) {
{
if (isSelected() || StageBuilderState.curTool == SELECT) alpha = 0.5; if (isSelected() || StageBuilderState.curTool == SELECT) alpha = 0.5;
}, function(spr:SprStage) }, function(spr:SprStage) {
{
alpha = 1; alpha = 1;
}, false, true, true); }, false, true, true);
} }

6
source/funkin/ui/stageBuildShit/StageBuilderState.hx
View file

@ -94,8 +94,7 @@ class StageBuilderState extends MusicBeatState
hudGrp.add(saveSceneBtn); hudGrp.add(saveSceneBtn);
#if desktop #if desktop
FlxG.stage.window.onDropFile.add(function(path:String) FlxG.stage.window.onDropFile.add(function(path:String) {
{
trace("DROPPED FILE FROM: " + Std.string(path)); trace("DROPPED FILE FROM: " + Std.string(path));
var fileName:String = path.split('\\').pop(); var fileName:String = path.split('\\').pop();
@ -113,8 +112,7 @@ class StageBuilderState extends MusicBeatState
fo.write(sys.io.File.getBytes(path)); fo.write(sys.io.File.getBytes(path));
new FlxTimer().start(0.2, function(tmr) new FlxTimer().start(0.2, function(tmr) {
{
var awesomeImg:SprStage = new SprStage(FlxG.mouse.x, FlxG.mouse.y, sprDragShitFunc); var awesomeImg:SprStage = new SprStage(FlxG.mouse.x, FlxG.mouse.y, sprDragShitFunc);
awesomeImg.loadGraphic(Paths.image('stageBuild/stageTempImg'), false, 0, 0, true); awesomeImg.loadGraphic(Paths.image('stageBuild/stageTempImg'), false, 0, 0, true);

2
source/funkin/util/macro/FlxMacro.hx
View file

@ -24,7 +24,7 @@ class FlxMacro
{ {
name: "zIndex", // Field name. name: "zIndex", // Field name.
access: [haxe.macro.Expr.Access.APublic], // Access level access: [haxe.macro.Expr.Access.APublic], // Access level
kind: haxe.macro.Expr.FieldType.FVar(macro:Int, macro $v{0}), // Variable type and default value kind: haxe.macro.Expr.FieldType.FVar(macro :Int, macro $v{0}), // Variable type and default value
pos: pos, // The field's position in code. pos: pos, // The field's position in code.
} }
]); ]);