cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-23 18:39:33 +00:00
Code Issues Releases Wiki Activity

that pussy be yankin

Browse source
This commit is contained in:
Cameron Taylor 2021-04-18 13:23:09 -04:00
parent 08971e185d
commit 157769b41a
4 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> <project>
<!-- _________________________ Application Settings _________________________ --> <!-- _________________________ 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--> <!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" /> <set name="APP_ID" value="0x0100f6c013bbc000" />

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); versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit); add(versionShit);
versionShit.text += '(Newgrounds exclusive preview)';
// NG.core.calls.event.logEvent('swag').send(); // NG.core.calls.event.logEvent('swag').send();
super.create(); 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); tankGround = new BGSprite('tankRolling', 300, 300, 0.5, 0.5, ['BG tank w lighting'], true);
add(tankGround); add(tankGround);
tankGround.active = false; // tankGround.active = false;
tankmanRun = new FlxTypedGroup<TankmenBG>(); tankmanRun = new FlxTypedGroup<TankmenBG>();
add(tankmanRun); add(tankmanRun);
@ -653,6 +653,11 @@ class PlayState extends MusicBeatState
{ {
if (FlxG.random.bool(16)) 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); var tankman:TankmenBG = tankmanRun.recycle(TankmenBG);
// new TankmenBG(500, 200 + FlxG.random.int(50, 100), TankmenBG.animationNotes[i][1] < 2); // new TankmenBG(500, 200 + FlxG.random.int(50, 100), TankmenBG.animationNotes[i][1] < 2);
tankman.strumTime = TankmenBG.animationNotes[i][0]; tankman.strumTime = TankmenBG.animationNotes[i][0];
@ -934,8 +939,12 @@ class PlayState extends MusicBeatState
switch (curSong.toLowerCase()) switch (curSong.toLowerCase())
{ {
// REMOVE THIS LATER // REMOVE THIS LATER
case 'stress': // case 'ugh':
stressIntro(); // ughIntro();
// case 'stress':
// stressIntro();
// case 'guns':
// gunsIntro();
default: default:
startCountdown(); startCountdown();
@ -967,8 +976,7 @@ class PlayState extends MusicBeatState
camFollow.x += 100; camFollow.x += 100;
camFollow.y += 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); FlxG.sound.music.fadeIn(5, 0, 0.5);
dad.visible = false; dad.visible = false;
@ -1049,8 +1057,7 @@ class PlayState extends MusicBeatState
cameraMovement(); cameraMovement();
}; };
/* /* camFollow.setPosition(camPos.x, camPos.y);
camFollow.setPosition(camPos.x, camPos.y);
camHUD.visible = false; camHUD.visible = false;
@ -1124,8 +1131,7 @@ class PlayState extends MusicBeatState
cameraMovement(); cameraMovement();
}; };
/* /* camHUD.visible = false;
camHUD.visible = false;
// for story mode shit // for story mode shit
camFollow.setPosition(camPos.x, camPos.y); camFollow.setPosition(camPos.x, camPos.y);

7
source/TitleState.hx
View file

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