cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-06-20 09:21:27 +00:00
Code Issues Releases Wiki Activity

got g-friend codeed

Browse source
This commit is contained in:
Cameron Taylor 2022-09-23 14:26:50 -04:00
parent 1a1ac2a866
commit 58fe9c8f8c
3 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/FreeplayState.hx
View file

@ -561,7 +561,7 @@ class FreeplayState extends MusicBeatSubstate
curDifficulty = 0; curDifficulty = 0;
// intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); // intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
intendedScore = FlxG.random.int(0, 100000); intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
PlayState.storyDifficulty = curDifficulty; PlayState.storyDifficulty = curDifficulty;

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

@ -1446,13 +1446,17 @@ class PlayState extends MusicBeatState implements IHook
// unloadAssets(); // unloadAssets();
camZooming = false; camZooming = false;
FlxG.camera.follow(PlayState.instance.currentStage.getGirlfriend(), null, 0.05); FlxG.camera.follow(PlayState.instance.currentStage.getGirlfriend(), null, 0.05);
FlxG.camera.targetOffset.y -= 370; FlxG.camera.targetOffset.y -= 350;
FlxG.camera.targetOffset.x += 20;
FlxTween.tween(camHUD, {alpha: 0}, 0.6); FlxTween.tween(camHUD, {alpha: 0}, 0.6);
new FlxTimer().start(0.8, _ -> new FlxTimer().start(0.8, _ ->
{ {
currentStage.getGirlfriend().animation.play("cheer");
FlxTween.tween(FlxG.camera, {zoom: 1200}, 1.1, { FlxTween.tween(FlxG.camera, {zoom: 1200}, 1.1, {
ease: FlxEase.expoIn, ease: FlxEase.expoIn,
onComplete: _ -> onComplete: _ ->

31
source/funkin/play/ResultState.hx
View file

@ -35,6 +35,27 @@ class ResultState extends MusicBeatSubstate
bg.scrollFactor.set(); bg.scrollFactor.set();
add(bg); add(bg);
var gf:FlxSprite = new FlxSprite(500, 300);
gf.frames = Paths.getSparrowAtlas('resultScreen/resultGirlfriendGOOD');
gf.animation.addByPrefix("clap", "Girlfriend Good Anim", 24, false);
gf.visible = false;
gf.animation.finishCallback = _ ->
{
gf.animation.play('clap', true, false, 9);
};
add(gf);
var boyfriend:FlxSprite = new FlxSprite(640, -200);
boyfriend.frames = Paths.getSparrowAtlas('resultScreen/resultBoyfriendGOOD');
boyfriend.animation.addByPrefix("fall", "Boyfriend Good", 24, false);
boyfriend.visible = false;
boyfriend.animation.finishCallback = function(_)
{
boyfriend.animation.play('fall', true, false, 14);
};
add(boyfriend);
var soundSystem:FlxSprite = new FlxSprite(-15, -180); var soundSystem:FlxSprite = new FlxSprite(-15, -180);
soundSystem.frames = Paths.getSparrowAtlas("resultScreen/soundSystem"); soundSystem.frames = Paths.getSparrowAtlas("resultScreen/soundSystem");
soundSystem.animation.addByPrefix("idle", "sound system", 24, false); soundSystem.animation.addByPrefix("idle", "sound system", 24, false);
@ -130,6 +151,16 @@ class ResultState extends MusicBeatSubstate
{ {
ratingsPopin.animation.play("idle"); ratingsPopin.animation.play("idle");
ratingsPopin.visible = true; ratingsPopin.visible = true;
boyfriend.animation.play('fall');
boyfriend.visible = true;
new FlxTimer().start((1 / 24) * 22, _ ->
{
// plays about 22 frames (at 24fps timing) after bf spawns in
gf.animation.play('clap', true);
gf.visible = true;
});
}); });
super.create(); super.create();