REFACTOR cleanup old files + naming conventions

states/game.py

@@ -3,7 +3,7 @@ from controllers.player_controller import PlayerController
 from render.map_renderer import MapRenderer
 from render.gui_renderer import GUIRenderer
 from render.player_renderer import PlayerRenderer
-from controllers.map_coord_controller import MapCoordController
+from utils.map_coord_converter import MapCoordConverter
 from controllers.gui_controller import GUIController
 import pygame
 
@@ -11,19 +11,19 @@ class Game(GameState):
     def __init__(self, switch_state_callback, context):
         super().__init__(switch_state_callback, context)
 
-        match_data_path = "maps/" + self.match.map_name + ".json"
-        match_image_path = "maps/" + self.match.map_name + ".png"
+        match_data_path = f"maps/{self.match.map_name}.json"
+        match_image_path = f"maps/{self.match.map_name}.png"
 
-        #self.renderer = Renderer(self.match, self.screen, self.options)
-        self.map_coord_controller = MapCoordController(self.screen.get_width(), self.screen.get_height(), match_data_path, match_image_path)
+        # Map Coordinate Helper Class, misnamed
+        self.map_coord_controller = MapCoordConverter(self.screen.get_width(), self.screen.get_height(), match_data_path, match_image_path)
 
         # Renderers
         self.map_renderer = MapRenderer(self.screen, match_data_path, match_image_path)
-        self.player_render = PlayerRenderer(self.screen, self.match, self.map_coord_controller, self.options)
+        self.player_renderer = PlayerRenderer(self.screen, self.match, self.map_coord_controller, self.options)
         self.gui_render = GUIRenderer(self.screen, self.match)
 
         # Controllers
-        self.player_controller = PlayerController(self.player_render, self.match)
+        self.player_controller = PlayerController(self.player_renderer, self.match)
         self.gui_controller = GUIController(self.gui_render)
 
 
@@ -43,5 +43,5 @@ class Game(GameState):
         """Draws everything on screen."""
         self.screen.fill((0, 0, 0))
         self.map_renderer.render()
-        self.player_render.render()
+        self.player_renderer.render()
         self.gui_render.render()

utils/map_coord_converter.py

@@ -1,11 +1,9 @@
 # Description: This file contains the CoordinateManager class which is responsible for converting coordinates to pixels and vice versa.
-
-import math
 import pygame
 from utils.utils import mapped_value
 from utils.json_object import JSONObject
 
-class MapCoordController:
+class MapCoordConverter:
     def __init__(self, screen_width: int, screen_height, json_file: str, map_image_path: str):
         self.screen_width = screen_width
         self.screen_height = screen_height
@@ -50,7 +48,7 @@ class MapCoordController:
         return mapped_x, mapped_y
     
 if __name__ == "__main__":
-    map_coord_controller = MapCoordController(700, 700, -3000, 3000, -3000, 3000)
+    map_coord_controller = MapCoordConverter(700, 700, -3000, 3000, -3000, 3000)
     print(map_coord_controller.map_to_screen(0,0))