Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions source/funkin/play/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import funkin.play.notes.Strumline;
import funkin.play.notes.SustainTrail;
import funkin.play.notes.NoteVibrationsHandler;
import funkin.play.scoring.Scoring;
import funkin.play.scoring.ScoringPBOT1;
import funkin.play.song.Song;
import funkin.play.stage.Stage;
import funkin.save.Save;
Expand Down Expand Up @@ -447,6 +448,11 @@ class PlayState extends MusicBeatSubState
*/
public var currentConversation:Null<Conversation>;

/**
* The current scoring system used for judging and calculating scores.
*/
public var scoring = new ScoringPBOT1();

/**
* Key press inputs which have been received but not yet processed.
* These are encoded with an OS timestamp, so we can account for input latency.
Expand Down Expand Up @@ -3117,8 +3123,8 @@ class PlayState extends MusicBeatSubState
// Round inward (trim remainder) for consistency.
var noteDiff:Int = Std.int(Conductor.instance.songPosition - note.noteData.time - inputLatencyMs);

var score = Scoring.scoreNote(noteDiff, PBOT1);
var daRating = Scoring.judgeNote(noteDiff, PBOT1);
var score = scoring.scoreNote(noteDiff);
var daRating = scoring.judgeNote(noteDiff);

var healthChange = 0.0;
var isComboBreak = false;
Expand Down Expand Up @@ -3184,7 +3190,7 @@ class PlayState extends MusicBeatSubState
}
}

applyScore(Scoring.getMissScore(), 'miss', healthChange, true);
applyScore(scoring.getMissScore(), 'miss', healthChange, true);

if (playSound)
{
Expand Down
Loading
Loading