Merge branch 'score-tuning-solo-base' into score-tuning-ch-scale

Assets/Script/PlayMode/StarScoreKeeper.cs

@@ -88,23 +88,41 @@ public StarScoreKeeper(List<NoteInfo> chart, ScoreKeeper scoreKeeper, string ins
 			instances.Add(this);
 			this.scoreKeeper = scoreKeeper;
 
+			// solo sections
+			List<EventInfo> soloEvents = new();
+			foreach (var ev in Play.Instance.chart.events) {
+				if (ev.name == $"solo_{instrument}") {
+					soloEvents.Add(ev);
+				}
+			}	
+
 			// calculate and store base score
 			BaseScore = 0;
 			foreach (var note in chart) {
 				BaseScore += ptPerNote;
 				if (note.length > .2f) {
 					BaseScore += ptSusPerBeat * Util.Utils.InfoLengthInBeats(note, Play.Instance.chart.beats);
 				}
-			}
 
+				// add solo bonus
+				foreach (var ev in soloEvents) {
+					if (ev.time <= note.time && note.time < ev.EndTime) {
+						// solo notes get double score, effectively
+						BaseScore += ptPerNote;
+						goto leaveSoloLoop;
+					}
+				}
+				leaveSoloLoop:;
+			}
 			SetupScoreThreshold(instrument);
 		}
 
-		public StarScoreKeeper(ScoreKeeper scoreKeeper, string instrument, int noteCount, int ptPerNote) {
+		public StarScoreKeeper(ScoreKeeper scoreKeeper, string instrument, int noteCount, int ptPerNote, int soloNotes = 0) {
 			instances.Add(this);
 			this.scoreKeeper = scoreKeeper;
 
-			BaseScore = noteCount * ptPerNote;
+			// solo notes get double score, effectively
+			BaseScore = (noteCount + soloNotes) * ptPerNote;
 
 			SetupScoreThreshold(instrument);
 		}