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

assets and gf and shit

This commit is contained in:
Cameron Taylor 2020-10-05 05:55:39 -07:00
parent 95415f5890
commit d8513fc4a0
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/UI_assets.fla Normal file
View File

Binary file not shown.

BIN
assets/images/healthBar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

BIN
assets/images/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 85 KiB

24
source/PlayState.hx
View File

@ -51,6 +51,9 @@ class PlayState extends FlxState
private var camZooming:Bool = false;
private var curSong:String = "";
private var gfSpeed:Int = 1;
private var health:Float = 1;
override public function create()
{
var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.bg__png);
@ -63,6 +66,7 @@ class PlayState extends FlxState
gf = new Girlfriend(400, 130);
gf.scrollFactor.set(0.95, 0.95);
gf.antialiasing = true;
add(gf);
dad = new Dad(100, 100);
@ -304,9 +308,20 @@ class PlayState extends FlxState
FlxG.watch.addQuick("beatShit", totalBeats);
if (curSong == 'Fresh' && totalBeats == 16)
if (curSong == 'Fresh')
{
camZooming = true;
switch (totalBeats)
{
case 16:
camZooming = true;
gfSpeed = 2;
case 48:
gfSpeed = 1;
case 80:
gfSpeed = 2;
case 112:
gfSpeed = 1;
}
}
everyBeat();
everyStep();
@ -539,6 +554,7 @@ class PlayState extends FlxState
{
if (!boyfriend.stunned)
{
health -= 0.075;
trace('badNote');
FlxG.sound.play('assets/sounds/missnote' + FlxG.random.int(1, 3) + ".mp3", FlxG.random.float(0.05, 0.2));
@ -638,7 +654,9 @@ class PlayState extends FlxState
totalBeats += 1;
dad.playAnim('idle');
gf.dance();
if (totalBeats % gfSpeed == 0)
gf.dance();
if (!boyfriend.animation.curAnim.name.startsWith("sing"))
boyfriend.playAnim('idle');