Reformat code

Author: Joltras

src/floors/floor.py

@@ -73,11 +73,11 @@ def to_json(self, indent: int):
         current_index: int = 0
         max_index: int = len(self._rooms)
         json_string = (
-                "{\n"
-                + f'{indent_s}"_seed": "{self.seed}",\n'
-                + indent_s
-                + '"_rooms"'
-                + ": ["
+            "{\n"
+            + f'{indent_s}"_seed": "{self.seed}",\n'
+            + indent_s
+            + '"_rooms"'
+            + ": ["
         )
         if len(self._rooms) == 0:
             json_string += "]"
@@ -98,7 +98,9 @@ def from_json(cls, json_string: str):
         Creates a floor object from a json string.
         """
         json_dict = json.loads(json_string)
-        floor = Floor(json_dict["_height"], json_dict["_width"], json_dict["_floor"]["_seed"])
+        floor = Floor(
+            json_dict["_height"], json_dict["_width"], json_dict["_floor"]["_seed"]
+        )
         rooms = json_dict["_floor"]["_rooms"]
         for room in rooms:
             floor._rooms.append(Room.from_dict(room))
@@ -113,7 +115,7 @@ def add_to_floor_grid(self, x: int, y: int) -> None:
         self._floor_grid[y][x] = 1
 
     def add_room(
-            self, x: int, y: int, room_type: RoomType = RoomType.NORMAL_ROOM
+        self, x: int, y: int, room_type: RoomType = RoomType.NORMAL_ROOM
     ) -> None:
         """
         Creates and adds a room to the floor.
@@ -126,7 +128,7 @@ def add_room(
         self._room_id += 1
 
     def add_room_next_to(
-            self, room: Room, direction: Direction, room_type: RoomType
+        self, room: Room, direction: Direction, room_type: RoomType
     ) -> None:
         """
         Creates and adds a room next to a given room.
@@ -262,8 +264,12 @@ def has_boos_room_as_neighbour(self, coordinates: Tuple[int, int]) -> bool:
         @return: True if the coordinates have a boss room as neighbour otherwise False
         """
         for direction in Direction.main_directions():
-            new_coordinates = utils.util_functions.add_direction_to_coordinates(direction, coordinates)
-            if self.is_within_border(new_coordinates) and self.contains_room(new_coordinates):
+            new_coordinates = utils.util_functions.add_direction_to_coordinates(
+                direction, coordinates
+            )
+            if self.is_within_border(new_coordinates) and self.contains_room(
+                new_coordinates
+            ):
                 room = self._get_room(new_coordinates)
                 if room.get_type() == RoomType.BOSS_ROOM:
                     return True
@@ -282,8 +288,12 @@ def has_special_room_as_neighbour(self, coordinates: Tuple[int, int]) -> bool:
         @return: True if the coordinates have a special room as neighbour otherwise False
         """
         for direction in Direction.main_directions():
-            new_coordinates = utils.util_functions.add_direction_to_coordinates(direction, coordinates)
-            if self.is_within_border(new_coordinates) and self.contains_room(new_coordinates):
+            new_coordinates = utils.util_functions.add_direction_to_coordinates(
+                direction, coordinates
+            )
+            if self.is_within_border(new_coordinates) and self.contains_room(
+                new_coordinates
+            ):
                 room = self._get_room(new_coordinates)
                 if room.get_type().is_special():
                     return True

src/generators/floor_manager.py

@@ -14,6 +14,7 @@ class FloorManager:
     """
     Class to manage the floors of the tkinter generator.
     """
+
     def __init__(self, output_file_name: str) -> None:
         """
         Creates a new floor manager.

src/generators/generator.py

@@ -26,11 +26,11 @@ class Generator:
     """
 
     def __init__(
-            self,
-            seed: str,
-            output_file_name: str,
-            output_file_path: str = "",
-            stage_id: int = 2,
+        self,
+        seed: str,
+        output_file_name: str,
+        output_file_path: str = "",
+        stage_id: int = 2,
     ):
         """
         Creates a new generator with the given arguments.
@@ -53,22 +53,22 @@ def to_json(self, indent: int) -> str:
         indent_s = my_globals.BASE_INDENT * indent
 
         j = (
-                "{\n"
-                + indent_s
-                + '"_width": '
-                + str(my_globals.FLOOR_WIDTH)
-                + ",\n"
-                + indent_s
-                + '"_height": '
-                + str(my_globals.FLOOR_HEIGHT)
-                + ",\n"
-                + indent_s
-                + '"_floor": '
-                + self._floor.to_json(indent + 1)
-                + ",\n"
-                + indent_s
-                + '"_generated_by": "python"'
-                + "\n}"
+            "{\n"
+            + indent_s
+            + '"_width": '
+            + str(my_globals.FLOOR_WIDTH)
+            + ",\n"
+            + indent_s
+            + '"_height": '
+            + str(my_globals.FLOOR_HEIGHT)
+            + ",\n"
+            + indent_s
+            + '"_floor": '
+            + self._floor.to_json(indent + 1)
+            + ",\n"
+            + indent_s
+            + '"_generated_by": "python"'
+            + "\n}"
         )
         return j
 
@@ -78,7 +78,9 @@ def _create_floor(self) -> None:
         """
         self._floor = Floor(my_globals.FLOOR_HEIGHT, my_globals.FLOOR_WIDTH, self._seed)
 
-    def _add_new_room(self, new_room_tuple: Tuple[int, int], room_tuple_queue: deque) -> bool:
+    def _add_new_room(
+        self, new_room_tuple: Tuple[int, int], room_tuple_queue: deque
+    ) -> bool:
         """
         Checks if a room can be added at the new position
         and if possible adds it to the queue and floor grid.
@@ -87,10 +89,12 @@ def _add_new_room(self, new_room_tuple: Tuple[int, int], room_tuple_queue: deque
         @return: True if the position was added to the queue otherwise False
         """
         if (
-                self._floor.is_within_border(new_room_tuple)
-                and (not self._floor.contains_room(new_room_tuple))
-                and (self._floor.count_neighbours(new_room_tuple[0], new_room_tuple[1]) <= 1)
-                and util_functions.place_room()
+            self._floor.is_within_border(new_room_tuple)
+            and (not self._floor.contains_room(new_room_tuple))
+            and (
+                self._floor.count_neighbours(new_room_tuple[0], new_room_tuple[1]) <= 1
+            )
+            and util_functions.place_room()
         ):
             room_tuple_queue.append(new_room_tuple)
             self._floor.add_to_floor_grid(*new_room_tuple)
@@ -155,8 +159,8 @@ def mark_dead_ends(self) -> list:
         for i in range(len(floor.get_rooms())):
             room = floor.get_rooms()[i]
             if (
-                    floor.is_dead_end(room[0], room[1])
-                    and room.get_type() == RoomType.NORMAL_ROOM
+                floor.is_dead_end(room[0], room[1])
+                and room.get_type() == RoomType.NORMAL_ROOM
             ):
                 room.set_type(RoomType.DEAD_END)
                 dead_end_indices += (i,)
@@ -205,9 +209,9 @@ def add_boss_room(self, dead_end_indices: list, start_room: tuple) -> None:
                 direction, (boss_room_x, boss_room_y)
             )
             if (
-                    self._floor.is_within_border(new_boss_tuple)
-                    and floor.count_neighbours(new_boss_tuple[0], new_boss_tuple[1]) == 1
-                    and not self._floor.contains_room(new_boss_tuple)
+                self._floor.is_within_border(new_boss_tuple)
+                and floor.count_neighbours(new_boss_tuple[0], new_boss_tuple[1]) == 1
+                and not self._floor.contains_room(new_boss_tuple)
             ):
                 possible_locations.append(direction)
 
@@ -221,9 +225,9 @@ def add_boss_room(self, dead_end_indices: list, start_room: tuple) -> None:
             boss_room_placed = self._place_big_boss_room(possible_locations, boss_room)
 
         if (
-                not boss_room_placed
-                and len(possible_locations) >= 1
-                and random.randint(0, 10) < 5
+            not boss_room_placed
+            and len(possible_locations) >= 1
+            and random.randint(0, 10) < 5
         ):
             # Create a 1 * 2 boss-room
             floor.add_room_next_to(boss_room, possible_locations[0], RoomType.BOSS_ROOM)
@@ -249,9 +253,9 @@ def _place_big_boss_room(self, possible_locations: List, boss_room: Room) -> boo
                 direction[2], (boss_room[0], boss_room[1])
             )
             if (
-                    direction[0] in possible_locations
-                    and direction[1] in possible_locations
-                    and self._floor.has_no_neighbours(corner)
+                direction[0] in possible_locations
+                and direction[1] in possible_locations
+                and self._floor.has_no_neighbours(corner)
             ):
                 self._add_rooms_next_to_room(boss_room, direction)
                 return True
@@ -272,17 +276,17 @@ def _place_boss_with_teleport_room(self, boss_room) -> None:
             boss_room.set_cord(0, my_globals.FLOOR_HEIGHT - 1)
 
         elif self._check_if_not_contains_room_and_has_no_neighbours(
-                floor.bottom_left()
+            floor.bottom_left()
         ):
             boss_room.set_cord(my_globals.FLOOR_WIDTH - 1, my_globals.FLOOR_HEIGHT - 1)
 
         elif self._check_if_not_contains_room_and_has_no_neighbours(
-                floor.bottom_right()
+            floor.bottom_right()
         ):
             boss_room.set_cord(my_globals.FLOOR_WIDTH - 1, 0)
 
     def _check_if_not_contains_room_and_has_no_neighbours(
-            self, point: Tuple[int, int]
+        self, point: Tuple[int, int]
     ) -> bool:
         floor = self._floor
         return not floor.contains_room(
@@ -316,9 +320,12 @@ def place_super_secret_room(self) -> None:
                 neighbour = util_functions.add_direction_to_coordinates(
                     direction, (room[0], room[1])
                 )
-                if (floor.is_within_border(neighbour) and not floor.contains_room(neighbour)
-                        and not floor.has_boos_room_as_neighbour(neighbour)
-                        and floor.count_neighbours(neighbour[0],neighbour[1]) == 1):
+                if (
+                    floor.is_within_border(neighbour)
+                    and not floor.contains_room(neighbour)
+                    and not floor.has_boos_room_as_neighbour(neighbour)
+                    and floor.count_neighbours(neighbour[0], neighbour[1]) == 1
+                ):
                     distance = util_functions.calculate_distance(boss_room, neighbour)
                     if distance < distance_to_boss:
                         distance_to_boss = distance
@@ -336,12 +343,16 @@ def place_secret_room(self) -> None:
         while not secret_room_placed:
             for room in reversed(floor.get_rooms()):
                 # Check all neighbours of the room
-                secret_room_placed = self._check_directions_for_secret_room(room, neighbour_rooms)
+                secret_room_placed = self._check_directions_for_secret_room(
+                    room, neighbour_rooms
+                )
                 if secret_room_placed:
                     break
             neighbour_rooms -= 1
 
-    def _check_directions_for_secret_room(self, room: Room, neighbour_rooms: int) -> bool:
+    def _check_directions_for_secret_room(
+        self, room: Room, neighbour_rooms: int
+    ) -> bool:
         """
         Checks if a secret room can be placed next to a given room.
         @param room: room to check
@@ -358,7 +369,10 @@ def _check_directions_for_secret_room(self, room: Room, neighbour_rooms: int) ->
             if floor.has_special_room_as_neighbour(neighbour):
                 continue
             current_neighbour = floor.count_neighbours(neighbour[0], neighbour[1])
-            if current_neighbour >= neighbour_rooms and not floor.has_boos_room_as_neighbour(neighbour):
+            if (
+                current_neighbour >= neighbour_rooms
+                and not floor.has_boos_room_as_neighbour(neighbour)
+            ):
                 floor.add_room(neighbour[0], neighbour[1], RoomType.SECRET_ROOM)
                 return True
         return False

src/generators/theme_handler.py

@@ -9,6 +9,7 @@ class ThemeHandler:
     """
     Class to handle the theme of the application.
     """
+
     def __init__(self, tk: Tk, canvas: Canvas) -> None:
         """
         Creates a new theme handler.

src/generators/tkinter_generator.py

@@ -23,7 +23,7 @@ class TkinterGenerator(Generator):
     """
 
     def __init__(
-            self, seed: str, output_file_name: str, output_file_path: str, stage_id: int = 2
+        self, seed: str, output_file_name: str, output_file_path: str, stage_id: int = 2
     ):
         """
         Creates a new generator.
@@ -47,14 +47,19 @@ def __init__(
         self._menu_bar = tk.Menu(self._tk)
         self._theme_handler = ThemeHandler(self._tk, self._canvas)
         self._floor_manager = FloorManager(output_file_name)
-        self._tk.protocol('WM_DELETE_WINDOW', self.quit)
+        self._tk.protocol("WM_DELETE_WINDOW", self.quit)
 
     def _create_floor(self) -> None:
         """
         Creates a new TkinterFloor and appends it to the floor queue.
         """
-        self._floor = TkinterFloor(my_globals.FLOOR_HEIGHT, my_globals.FLOOR_WIDTH, self._canvas,
-                                   my_globals.DEFAULT_FLOOR_NAME + my_globals.JSON_SUFFIX, self._seed)
+        self._floor = TkinterFloor(
+            my_globals.FLOOR_HEIGHT,
+            my_globals.FLOOR_WIDTH,
+            self._canvas,
+            my_globals.DEFAULT_FLOOR_NAME + my_globals.JSON_SUFFIX,
+            self._seed,
+        )
         self._floor_manager.add_new_floor(self._floor, self._canvas)
         self._floor = self._floor_manager.get_current_floor()
 
@@ -107,7 +112,7 @@ def save(self, path: str = "") -> str:
             if os.path.exists(path):
                 # Show dialog for overwriting the file
                 if messagebox.askyesno(
-                        "File already exists", "Do you want to overwrite the file?"
+                    "File already exists", "Do you want to overwrite the file?"
                 ):
                     save_file = True
             else:
@@ -164,8 +169,7 @@ def add_information_frame(self) -> None:
         name_text = ttk.Label(information_frame, text="Floor name: ")
         name_text.pack(side=tk.LEFT)
         name_label = ttk.Label(
-            information_frame,
-            textvariable=self._floor_manager.current_floor_name
+            information_frame, textvariable=self._floor_manager.current_floor_name
         )
         name_label.pack(side=tk.LEFT)
         path_text = ttk.Label(information_frame, text="Current path: ")
@@ -175,8 +179,7 @@ def add_information_frame(self) -> None:
         seed_text = ttk.Label(information_frame, text="Seed: ")
         seed_text.pack(side=tk.LEFT, padx=(25, 0))
         seed_label = ttk.Label(
-            information_frame,
-            textvariable=self._floor_manager.current_floor_seed_var
+            information_frame, textvariable=self._floor_manager.current_floor_seed_var
         )
         seed_label.pack(side=tk.LEFT)
 
@@ -218,7 +221,9 @@ def add_buttons(self) -> None:
         # Next seed entry
         next_seed_label = ttk.Label(button_frame, text="Next seed: ")
         next_seed_label.pack(side=tk.LEFT, padx=10)
-        next_seed_entry = ttk.Entry(button_frame, textvariable=self._floor_manager.next_seed)
+        next_seed_entry = ttk.Entry(
+            button_frame, textvariable=self._floor_manager.next_seed
+        )
         next_seed_entry.bind(
             "<Return>", lambda event: self._floor_manager.set_next_seed()
         )
@@ -243,7 +248,11 @@ def create_menu_bar(self) -> None:
             label="Save As", command=self.save, accelerator="Ctrl+Shift+s"
         )
         menu_bar.add_command(
-            label="Switch Theme", command=self._theme_handler.switch_theme, accelerator="Ctrl+t"
+            label="Switch Theme",
+            command=self._theme_handler.switch_theme,
+            accelerator="Ctrl+t",
+        )
+        menu_bar.add_command(
+            label="Legend", command=legend_window.display_legend, accelerator="F1"
         )
-        menu_bar.add_command(label="Legend", command=legend_window.display_legend, accelerator="F1")
         menu_bar.add_command(label="Exit", command=self.quit, accelerator="Ctrl+q")

src/rooms/tkinter/legend_window.py

@@ -21,9 +21,10 @@ def display_legend():
     room_type: RoomType
     for room_type in RoomType.get_all():
         color: my_globals.Color = room_colors[room_type]
-        legend_canvas.create_rectangle(10, y_offset, 30, y_offset + 20, fill=util_functions.rgb2hex(*color.value))
-        legend_canvas.create_text(40, y_offset + 10, anchor=tk.W, text=room_names[room_type])
+        legend_canvas.create_rectangle(
+            10, y_offset, 30, y_offset + 20, fill=util_functions.rgb2hex(*color.value)
+        )
+        legend_canvas.create_text(
+            40, y_offset + 10, anchor=tk.W, text=room_names[room_type]
+        )
         y_offset += 30
-
-
-