From 7e6208740cd6a3be3abdadd67ccf5887e4352a72 Mon Sep 17 00:00:00 2001 From: Airun_Iru Date: Sun, 30 Nov 2025 22:50:29 -0800 Subject: [PATCH 1/3] fix bug --- tetr_cli/tetr_modules/modes/solo/sprint_mode.py | 12 ++++++------ tetr_cli/tetr_modules/modes/solo/ultra_mode.py | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tetr_cli/tetr_modules/modes/solo/sprint_mode.py b/tetr_cli/tetr_modules/modes/solo/sprint_mode.py index bc0de3d..fd8e614 100644 --- a/tetr_cli/tetr_modules/modes/solo/sprint_mode.py +++ b/tetr_cli/tetr_modules/modes/solo/sprint_mode.py @@ -304,12 +304,6 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: if check_max_yx[0] < MIN_Y or check_max_yx[1] < MIN_X: return - if self.check_clear(): - self.mode = "cleared" - self.display_game_cleared(stdscr) - self.sound_action["BGM"] = ["stop"] - return - if self.mode == "game_over": if self.get_user_keybind("menu_confirm", menu_mode=True) & pressed_keys: self.action["transition"] = ["Score_Screen"] @@ -329,6 +323,12 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: self.display_game_cleared(stdscr) return + if self.check_clear(): + self.mode = "cleared" + self.display_game_cleared(stdscr) + self.sound_action["BGM"] = ["stop"] + return + queue_to_draw: List[str] = self.mino_list[0:5] hold_to_draw: Optional[str] = ( self.current_hold.type if self.current_hold else None diff --git a/tetr_cli/tetr_modules/modes/solo/ultra_mode.py b/tetr_cli/tetr_modules/modes/solo/ultra_mode.py index 973711d..e114935 100644 --- a/tetr_cli/tetr_modules/modes/solo/ultra_mode.py +++ b/tetr_cli/tetr_modules/modes/solo/ultra_mode.py @@ -312,12 +312,6 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: if check_max_yx[0] < MIN_Y or check_max_yx[1] < MIN_X: return - if self.check_clear(): - self.mode = "cleared" - self.display_game_cleared(stdscr) - self.sound_action["BGM"] = ["stop"] - return - if self.mode == "game_over": if self.get_user_keybind("menu_confirm", menu_mode=True) & pressed_keys: self.action["transition"] = ["Score_Screen"] @@ -337,6 +331,12 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: self.display_game_cleared(stdscr) return + if self.check_clear(): + self.mode = "cleared" + self.display_game_cleared(stdscr) + self.sound_action["BGM"] = ["stop"] + return + queue_to_draw: List[str] = self.mino_list[0:5] hold_to_draw: Optional[str] = ( self.current_hold.type if self.current_hold else None From 275fe09f987a71b249dae1966230a465e3f92a63 Mon Sep 17 00:00:00 2001 From: Airun_Iru Date: Sun, 30 Nov 2025 22:52:32 -0800 Subject: [PATCH 2/3] version 1.0.1 --- pyproject.toml | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e08c389..6109e95 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "tetr_cli" -version = "1.0.0" +version = "1.0.1" description = "Setup script for the tetr_cli package." authors = [ { name = "Airun_Iru", email = "hugo_s_tanaka@yahoo.com" } @@ -18,7 +18,7 @@ dependencies = [ "wcwidth>=0.1.7", 'windows-curses>=2.2.0; platform_system == "Windows"' ] -requires-python = ">=3.8" +requires-python = ">=3.8, <3.14" readme = "README.md" [tool.setuptools.packages.find] diff --git a/setup.py b/setup.py index 96079ed..e3deae5 100644 --- a/setup.py +++ b/setup.py @@ -5,10 +5,10 @@ setup( name="tetr_cli", - version="1.0.0", + version="1.0.1", packages=find_packages(), entry_points={"console_scripts": ["tetr_cli = tetr_cli.starter:starter"]}, - python_requires=">=3.7", + python_requires=">=3.8, <3.14", install_requires=[ "ansicon>=1.83.0", "jinxed>=1.1.0", From 77d522949bf407abc830f5ff7251ebe841ad0e79 Mon Sep 17 00:00:00 2001 From: Airun_Iru Date: Sun, 30 Nov 2025 23:35:30 -0800 Subject: [PATCH 3/3] version 1.0.1-post2 --- pyproject.toml | 2 +- setup.py | 2 +- .../graphic_options/mino_design_mode.py | 4 ++-- .../tetr_modules/modes/solo/sprint_mode.py | 22 +++++++++---------- .../tetr_modules/modes/solo/ultra_mode.py | 22 +++++++++---------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6109e95..742ecaf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "tetr_cli" -version = "1.0.1" +version = "1.0.1-2" description = "Setup script for the tetr_cli package." authors = [ { name = "Airun_Iru", email = "hugo_s_tanaka@yahoo.com" } diff --git a/setup.py b/setup.py index e3deae5..65e4b27 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name="tetr_cli", - version="1.0.1", + version="1.0.1-2", packages=find_packages(), entry_points={"console_scripts": ["tetr_cli = tetr_cli.starter:starter"]}, python_requires=">=3.8, <3.14", diff --git a/tetr_cli/tetr_modules/modes/options/graphic_options/mino_design_mode.py b/tetr_cli/tetr_modules/modes/options/graphic_options/mino_design_mode.py index 5963c4f..4c4ccb7 100644 --- a/tetr_cli/tetr_modules/modes/options/graphic_options/mino_design_mode.py +++ b/tetr_cli/tetr_modules/modes/options/graphic_options/mino_design_mode.py @@ -9,12 +9,12 @@ from tetr_cli.tetr_modules.modules.database import set_setting OPTION_TO_ACTION: Dict[str, Dict[str, str]] = { - "Go_Back": {"action": "Gameplay_Options", "sound": "select_back"}, + "Go_Back": {"action": "Graphic_Options", "sound": "select_back"}, } for mino_style in MINO_TO_GHOST.keys(): OPTION_TO_ACTION[mino_style] = { - "action": "Gameplay_Options", + "action": "Graphic_Options", "sound": "select_confirm", } diff --git a/tetr_cli/tetr_modules/modes/solo/sprint_mode.py b/tetr_cli/tetr_modules/modes/solo/sprint_mode.py index fd8e614..9177daa 100644 --- a/tetr_cli/tetr_modules/modes/solo/sprint_mode.py +++ b/tetr_cli/tetr_modules/modes/solo/sprint_mode.py @@ -204,11 +204,6 @@ def play_mode(self, stdscr: window, pressed_keys: Set[str]) -> None: das=self.__das, arr=self.__arr, ) - if self.check_game_over(): - self.mode = "game_over" - self.display_game_over(stdscr) - self.sound_action["BGM"] = ["stop"] - return self.check_keyinput_pressed(pressed_keys=pressed_keys) if not self.current_mino: @@ -323,12 +318,6 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: self.display_game_cleared(stdscr) return - if self.check_clear(): - self.mode = "cleared" - self.display_game_cleared(stdscr) - self.sound_action["BGM"] = ["stop"] - return - queue_to_draw: List[str] = self.mino_list[0:5] hold_to_draw: Optional[str] = ( self.current_hold.type if self.current_hold else None @@ -370,6 +359,17 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: self.countdown_mode(stdscr) return + if self.check_game_over(): + self.mode = "game_over" + self.display_game_over(stdscr) + self.sound_action["BGM"] = ["stop"] + return + if self.check_clear(): + self.mode = "cleared" + self.display_game_cleared(stdscr) + self.sound_action["BGM"] = ["stop"] + return + self.play_mode(stdscr, pressed_keys) self.__time += 60 // self.fps_limit diff --git a/tetr_cli/tetr_modules/modes/solo/ultra_mode.py b/tetr_cli/tetr_modules/modes/solo/ultra_mode.py index e114935..d4cb369 100644 --- a/tetr_cli/tetr_modules/modes/solo/ultra_mode.py +++ b/tetr_cli/tetr_modules/modes/solo/ultra_mode.py @@ -212,11 +212,6 @@ def play_mode(self, stdscr: window, pressed_keys: Set[str]) -> None: das=self.__das, arr=self.__arr, ) - if self.check_game_over(): - self.mode = "game_over" - self.display_game_over(stdscr) - self.sound_action["BGM"] = ["stop"] - return self.check_keyinput_pressed(pressed_keys=pressed_keys) if not self.current_mino: @@ -331,12 +326,6 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: self.display_game_cleared(stdscr) return - if self.check_clear(): - self.mode = "cleared" - self.display_game_cleared(stdscr) - self.sound_action["BGM"] = ["stop"] - return - queue_to_draw: List[str] = self.mino_list[0:5] hold_to_draw: Optional[str] = ( self.current_hold.type if self.current_hold else None @@ -378,6 +367,17 @@ def increment_frame(self, stdscr: window, pressed_keys: Set[str]) -> None: self.countdown_mode(stdscr) return + if self.check_game_over(): + self.mode = "game_over" + self.display_game_over(stdscr) + self.sound_action["BGM"] = ["stop"] + return + if self.check_clear(): + self.mode = "cleared" + self.display_game_cleared(stdscr) + self.sound_action["BGM"] = ["stop"] + return + self.play_mode(stdscr, pressed_keys) self.__time -= 1