cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-30 18:53:35 +00:00
Code Issues Releases Wiki Activity

score shit

Browse source
This commit is contained in:
Cameron Taylor 2020-11-06 13:51:11 -08:00
parent 4ba3cfbfdb
commit 5ed65c5ee5
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -4,8 +4,13 @@ All notable changes will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.2.1.2] - 2020-11-06
### Fixed
- Story mode scores not properly resetting, leading to VERY inflated highscores on the leaderboards. This also requires me to clear the scores that are on the leaderboard right now, sorry!
## [0.2.1.1] - 2020-11-06 ## [0.2.1.1] - 2020-11-06
### Fixed ### Fixed
- Difficulty on storymode and in freeplay scores
- Week 2 not unlocking properly - Week 2 not unlocking properly
## [0.2.1] - 2020-11-06 ## [0.2.1] - 2020-11-06

4
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" main="Main" version="0.2.1.1" company="ninjamuffin99" /> <app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.1.2" company="ninjamuffin99" />
<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file <!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"--> or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
@ -104,7 +104,7 @@
<icon path="art/icon.png" /> <icon path="art/icon.png" />
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> --> <!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
<!-- <haxedef name="NG_LOGIN" /> --> <haxedef name="NG_LOGIN" if="newgrounds" />
</project> </project>

3
source/FreeplayState.hx
View file

@ -149,8 +149,11 @@ class FreeplayState extends MusicBeatState
{ {
var poop:String = Highscore.formatSong(songs[curSelected].toLowerCase(), curDifficulty); var poop:String = Highscore.formatSong(songs[curSelected].toLowerCase(), curDifficulty);
trace(poop);
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase()); PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase());
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty;
FlxG.switchState(new PlayState()); FlxG.switchState(new PlayState());
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
FlxG.sound.music.stop(); FlxG.sound.music.stop();

9
source/PlayState.hx
View file

@ -463,7 +463,7 @@ class PlayState extends MusicBeatState
daBeats += 1; daBeats += 1;
} }
trace(unspawnNotes.length); // trace(unspawnNotes.length);
// playerCounter += 1; // playerCounter += 1;
unspawnNotes.sort(sortByShit); unspawnNotes.sort(sortByShit);
@ -586,9 +586,6 @@ class PlayState extends MusicBeatState
{ {
super.update(elapsed); super.update(elapsed);
// trace("SONG POS: " + Conductor.songPosition);
// FlxG.sound.music.pitch = 2;
if (FlxG.keys.justPressed.ENTER && startedCountdown) if (FlxG.keys.justPressed.ENTER && startedCountdown)
{ {
persistentUpdate = false; persistentUpdate = false;
@ -822,8 +819,6 @@ class PlayState extends MusicBeatState
function endSong():Void function endSong():Void
{ {
trace('SONG DONE' + isStoryMode);
Highscore.saveScore(SONG.song, songScore, storyDifficulty); Highscore.saveScore(SONG.song, songScore, storyDifficulty);
if (isStoryMode) if (isStoryMode)
@ -1021,7 +1016,6 @@ class PlayState extends MusicBeatState
if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate) if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate)
{ {
possibleNotes.push(daNote); possibleNotes.push(daNote);
trace('NOTE-' + daNote.strumTime + ' ADDED');
} }
}); });
@ -1214,7 +1208,6 @@ class PlayState extends MusicBeatState
function noteCheck(keyP:Bool, note:Note):Void function noteCheck(keyP:Bool, note:Note):Void
{ {
trace(note.noteData + ' note check here ' + keyP);
if (keyP) if (keyP)
goodNoteHit(note); goodNoteHit(note);
else else

1
source/StoryMenuState.hx
View file

@ -248,6 +248,7 @@ class StoryMenuState extends MusicBeatState
PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + diffic, PlayState.storyPlaylist[0].toLowerCase()); PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + diffic, PlayState.storyPlaylist[0].toLowerCase());
PlayState.storyWeek = curWeek; PlayState.storyWeek = curWeek;
PlayState.campaignScore = 0;
new FlxTimer().start(1, function(tmr:FlxTimer) new FlxTimer().start(1, function(tmr:FlxTimer)
{ {
if (FlxG.sound.music != null) if (FlxG.sound.music != null)