cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-16 20:03:04 +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 0dde68341c
commit 7865a59fed
8 changed files with 5294 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
art/flashFiles/Senpai_Assets.fla Normal file
View file

Binary file not shown.

1
assets/data/characterList.txt
View file

@ -12,3 +12,4 @@ bf-christmas
gf-christmas gf-christmas
monster monster
bf-pixel bf-pixel
senpai

5182
assets/data/senpai/senpai.json
View file

File diff suppressed because one or more lines are too long

BIN
assets/images/weeb/senpai.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 40 KiB

75
assets/images/weeb/senpai.xml Normal file
View file

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="senpai.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="SENPAI DOWN NOTE instance 10000" x="0" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10001" x="0" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10002" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10003" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10004" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10005" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10006" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10007" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10008" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10009" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10010" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10011" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10012" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI DOWN NOTE instance 10013" x="135" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10000" x="270" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10001" x="270" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10002" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10003" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10004" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10005" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10006" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10007" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10008" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10009" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10010" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10011" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10012" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI LEFT NOTE instance 10013" x="405" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10000" x="540" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10001" x="540" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10002" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10003" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10004" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10005" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10006" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10007" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10008" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10009" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10010" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10011" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10012" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI RIGHT NOTE instance 10013" x="675" y="0" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10000" x="810" y="0" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10001" x="810" y="0" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10002" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10003" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10004" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10005" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10006" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10007" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10008" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10009" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10010" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10011" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10012" x="0" y="174" width="125" height="164"/>
<SubTexture name="SENPAI UP NOTE instance 10013" x="0" y="174" width="125" height="164"/>
<SubTexture name="Senpai Idle instance 10000" x="135" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10001" x="135" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10002" x="269" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10003" x="269" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10004" x="403" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10005" x="403" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10006" x="537" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10007" x="537" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10008" x="671" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10009" x="671" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10010" x="671" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10011" x="671" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10012" x="671" y="174" width="124" height="164"/>
<SubTexture name="Senpai Idle instance 10013" x="671" y="174" width="124" height="164"/>
</TextureAtlas>

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);

16
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,8 +1150,17 @@ 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);
if (dad.curCharacter == 'mom')
switch (dad.curCharacter)
{
case 'mom':
camFollow.y = dad.getMidpoint().y; camFollow.y = dad.getMidpoint().y;
case 'senpai':
camFollow.y = dad.getMidpoint().y - 430;
camFollow.x = dad.getMidpoint().x - 100;
}
if (dad.curCharacter == 'mom')
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')