diff --git a/mine_models/__init__.py b/mine_models/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/mine_models/mine.py b/mine_models/mine.py index 7e9dcb3..82071c4 100644 --- a/mine_models/mine.py +++ b/mine_models/mine.py @@ -1,11 +1,11 @@ -# module for abstarct classes +# module for abstract classes from abc import ABC, abstractmethod # type hints from typing import Tuple -# Mine cannot be instatinated -# all abstarct methods must be implemented in derived classes +# Mine cannot be instantiated +# all abstract methods must be implemented in derived classes class Mine(ABC): diff --git a/minefield.py b/minefield.py index 4b431dc..b994ee7 100644 --- a/minefield.py +++ b/minefield.py @@ -1,5 +1,5 @@ import json -import ctypes # +import ctypes import agent as ag import project_constants as const import tile as tl diff --git a/project_constants.py b/project_constants.py index 49d987c..828a2f7 100644 --- a/project_constants.py +++ b/project_constants.py @@ -19,8 +19,8 @@ V_FPS = 60 V_TILE_SIZE = 60 V_GRID_VER_TILES = V_GRID_HOR_TILES = 10 # vertical (number of rows), horizontal (number of columns) V_SCREEN_PADDING = 10 -V_MINEFIELD_HEIGHT = V_TILE_SIZE * V_GRID_VER_TILES -V_MINEFIELD_WIDTH = V_TILE_SIZE * V_GRID_HOR_TILES +V_WINDOW_HEIGHT = V_TILE_SIZE * V_GRID_VER_TILES +V_WINDOW_WIDTH = V_TILE_SIZE * V_GRID_HOR_TILES SCREEN = pygame.display.set_mode( ( @@ -71,6 +71,7 @@ STRUCT_MINE_ATTRIBUTES = { # used for random mine generation # int - integral number # (int, int) - index "row,column" where row=int and column=int (used exclusively for chained mine) + STRUCT_MINE_ATTRIBUTE_TYPES = { "standard": [], "chained": [], @@ -80,19 +81,26 @@ STRUCT_MINE_ATTRIBUTE_TYPES = { # ============== # # ==== MAPS ==== # # ============== # + MAP_RANDOM_10x10 = os.path.join("resources", "minefields", "secondmap.json") + # ============== # # === ASSETS === # # ============== # ASSET_BACKGROUND = pygame.transform.scale( pygame.image.load(os.path.join(ASSETS_DIR, "new_grid.png")), - (V_MINEFIELD_WIDTH, V_MINEFIELD_WIDTH) + (V_WINDOW_WIDTH, V_WINDOW_WIDTH) ) ASSET_SAPPER = pygame.transform.scale( - pygame.image.load(os.path.join(ASSETS_DIR, "sapper.png")), + pygame.image.load(os.path.join(ASSETS_DIR, "robot_sapper.png")), + (V_TILE_SIZE, V_TILE_SIZE) +) + +ASSET_WALL = pygame.transform.scale( + pygame.image.load(os.path.join(ASSETS_DIR, "brick_wall.png")), (V_TILE_SIZE, V_TILE_SIZE) ) diff --git a/resources/assets/brick_wall.png b/resources/assets/brick_wall.png new file mode 100644 index 0000000..6800542 Binary files /dev/null and b/resources/assets/brick_wall.png differ diff --git a/resources/assets/chain_numbers/chain_number_0.png b/resources/assets/chain_numbers/chain_number_0.png new file mode 100644 index 0000000..f0ac922 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_0.png differ diff --git a/resources/assets/chain_numbers/chain_number_1.png b/resources/assets/chain_numbers/chain_number_1.png new file mode 100644 index 0000000..74e62d6 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_1.png differ diff --git a/resources/assets/chain_numbers/chain_number_10.png b/resources/assets/chain_numbers/chain_number_10.png new file mode 100644 index 0000000..92e124b Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_10.png differ diff --git a/resources/assets/chain_numbers/chain_number_11.png b/resources/assets/chain_numbers/chain_number_11.png new file mode 100644 index 0000000..7e4b647 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_11.png differ diff --git a/resources/assets/chain_numbers/chain_number_12.png b/resources/assets/chain_numbers/chain_number_12.png new file mode 100644 index 0000000..6e8702e Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_12.png differ diff --git a/resources/assets/chain_numbers/chain_number_13.png b/resources/assets/chain_numbers/chain_number_13.png new file mode 100644 index 0000000..79fbef9 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_13.png differ diff --git a/resources/assets/chain_numbers/chain_number_14.png b/resources/assets/chain_numbers/chain_number_14.png new file mode 100644 index 0000000..c5554f3 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_14.png differ diff --git a/resources/assets/chain_numbers/chain_number_15.png b/resources/assets/chain_numbers/chain_number_15.png new file mode 100644 index 0000000..73c7e4f Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_15.png differ diff --git a/resources/assets/chain_numbers/chain_number_2.png b/resources/assets/chain_numbers/chain_number_2.png new file mode 100644 index 0000000..bd04911 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_2.png differ diff --git a/resources/assets/chain_numbers/chain_number_3.png b/resources/assets/chain_numbers/chain_number_3.png new file mode 100644 index 0000000..33bbfae Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_3.png differ diff --git a/resources/assets/chain_numbers/chain_number_4.png b/resources/assets/chain_numbers/chain_number_4.png new file mode 100644 index 0000000..980ed18 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_4.png differ diff --git a/resources/assets/chain_numbers/chain_number_5.png b/resources/assets/chain_numbers/chain_number_5.png new file mode 100644 index 0000000..730ca96 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_5.png differ diff --git a/resources/assets/chain_numbers/chain_number_6.png b/resources/assets/chain_numbers/chain_number_6.png new file mode 100644 index 0000000..9bf756d Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_6.png differ diff --git a/resources/assets/chain_numbers/chain_number_7.png b/resources/assets/chain_numbers/chain_number_7.png new file mode 100644 index 0000000..c95c6ea Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_7.png differ diff --git a/resources/assets/chain_numbers/chain_number_8.png b/resources/assets/chain_numbers/chain_number_8.png new file mode 100644 index 0000000..3c8b7a6 Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_8.png differ diff --git a/resources/assets/chain_numbers/chain_number_9.png b/resources/assets/chain_numbers/chain_number_9.png new file mode 100644 index 0000000..f75615c Binary files /dev/null and b/resources/assets/chain_numbers/chain_number_9.png differ diff --git a/resources/assets/chained_mine.png b/resources/assets/chained_mine.png new file mode 100644 index 0000000..5a5abbc Binary files /dev/null and b/resources/assets/chained_mine.png differ diff --git a/resources/assets/explosion_100.gif b/resources/assets/explosion_100.gif new file mode 100644 index 0000000..4ce62e4 Binary files /dev/null and b/resources/assets/explosion_100.gif differ diff --git a/resources/assets/blue_tile.png b/resources/assets/first assets/blue_tile.png similarity index 100% rename from resources/assets/blue_tile.png rename to resources/assets/first assets/blue_tile.png diff --git a/resources/assets/green_tile.png b/resources/assets/first assets/green_tile.png similarity index 100% rename from resources/assets/green_tile.png rename to resources/assets/first assets/green_tile.png diff --git a/resources/assets/grid.png b/resources/assets/first assets/grid.png similarity index 100% rename from resources/assets/grid.png rename to resources/assets/first assets/grid.png diff --git a/resources/assets/hex_mine.png b/resources/assets/first assets/hex_mine.png similarity index 100% rename from resources/assets/hex_mine.png rename to resources/assets/first assets/hex_mine.png diff --git a/resources/assets/pen_mine.png b/resources/assets/first assets/pen_mine.png similarity index 100% rename from resources/assets/pen_mine.png rename to resources/assets/first assets/pen_mine.png diff --git a/resources/assets/romb.png b/resources/assets/first assets/romb.png similarity index 100% rename from resources/assets/romb.png rename to resources/assets/first assets/romb.png diff --git a/resources/assets/white_tile.png b/resources/assets/first assets/white_tile.png similarity index 100% rename from resources/assets/white_tile.png rename to resources/assets/first assets/white_tile.png diff --git a/resources/assets/mine.png b/resources/assets/mine.png new file mode 100644 index 0000000..1a42234 Binary files /dev/null and b/resources/assets/mine.png differ diff --git a/resources/assets/robot_sapper.png b/resources/assets/robot_sapper.png new file mode 100644 index 0000000..3f07ef2 Binary files /dev/null and b/resources/assets/robot_sapper.png differ diff --git a/resources/assets/time_mine.png b/resources/assets/time_mine.png new file mode 100644 index 0000000..61d90e4 Binary files /dev/null and b/resources/assets/time_mine.png differ diff --git a/resources/assets/time_numbers/number0.png b/resources/assets/time_numbers/number0.png new file mode 100644 index 0000000..6dfa004 Binary files /dev/null and b/resources/assets/time_numbers/number0.png differ diff --git a/resources/assets/time_numbers/number1.png b/resources/assets/time_numbers/number1.png new file mode 100644 index 0000000..ab7bdb4 Binary files /dev/null and b/resources/assets/time_numbers/number1.png differ diff --git a/resources/assets/time_numbers/number2.png b/resources/assets/time_numbers/number2.png new file mode 100644 index 0000000..a8e4b81 Binary files /dev/null and b/resources/assets/time_numbers/number2.png differ diff --git a/resources/assets/time_numbers/number3.png b/resources/assets/time_numbers/number3.png new file mode 100644 index 0000000..8a53709 Binary files /dev/null and b/resources/assets/time_numbers/number3.png differ diff --git a/resources/assets/time_numbers/number4.png b/resources/assets/time_numbers/number4.png new file mode 100644 index 0000000..6dc2984 Binary files /dev/null and b/resources/assets/time_numbers/number4.png differ diff --git a/resources/assets/time_numbers/number5.png b/resources/assets/time_numbers/number5.png new file mode 100644 index 0000000..dd3c936 Binary files /dev/null and b/resources/assets/time_numbers/number5.png differ diff --git a/resources/assets/time_numbers/number6.png b/resources/assets/time_numbers/number6.png new file mode 100644 index 0000000..765b630 Binary files /dev/null and b/resources/assets/time_numbers/number6.png differ diff --git a/resources/assets/time_numbers/number7.png b/resources/assets/time_numbers/number7.png new file mode 100644 index 0000000..0e238d6 Binary files /dev/null and b/resources/assets/time_numbers/number7.png differ diff --git a/resources/assets/time_numbers/number8.png b/resources/assets/time_numbers/number8.png new file mode 100644 index 0000000..63f9a3e Binary files /dev/null and b/resources/assets/time_numbers/number8.png differ diff --git a/resources/assets/time_numbers/number9.png b/resources/assets/time_numbers/number9.png new file mode 100644 index 0000000..3b47578 Binary files /dev/null and b/resources/assets/time_numbers/number9.png differ