From bcda244b5fb11c2927cb8a6e76c67e73db75c0d6 Mon Sep 17 00:00:00 2001 From: Yonokid <37304577+Yonokid@users.noreply.github.com> Date: Thu, 12 Jun 2025 21:06:29 -0400 Subject: [PATCH] minor fixes, alpha ver --- .gitignore | 5 +---- PyTaiko.py | 3 --- libs/utils.py | 12 ++++++++++-- scenes/game.py | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9eb8806..ad5006f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,5 @@ __pycache__ .ruff_cache scores.db cache -pytaiko.build -pytaiko.dist -pytaiko.onefile-build -pytaiko.exe full.csv +dev-config.toml diff --git a/PyTaiko.py b/PyTaiko.py index 58d4fe7..dd537fd 100644 --- a/PyTaiko.py +++ b/PyTaiko.py @@ -69,12 +69,9 @@ def main(): ray.set_config_flags(ray.ConfigFlags.FLAG_MSAA_4X_HINT) ray.set_trace_log_level(ray.TraceLogLevel.LOG_ERROR) - #ray.set_window_max_size(screen_width, screen_height) - #ray.set_window_min_size(screen_width, screen_height) ray.init_window(screen_width, screen_height, "PyTaiko") if global_data.config["video"]["borderless"]: ray.toggle_borderless_windowed() - #ray.clear_window_state(ray.ConfigFlags.FLAG_WINDOW_TOPMOST) if global_data.config["video"]["fullscreen"]: ray.maximize_window() diff --git a/libs/utils.py b/libs/utils.py index bcc88a1..163abea 100644 --- a/libs/utils.py +++ b/libs/utils.py @@ -97,12 +97,20 @@ def get_pixels_per_frame(bpm: float, time_signature: float, distance: float) -> return (distance / total_frames) def get_config() -> dict[str, Any]: - with open('config.toml', "r", encoding="utf-8") as f: + if Path('dev-config.toml').exists(): + with open(Path('dev-config.toml'), "r", encoding="utf-8") as f: + config_file = tomlkit.load(f) + return config_file + with open(Path('config.toml'), "r", encoding="utf-8") as f: config_file = tomlkit.load(f) return config_file def save_config(config: dict[str, Any]) -> None: - with open('config.toml', "w", encoding="utf-8") as f: + if Path('dev-config.toml').exists(): + with open(Path('dev-config.toml'), "w", encoding="utf-8") as f: + tomlkit.dump(config, f) + return + with open(Path('config.toml'), "w", encoding="utf-8") as f: tomlkit.dump(config, f) def is_l_don_pressed() -> bool: diff --git a/scenes/game.py b/scenes/game.py index 4636b0c..c137698 100644 --- a/scenes/game.py +++ b/scenes/game.py @@ -731,7 +731,8 @@ class Judgement: ray.draw_texture(textures_2[index+5], 304, 143, hit_color) ray.draw_texture(textures_2[9], 370, int(y), color) if self.curr_hit_ms is not None: - ray.draw_text(self.curr_hit_ms, 370, int(y)-20, 40, ray.fade(ray.YELLOW, self.fade_animation_1.attribute)) + pass + #ray.draw_text(self.curr_hit_ms, 370, int(y)-20, 40, ray.fade(ray.YELLOW, self.fade_animation_1.attribute)) elif self.type == 'OK': if self.big: ray.draw_texture(textures_1[20], 342, 184, color)