From 40b86ebf866bfb132c4fd4e692de4f66b4d1e446 Mon Sep 17 00:00:00 2001 From: ThisBirchWood Date: Sun, 20 Apr 2025 17:04:51 +0200 Subject: [PATCH] PATCH incorrect names --- controllers/player_controller.py | 2 +- render/map_renderer.py | 1 - render/player_renderer.py | 16 +++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/controllers/player_controller.py b/controllers/player_controller.py index 87bf29f..d997ab9 100644 --- a/controllers/player_controller.py +++ b/controllers/player_controller.py @@ -11,7 +11,7 @@ class PlayerController: def _update_hover_state(self, event, player): if event.type == pygame.MOUSEMOTION: mouse_x, mouse_y = event.pos - player_x, player_y = self.player_renderer.map_coord_controller.map_to_screen(player.x, player.y) + player_x, player_y = self.player_renderer.map_coord_converter.map_to_screen(player.x, player.y) distance = ((mouse_x - player_x) ** 2 + (mouse_y - player_y) ** 2) ** 0.5 if distance < self.player_renderer.get_radius(): diff --git a/render/map_renderer.py b/render/map_renderer.py index 6e1bc53..aab7695 100644 --- a/render/map_renderer.py +++ b/render/map_renderer.py @@ -1,6 +1,5 @@ import pygame from utils.json_object import JSONObject -from controllers.map_coord_controller import MapCoordController class MapRenderer: def __init__(self, screen, map_data_path, map_image_path): diff --git a/render/player_renderer.py b/render/player_renderer.py index c2ad3f8..fe38325 100644 --- a/render/player_renderer.py +++ b/render/player_renderer.py @@ -1,14 +1,14 @@ import pygame, math from models.match import Match from models.player import Player -from controllers.map_coord_controller import MapCoordController +from utils.map_coord_converter import MapCoordConverter from utils.utils import mapped_value class PlayerRenderer: - def __init__(self, screen, match: Match, map_coord_controller: MapCoordController, options: dict): + def __init__(self, screen, match: Match, map_coord_converter: MapCoordConverter, options: dict): self.screen = screen self.match = match - self.map_coord_controller = map_coord_controller + self.map_coord_converter = map_coord_converter self.options = options self.player_font = pygame.font.Font(None, 15) @@ -45,11 +45,11 @@ class PlayerRenderer: else: radius = self.player_radius - x, y = self.map_coord_controller.map_to_screen(player.x, player.y) + x, y = self.map_coord_converter.map_to_screen(player.x, player.y) pygame.draw.circle(self.screen, team.colour, (x, y), radius) def _render_text(self, player): - x, y = self.map_coord_controller.map_to_screen(player.x, player.y) + 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)) @@ -59,14 +59,14 @@ class PlayerRenderer: else: yaw_length = 20 - mapped_x, mapped_y = self.map_coord_controller.map_to_screen(player.x, player.y) + mapped_x, mapped_y = self.map_coord_converter.map_to_screen(player.x, player.y) player_yaw = math.radians(player.yaw) end_x = mapped_x + (yaw_length * math.cos(player_yaw)) end_y = mapped_y - (yaw_length * math.sin(player_yaw)) pygame.draw.line(self.screen, team.colour, (mapped_x, mapped_y), (end_x, end_y), 2) def _render_health(self, player): - x, y = self.map_coord_controller.map_to_screen(player.x, player.y) + x, y = self.map_coord_converter.map_to_screen(player.x, player.y) pygame.draw.rect(self.screen, self.health_bar_background, (x-10, y-10, 20, 5)) pygame.draw.rect(self.screen, self.health_bar_foreground, (x-10, y-10, mapped_value(player.health, 0, 100, 0, 20), 5)) @@ -79,6 +79,8 @@ class PlayerRenderer: self._render_circle(player, team) self._render_text(player) + if self.options["show_yaw"]: self._render_yaw(player, team) + self._render_health(player) \ No newline at end of file