Merge pull request #27 from rakuri255/LineBonus

Line bonus
This commit is contained in:
Vadim Rangnau authored and GitHub committed 2023-05-25 21:08:09 +02:00
commit 98b4f602c6
1 file changed
+33 -21
+33 -21
View File
@@ -1,15 +1,10 @@
from moduls.Midi.midi_creator import create_midi_note_from_pitched_data
from moduls.Ultrastar.ultrastar_converter import get_start_time_from_ultrastar, get_end_time_from_ultrastar, \
ultrastar_note_to_midi_note
from moduls.Log import PRINT_ULTRASTAR, print_blue_highlighted_text, print_gold_highlighted_text, print_light_blue_highlighted_text, print_underlined_text, print_cyan_highlighted_text
from moduls.Log import PRINT_ULTRASTAR, print_blue_highlighted_text, print_gold_highlighted_text, \
print_light_blue_highlighted_text, print_underlined_text, print_cyan_highlighted_text
import librosa
# Todo: LineBonus
# if (Ini.LineBonus > 0) then
# MaxSongPoints := MAX_SONG_SCORE - MAX_SONG_LINE_BONUS
# else
# MaxSongPoints := MAX_SONG_SCORE;
MAX_SONG_SCORE = 10000
MAX_SONG_LINE_BONUS = 1000
@@ -36,11 +31,14 @@ def add_point(noteType, points):
def print_score(points):
notes = MAX_SONG_SCORE * (points.notes + points.rap) / points.parts
line_bonus = 0
# todo: here also a score calculation !?!
max_score = MAX_SONG_SCORE if points.line_bonus == 0 else MAX_SONG_SCORE - MAX_SONG_LINE_BONUS
notes = max_score * (points.notes + points.rap) / points.parts
golden = points.golden_notes + points.golden_rap
score = notes + line_bonus + golden
print(PRINT_ULTRASTAR + " Total: {}, notes: {}, line bonus: {}, golden notes: {}".format(print_cyan_highlighted_text(str(round(score))), print_blue_highlighted_text(str(round(notes))), print_light_blue_highlighted_text(str(round(line_bonus))), print_gold_highlighted_text(str(round(golden)))))
score = notes + points.line_bonus + golden
print(PRINT_ULTRASTAR + " Total: {}, notes: {}, line bonus: {}, golden notes: {}".format(
print_cyan_highlighted_text(str(round(score))), print_blue_highlighted_text(str(round(notes))),
print_light_blue_highlighted_text(str(round(points.line_bonus))), print_gold_highlighted_text(str(round(golden)))))
def print_score_calculation(pitched_data, ultrastar_class):
@@ -49,6 +47,8 @@ def print_score_calculation(pitched_data, ultrastar_class):
simple_points = Points()
accurate_points = Points()
reachable_line_bonus_per_word = MAX_SONG_LINE_BONUS / len(ultrastar_class.words)
for i in range(len(ultrastar_class.words)):
if ultrastar_class.words == "":
continue
@@ -59,30 +59,42 @@ def print_score_calculation(pitched_data, ultrastar_class):
start_time = get_start_time_from_ultrastar(ultrastar_class, i)
end_time = get_end_time_from_ultrastar(ultrastar_class, i)
duration = end_time - start_time
parts_len = 0.01
parts = duration / parts_len
step_size = 0.01 # todo: should be beat length ?
parts = int(duration / step_size)
parts = 1 if parts == 0 else parts
accurate_part_line_bonus_points = 0
simple_part_line_bonus_points = 0
ultrastar_midi_note = ultrastar_note_to_midi_note(int(ultrastar_class.pitches[i]))
ultrastar_note = librosa.midi_to_note(ultrastar_midi_note)
for p in range(int(parts)):
st = start_time + parts_len * p
end = st + parts_len
for p in range(parts):
st = start_time + step_size * p
end = st + step_size
pitch_note = create_midi_note_from_pitched_data(st, end, pitched_data)
if pitch_note[:-1] == ultrastar_note[:-1]:
accurate_points = add_point(ultrastar_class.noteType[i], accurate_points)
# Ignore octave high
simple_points = add_point(ultrastar_class.noteType[i], simple_points)
simple_part_line_bonus_points += 1
if pitch_note == ultrastar_note:
simple_points = add_point(ultrastar_class.noteType[i], simple_points)
# Octave high must be the same
accurate_points = add_point(ultrastar_class.noteType[i], accurate_points)
accurate_part_line_bonus_points += 1
accurate_points.parts += 1
simple_points.parts += 1
# todo: line_bonus
if accurate_part_line_bonus_points >= parts:
accurate_points.line_bonus += reachable_line_bonus_per_word
print("{} {} points".format(PRINT_ULTRASTAR, print_underlined_text("Simple")))
if simple_part_line_bonus_points >= parts:
simple_points.line_bonus += reachable_line_bonus_per_word
print("{} {} points".format(PRINT_ULTRASTAR, print_underlined_text("Simple (octave high ignored)")))
print_score(simple_points)
print("{} {} points:".format(PRINT_ULTRASTAR, print_underlined_text("Accurate")))
print("{} {} points:".format(PRINT_ULTRASTAR, print_underlined_text("Accurate (octave high matches)")))
print_score(accurate_points)