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

better combo stuf

Browse source
This commit is contained in:
Cameron Taylor 2022-09-20 02:37:43 -04:00
parent 1dbb4099ec
commit afa1a9d13c
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/funkin/Highscore.hx
View file

@ -122,11 +122,20 @@ abstract Tallies(RawTallies)
typedef RawTallies =
{
var combo:Int;
/**
* How many notes you let scroll by.
*/
var missed:Int;
var shit:Int;
var bad:Int;
var good:Int;
var sick:Int;
var maxCombo:Int;
/**
* How many notes total that you hit. (NOT how many notes total in the song!)
*/
var totalNotes:Int;
}

6
source/funkin/play/PlayState.hx
View file

@ -1704,6 +1704,9 @@ class PlayState extends MusicBeatState implements IHook
function noteMiss(note:Note):Void
{
// a MISS is when you let a note scroll past you!!
Highscore.tallies.missed++;
var event:NoteScriptEvent = new NoteScriptEvent(ScriptEvent.NOTE_MISS, note, true);
dispatchEvent(event);
// Calling event.cancelEvent() skips all the other logic! Neat!
@ -1737,7 +1740,8 @@ class PlayState extends MusicBeatState implements IHook
if (!note.isSustainNote)
{
Highscore.tallies.combo += 1;
Highscore.tallies.combo++;
Highscore.tallies.totalNotes++;
if (Highscore.tallies.combo > Highscore.tallies.maxCombo)
Highscore.tallies.maxCombo = Highscore.tallies.combo;

4
source/funkin/play/ResultState.hx
View file

@ -10,8 +10,10 @@ class ResultState extends MusicBeatSubstate
var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, 0xFF000000);
bg.scrollFactor.set();
add(bg);
var results:FlxText = new FlxText(0, 0, 0, "RESULTS:", 32);
var results:FlxText = new FlxText(70, 70, 0, "RESULTS:", 32);
results.text += "\nTOTAL NOTES: ";
results.text += Highscore.tallies.totalNotes;
results.text += "\nMISSED: ";
results.text += Highscore.tallies.missed;
results.text += "\nSHIT: ";