diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bee8a64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__ diff --git a/README.md b/README.md index 98d5206..c22b257 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,5 @@ Find the documentation of functions, Game Details and other instructions for Ind Have a great Introduction to Programming! -![image description](logo.jpeg) +![image description](assets/logo.jpeg) diff --git a/__pycache__/base.cpython-38.pyc b/__pycache__/base.cpython-38.pyc deleted file mode 100644 index 12a5459..0000000 Binary files a/__pycache__/base.cpython-38.pyc and /dev/null differ diff --git a/__pycache__/collectible.cpython-38.pyc b/__pycache__/collectible.cpython-38.pyc deleted file mode 100644 index 2bc0e6e..0000000 Binary files a/__pycache__/collectible.cpython-38.pyc and /dev/null differ diff --git a/__pycache__/robot.cpython-38.pyc b/__pycache__/robot.cpython-38.pyc deleted file mode 100644 index 7a290e6..0000000 Binary files a/__pycache__/robot.cpython-38.pyc and /dev/null differ diff --git a/__pycache__/script.cpython-38.pyc b/__pycache__/script.cpython-38.pyc deleted file mode 100644 index 36f8935..0000000 Binary files a/__pycache__/script.cpython-38.pyc and /dev/null differ diff --git a/__pycache__/scriptblue.cpython-38.pyc b/__pycache__/scriptblue.cpython-38.pyc deleted file mode 100644 index 397602b..0000000 Binary files a/__pycache__/scriptblue.cpython-38.pyc and /dev/null differ diff --git a/__pycache__/scriptred.cpython-38.pyc b/__pycache__/scriptred.cpython-38.pyc deleted file mode 100644 index db98a0d..0000000 Binary files a/__pycache__/scriptred.cpython-38.pyc and /dev/null differ diff --git a/blue_robot.png b/assets/blue_robot.png similarity index 100% rename from blue_robot.png rename to assets/blue_robot.png diff --git a/bluebase.png b/assets/bluebase.png similarity index 100% rename from bluebase.png rename to assets/bluebase.png diff --git a/explode.png b/assets/explode.png similarity index 100% rename from explode.png rename to assets/explode.png diff --git a/logo.jpeg b/assets/logo.jpeg similarity index 100% rename from logo.jpeg rename to assets/logo.jpeg diff --git a/red_robot.png b/assets/red_robot.png similarity index 100% rename from red_robot.png rename to assets/red_robot.png diff --git a/redbase.png b/assets/redbase.png similarity index 100% rename from redbase.png rename to assets/redbase.png diff --git a/test_img.jpg b/assets/test_img.jpg similarity index 100% rename from test_img.jpg rename to assets/test_img.jpg diff --git a/test_img2.jpg b/assets/test_img2.jpg similarity index 100% rename from test_img2.jpg rename to assets/test_img2.jpg diff --git a/test_img3.jpg b/assets/test_img3.jpg similarity index 100% rename from test_img3.jpg rename to assets/test_img3.jpg diff --git a/base.py b/base.py index a48abe7..4fb88e5 100644 --- a/base.py +++ b/base.py @@ -15,9 +15,9 @@ def __init__(self, screen, x, y, type, __robot_list, __robot_map, game): self.__Signal = '' if type == "red": - self.image = pygame.image.load("redbase.png") + self.image = pygame.image.load("assets/redbase.png") else: - self.image = pygame.image.load("bluebase.png") + self.image = pygame.image.load("assets/bluebase.png") self.rect = self.image.get_rect() self.rect.x = x diff --git a/main.py b/main.py index 39c615e..72531b2 100644 --- a/main.py +++ b/main.py @@ -25,7 +25,7 @@ def __init__(self): self.__resources[19][9] = 0 self.__resources[19][29] = 0 self.GlobalRobotCount = 0 - self.explosion = pygame.image.load("explode.png") + self.explosion = pygame.image.load("assets/explode.png") self.rate = 10 self.__collectibles = [] @@ -206,7 +206,7 @@ def check_collisions(self): def create_map(self): """Take info about __collectibles and create the map""" - im = cv2.imread("test_img3.jpg", cv2.IMREAD_GRAYSCALE) + im = cv2.imread("assets/test_img3.jpg", cv2.IMREAD_GRAYSCALE) im = cv2.resize(im, (40,40)) im = np.array(im) im = im - np.full((40,40), 127) diff --git a/robot.py b/robot.py index 1b665e8..7b2a915 100644 --- a/robot.py +++ b/robot.py @@ -13,9 +13,9 @@ def __init__(self, screen, x, y, type, signal, base): # Integer less than 2^31 -1 self.__Initialsignal = signal if type == "red": - self.image = pygame.image.load("red_robot.png") + self.image = pygame.image.load("assets/red_robot.png") else: - self.image = pygame.image.load("blue_robot.png") + self.image = pygame.image.load("assets/blue_robot.png") self.rect = self.image.get_rect() self.rect.x = x