gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format .hx files

Browse Source 
Co-Authored-By: Eric <4635334+EliteMasterEric@users.noreply.github.com>
This commit is contained in:
Hundrec
2026-04-06 04:18:09 -06:00
co-authored by Eric
parent 71d7d929b4
commit 56dabfd5c9
267 changed files with 2748 additions and 2045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/charSelect/CharSelectCursors.hx
-1
View File
@@ -17,7 +17,6 @@ class CharSelectCursors extends FlxTypedSpriteContainer<FunkinSprite>
var lightBlue:FunkinSprite;
var darkBlue:FunkinSprite;
var cursorConfirmed:FunkinSprite;
var cursorDenied:FunkinSprite;
source/funkin/ui/charSelect/CharSelectGF.hx
-2
View File
@@ -13,10 +13,8 @@ class CharSelectGF extends FunkinSprite implements IBPMSyncedScriptedClass
{
var analyzer:Null<SpectralAnalyzer>;
var analyzerLevelsCache:Array<Bar> = new Array<Bar>();
var currentGFPath:String = "";
var enableVisualizer:Bool = false;
var danceEvery:Int = 2;
public function new(x:Float, y:Float)
source/funkin/ui/charSelect/CharSelectPlayer.hx
-2
View File
@@ -11,7 +11,6 @@ class CharSelectPlayer extends FunkinSprite implements IBPMSyncedScriptedClass
var initialX:Float = 0;
var initialY:Float = 0;
var currentBFPath:Null<String>;
public function new(x:Float, y:Float)
@@ -45,7 +44,6 @@ class CharSelectPlayer extends FunkinSprite implements IBPMSyncedScriptedClass
case "slidein idle point", "cannot select Label", "unlock":
anim.play("idle", true);
case "idle":
// TODO: once char select data is refactored, add a `shouldBop` field or something IDK
if (currentBFPath != null)
{
source/funkin/ui/charSelect/CharSelectSubState.hx
+11 -13
View File
@@ -49,14 +49,12 @@ class CharSelectSubState extends MusicBeatSubState
final DEFAULT_CURSOR_INDEX:Int = 4;
var cursors:CharSelectCursors;
var cursorX:Int = 0;
var cursorY:Int = 0;
var cursorFactor:Float = 110;
var cursorOffsetX:Float = -16;
var cursorOffsetY:Float = -48;
var cursorLocIntended:FlxPoint = new FlxPoint(0, 0);
var playerChill:CharSelectPlayer;
var playerChillOut:CharSelectPlayer;
var gfChill:CharSelectGF;
@@ -74,23 +72,19 @@ class CharSelectSubState extends MusicBeatSubState
var pressedSelect:Bool = false;
var selectTimer:FlxTimer = new FlxTimer();
var allowInput:Bool = false;
var selectSound:FunkinSound = new FunkinSound();
var unlockSound:FunkinSound = new FunkinSound();
var lockedSound:FunkinSound = new FunkinSound();
var introSound:FunkinSound = new FunkinSound();
var staticSound:FunkinSound = new FunkinSound();
var selectedBizz:Array<BitmapFilter> = [new DropShadowFilter(0, 0, 0xFFFFFF, 1, 2, 2, 19, 1, false, false,
false), new DropShadowFilter(5, 45, 0x000000, 1, 2, 2, 1, 1, false, false, false)];
var selectedBizz:Array<BitmapFilter> = [
new DropShadowFilter(0, 0, 0xFFFFFF, 1, 2, 2, 19, 1, false, false, false),
new DropShadowFilter(5, 45, 0x000000, 1, 2, 2, 1, 1, false, false, false)
];
var bopInfo:Null<Null<FramesJSFLInfo>>;
// var blackScreen:FunkinSprite;
var charHitbox:FlxObject = new FlxObject();
var cutoutSize:Float = 0;
var fadeShader:BlueFade = new BlueFade();
public function new(?params:CharSelectSubStateParams)
@@ -300,7 +294,13 @@ class CharSelectSubState extends MusicBeatSubState
nametag.scrollFactor.set();
FlxG.debugger.addTrackerProfile(new TrackerProfile(FunkinSprite, ["x", "y", "alpha", "scale", "blend"]));
FlxG.debugger.addTrackerProfile(new TrackerProfile(FunkinSprite, [
"x",
"y",
"alpha",
"scale",
"blend"
]));
FlxG.debugger.addTrackerProfile(new TrackerProfile(FlxSound, ["pitch", "volume"]));
add(cursors);
@@ -726,10 +726,8 @@ class CharSelectSubState extends MusicBeatSubState
var holdTmrRight:Float = 0;
var spamDirections:FlxDirectionFlags = NONE;
var initSpam = 0.5;
var mobileDeny:Bool = false;
var mobileAccept:Bool = false;
var wentBackToFreeplay:Bool = false;
override public function update(elapsed:Float):Void
source/funkin/ui/charSelect/IntroSubState.hx
-1
View File
@@ -18,7 +18,6 @@ class IntroSubState extends MusicBeatSubState
#if html5
static final LIGHTS_VIDEO_PATH:String = Paths.stripLibrary(Paths.videos('introSelect'));
#end
#if hxvlc
static final LIGHTS_VIDEO_PATH:String = Paths.videos('introSelect');
#end
source/funkin/ui/charSelect/Nametag.hx
+26 -18
View File
@@ -13,7 +13,6 @@ class Nametag extends FlxSprite
@:allow(funkin.ui.charSelect.CharSelectSubState)
var midpointY(default, set):Float = 100;
var mosaicShader:MosaicEffect;
var currentMosaicSequence:Null<Sequence>;
public function new(?x:Float = 0, ?y:Float = 0, character:String)
@@ -83,26 +82,35 @@ class Nametag extends FlxSprite
if (fadeOut)
{
currentMosaicSequence = new Sequence([{
time: 0 / 30,
callback: () -> mosaicShader.setBlockSize(1, 1)
}, {
time: 1 / 30,
callback: () -> mosaicShader.setBlockSize(width / 27, height / 26)
}, {
time: 2 / 30,
callback: () -> mosaicShader.setBlockSize(width / 10, height / 10)
}, {time: 3 / 30, callback: () -> mosaicShader.setBlockSize(1, 1)},]);
currentMosaicSequence = new Sequence([
{
time: 0 / 30,
callback: () -> mosaicShader.setBlockSize(1, 1)
},
{
time: 1 / 30,
callback: () -> mosaicShader.setBlockSize(width / 27, height / 26)
},
{
time: 2 / 30,
callback: () -> mosaicShader.setBlockSize(width / 10, height / 10)
},
{time: 3 / 30, callback: () -> mosaicShader.setBlockSize(1, 1)},
]);
}
else
{
currentMosaicSequence = new Sequence([{
time: 0 / 30,
callback: () -> mosaicShader.setBlockSize(width / 10, height / 10)
}, {
time: 1 / 30,
callback: () -> mosaicShader.setBlockSize(width / 73, height / 6)
}, {time: 2 / 30, callback: () -> mosaicShader.setBlockSize(width / 10, height / 10)},]);
currentMosaicSequence = new Sequence([
{
time: 0 / 30,
callback: () -> mosaicShader.setBlockSize(width / 10, height / 10)
},
{
time: 1 / 30,
callback: () -> mosaicShader.setBlockSize(width / 73, height / 6)
},
{time: 2 / 30, callback: () -> mosaicShader.setBlockSize(width / 10, height / 10)},
]);
}
}