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

minor bug fixes

Browse Source
This commit is contained in:
Anthony Samms
2025-10-26 22:43:18 -04:00
parent 21ae411c67
commit 708643ac71
6 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scenes/game.py
View File

@@ -129,7 +129,22 @@ class GameScreen:
with sqlite3.connect('scores.db') as con:
session_data = global_data.session_data[global_data.player_num-1]
cursor = con.cursor()
notes, _, _, _ = TJAParser.notes_to_position(TJAParser(self.tja.file_path), self.player_1.difficulty)
notes, branch_m, branch_e, branch_n = TJAParser.notes_to_position(TJAParser(self.tja.file_path), 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)
check_query = "SELECT score, clear FROM Scores WHERE hash = ? LIMIT 1"
cursor.execute(check_query, (hash,))
@@ -507,7 +522,7 @@ class Player:
self.is_drumroll = False
self.is_balloon = False
else:
if len(self.other_notes) == 1:
if len(self.other_notes) >= 1:
self.other_notes.popleft()
elif (note.hit_ms <= current_ms):
if note.type == 5 or note.type == 6:

11
scenes/song_select.py
View File

@@ -536,14 +536,17 @@ class SongSelectPlayer:
prev_diff = self.selected_difficulty
if is_l_kat_pressed(self.player_num):
self._navigate_difficulty_left(diffs)
else: # is_r_kat_pressed()
self._navigate_difficulty_right(diffs)
ret_val = self._navigate_difficulty_left(diffs)
elif is_r_kat_pressed(self.player_num):
ret_val = self._navigate_difficulty_right(diffs)
if 0 <= self.selected_difficulty <= 4 and self.selected_difficulty != prev_diff:
self.selected_diff_bounce.start()
self.selected_diff_fadein.start()
return ret_val
if (ray.is_key_pressed(ray.KeyboardKey.KEY_TAB) and
self.selected_difficulty in [3, 4]):
return self._toggle_ura_mode()
@@ -590,7 +593,7 @@ class SongSelectPlayer:
if (self.selected_difficulty in [3, 4] and 4 in diffs and 3 in diffs):
self.ura_toggle = (self.ura_toggle + 1) % 10
if self.ura_toggle == 0:
self._toggle_ura_mode()
return self._toggle_ura_mode()
elif self.selected_difficulty == -1:
self.prev_diff = self.selected_difficulty
self.selected_difficulty = min(diffs)