Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #531 from FunkinCrew/freeplay-objects-tweens

Browse source 
Freeplay objects tweens
This commit is contained in:
Cameron Taylor 2024-04-30 04:15:30 -04:00 committed by GitHub
commit 9731b2acd7
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -336,13 +336,12 @@ class FreeplayState extends MusicBeatSubState
exitMovers.set([blackOverlayBullshitLOLXD, bgDad], exitMovers.set([blackOverlayBullshitLOLXD, bgDad],
{ {
x: FlxG.width * 1.5, x: FlxG.width * 1.5,
y: bgDad.height,
speed: 0.4, speed: 0.4,
wait: 0 wait: 0
}); });
add(bgDad); add(bgDad);
FlxTween.tween(blackOverlayBullshitLOLXD, {x: pinkBack.width * 0.75}, 1, {ease: FlxEase.quintOut}); FlxTween.tween(blackOverlayBullshitLOLXD, {x: pinkBack.width * 0.75}, 0.7, {ease: FlxEase.quintOut});
blackOverlayBullshitLOLXD.shader = bgDad.shader; blackOverlayBullshitLOLXD.shader = bgDad.shader;
@ -409,6 +408,7 @@ class FreeplayState extends MusicBeatSubState
var sillyStroke:StrokeShader = new StrokeShader(0xFFFFFFFF, 2, 2); var sillyStroke:StrokeShader = new StrokeShader(0xFFFFFFFF, 2, 2);
fnfFreeplay.shader = sillyStroke; fnfFreeplay.shader = sillyStroke;
ostName.shader = sillyStroke;
add(fnfFreeplay); add(fnfFreeplay);
add(ostName); add(ostName);
@ -430,6 +430,7 @@ class FreeplayState extends MusicBeatSubState
add(fp); add(fp);
var clearBoxSprite:FlxSprite = new FlxSprite(1165, 65).loadGraphic(Paths.image('freeplay/clearBox')); var clearBoxSprite:FlxSprite = new FlxSprite(1165, 65).loadGraphic(Paths.image('freeplay/clearBox'));
clearBoxSprite.visible = false;
add(clearBoxSprite); add(clearBoxSprite);
txtCompletion = new AtlasText(1185, 87, '69', AtlasFont.FREEPLAY_CLEAR); txtCompletion = new AtlasText(1185, 87, '69', AtlasFont.FREEPLAY_CLEAR);
@ -466,7 +467,7 @@ class FreeplayState extends MusicBeatSubState
} }
}; };
exitMovers.set([fp, txtCompletion, fnfHighscoreSpr], exitMovers.set([fp, txtCompletion, fnfHighscoreSpr, txtCompletion, clearBoxSprite],
{ {
x: FlxG.width, x: FlxG.width,
speed: 0.3 speed: 0.3
@ -509,6 +510,7 @@ class FreeplayState extends MusicBeatSubState
fp.visible = true; fp.visible = true;
fp.updateScore(0); fp.updateScore(0);
clearBoxSprite.visible = true;
txtCompletion.visible = true; txtCompletion.visible = true;
intendedCompletion = 0; intendedCompletion = 0;
@ -752,13 +754,13 @@ class FreeplayState extends MusicBeatSubState
switch (txtCompletion.text.length) switch (txtCompletion.text.length)
{ {
case 3: case 3:
txtCompletion.x = 1185 - 10; txtCompletion.offset.x = 10;
case 2: case 2:
txtCompletion.x = 1185; txtCompletion.offset.x = 0;
case 1: case 1:
txtCompletion.x = 1185 + 24; txtCompletion.offset.x = -24;
default: default:
txtCompletion.x = 1185; txtCompletion.offset.x = 0;
} }
handleInputs(elapsed); handleInputs(elapsed);