Merge branch 'Yonokid:main' into osu-parser

This commit is contained in:
magickale
2026-01-12 12:46:04 -05:00
committed by GitHub
9 changed files with 8 additions and 9 deletions

View File

@@ -20,7 +20,7 @@ from libs.config import get_config
from libs.global_data import PlayerNum, ScoreMethod from libs.global_data import PlayerNum, ScoreMethod
from libs.screen import Screen from libs.screen import Screen
from libs.song_hash import DB_VERSION from libs.song_hash import DB_VERSION
from libs.tja import TJAParser from libs.parsers.tja import TJAParser
from libs.utils import ( from libs.utils import (
force_dedicated_gpu, force_dedicated_gpu,
get_current_ms, get_current_ms,

View File

@@ -15,7 +15,7 @@ from libs.animation import Animation, MoveAnimation
from libs.audio import audio from libs.audio import audio
from libs.global_data import Crown, Difficulty, ScoreMethod from libs.global_data import Crown, Difficulty, ScoreMethod
from libs.texture import tex from libs.texture import tex
from libs.tja import TJAParser, test_encodings from libs.parsers.tja import TJAParser, test_encodings
from libs.utils import OutlinedText, get_current_ms, global_data from libs.utils import OutlinedText, get_current_ms, global_data
BOX_CENTER = 594 * tex.screen_scale BOX_CENTER = 594 * tex.screen_scale

View File

@@ -2,7 +2,6 @@ import hashlib
import logging import logging
import math import math
import random import random
from collections import deque
from dataclasses import dataclass, field, fields from dataclasses import dataclass, field, fields
from enum import IntEnum from enum import IntEnum
from functools import lru_cache from functools import lru_cache

View File

@@ -8,7 +8,7 @@ from pathlib import Path
from libs.config import get_config from libs.config import get_config
from libs.global_data import Crown from libs.global_data import Crown
from libs.tja import NoteList, TJAParser, test_encodings from libs.parsers.tja import NoteList, TJAParser, test_encodings
from libs.utils import global_data from libs.utils import global_data
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@@ -15,7 +15,7 @@ from libs.chara_2d import Chara2D
from libs.global_data import Difficulty, Modifiers, PlayerNum, global_data from libs.global_data import Difficulty, Modifiers, PlayerNum, global_data
from libs.global_objects import Nameplate from libs.global_objects import Nameplate
from libs.texture import tex from libs.texture import tex
from libs.tja import TJAParser from libs.parsers.tja import TJAParser
from libs.utils import get_current_ms, global_tex from libs.utils import get_current_ms, global_tex
from scenes.game import ( from scenes.game import (
DrumType, DrumType,

View File

@@ -16,7 +16,7 @@ from libs.global_data import (
) )
from libs.global_objects import AllNetIcon from libs.global_objects import AllNetIcon
from libs.texture import tex from libs.texture import tex
from libs.tja import TJAParser from libs.parsers.tja import TJAParser
from libs.transition import Transition from libs.transition import Transition
from libs.utils import OutlinedText, get_current_ms from libs.utils import OutlinedText, get_current_ms
from scenes.game import ( from scenes.game import (

View File

@@ -25,7 +25,7 @@ from libs.global_data import (
from libs.global_objects import AllNetIcon, Nameplate from libs.global_objects import AllNetIcon, Nameplate
from libs.screen import Screen from libs.screen import Screen
from libs.texture import tex from libs.texture import tex
from libs.tja import ( from libs.parsers.tja import (
Balloon, Balloon,
Drumroll, Drumroll,
Note, Note,

View File

@@ -12,7 +12,7 @@ from libs.audio import audio
from libs.background import Background from libs.background import Background
from libs.global_data import Modifiers, PlayerNum, global_data from libs.global_data import Modifiers, PlayerNum, global_data
from libs.texture import tex from libs.texture import tex
from libs.tja import ( from libs.parsers.tja import (
Balloon, Balloon,
Drumroll, Drumroll,
NoteType, NoteType,

View File

@@ -6,7 +6,7 @@ import pyray as ray
from libs.audio import audio from libs.audio import audio
from libs.global_data import PlayerNum from libs.global_data import PlayerNum
from libs.tja import TJAParser from libs.parsers.tja import TJAParser
from libs.utils import get_current_ms, global_data from libs.utils import get_current_ms, global_data
from libs.video import VideoPlayer from libs.video import VideoPlayer
from scenes.game import ( from scenes.game import (