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

week6 cam center and move senpaiEvil

Browse source
This commit is contained in:
MtH 2021-04-15 03:56:42 +02:00
parent 5cc9f5532b
commit 86e1aed2fa
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/PlayState.hx
View file

@ -989,7 +989,6 @@ class PlayState extends MusicBeatState
cameraMovement(); cameraMovement();
startCountdown(); startCountdown();
camHUD.visible = true;
}); });
}); });
}); });
@ -1039,8 +1038,6 @@ class PlayState extends MusicBeatState
dad.visible = true; dad.visible = true;
gfCutsceneLayer.remove(tankCutscene); gfCutsceneLayer.remove(tankCutscene);
}); });
camHUD.visible = true;
}); });
} }
@ -1333,10 +1330,13 @@ class PlayState extends MusicBeatState
var senpaiEvil:FlxSprite = new FlxSprite(); var senpaiEvil:FlxSprite = new FlxSprite();
senpaiEvil.frames = Paths.getSparrowAtlas('weeb/senpaiCrazy'); senpaiEvil.frames = Paths.getSparrowAtlas('weeb/senpaiCrazy');
senpaiEvil.animation.addByPrefix('idle', 'Senpai Pre Explosion', 24, false); senpaiEvil.animation.addByPrefix('idle', 'Senpai Pre Explosion', 24, false);
senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * 6)); senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * daPixelZoom));
senpaiEvil.scrollFactor.set(); senpaiEvil.scrollFactor.set();
senpaiEvil.updateHitbox(); senpaiEvil.updateHitbox();
senpaiEvil.screenCenter(); senpaiEvil.screenCenter();
senpaiEvil.x += senpaiEvil.width / 5;
camFollow.setPosition(camPos.x, camPos.y);
if (SONG.song.toLowerCase() == 'roses' || SONG.song.toLowerCase() == 'thorns') if (SONG.song.toLowerCase() == 'roses' || SONG.song.toLowerCase() == 'thorns')
{ {
@ -1345,6 +1345,7 @@ class PlayState extends MusicBeatState
if (SONG.song.toLowerCase() == 'thorns') if (SONG.song.toLowerCase() == 'thorns')
{ {
add(red); add(red);
camHUD.visible = false;
} }
} }
@ -1383,6 +1384,7 @@ class PlayState extends MusicBeatState
FlxG.camera.fade(FlxColor.WHITE, 0.01, true, function() FlxG.camera.fade(FlxColor.WHITE, 0.01, true, function()
{ {
add(dialogueBox); add(dialogueBox);
camHUD.visible = true;
}, true); }, true);
}); });
new FlxTimer().start(3.2, function(deadTime:FlxTimer) new FlxTimer().start(3.2, function(deadTime:FlxTimer)
@ -1411,6 +1413,7 @@ class PlayState extends MusicBeatState
function startCountdown():Void function startCountdown():Void
{ {
inCutscene = false; inCutscene = false;
camHUD.visible = true;
generateStaticArrows(0); generateStaticArrows(0);
generateStaticArrows(1); generateStaticArrows(1);
@ -2516,10 +2519,7 @@ class PlayState extends MusicBeatState
{ {
case 'mom': case 'mom':
camFollow.y = dad.getMidpoint().y; camFollow.y = dad.getMidpoint().y;
case 'senpai': case 'senpai' | 'senpai-angry':
camFollow.y = dad.getMidpoint().y - 430;
camFollow.x = dad.getMidpoint().x - 100;
case 'senpai-angry':
camFollow.y = dad.getMidpoint().y - 430; camFollow.y = dad.getMidpoint().y - 430;
camFollow.x = dad.getMidpoint().x - 100; camFollow.x = dad.getMidpoint().x - 100;
} }