robob/PyTaiko
1
0
Fork 0
mirror of https://github.com/Yonokid/PyTaiko.git synced 2026-02-04 11:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix scores not being overwritten correctly

Browse Source
This commit is contained in:
Anthony Samms
2025-11-07 15:53:06 -05:00
parent e15fc951ec
commit fc8dd75384
3 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
scenes/dan/dan_result.py Normal file
View File

71
scenes/game.py
View File

@@ -130,50 +130,47 @@ class GameScreen(Screen):
self.player_1 = Player(self.tja, global_data.player_num, global_data.session_data[global_data.player_num-1].selected_difficulty, False, global_data.modifiers[0]) self.player_1 = Player(self.tja, global_data.player_num, global_data.session_data[global_data.player_num-1].selected_difficulty, False, global_data.modifiers[0])
self.start_ms = (get_current_ms() - self.tja.metadata.offset*1000) self.start_ms = (get_current_ms() - self.tja.metadata.offset*1000)
def get_song_hash(self, song: Path):
notes, branch_m, branch_e, branch_n = TJAParser.notes_to_position(TJAParser(song), self.player_1.difficulty)
if branch_m:
for branch in branch_m:
notes.play_notes.extend(branch.play_notes)
notes.draw_notes.extend(branch.draw_notes)
notes.bars.extend(branch.bars)
if branch_e:
for branch in branch_e:
notes.play_notes.extend(branch.play_notes)
notes.draw_notes.extend(branch.draw_notes)
notes.bars.extend(branch.bars)
if branch_n:
for branch in branch_n:
notes.play_notes.extend(branch.play_notes)
notes.draw_notes.extend(branch.draw_notes)
notes.bars.extend(branch.bars)
hash = self.tja.hash_note_data(notes)
return hash
def write_score(self): def write_score(self):
"""Write the score to the database""" """Write the score to the database"""
if self.tja is None:
return
if global_data.modifiers[global_data.player_num-1].auto: if global_data.modifiers[global_data.player_num-1].auto:
return return
with sqlite3.connect('scores.db') as con: with sqlite3.connect('scores.db') as con:
session_data = global_data.session_data[global_data.player_num-1] session_data = global_data.session_data[global_data.player_num-1]
cursor = con.cursor() cursor = con.cursor()
notes, branch_m, branch_e, branch_n = TJAParser.notes_to_position(TJAParser(self.tja.file_path), self.player_1.difficulty) hash = self.get_song_hash(session_data.selected_song)
if branch_m:
for branch in branch_m:
notes.play_notes.extend(branch.play_notes)
notes.draw_notes.extend(branch.draw_notes)
notes.bars.extend(branch.bars)
if branch_e:
for branch in branch_e:
notes.play_notes.extend(branch.play_notes)
notes.draw_notes.extend(branch.draw_notes)
notes.bars.extend(branch.bars)
if branch_n:
for branch in branch_n:
notes.play_notes.extend(branch.play_notes)
notes.draw_notes.extend(branch.draw_notes)
notes.bars.extend(branch.bars)
hash = self.tja.hash_note_data(notes)
check_query = "SELECT score, clear FROM Scores WHERE hash = ? LIMIT 1" check_query = "SELECT score, clear FROM Scores WHERE hash = ? LIMIT 1"
cursor.execute(check_query, (hash,)) cursor.execute(check_query, (hash,))
result = cursor.fetchone() result = cursor.fetchone()
existing_score = result[0] if result is not None else None existing_score = result[0] if result is not None else None
existing_clear = result[1] if result is not None and len(result) > 1 and result[1] is not None else 0 existing_crown = result[1] if result is not None and len(result) > 1 and result[1] is not None else 0
crown = 0
# Determine clear value for this run: 2 for full combo (no bads), 1 for clear gauge, 0 otherwise if session_data.result_bad and session_data.result_ok == 0:
run_clear = 2 if session_data.result_bad == 0 else (1 if self.player_1.gauge.is_clear else 0) crown = 3
best_clear = max(existing_clear, run_clear) elif session_data.result_bad == 0:
crown = 2
elif self.player_1.gauge.is_clear:
crown = 1
if result is None or (existing_score is not None and session_data.result_score > existing_score): if result is None or (existing_score is not None and session_data.result_score > existing_score):
if result is None:
session_data.prev_score = 0
else:
if not isinstance(existing_score, int):
session_data.prev_score = 0
else:
session_data.prev_score = existing_score
insert_query = ''' insert_query = '''
INSERT OR REPLACE INTO Scores (hash, en_name, jp_name, diff, score, good, ok, bad, drumroll, combo, clear) INSERT OR REPLACE INTO Scores (hash, en_name, jp_name, diff, score, good, ok, bad, drumroll, combo, clear)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
@@ -182,14 +179,12 @@ class GameScreen(Screen):
self.tja.metadata.title.get('ja', ''), self.player_1.difficulty, self.tja.metadata.title.get('ja', ''), self.player_1.difficulty,
session_data.result_score, session_data.result_good, session_data.result_score, session_data.result_good,
session_data.result_ok, session_data.result_bad, session_data.result_ok, session_data.result_bad,
session_data.result_total_drumroll, session_data.result_max_combo, best_clear) session_data.result_total_drumroll, session_data.result_max_combo, crown)
cursor.execute(insert_query, data) cursor.execute(insert_query, data)
con.commit() con.commit()
else: if result is None or (existing_crown is not None and crown > existing_crown):
# Score didn't improve; if clear improved, update only the clear column to preserve best crown cursor.execute("UPDATE Scores SET crown = ? WHERE hash = ?", (crown, hash))
if run_clear > existing_clear: con.commit()
cursor.execute("UPDATE Scores SET clear = ? WHERE hash = ?", (run_clear, hash))
con.commit()
def start_song(self, current_time): def start_song(self, current_time):
if (self.current_ms >= self.tja.metadata.offset*1000 + self.start_delay - global_data.config["general"]["audio_offset"]) and not self.song_started: if (self.current_ms >= self.tja.metadata.offset*1000 + self.start_delay - global_data.config["general"]["audio_offset"]) and not self.song_started: