mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-04-09 05:44:44 +00:00
better combo stuf
This commit is contained in:
parent
1dbb4099ec
commit
afa1a9d13c
source/funkin
|
@ -122,11 +122,20 @@ abstract Tallies(RawTallies)
|
||||||
typedef RawTallies =
|
typedef RawTallies =
|
||||||
{
|
{
|
||||||
var combo:Int;
|
var combo:Int;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many notes you let scroll by.
|
||||||
|
*/
|
||||||
var missed:Int;
|
var missed:Int;
|
||||||
|
|
||||||
var shit:Int;
|
var shit:Int;
|
||||||
var bad:Int;
|
var bad:Int;
|
||||||
var good:Int;
|
var good:Int;
|
||||||
var sick:Int;
|
var sick:Int;
|
||||||
var maxCombo:Int;
|
var maxCombo:Int;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many notes total that you hit. (NOT how many notes total in the song!)
|
||||||
|
*/
|
||||||
var totalNotes:Int;
|
var totalNotes:Int;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1704,6 +1704,9 @@ class PlayState extends MusicBeatState implements IHook
|
||||||
|
|
||||||
function noteMiss(note:Note):Void
|
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);
|
var event:NoteScriptEvent = new NoteScriptEvent(ScriptEvent.NOTE_MISS, note, true);
|
||||||
dispatchEvent(event);
|
dispatchEvent(event);
|
||||||
// Calling event.cancelEvent() skips all the other logic! Neat!
|
// Calling event.cancelEvent() skips all the other logic! Neat!
|
||||||
|
@ -1737,7 +1740,8 @@ class PlayState extends MusicBeatState implements IHook
|
||||||
|
|
||||||
if (!note.isSustainNote)
|
if (!note.isSustainNote)
|
||||||
{
|
{
|
||||||
Highscore.tallies.combo += 1;
|
Highscore.tallies.combo++;
|
||||||
|
Highscore.tallies.totalNotes++;
|
||||||
|
|
||||||
if (Highscore.tallies.combo > Highscore.tallies.maxCombo)
|
if (Highscore.tallies.combo > Highscore.tallies.maxCombo)
|
||||||
Highscore.tallies.maxCombo = Highscore.tallies.combo;
|
Highscore.tallies.maxCombo = Highscore.tallies.combo;
|
||||||
|
|
|
@ -10,8 +10,10 @@ class ResultState extends MusicBeatSubstate
|
||||||
var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, 0xFF000000);
|
var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, 0xFF000000);
|
||||||
bg.scrollFactor.set();
|
bg.scrollFactor.set();
|
||||||
add(bg);
|
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 += "\nMISSED: ";
|
||||||
results.text += Highscore.tallies.missed;
|
results.text += Highscore.tallies.missed;
|
||||||
results.text += "\nSHIT: ";
|
results.text += "\nSHIT: ";
|
||||||
|
|
Loading…
Reference in a new issue