Skip to content

Commit

Permalink
Merge branch 'score-tuning-solo-base' into score-tuning-ch-scale
Browse files Browse the repository at this point in the history
  • Loading branch information
muskit committed May 8, 2023
2 parents d912fe0 + ab7ab5a commit 2cad203
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion Assets/Script/PlayMode/StarScoreKeeper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public StarScoreKeeper(List<NoteInfo> chart, ScoreKeeper scoreKeeper, string ins
BaseScore += ptSusPerBeat * Util.Utils.InfoLengthInBeats(note, Play.Instance.chart.beats);
}

// add solo bonus
// add solo notes
foreach (var ev in soloEvents) {
if (ev.time <= note.time && note.time < ev.EndTime) {
// solo notes get double score, effectively
Expand All @@ -114,6 +114,10 @@ public StarScoreKeeper(List<NoteInfo> chart, ScoreKeeper scoreKeeper, string ins
}
leaveSoloLoop:;
}

// if there's no solo, raise BaseScore slightly
if (soloEvents.Count == 0)
BaseScore *= 1.055;
SetupScoreThreshold(instrument);
}

Expand All @@ -124,6 +128,9 @@ public StarScoreKeeper(ScoreKeeper scoreKeeper, string instrument, int noteCount
// solo notes get double score, effectively
BaseScore = (noteCount + soloNotes) * ptPerNote;

// if there's no solo, raise BaseScore slightly
if (soloNotes == 0)
BaseScore *= 1.055;
SetupScoreThreshold(instrument);
}

Expand Down

0 comments on commit 2cad203

Please sign in to comment.