Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 16:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #21 from FunkinCrew/ravy-stuff

Browse source 
score spitter changes for ravy
This commit is contained in:
Cameron Taylor 2023-03-02 12:39:14 -05:00 committed by GitHub
commit a1649900ef
1 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2025,7 +2025,19 @@ class PlayState extends MusicBeatState
grpNoteSplashes.add(noteSplash); grpNoteSplashes.add(noteSplash);
} }
// Only add the score if you're not on practice mode // Only add the score if you're not on practice mode
if (!isPracticeMode) songScore += score; if (!isPracticeMode)
{
songScore += score;
var pressArray:Array<Bool> = [
controls.NOTE_LEFT_P,
controls.NOTE_DOWN_P,
controls.NOTE_UP_P,
controls.NOTE_RIGHT_P
];
var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ") + " " + Std.string(score) + " " + songScore);
}
comboPopUps.displayRating(daRating); comboPopUps.displayRating(daRating);
if (Highscore.tallies.combo >= 10 || Highscore.tallies.combo == 0) comboPopUps.displayCombo(Highscore.tallies.combo); if (Highscore.tallies.combo >= 10 || Highscore.tallies.combo == 0) comboPopUps.displayCombo(Highscore.tallies.combo);
} }
@ -2112,11 +2124,11 @@ class PlayState extends MusicBeatState
controls.NOTE_RIGHT_R controls.NOTE_RIGHT_R
]; ];
if (pressArray.contains(true)) // if (pressArray.contains(true))
{ // {
var lol:Array<Int> = cast pressArray; // var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ")); // inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" "));
} // }
if (FlxG.keys.justPressed.B) trace(inputSpitter.join("\n")); if (FlxG.keys.justPressed.B) trace(inputSpitter.join("\n"));
@ -2239,7 +2251,19 @@ class PlayState extends MusicBeatState
health += event.healthChange; health += event.healthChange;
if (!isPracticeMode) songScore += event.scoreChange; if (!isPracticeMode)
{
songScore += event.scoreChange;
var pressArray:Array<Bool> = [
controls.NOTE_LEFT_P,
controls.NOTE_DOWN_P,
controls.NOTE_UP_P,
controls.NOTE_RIGHT_P
];
var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ") + " " + Std.string(event.scoreChange) + " " + songScore);
}
if (event.playSound) if (event.playSound)
{ {
@ -2259,7 +2283,21 @@ class PlayState extends MusicBeatState
if (event.eventCanceled) return; if (event.eventCanceled) return;
health -= 0.0775; health -= 0.0775;
if (!isPracticeMode) songScore -= 10;
if (!isPracticeMode)
{
songScore -= 10;
// messy copy paste rn lol
var pressArray:Array<Bool> = [
controls.NOTE_LEFT_P,
controls.NOTE_DOWN_P,
controls.NOTE_UP_P,
controls.NOTE_RIGHT_P
];
var lol:Array<Int> = cast pressArray;
inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ") + " " + Std.string(-10) + " " + songScore);
}
vocals.volume = 0; vocals.volume = 0;
if (Highscore.tallies.combo != 0) if (Highscore.tallies.combo != 0)