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

print statement gone wrong broke everything, also changed the hashing

Browse Source 
function again
This commit is contained in:
Yonokid
2025-08-27 21:49:41 -04:00
parent fdcbd5cdd8
commit 663f29f7f0
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/tja.py
View File

@@ -82,19 +82,19 @@ class Drumroll(Note):
setattr(self, field_name, getattr(self._source_note, field_name)) setattr(self, field_name, getattr(self._source_note, field_name))
def _get_hash_data(self) -> bytes: def _get_hash_data(self) -> bytes:
"""Override to include source note and drumroll-specific data""" """Override to drumroll-specific data"""
hash_fields = ['type', 'hit_ms', 'load_ms', 'color']
field_values = [] field_values = []
for f in sorted([f.name for f in fields(Note)]):
value = getattr(self, f, None)
field_values.append((f, value))
field_values.append(('color', getattr(self, 'color', None))) for field_name in sorted(hash_fields):
value = getattr(self, field_name, None)
field_values.append((field_name, value))
field_values.append(('__class__', self.__class__.__name__)) field_values.append(('__class__', self.__class__.__name__))
field_values.append(('_source_note_hash', self._source_note.get_hash()))
hash_string = str(field_values) hash_string = str(field_values)
return hash_string.encode('utf-8') return hash_string.encode('utf-8')
@dataclass @dataclass
class Balloon(Note): class Balloon(Note):
_source_note: Note _source_note: Note
@@ -115,15 +115,14 @@ class Balloon(Note):
def _get_hash_data(self) -> bytes: def _get_hash_data(self) -> bytes:
"""Override to include source note and balloon-specific data""" """Override to include source note and balloon-specific data"""
hash_fields = ['type', 'hit_ms', 'load_ms', 'count']
field_values = [] field_values = []
for f in sorted([f.name for f in fields(Note)]):
value = getattr(self, f, None)
field_values.append((f, value))
field_values.append(('count', getattr(self, 'count', None)))
field_values.append(('popped', self.popped))
field_values.append(('__class__', self.__class__.__name__))
field_values.append(('_source_note_hash', self._source_note.get_hash()))
for field_name in sorted(hash_fields):
value = getattr(self, field_name, None)
field_values.append((field_name, value))
field_values.append(('__class__', self.__class__.__name__))
hash_string = str(field_values) hash_string = str(field_values)
return hash_string.encode('utf-8') return hash_string.encode('utf-8')
@@ -630,7 +629,6 @@ class TJAParser:
# Sorting by load_ms is necessary for drawing, as some notes appear on the # Sorting by load_ms is necessary for drawing, as some notes appear on the
# screen slower regardless of when they reach the judge circle # screen slower regardless of when they reach the judge circle
# Bars can be sorted like this because they don't need hit detection # Bars can be sorted like this because they don't need hit detection
print(play_note_list[0])
return deque(play_note_list), deque(draw_note_list), deque(bar_list) return deque(play_note_list), deque(draw_note_list), deque(bar_list)
def hash_note_data(self, play_notes: deque[Note | Drumroll | Balloon], bars: deque[Note]): def hash_note_data(self, play_notes: deque[Note | Drumroll | Balloon], bars: deque[Note]):