diff --git a/controllers/player_controller.py b/controllers/player_controller.py index 35792e3..4eca3be 100644 --- a/controllers/player_controller.py +++ b/controllers/player_controller.py @@ -26,9 +26,12 @@ class PlayerController: def _select_player(self, mouse_x, mouse_y, player): if self._is_player_at_mouse(player, mouse_x, mouse_y): player.is_selected = not player.is_selected + + if self.selected_player and self.selected_player != player: + self.selected_player.is_selected = False + self.selected_player = player if player.is_selected else None - print(f"Selected player: {player.name}" if player.is_selected else "Player deselected") - + ## Public Methods def update(self, event): if hasattr(event, 'pos'): diff --git a/main.py b/main.py index b2921a5..cad4a27 100644 --- a/main.py +++ b/main.py @@ -27,7 +27,8 @@ def main(): "pressed_button_colour": (150, 150, 150), "text_colour": (255, 255, 255), "background_colour": (30, 30, 30), - "foreground_colour": (100, 100, 100) + "foreground_colour": (100, 100, 100), + "player_selected_colour": (255, 255, 0), } } diff --git a/render/player_renderer.py b/render/player_renderer.py index 6b8378b..afd45e3 100644 --- a/render/player_renderer.py +++ b/render/player_renderer.py @@ -5,11 +5,12 @@ from utils.map_coord_converter import MapCoordConverter from utils.utils import mapped_value class PlayerRenderer: - def __init__(self, screen, match: Match, map_coord_converter: MapCoordConverter, options: dict): + def __init__(self, screen, match: Match, map_coord_converter: MapCoordConverter, options: dict, styling: dict): self.screen = screen self.match = match self.map_coord_converter = map_coord_converter self.options = options + self.styling = styling self.player_font = pygame.font.Font(None, 15) self.player_radius = 5 @@ -49,8 +50,12 @@ class PlayerRenderer: pygame.draw.circle(self.screen, team.colour, (x, y), radius) def _render_text(self, player): + if player.is_selected: + text = self.player_font.render(player.name, True, self.styling["player_selected_colour"]) + else: + text = self.player_font.render(player.name, True, (255, 255, 255)) + x, y = self.map_coord_converter.map_to_screen(player.x, player.y) - text = self.player_font.render(player.name, True, (255, 255, 255)) self.screen.blit(text, (x-(text.get_width()/2), y+5)) def _render_yaw(self, player, team): diff --git a/states/game.py b/states/game.py index 81a0714..cbd29f4 100644 --- a/states/game.py +++ b/states/game.py @@ -33,7 +33,7 @@ class Game(GameState): # Renderers self.map_renderer = MapRenderer(self.game_box, match_data_path, match_image_path) - self.player_renderer = PlayerRenderer(self.game_box, self.match, self.map_coord_controller, self.options) + self.player_renderer = PlayerRenderer(self.game_box, self.match, self.map_coord_controller, self.options, self.styling) self.gui_render = GUIRenderer(self.screen, self.match) self.info_render = InfoRenderer(self.info_box, self.styling, self.match) self.control_render = ControlRenderer(self.control_box, self.match)