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

that pussy be yankin

This commit is contained in:
Cameron Taylor 2021-04-18 13:23:09 -04:00
parent 5e4f8a9aba
commit 359300011e
8 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Project.xml
View File

@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.8" company="ninjamuffin99" />
<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />

BIN
assets/preload/music/gunsCutscene.mp4
View File

Binary file not shown.

BIN
assets/preload/music/kickstarterTrailer.mp4
View File

Binary file not shown.

BIN
assets/preload/music/stressCutscene.mp4
View File

Binary file not shown.

BIN
assets/preload/music/ughCutscene.mp4
View File

Binary file not shown.

2
source/MainMenuState.hx
View File

@ -128,6 +128,8 @@ class MainMenuState extends MusicBeatState
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit);
versionShit.text += '(Newgrounds exclusive preview)';
// NG.core.calls.event.logEvent('swag').send();
super.create();

24
source/PlayState.hx
View File

@ -563,7 +563,7 @@ class PlayState extends MusicBeatState
tankGround = new BGSprite('tankRolling', 300, 300, 0.5, 0.5, ['BG tank w lighting'], true);
add(tankGround);
tankGround.active = false;
// tankGround.active = false;
tankmanRun = new FlxTypedGroup<TankmenBG>();
add(tankmanRun);
@ -653,6 +653,11 @@ class PlayState extends MusicBeatState
{
if (FlxG.random.bool(16))
{
var tempTankman:TankmenBG = new TankmenBG(20, 500, true);
tempTankman.strumTime = 10;
tempTankman.resetShit(20, 600, true);
tankmanRun.add(tempTankman);
var tankman:TankmenBG = tankmanRun.recycle(TankmenBG);
// new TankmenBG(500, 200 + FlxG.random.int(50, 100), TankmenBG.animationNotes[i][1] < 2);
tankman.strumTime = TankmenBG.animationNotes[i][0];
@ -934,8 +939,12 @@ class PlayState extends MusicBeatState
switch (curSong.toLowerCase())
{
// REMOVE THIS LATER
case 'stress':
stressIntro();
// case 'ugh':
// ughIntro();
// case 'stress':
// stressIntro();
// case 'guns':
// gunsIntro();
default:
startCountdown();
@ -967,8 +976,7 @@ class PlayState extends MusicBeatState
camFollow.x += 100;
camFollow.y += 100;
/*
FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
/* FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
FlxG.sound.music.fadeIn(5, 0, 0.5);
dad.visible = false;
@ -1049,8 +1057,7 @@ class PlayState extends MusicBeatState
cameraMovement();
};
/*
camFollow.setPosition(camPos.x, camPos.y);
/* camFollow.setPosition(camPos.x, camPos.y);
camHUD.visible = false;
@ -1124,8 +1131,7 @@ class PlayState extends MusicBeatState
cameraMovement();
};
/*
camHUD.visible = false;
/* camHUD.visible = false;
// for story mode shit
camFollow.setPosition(camPos.x, camPos.y);

7
source/TitleState.hx
View File

@ -438,12 +438,15 @@ class TitleState extends MusicBeatState
if (version.trim() != onlineVersion)
{
trace('OLD VERSION!');
FlxG.switchState(new OutdatedSubState());
// FlxG.switchState(new OutdatedSubState());
}
else
{
FlxG.switchState(new MainMenuState());
// FlxG.switchState(new MainMenuState());
}
// REDO FOR ITCH/FINAL SHIT
FlxG.switchState(new MainMenuState());
});
}
#else