diff --git a/katrain/gui/badukpan.py b/katrain/gui/badukpan.py index 40294d9..17d0fbb 100644 --- a/katrain/gui/badukpan.py +++ b/katrain/gui/badukpan.py @@ -118,7 +118,7 @@ class BadukPanWidget(Widget): ] if nodes_here and max(yd, xd) < self.grid_size / 2: # load old comment if touch.is_double_tap: # navigate to move - katrain.game.set_current_node(nodes_here[-1]) + katrain.game.set_current_node(nodes_here[-1].parent) katrain.update_state() else: # load comments & pv katrain.log(f"\nAnalysis:\n{nodes_here[-1].analysis}", OUTPUT_DEBUG) @@ -418,9 +418,7 @@ class BadukPanWidget(Widget): move = Move.from_gtp(move_dict["move"]) if move.coords is not None: alpha, scale = GHOST_ALPHA, 1.0 - if i == 0: - alpha += TOP_MOVE_ALPHA - elif move_dict["visits"] < VISITS_FRAC_SMALL * hint_moves[0]["visits"]: + if move_dict["visits"] < VISITS_FRAC_SMALL * hint_moves[0]["visits"]: scale = 0.8 if "pv" in move_dict: self.active_pv_moves.append((move.coords, move_dict["pv"], current_node)) @@ -431,9 +429,16 @@ class BadukPanWidget(Widget): col=[*self.eval_color(move_dict["pointsLost"])[:3], alpha], r=self.stone_size * scale, ) - if i==0: + if i == 0: Color(*TOP_MOVE_BORDER_COLOR) - Line(circle=(self.gridpos_x[move.coords[0]], self.gridpos_y[move.coords[1]],self.stone_size * scale),width=1.1) + Line( + circle=( + self.gridpos_x[move.coords[0]], + self.gridpos_y[move.coords[1]], + self.stone_size * scale - 1.2, + ), + width=dp(1.2), + ) # hover next move ghost stone if self.ghost_stone: diff --git a/katrain/gui/style.py b/katrain/gui/style.py index 94b88e8..7d0acc2 100644 --- a/katrain/gui/style.py +++ b/katrain/gui/style.py @@ -51,7 +51,7 @@ VISITS_FRAC_SMALL = 0.1 GHOST_ALPHA = 0.5 TOP_MOVE_ALPHA = 0.4 -TOP_MOVE_BORDER_COLOR = [46 / 255, 65 / 255, 88 / 255,0.9] +TOP_MOVE_BORDER_COLOR = [46 / 255, 65 / 255, 88 / 255, 0.9] CHILD_SCALE = 0.95 # ponder light diff --git a/spec/KaTrain.spec b/spec/KaTrain.spec index c53f3d5..9521274 100644 --- a/spec/KaTrain.spec +++ b/spec/KaTrain.spec @@ -14,18 +14,13 @@ a = Analysis( datas=[ ("..\\katrain\\gui.kv", "katrain"), ("..\\katrain\\popups.kv", "katrain"), - ("..\\katrain\\countdownbeep.wav", "katrain"), - ("..\\katrain\\stone1.wav", "katrain"), - ("..\\katrain\\stone2.wav", "katrain"), - ("..\\katrain\\stone3.wav", "katrain"), - ("..\\katrain\\stone4.wav", "katrain"), - ("..\\katrain\\stone5.wav", "katrain"), ("..\\katrain\\config.json", "katrain"), ("..\\katrain\\KataGo", "katrain\\KataGo"), - ("..\\katrain\img", "katrain\\img"), ("..\\katrain\\models", "katrain\\models"), - ("..\\katrain\\i18n", "katrain\\i18n"), + ("..\\katrain\\sounds", "katrain\\sounds"), + ("..\\katrain\img", "katrain\\img"), ("..\\katrain\\fonts", "katrain\\fonts"), + ("..\\katrain\\i18n", "katrain\\i18n"), ], hiddenimports=["win32file", "win32timezone"], # FileChooser in kivy loads this conditionally hookspath=[kivymd_hooks_path], diff --git a/tests/test_ai.py b/tests/test_ai.py index 9f4f1fb..cd97314 100644 --- a/tests/test_ai.py +++ b/tests/test_ai.py @@ -40,6 +40,6 @@ class TestAI: katrain = KaTrainBase(force_package_config=True, debug_level=0) for strategy in AI_STRATEGIES: settings = katrain.config(f"ai/{strategy}") - rank,flag = ai_rank_estimation(strategy,settings) + rank, flag = ai_rank_estimation(strategy, settings) assert -20 <= rank <= 9 - assert isinstance(flag,bool) \ No newline at end of file + assert isinstance(flag, bool)