From e71911976490ed6c54935f91b3ed97debf5d313a Mon Sep 17 00:00:00 2001 From: Yonokid <37304577+Yonokid@users.noreply.github.com> Date: Sat, 27 Dec 2025 13:26:24 -0500 Subject: [PATCH] chore: organize imports --- PyTaiko.py | 26 ++++++++++++-------------- libs/audio.py | 8 ++++---- libs/bg_collabs/a3.py | 2 ++ libs/bg_collabs/animal.py | 3 ++- libs/bg_collabs/buttoburst.py | 3 ++- libs/bg_collabs/dan.py | 1 + libs/bg_collabs/imas.py | 6 +++--- libs/bg_collabs/imas_sidem.py | 2 +- libs/bg_collabs/oshiri.py | 3 ++- libs/bg_objects/chibi.py | 4 +++- libs/bg_objects/dancer.py | 1 + libs/bg_objects/fever.py | 1 + libs/bg_objects/footer.py | 1 + libs/bg_objects/renda.py | 4 +++- libs/chara_2d.py | 1 + libs/config.py | 5 +++-- libs/file_navigator.py | 25 +++++++++++++------------ libs/global_data.py | 1 + libs/global_objects.py | 8 ++++---- libs/screen.py | 1 + libs/song_hash.py | 6 +++--- libs/texture.py | 3 +-- libs/tja.py | 4 ++-- libs/video.py | 6 +++--- scenes/dan/dan_result.py | 5 +++-- scenes/dan/dan_select.py | 24 ++++++++++++++++++------ scenes/dan/game_dan.py | 25 ++++++++++++++++++++----- scenes/entry.py | 12 ++++++++++-- scenes/game.py | 16 +++++++++++----- scenes/loading.py | 5 ++--- scenes/practice/game.py | 31 ++++++++++++++++++++++++++----- scenes/result.py | 5 +++-- scenes/settings.py | 3 ++- scenes/song_select.py | 23 ++++++++++++++++++----- scenes/title.py | 5 +++-- scenes/two_player/game.py | 21 +++++++++++++++------ scenes/two_player/result.py | 1 + scenes/two_player/song_select.py | 10 ++++++++-- 38 files changed, 210 insertions(+), 101 deletions(-) diff --git a/PyTaiko.py b/PyTaiko.py index d52f49d..af85608 100644 --- a/PyTaiko.py +++ b/PyTaiko.py @@ -1,12 +1,12 @@ +import argparse import logging import os -from pathlib import Path -import sys -import argparse - import sqlite3 +import sys +from pathlib import Path import pyray as ray +from pypresence.presence import Presence from raylib.defines import ( RL_FUNC_ADD, RL_ONE, @@ -15,6 +15,7 @@ from raylib.defines import ( ) from libs.audio import audio +from libs.config import get_config from libs.global_data import PlayerNum, ScoreMethod from libs.screen import Screen from libs.song_hash import DB_VERSION @@ -23,27 +24,24 @@ from libs.utils import ( force_dedicated_gpu, get_current_ms, global_data, - global_tex + global_tex, ) -from libs.config import get_config +from scenes.dan.dan_result import DanResultScreen +from scenes.dan.dan_select import DanSelectScreen +from scenes.dan.game_dan import DanGameScreen from scenes.devtest import DevScreen from scenes.entry import EntryScreen from scenes.game import GameScreen -from scenes.dan.game_dan import DanGameScreen +from scenes.loading import LoadScreen from scenes.practice.game import PracticeGameScreen from scenes.practice.song_select import PracticeSongSelectScreen -from scenes.two_player.game import TwoPlayerGameScreen -from scenes.two_player.result import TwoPlayerResultScreen -from scenes.loading import LoadScreen from scenes.result import ResultScreen from scenes.settings import SettingsScreen from scenes.song_select import SongSelectScreen from scenes.title import TitleScreen +from scenes.two_player.game import TwoPlayerGameScreen +from scenes.two_player.result import TwoPlayerResultScreen from scenes.two_player.song_select import TwoPlayerSongSelectScreen -from scenes.dan.dan_select import DanSelectScreen -from scenes.dan.dan_result import DanResultScreen - -from pypresence.presence import Presence logger = logging.getLogger(__name__) DISCORD_APP_ID = '1451423960401973353' diff --git a/libs/audio.py b/libs/audio.py index a9229aa..73e7e8f 100644 --- a/libs/audio.py +++ b/libs/audio.py @@ -1,10 +1,10 @@ -import cffi -import platform import logging +import platform from pathlib import Path -from libs.config import VolumeConfig -from libs.config import get_config +import cffi + +from libs.config import VolumeConfig, get_config ffi = cffi.FFI() diff --git a/libs/bg_collabs/a3.py b/libs/bg_collabs/a3.py index 6a818ed..7f47ccc 100644 --- a/libs/bg_collabs/a3.py +++ b/libs/bg_collabs/a3.py @@ -1,4 +1,5 @@ import random + from libs.animation import Animation from libs.bg_objects.bg_fever import BGFever4 from libs.bg_objects.bg_normal import BGNormal2 @@ -9,6 +10,7 @@ from libs.bg_objects.renda import RendaController from libs.global_data import PlayerNum from libs.texture import TextureWrapper + class Background: def __init__(self, tex: TextureWrapper, player_num: PlayerNum, bpm: float, path: str, max_dancers: int): self.tex_wrapper = tex diff --git a/libs/bg_collabs/animal.py b/libs/bg_collabs/animal.py index 1543857..e520b3c 100644 --- a/libs/bg_collabs/animal.py +++ b/libs/bg_collabs/animal.py @@ -1,14 +1,15 @@ import random + from libs.bg_objects.bg_fever import BGFeverBase from libs.bg_objects.bg_normal import BGNormalBase from libs.bg_objects.chibi import ChibiController from libs.bg_objects.dancer import BaseDancer, BaseDancerGroup +from libs.bg_objects.don_bg import DonBG4 from libs.bg_objects.fever import Fever3 from libs.bg_objects.footer import Footer from libs.bg_objects.renda import RendaController from libs.global_data import PlayerNum from libs.texture import TextureWrapper -from libs.bg_objects.don_bg import DonBG4 class Background: diff --git a/libs/bg_collabs/buttoburst.py b/libs/bg_collabs/buttoburst.py index b666c42..85ca05a 100644 --- a/libs/bg_collabs/buttoburst.py +++ b/libs/bg_collabs/buttoburst.py @@ -1,13 +1,14 @@ import random + from libs.bg_objects.bg_fever import BGFeverBase from libs.bg_objects.bg_normal import BGNormalBase from libs.bg_objects.chibi import ChibiController from libs.bg_objects.dancer import BaseDancer, BaseDancerGroup +from libs.bg_objects.don_bg import DonBG4 from libs.bg_objects.fever import Fever3 from libs.bg_objects.renda import RendaController from libs.global_data import PlayerNum from libs.texture import TextureWrapper -from libs.bg_objects.don_bg import DonBG4 class Background: diff --git a/libs/bg_collabs/dan.py b/libs/bg_collabs/dan.py index d0292de..3c33563 100644 --- a/libs/bg_collabs/dan.py +++ b/libs/bg_collabs/dan.py @@ -6,6 +6,7 @@ from libs.bg_objects.footer import Footer from libs.global_data import PlayerNum from libs.texture import TextureWrapper + class Background: def __init__(self, tex: TextureWrapper, player_num: PlayerNum, bpm: float, path: str, max_dancers: int): self.tex_wrapper = tex diff --git a/libs/bg_collabs/imas.py b/libs/bg_collabs/imas.py index f4f817c..3244f64 100644 --- a/libs/bg_collabs/imas.py +++ b/libs/bg_collabs/imas.py @@ -1,16 +1,16 @@ +import pyray as ray + from libs.animation import Animation from libs.bg_objects.bg_fever import BGFeverBase from libs.bg_objects.bg_normal import BGNormalBase from libs.bg_objects.chibi import ChibiController from libs.bg_objects.dancer import BaseDancerGroup +from libs.bg_objects.don_bg import DonBGBase from libs.bg_objects.fever import BaseFever from libs.bg_objects.footer import Footer from libs.bg_objects.renda import RendaController from libs.global_data import PlayerNum from libs.texture import TextureWrapper -from libs.bg_objects.don_bg import DonBGBase - -import pyray as ray class Background: diff --git a/libs/bg_collabs/imas_sidem.py b/libs/bg_collabs/imas_sidem.py index c3da39c..3847e99 100644 --- a/libs/bg_collabs/imas_sidem.py +++ b/libs/bg_collabs/imas_sidem.py @@ -4,11 +4,11 @@ from libs.bg_objects.bg_fever import BGFeverBase from libs.bg_objects.bg_normal import BGNormalBase from libs.bg_objects.chibi import ChibiController from libs.bg_objects.dancer import BaseDancerGroup +from libs.bg_objects.don_bg import DonBGBase from libs.bg_objects.footer import Footer from libs.bg_objects.renda import RendaController from libs.global_data import PlayerNum from libs.texture import TextureWrapper -from libs.bg_objects.don_bg import DonBGBase class Background: diff --git a/libs/bg_collabs/oshiri.py b/libs/bg_collabs/oshiri.py index f439d85..a61be84 100644 --- a/libs/bg_collabs/oshiri.py +++ b/libs/bg_collabs/oshiri.py @@ -1,15 +1,16 @@ from libs.animation import Animation -from libs.bg_objects.fever import Fever3 from libs.bg_objects.bg_fever import BGFeverBase from libs.bg_objects.bg_normal import BGNormalBase from libs.bg_objects.chibi import ChibiController from libs.bg_objects.dancer import BaseDancer, BaseDancerGroup from libs.bg_objects.don_bg import DonBGBase +from libs.bg_objects.fever import Fever3 from libs.bg_objects.footer import Footer from libs.bg_objects.renda import RendaController from libs.global_data import PlayerNum from libs.texture import TextureWrapper + class Background: def __init__(self, tex: TextureWrapper, player_num: PlayerNum, bpm: float, path: str, max_dancers: int): self.tex_wrapper = tex diff --git a/libs/bg_objects/chibi.py b/libs/bg_objects/chibi.py index c733a9c..00704cd 100644 --- a/libs/bg_objects/chibi.py +++ b/libs/bg_objects/chibi.py @@ -1,8 +1,10 @@ import random + +import pyray as ray + from libs.animation import Animation from libs.texture import TextureWrapper -import pyray as ray class Chibi: diff --git a/libs/bg_objects/dancer.py b/libs/bg_objects/dancer.py index b4ce18f..5e802a2 100644 --- a/libs/bg_objects/dancer.py +++ b/libs/bg_objects/dancer.py @@ -3,6 +3,7 @@ import random from libs.animation import Animation from libs.texture import TextureWrapper + class Dancer: @staticmethod diff --git a/libs/bg_objects/fever.py b/libs/bg_objects/fever.py index d8e04fc..b133900 100644 --- a/libs/bg_objects/fever.py +++ b/libs/bg_objects/fever.py @@ -1,6 +1,7 @@ from libs.animation import Animation from libs.texture import TextureWrapper + class Fever: @staticmethod diff --git a/libs/bg_objects/footer.py b/libs/bg_objects/footer.py index a6ad090..6292154 100644 --- a/libs/bg_objects/footer.py +++ b/libs/bg_objects/footer.py @@ -1,5 +1,6 @@ from libs.texture import TextureWrapper + class Footer: def __init__(self, tex: TextureWrapper, index: int, path: str = 'background'): self.index = index diff --git a/libs/bg_objects/renda.py b/libs/bg_objects/renda.py index e467ef4..f0bf744 100644 --- a/libs/bg_objects/renda.py +++ b/libs/bg_objects/renda.py @@ -1,8 +1,10 @@ import random + +import pyray as ray + from libs.animation import Animation from libs.texture import TextureWrapper -import pyray as ray class Renda: diff --git a/libs/chara_2d.py b/libs/chara_2d.py index 7998dab..06d005a 100644 --- a/libs/chara_2d.py +++ b/libs/chara_2d.py @@ -1,4 +1,5 @@ import logging + from libs.animation import Animation from libs.utils import global_tex diff --git a/libs/config.py b/libs/config.py index 3ac46c8..8aeceb6 100644 --- a/libs/config.py +++ b/libs/config.py @@ -1,9 +1,10 @@ -from pathlib import Path -import tomlkit import json +from pathlib import Path from typing import TypedDict import pyray as ray +import tomlkit + class GeneralConfig(TypedDict): fps_counter: bool diff --git a/libs/file_navigator.py b/libs/file_navigator.py index dd23dd1..2231806 100644 --- a/libs/file_navigator.py +++ b/libs/file_navigator.py @@ -1,21 +1,22 @@ -from dataclasses import dataclass -from enum import IntEnum import json import logging -from pathlib import Path import random +import sqlite3 +from dataclasses import dataclass +from datetime import datetime, timedelta +from enum import IntEnum +from pathlib import Path from typing import Optional, Union -from raylib import SHADER_UNIFORM_VEC3 -from libs.audio import audio -from libs.animation import Animation, MoveAnimation -from libs.global_data import Crown, Difficulty, ScoreMethod -from libs.tja import TJAParser, test_encodings -from libs.texture import tex -from libs.utils import OutlinedText, get_current_ms, global_data -from datetime import datetime, timedelta -import sqlite3 import pyray as ray +from raylib import SHADER_UNIFORM_VEC3 + +from libs.animation import Animation, MoveAnimation +from libs.audio import audio +from libs.global_data import Crown, Difficulty, ScoreMethod +from libs.texture import tex +from libs.tja import TJAParser, test_encodings +from libs.utils import OutlinedText, get_current_ms, global_data BOX_CENTER = 594 * tex.screen_scale diff --git a/libs/global_data.py b/libs/global_data.py index cbb9e52..ba47634 100644 --- a/libs/global_data.py +++ b/libs/global_data.py @@ -7,6 +7,7 @@ import pyray as ray from libs.config import Config + class PlayerNum(IntEnum): ALL = 0 P1 = 1 diff --git a/libs/global_objects.py b/libs/global_objects.py index 2470116..f5e581d 100644 --- a/libs/global_objects.py +++ b/libs/global_objects.py @@ -1,12 +1,12 @@ from enum import Enum from typing import Callable + import pyray as ray -from libs.global_data import PlayerNum -from libs.global_data import global_data -from libs.utils import OutlinedText, global_tex -from libs.config import get_config from libs.audio import audio +from libs.config import get_config +from libs.global_data import PlayerNum, global_data +from libs.utils import OutlinedText, global_tex class Nameplate: diff --git a/libs/screen.py b/libs/screen.py index 31b349f..9b55d35 100644 --- a/libs/screen.py +++ b/libs/screen.py @@ -1,5 +1,6 @@ import logging from typing import Any + from libs.audio import audio from libs.texture import tex diff --git a/libs/song_hash.py b/libs/song_hash.py index a258dfd..3165f42 100644 --- a/libs/song_hash.py +++ b/libs/song_hash.py @@ -1,15 +1,15 @@ import configparser -import logging +import csv import json +import logging import sqlite3 import time -import csv from pathlib import Path +from libs.config import get_config from libs.global_data import Crown from libs.tja import NoteList, TJAParser, test_encodings from libs.utils import global_data -from libs.config import get_config logger = logging.getLogger(__name__) DB_VERSION = 1 diff --git a/libs/texture.py b/libs/texture.py index 21ac316..1c7246a 100644 --- a/libs/texture.py +++ b/libs/texture.py @@ -6,10 +6,9 @@ from pathlib import Path from typing import Any, Optional import raylib as ray -from pyray import Vector2, Rectangle, Color +from pyray import Color, Rectangle, Vector2 from libs.animation import BaseAnimation, parse_animations - from libs.config import get_config logger = logging.getLogger(__name__) diff --git a/libs/tja.py b/libs/tja.py index e04b62e..2504ea6 100644 --- a/libs/tja.py +++ b/libs/tja.py @@ -1,10 +1,10 @@ -from enum import IntEnum import hashlib -import math import logging +import math import random from collections import deque from dataclasses import dataclass, field, fields +from enum import IntEnum from functools import lru_cache from pathlib import Path from typing import Optional diff --git a/libs/video.py b/libs/video.py index 21a4510..09f7bd0 100644 --- a/libs/video.py +++ b/libs/video.py @@ -1,12 +1,12 @@ -from pathlib import Path import logging +from pathlib import Path -import raylib as ray import av +import raylib as ray from libs.audio import audio -from libs.utils import get_current_ms from libs.texture import tex +from libs.utils import get_current_ms logger = logging.getLogger(__name__) diff --git a/scenes/dan/dan_result.py b/scenes/dan/dan_result.py index 3552ead..1d7dd2b 100644 --- a/scenes/dan/dan_result.py +++ b/scenes/dan/dan_result.py @@ -1,10 +1,11 @@ import logging + import pyray as ray from libs.animation import Animation +from libs.audio import audio from libs.chara_2d import Chara2D from libs.global_data import PlayerNum, reset_session -from libs.audio import audio from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate from libs.screen import Screen from libs.texture import tex @@ -13,7 +14,7 @@ from libs.utils import ( get_current_ms, global_data, is_l_don_pressed, - is_r_don_pressed + is_r_don_pressed, ) from scenes.game import Gauge from scenes.result import Background diff --git a/scenes/dan/dan_select.py b/scenes/dan/dan_select.py index 295b158..845c91b 100644 --- a/scenes/dan/dan_select.py +++ b/scenes/dan/dan_select.py @@ -1,16 +1,28 @@ - import logging + import pyray as ray from libs.audio import audio -from libs.global_data import PlayerNum, global_data -from libs.texture import tex from libs.chara_2d import Chara2D -from libs.global_objects import AllNetIcon, CoinOverlay, Indicator, Nameplate, Timer -from libs.screen import Screen from libs.file_navigator import BackBox, DanCourse, navigator +from libs.global_data import PlayerNum, global_data +from libs.global_objects import ( + AllNetIcon, + CoinOverlay, + Indicator, + Nameplate, + Timer, +) +from libs.screen import Screen +from libs.texture import tex from libs.transition import Transition -from libs.utils import get_current_ms, is_l_don_pressed, is_l_kat_pressed, is_r_don_pressed, is_r_kat_pressed +from libs.utils import ( + get_current_ms, + is_l_don_pressed, + is_l_kat_pressed, + is_r_don_pressed, + is_r_kat_pressed, +) from scenes.song_select import State logger = logging.getLogger(__name__) diff --git a/scenes/dan/game_dan.py b/scenes/dan/game_dan.py index 4fb7967..2f5fd7f 100644 --- a/scenes/dan/game_dan.py +++ b/scenes/dan/game_dan.py @@ -1,18 +1,33 @@ import copy -from typing import Optional, override -import pyray as ray import logging +from typing import Optional, override + +import pyray as ray + from libs.animation import Animation from libs.audio import audio from libs.background import Background from libs.file_navigator import Exam -from libs.global_data import DanResultExam, DanResultSong, PlayerNum, global_data +from libs.global_data import ( + DanResultExam, + DanResultSong, + PlayerNum, + global_data, +) from libs.global_objects import AllNetIcon +from libs.texture import tex from libs.tja import TJAParser from libs.transition import Transition from libs.utils import OutlinedText, get_current_ms -from libs.texture import tex -from scenes.game import ClearAnimation, FCAnimation, FailAnimation, GameScreen, Gauge, ResultTransition, SongInfo +from scenes.game import ( + ClearAnimation, + FailAnimation, + FCAnimation, + GameScreen, + Gauge, + ResultTransition, + SongInfo, +) logger = logging.getLogger(__name__) diff --git a/scenes/entry.py b/scenes/entry.py index 1335488..afaccdf 100644 --- a/scenes/entry.py +++ b/scenes/entry.py @@ -1,13 +1,21 @@ import logging from typing import Optional + import pyray as ray from libs.audio import audio from libs.chara_2d import Chara2D from libs.global_data import PlayerNum -from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate, Indicator, EntryOverlay, Timer -from libs.texture import tex +from libs.global_objects import ( + AllNetIcon, + CoinOverlay, + EntryOverlay, + Indicator, + Nameplate, + Timer, +) from libs.screen import Screen +from libs.texture import tex from libs.utils import ( OutlinedText, get_current_ms, diff --git a/scenes/game.py b/scenes/game.py index 578ddac..444f640 100644 --- a/scenes/game.py +++ b/scenes/game.py @@ -1,12 +1,12 @@ import bisect -from enum import IntEnum -import math import logging +import math import sqlite3 from collections import deque +from enum import IntEnum +from itertools import chain from pathlib import Path from typing import Optional -from itertools import chain import pyray as ray @@ -14,7 +14,13 @@ from libs.animation import Animation from libs.audio import audio from libs.background import Background from libs.chara_2d import Chara2D -from libs.global_data import Crown, Difficulty, Modifiers, PlayerNum, ScoreMethod +from libs.global_data import ( + Crown, + Difficulty, + Modifiers, + PlayerNum, + ScoreMethod, +) from libs.global_objects import AllNetIcon, Nameplate from libs.screen import Screen from libs.texture import tex @@ -24,8 +30,8 @@ from libs.tja import ( Note, NoteList, NoteType, - TJAParser, TimelineObject, + TJAParser, apply_modifiers, calculate_base_score, ) diff --git a/scenes/loading.py b/scenes/loading.py index f5a0ed6..61c2894 100644 --- a/scenes/loading.py +++ b/scenes/loading.py @@ -1,17 +1,16 @@ import logging -from pathlib import Path import threading +from pathlib import Path import pyray as ray from libs.animation import Animation +from libs.file_navigator import navigator from libs.global_objects import AllNetIcon from libs.screen import Screen from libs.song_hash import build_song_hashes from libs.texture import tex from libs.utils import get_current_ms, global_data -from libs.file_navigator import navigator - logger = logging.getLogger(__name__) diff --git a/scenes/practice/game.py b/scenes/practice/game.py index c2525da..8a2457b 100644 --- a/scenes/practice/game.py +++ b/scenes/practice/game.py @@ -1,20 +1,41 @@ +import copy +import logging import math from collections import deque -import logging from pathlib import Path from typing import Optional import pyray as ray -import copy from libs.animation import Animation from libs.audio import audio from libs.background import Background from libs.global_data import Modifiers, PlayerNum, global_data -from libs.tja import Balloon, Drumroll, NoteType, TJAParser, TimelineObject, apply_modifiers -from libs.utils import get_current_ms, is_l_don_pressed, is_l_kat_pressed, is_r_don_pressed, is_r_kat_pressed from libs.texture import tex -from scenes.game import DrumHitEffect, DrumType, GameScreen, JudgeCounter, LaneHitEffect, Player, Side +from libs.tja import ( + Balloon, + Drumroll, + NoteType, + TimelineObject, + TJAParser, + apply_modifiers, +) +from libs.utils import ( + get_current_ms, + is_l_don_pressed, + is_l_kat_pressed, + is_r_don_pressed, + is_r_kat_pressed, +) +from scenes.game import ( + DrumHitEffect, + DrumType, + GameScreen, + JudgeCounter, + LaneHitEffect, + Player, + Side, +) logger = logging.getLogger(__name__) diff --git a/scenes/result.py b/scenes/result.py index f8b733b..ac44422 100644 --- a/scenes/result.py +++ b/scenes/result.py @@ -1,9 +1,10 @@ import logging + import pyray as ray -from libs.global_data import Difficulty, PlayerNum, reset_session from libs.audio import audio from libs.chara_2d import Chara2D +from libs.global_data import Difficulty, PlayerNum, reset_session from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate from libs.screen import Screen from libs.texture import tex @@ -12,7 +13,7 @@ from libs.utils import ( get_current_ms, global_data, is_l_don_pressed, - is_r_don_pressed + is_r_don_pressed, ) from scenes.game import ScoreMethod diff --git a/scenes/settings.py b/scenes/settings.py index 6f80d82..a431ec0 100644 --- a/scenes/settings.py +++ b/scenes/settings.py @@ -1,7 +1,9 @@ import logging + import pyray as ray from libs.audio import audio +from libs.config import save_config from libs.screen import Screen from libs.texture import tex from libs.utils import ( @@ -11,7 +13,6 @@ from libs.utils import ( is_r_don_pressed, is_r_kat_pressed, ) -from libs.config import save_config logger = logging.getLogger(__name__) diff --git a/scenes/song_select.py b/scenes/song_select.py index 254dfa0..69295f4 100644 --- a/scenes/song_select.py +++ b/scenes/song_select.py @@ -1,18 +1,31 @@ +import logging import random from dataclasses import fields from pathlib import Path import pyray as ray -import logging - from raylib import SHADER_UNIFORM_VEC3 -from libs.file_navigator import DEFAULT_COLORS, BackBox, DanCourse, GenreIndex, navigator from libs.audio import audio from libs.chara_2d import Chara2D -from libs.file_navigator import Directory, SongBox, SongFile +from libs.file_navigator import ( + DEFAULT_COLORS, + BackBox, + DanCourse, + Directory, + GenreIndex, + SongBox, + SongFile, + navigator, +) from libs.global_data import Difficulty, Modifiers, PlayerNum -from libs.global_objects import AllNetIcon, CoinOverlay, Nameplate, Indicator, Timer +from libs.global_objects import ( + AllNetIcon, + CoinOverlay, + Indicator, + Nameplate, + Timer, +) from libs.screen import Screen from libs.texture import tex from libs.transition import Transition diff --git a/scenes/title.py b/scenes/title.py index e1139c3..9267d1e 100644 --- a/scenes/title.py +++ b/scenes/title.py @@ -2,8 +2,11 @@ import logging import random from pathlib import Path +import pyray as ray + from libs.audio import audio from libs.global_objects import AllNetIcon, CoinOverlay, EntryOverlay +from libs.screen import Screen from libs.texture import tex from libs.utils import ( OutlinedText, @@ -13,9 +16,7 @@ from libs.utils import ( is_l_don_pressed, is_r_don_pressed, ) -import pyray as ray from libs.video import VideoPlayer -from libs.screen import Screen logger = logging.getLogger(__name__) diff --git a/scenes/two_player/game.py b/scenes/two_player/game.py index 6389f38..49a7d5d 100644 --- a/scenes/two_player/game.py +++ b/scenes/two_player/game.py @@ -1,14 +1,23 @@ -import logging import copy +import logging from pathlib import Path + +import pyray as ray + +from libs.audio import audio from libs.global_data import PlayerNum from libs.tja import TJAParser -from libs.utils import get_current_ms -from libs.audio import audio -from libs.utils import global_data +from libs.utils import get_current_ms, global_data from libs.video import VideoPlayer -import pyray as ray -from scenes.game import ClearAnimation, FCAnimation, FailAnimation, GameScreen, Player, Background, ResultTransition +from scenes.game import ( + Background, + ClearAnimation, + FailAnimation, + FCAnimation, + GameScreen, + Player, + ResultTransition, +) logger = logging.getLogger(__name__) diff --git a/scenes/two_player/result.py b/scenes/two_player/result.py index 7da60dd..e8a1d9e 100644 --- a/scenes/two_player/result.py +++ b/scenes/two_player/result.py @@ -1,4 +1,5 @@ import logging + from libs.global_data import PlayerNum from libs.texture import tex from libs.utils import get_current_ms diff --git a/scenes/two_player/song_select.py b/scenes/two_player/song_select.py index beb432b..b08ba95 100644 --- a/scenes/two_player/song_select.py +++ b/scenes/two_player/song_select.py @@ -1,10 +1,16 @@ import logging + +from libs.audio import audio from libs.file_navigator import SongBox, SongFile from libs.global_data import PlayerNum from libs.transition import Transition -from scenes.song_select import DiffSortSelect, SongSelectPlayer, SongSelectScreen, State from libs.utils import get_current_ms, global_data -from libs.audio import audio +from scenes.song_select import ( + DiffSortSelect, + SongSelectPlayer, + SongSelectScreen, + State, +) logger = logging.getLogger(__name__)