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 certain diff names

Browse Source
This commit is contained in:
Anthony Samms
2026-01-14 15:51:53 -05:00
parent 29878623ca
commit 2704097ee2
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyTaiko.py
View File

@@ -265,7 +265,7 @@ def check_args():
selected_difficulty = args.difficulty selected_difficulty = args.difficulty
else: else:
if not tja.metadata.course_data: if not tja.metadata.course_data:
selected_difficulty = Difficulty.ONI selected_difficulty = Difficulty.EASY
else: else:
selected_difficulty = max(tja.metadata.course_data.keys()) selected_difficulty = max(tja.metadata.course_data.keys())
current_screen = Screens.GAME_PRACTICE if args.practice else Screens.GAME current_screen = Screens.GAME_PRACTICE if args.practice else Screens.GAME

17
libs/parsers/osz.py
View File

@@ -2,7 +2,7 @@ import hashlib
import math import math
from pathlib import Path from pathlib import Path
from libs.parsers.tja import CourseData, Note, NoteType, Drumroll, Balloon, NoteList, TJAEXData, TJAMetadata from libs.parsers.tja import CourseData, Note, NoteType, Drumroll, Balloon, NoteList, TJAEXData, TJAMetadata, TimelineObject
import re import re
@@ -26,15 +26,21 @@ class OsuParser:
self.timing_points = self.read_osu_data_list(osu_file, target_header="TimingPoints") self.timing_points = self.read_osu_data_list(osu_file, target_header="TimingPoints")
#self.general = self.read_osu_data(osu_file, target_header="Colours", is_dict=True) #self.general = self.read_osu_data(osu_file, target_header="Colours", is_dict=True)
self.hit_objects = self.read_osu_data_list(osu_file, target_header="HitObjects") self.hit_objects = self.read_osu_data_list(osu_file, target_header="HitObjects")
self.bpm = []
self.slider_multiplier = float(self.difficulty["SliderMultiplier"]) self.slider_multiplier = float(self.difficulty["SliderMultiplier"])
self.metadata = TJAMetadata() self.metadata = TJAMetadata()
self.metadata.wave = osu_file.parent / self.general["AudioFilename"] self.metadata.wave = osu_file.parent / self.general["AudioFilename"]
self.metadata.course_data[0] = CourseData() self.metadata.course_data[0] = CourseData()
self.ex_data = TJAEXData() self.ex_data = TJAEXData()
self.bpm = []
for points in self.timing_points: for points in self.timing_points:
self.bpm.append(math.floor(1 / points[1] * 1000 * 60)) self.bpm.append(math.floor(1 / points[1] * 1000 * 60))
self.osu_NoteList = self.note_data_to_NoteList(self.hit_objects) self.osu_NoteList = self.note_data_to_NoteList(self.hit_objects)
for points in self.timing_points:
if points[1] > 0:
obj = TimelineObject()
obj.hit_ms = points[0]
obj.bpm = math.floor(1 / points[1] * 1000 * 60)
self.osu_NoteList[0].timeline.append(obj)
def read_osu_data_list(self, file_path: Path, target_header="HitObjects") -> list[list[float]]: def read_osu_data_list(self, file_path: Path, target_header="HitObjects") -> list[list[float]]:
data = [] data = []
@@ -73,10 +79,9 @@ class OsuParser:
current_header = line[1:-1] current_header = line[1:-1]
if current_header == target_header: if current_header == target_header:
if re.match(r'(\w*)\:\s?(\w*.?\w*)', line): # General, Editor, Metadata, Difficulty if ':' in line and not line.startswith('['):
match = re.search(r'(\w*)\:\s?(\w*.?\w*)', line) key, value = line.split(':', 1)
if match: data[key.strip()] = value.strip()
data[match.group(1)] = match.group(2)
else: else:
continue continue