cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

background girls

This commit is contained in:
Cameron Taylor 2021-02-02 03:24:34 -05:00
parent ec4a97a267
commit dd1d6263b9
9 changed files with 102 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/data/roses/roses-easy.json
View File

File diff suppressed because one or more lines are too long

2
assets/data/roses/roses-hard.json
View File

File diff suppressed because one or more lines are too long

2
assets/data/roses/roses.json
View File

File diff suppressed because one or more lines are too long

BIN
assets/images/weeb/bgFreaks.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 99 KiB

90
assets/images/weeb/bgFreaks.xml
View File

@ -2,34 +2,64 @@
<TextureAtlas imagePath="bgFreaks.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="BG girls group0000" x="0" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0001" x="0" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0002" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0003" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0004" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0005" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0006" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0007" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0008" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0009" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0010" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0011" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0012" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0013" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0014" x="460" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0015" x="460" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0016" x="0" y="212" width="450" height="96"/>
<SubTexture name="BG girls group0017" x="0" y="212" width="450" height="96"/>
<SubTexture name="BG girls group0018" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0019" x="0" y="106" width="450" height="96"/>
<SubTexture name="BG girls group0020" x="460" y="212" width="450" height="96"/>
<SubTexture name="BG girls group0021" x="460" y="212" width="450" height="96"/>
<SubTexture name="BG girls group0022" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0023" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0024" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0025" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0026" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0027" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0028" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG girls group0029" x="460" y="0" width="450" height="96"/>
<SubTexture name="BG fangirls dissuaded0000" x="0" y="0" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0001" x="0" y="0" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0002" x="461" y="0" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0003" x="461" y="0" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0004" x="461" y="0" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0005" x="461" y="0" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0006" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0007" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0008" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0009" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0010" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0011" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0012" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0013" x="0" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0014" x="461" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0015" x="461" y="106" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0016" x="0" y="212" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0017" x="0" y="212" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0018" x="461" y="212" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0019" x="461" y="212" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0020" x="0" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0021" x="0" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0022" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0023" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0024" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0025" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0026" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0027" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0028" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG fangirls dissuaded0029" x="461" y="318" width="451" height="96"/>
<SubTexture name="BG girls group0000" x="0" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0001" x="0" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0002" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0003" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0004" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0005" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0006" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0007" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0008" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0009" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0010" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0011" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0012" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0013" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0014" x="460" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0015" x="460" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0016" x="0" y="636" width="450" height="96"/>
<SubTexture name="BG girls group0017" x="0" y="636" width="450" height="96"/>
<SubTexture name="BG girls group0018" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0019" x="0" y="530" width="450" height="96"/>
<SubTexture name="BG girls group0020" x="460" y="636" width="450" height="96"/>
<SubTexture name="BG girls group0021" x="460" y="636" width="450" height="96"/>
<SubTexture name="BG girls group0022" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0023" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0024" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0025" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0026" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0027" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0028" x="460" y="424" width="450" height="96"/>
<SubTexture name="BG girls group0029" x="460" y="424" width="450" height="96"/>
</TextureAtlas>

10
source/BackgroundGirls.hx
View File

@ -9,14 +9,24 @@ class BackgroundGirls extends FlxSprite
{
super(x, y);
// BG fangirls dissuaded
frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/bgFreaks.png', 'assets/images/weeb/bgFreaks.xml');
animation.addByIndices('danceLeft', 'BG girls group', CoolUtil.numberArray(14), "", 24, false);
animation.addByIndices('danceRight', 'BG girls group', CoolUtil.numberArray(30, 15), "", 24, false);
animation.play('danceLeft');
}
var danceDir:Bool = false;
public function getScared():Void
{
animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false);
animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false);
dance();
}
public function dance():Void
{
danceDir = !danceDir;

18
source/Character.hx
View File

@ -420,6 +420,24 @@ class Character extends FlxSprite
setGraphicSize(Std.int(width * 6));
updateHitbox();
antialiasing = false;
case 'senpai-angry':
frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpai.png', 'assets/images/weeb/senpai.xml');
animation.addByPrefix('idle', 'Angry Senpai Idle', 24, false);
animation.addByPrefix('singUP', 'Angry Senpai UP NOTE', 24, false);
animation.addByPrefix('singLEFT', 'Angry Senpai LEFT NOTE', 24, false);
animation.addByPrefix('singRIGHT', 'Angry Senpai RIGHT NOTE', 24, false);
animation.addByPrefix('singDOWN', 'Angry 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 'spirit':

1
source/HealthIcon.hx
View File

@ -22,6 +22,7 @@ class HealthIcon extends FlxSprite
animation.add('face', [10, 11], 0, false, isPlayer);
animation.add('dad', [12, 13], 0, false, isPlayer);
animation.add('senpai', [22, 22], 0, false, isPlayer);
animation.add('senpai-angry', [22, 22], 0, false, isPlayer);
animation.add('spirit', [23, 23], 0, false, isPlayer);
animation.add('bf-old', [14, 15], 0, false, isPlayer);
animation.add('gf', [16], 0, false, isPlayer);

10
source/PlayState.hx
View File

@ -402,6 +402,9 @@ class PlayState extends MusicBeatState
bgGirls = new BackgroundGirls(-100, 190);
bgGirls.scrollFactor.set(0.9, 0.9);
if (SONG.song.toLowerCase() == 'roses')
bgGirls.getScared();
bgGirls.setGraphicSize(Std.int(bgGirls.width * daPixelZoom));
bgGirls.updateHitbox();
add(bgGirls);
@ -556,6 +559,10 @@ class PlayState extends MusicBeatState
dad.x += 150;
dad.y += 360;
camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y);
case 'senpai-angry':
dad.x += 150;
dad.y += 360;
camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y);
case 'spirit':
dad.x -= 150;
dad.y += 100;
@ -1325,6 +1332,9 @@ class PlayState extends MusicBeatState
case 'senpai':
camFollow.y = dad.getMidpoint().y - 430;
camFollow.x = dad.getMidpoint().x - 100;
case 'senpai-angry':
camFollow.y = dad.getMidpoint().y - 430;
camFollow.x = dad.getMidpoint().x - 100;
}
if (dad.curCharacter == 'mom')