cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-30 18:53:35 +00:00
Code Issues Releases Wiki Activity

SENPAI IN THE STREETS

Browse source
This commit is contained in:
Cameron Taylor 2021-01-25 06:07:45 -05:00
parent 2233242f64
commit c7c80c85fc
3 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/Character.hx
View file

@ -385,6 +385,25 @@ class Character extends FlxSprite
antialiasing = false; antialiasing = false;
flipX = true; flipX = true;
case 'senpai':
frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpai.png', 'assets/images/weeb/senpai.xml');
animation.addByPrefix('idle', 'Senpai Idle', 24, false);
animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false);
animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false);
animation.addByPrefix('singRIGHT', 'SENPAI RIGHT NOTE', 24, false);
animation.addByPrefix('singDOWN', 'SENPAI DOWN NOTE', 24, false);
addOffset('idle');
addOffset("singUP", 5, 37);
addOffset("singRIGHT");
addOffset("singLEFT", 40);
addOffset("singDOWN", 14);
setGraphicSize(Std.int(width * 6));
updateHitbox();
antialiasing = false;
case 'parents-christmas': case 'parents-christmas':
frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/mom_dad_christmas_assets.png', frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/mom_dad_christmas_assets.png',
'assets/images/christmas/mom_dad_christmas_assets.xml'); 'assets/images/christmas/mom_dad_christmas_assets.xml');

1
source/HealthIcon.hx
View file

@ -21,6 +21,7 @@ class HealthIcon extends FlxSprite
animation.add('tankman', [8, 9], 0, false, isPlayer); animation.add('tankman', [8, 9], 0, false, isPlayer);
animation.add('face', [10, 11], 0, false, isPlayer); animation.add('face', [10, 11], 0, false, isPlayer);
animation.add('dad', [12, 13], 0, false, isPlayer); animation.add('dad', [12, 13], 0, false, isPlayer);
animation.add('senpai', [12, 13], 0, false, isPlayer);
animation.add('bf-old', [14, 15], 0, false, isPlayer); animation.add('bf-old', [14, 15], 0, false, isPlayer);
animation.add('gf', [16], 0, false, isPlayer); animation.add('gf', [16], 0, false, isPlayer);
animation.add('parents-christmas', [17], 0, false, isPlayer); animation.add('parents-christmas', [17], 0, false, isPlayer);

18
source/PlayState.hx
View file

@ -464,6 +464,9 @@ class PlayState extends MusicBeatState
dad.y += 300; dad.y += 300;
case 'parents-christmas': case 'parents-christmas':
dad.x -= 500; dad.x -= 500;
case 'senpai':
dad.x += 150;
dad.y += 300;
} }
boyfriend = new Boyfriend(770, 450, SONG.player1); boyfriend = new Boyfriend(770, 450, SONG.player1);
@ -1147,9 +1150,18 @@ class PlayState extends MusicBeatState
{ {
camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100); camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100);
// camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); // camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210);
switch (dad.curCharacter)
{
case 'mom':
camFollow.y = dad.getMidpoint().y;
case 'senpai':
camFollow.y = dad.getMidpoint().y - 430;
camFollow.x = dad.getMidpoint().x - 100;
}
if (dad.curCharacter == 'mom') if (dad.curCharacter == 'mom')
camFollow.y = dad.getMidpoint().y; vocals.volume = 1;
vocals.volume = 1;
if (SONG.song.toLowerCase() == 'tutorial') if (SONG.song.toLowerCase() == 'tutorial')
{ {
@ -1167,6 +1179,8 @@ class PlayState extends MusicBeatState
camFollow.x = boyfriend.getMidpoint().x - 300; camFollow.x = boyfriend.getMidpoint().x - 300;
case 'mall': case 'mall':
camFollow.y = boyfriend.getMidpoint().y - 200; camFollow.y = boyfriend.getMidpoint().y - 200;
case 'school':
camFollow.x = boyfriend.getMidpoint().x - 200;
} }
if (SONG.song.toLowerCase() == 'tutorial') if (SONG.song.toLowerCase() == 'tutorial')