cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-28 15:26:12 +00:00
Code Issues Releases Wiki Activity

Additional freeplay cleanup

Browse source
This commit is contained in:
EliteMasterEric 2024-01-11 00:52:42 -05:00
parent 315aeea998
commit c05131e6a9
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -382,16 +382,16 @@ class FreeplayState extends MusicBeatSubState
add(overhangStuff); add(overhangStuff);
FlxTween.tween(overhangStuff, {y: 0}, 0.3, {ease: FlxEase.quartOut}); FlxTween.tween(overhangStuff, {y: 0}, 0.3, {ease: FlxEase.quartOut});
var fnfFreeplay:FlxText = new FlxText(4, 10, 0, "FREEPLAY", 48); var fnfFreeplay:FlxText = new FlxText(8, 8, 0, "FREEPLAY", 48);
fnfFreeplay.font = "VCR OSD Mono"; fnfFreeplay.font = "VCR OSD Mono";
fnfFreeplay.visible = false; fnfFreeplay.visible = false;
ostName = new FlxText(4, 10, FlxG.width - 4 - 4, "OFFICIAL OST", 48); ostName = new FlxText(8, 8, FlxG.width - 8 - 8, "OFFICIAL OST", 48);
ostName.font = "VCR OSD Mono"; ostName.font = "VCR OSD Mono";
ostName.alignment = RIGHT; ostName.alignment = RIGHT;
ostName.visible = false; ostName.visible = false;
exitMovers.set([overhangStuff, fnfFreeplay], exitMovers.set([overhangStuff, fnfFreeplay, ostName],
{ {
y: -overhangStuff.height, y: -overhangStuff.height,
x: 0, x: 0,
@ -402,6 +402,7 @@ class FreeplayState extends MusicBeatSubState
var sillyStroke = new StrokeShader(0xFFFFFFFF, 2, 2); var sillyStroke = new StrokeShader(0xFFFFFFFF, 2, 2);
fnfFreeplay.shader = sillyStroke; fnfFreeplay.shader = sillyStroke;
add(fnfFreeplay); add(fnfFreeplay);
add(ostName);
var fnfHighscoreSpr:FlxSprite = new FlxSprite(860, 70); var fnfHighscoreSpr:FlxSprite = new FlxSprite(860, 70);
fnfHighscoreSpr.frames = Paths.getSparrowAtlas('freeplay/highscore'); fnfHighscoreSpr.frames = Paths.getSparrowAtlas('freeplay/highscore');
@ -492,6 +493,7 @@ class FreeplayState extends MusicBeatSubState
new FlxTimer().start(1 / 24, function(handShit) { new FlxTimer().start(1 / 24, function(handShit) {
fnfHighscoreSpr.visible = true; fnfHighscoreSpr.visible = true;
fnfFreeplay.visible = true; fnfFreeplay.visible = true;
ostName.visible = true;
fp.visible = true; fp.visible = true;
fp.updateScore(0); fp.updateScore(0);

7
source/funkin/ui/freeplay/SongMenuItem.hx
View file

@ -208,7 +208,14 @@ class SongMenuItem extends FlxSpriteGroup
pixelIcon.loadGraphic(Paths.image(charPath)); pixelIcon.loadGraphic(Paths.image(charPath));
pixelIcon.scale.x = pixelIcon.scale.y = 2; pixelIcon.scale.x = pixelIcon.scale.y = 2;
switch (char)
{
case "parents-christmas":
pixelIcon.origin.x = 140;
default:
pixelIcon.origin.x = 100; pixelIcon.origin.x = 100;
}
// pixelIcon.origin.x = capsule.origin.x; // pixelIcon.origin.x = capsule.origin.x;
// pixelIcon.offset.x -= pixelIcon.origin.x; // pixelIcon.offset.x -= pixelIcon.origin.x;
} }