cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity

polish bits here and there

Browse source
This commit is contained in:
Cameron Taylor 2020-10-29 23:52:26 -07:00
parent 0c1fd3013c
commit 78599b457b
7 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Project.xml
View file

@ -92,5 +92,5 @@
<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
<icon path="art/icon.png"/>
<haxedef name="SKIP_TO_PLAYSTATE" if="debug" />
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
</project>

BIN
assets/music/Smash.mp3
View file

Binary file not shown.

BIN
assets/music/Smash_Inst.mp3
View file

Binary file not shown.

BIN
assets/music/Smash_Voices.mp3
View file

Binary file not shown.

7
source/ChartingState.hx
View file

@ -84,9 +84,9 @@ class ChartingState extends MusicBeatState
else
{
_song = {
song: 'Spookeez',
song: 'Monster',
notes: [],
bpm: 100,
bpm: 95,
sections: 0,
needsVoices: false,
player1: 'bf',
@ -318,6 +318,7 @@ class ChartingState extends MusicBeatState
_song.notes[curSection].mustHitSection = check.checked;
case 'Change BPM':
_song.notes[curSection].changeBPM = check.checked;
FlxG.log.add('changed bpm shit');
}
}
else if (id == FlxUINumericStepper.CHANGE_EVENT && (sender is FlxUINumericStepper))
@ -491,6 +492,8 @@ class ChartingState extends MusicBeatState
{
curSection = sec;
updateGrid();
if (updateMusic)
{
FlxG.sound.music.pause();

26
source/PlayState.hx
View file

@ -87,6 +87,8 @@ class PlayState extends MusicBeatState
if (SONG == null)
SONG = Song.loadFromJson(curLevel);
Conductor.changeBPM(SONG.bpm);
var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.stageback__png);
// bg.setGraphicSize(Std.int(bg.width * 2.5));
// bg.updateHitbox();
@ -693,13 +695,13 @@ class PlayState extends MusicBeatState
switch (Math.abs(daNote.noteData))
{
case 2:
dad.playAnim('singUP');
dad.playAnim('singUP', true);
case 3:
dad.playAnim('singRIGHT');
dad.playAnim('singRIGHT', true);
case 1:
dad.playAnim('singDOWN');
dad.playAnim('singDOWN', true);
case 0:
dad.playAnim('singLEFT');
dad.playAnim('singLEFT', true);
}
if (SONG.needsVoices)
@ -1150,20 +1152,24 @@ class PlayState extends MusicBeatState
if (generatedMusic)
{
notes.sort(FlxSort.byY, FlxSort.DESCENDING);
}
if (SONG.notes[curSection].changeBPM != null)
FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
if (SONG.notes[Std.int(curStep / 16)].changeBPM)
{
if (SONG.notes[curSection].changeBPM)
{
Conductor.changeBPM(SONG.notes[curSection].bpm);
}
}
Conductor.changeBPM(SONG.notes[Std.int(curStep / 16)].bpm);
FlxG.log.add('CHANGED BPM!');
}
else
Conductor.changeBPM(SONG.bpm);
if (camZooming && FlxG.camera.zoom < 1.35 && totalBeats % 4 == 0)
FlxG.camera.zoom += 0.025;
// Dad doesnt interupt his own notes
if (SONG.notes[Std.int(curStep / 16)].mustHitSection)
dad.dance();
healthHeads.setGraphicSize(Std.int(healthHeads.width + 20));
if (totalBeats % gfSpeed == 0)

2
source/TitleState.hx
View file

@ -41,7 +41,7 @@ class TitleState extends MusicBeatState
super.create();
#if SKIP_TO_PLAYSTATE
FlxG.switchState(new FreeplayState());
FlxG.switchState(new ChartingState());
#else
startIntro();
#end