From 9fd70d3110fc36fbbd4b95b28d534b21a5965ede Mon Sep 17 00:00:00 2001 From: GitBluub Date: Tue, 16 Jan 2024 00:50:27 +0100 Subject: [PATCH] fix normal scoro mode --- scorometer/chroma_case/Key.py | 1 + scorometer/main.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scorometer/chroma_case/Key.py b/scorometer/chroma_case/Key.py index c253bdf..66ed255 100644 --- a/scorometer/chroma_case/Key.py +++ b/scorometer/chroma_case/Key.py @@ -4,6 +4,7 @@ class Key: self.start = start self.duration = duration self.done = False + self.half_done = False def __repr__(self): return f"{self.key} ({self.start} - {self.duration})" diff --git a/scorometer/main.py b/scorometer/main.py index 8320138..d85c8f1 100755 --- a/scorometer/main.py +++ b/scorometer/main.py @@ -107,7 +107,10 @@ class Scorometer: } # Practice variables - self.to_play = set([x.key for x in self.practice_partition.pop(0)]) + if self.mode == PRACTICE: + self.to_play = set([x.key for x in self.practice_partition.pop(0)]) + else: + self.to_play = set() self.keys_down_practice: set = set() @@ -159,6 +162,7 @@ class Scorometer: else 50 ) self.incrementStreak() + to_play.half_done = True logging.debug({"note_on": f"{perf} on {message.note}"}) self.send({"type": "timing", "id": message.id, "timing": perf}) else: @@ -280,7 +284,7 @@ class Scorometer: def endGame(self): for i in self.partition.notes: - if i.done is False: + if i.done is False and not i.half_done: self.info["score"] -= 25 self.info["missed"] += 1 send(