From db06318b360473d03d9af81a7dd67e151e2d4d19 Mon Sep 17 00:00:00 2001 From: safwankdb Date: Thu, 23 Dec 2021 19:02:56 +0530 Subject: [PATCH 1/2] Added a gitignore and removed bytecode files --- .gitignore | 1 + __pycache__/base.cpython-38.pyc | Bin 8844 -> 0 bytes __pycache__/collectible.cpython-38.pyc | Bin 1248 -> 0 bytes __pycache__/robot.cpython-38.pyc | Bin 9135 -> 0 bytes __pycache__/script.cpython-38.pyc | Bin 470 -> 0 bytes __pycache__/scriptblue.cpython-38.pyc | Bin 558 -> 0 bytes __pycache__/scriptred.cpython-38.pyc | Bin 557 -> 0 bytes 7 files changed, 1 insertion(+) create mode 100644 .gitignore delete mode 100644 __pycache__/base.cpython-38.pyc delete mode 100644 __pycache__/collectible.cpython-38.pyc delete mode 100644 __pycache__/robot.cpython-38.pyc delete mode 100644 __pycache__/script.cpython-38.pyc delete mode 100644 __pycache__/scriptblue.cpython-38.pyc delete mode 100644 __pycache__/scriptred.cpython-38.pyc diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bee8a64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__ diff --git a/__pycache__/base.cpython-38.pyc b/__pycache__/base.cpython-38.pyc deleted file mode 100644 index 12a5459413195260561d13b4b7ef14b70a47b3fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8844 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 diff --git a/__pycache__/collectible.cpython-38.pyc b/__pycache__/collectible.cpython-38.pyc deleted file mode 100644 index 2bc0e6e8b8dacde1351585e50f470a0f118bdfd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1248 zcmZux&ubGw6rP#=k!{)(trd$0_29vXHi+P4CG{ zFn6#dEar;E;)rc>#g#aW5XVK0eHEzikj23f^I04scFE4x^DIkRMY;hD#(`)dn-Zqr zW(82N19r?$7-xOnXHxWipy$xnE<7FPY-#l=CajJUDXBTL3avTq`>FqkExe6%QHa|vzwmnRg zYg?Rn<0A0}E)sV4UN_r`^_6bE)w6iR-Ad2FI^~*@(3d7aMYZ8ZmKN=#0^0}x^w4-g)I156n$PUFDsIV*)S_6uJv$Wy}cuRFxca+c6P* zVm0HKCC8M(WNOwip_-%B>7vp|zYd2(=;8*F&{VC#3qbl~#AXxrWh~-Wl4Vj(C3KNoNCTQa yQ@XYZ0TG{zBF}MEUtb1eDC#Yy;l-DEbhoP{DDEYYmM6 diff --git a/__pycache__/robot.cpython-38.pyc b/__pycache__/robot.cpython-38.pyc deleted file mode 100644 index 7a290e603611a4c70d8d2cb29c5da46c4feda6a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9135 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 A{{R30 diff --git a/__pycache__/scriptblue.cpython-38.pyc b/__pycache__/scriptblue.cpython-38.pyc deleted file mode 100644 index 397602b427363c28c8296d7f90b252024cc57a2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmZ`$Jx{|h5ViBsq+b#f15+3?Km;>FK#IC`070cLD2Xj4YEnnGgD7GH@jK|qzhLAy zcx53w6BB1wLLK0wJKx#9=l9N6!(k7Bji29=2qW~Ni%qkjH~|*{1cC@IQH5t1BVrNz z3C%3x5EoXPbS_cowQviCSb02IkYXV-!2C6x+u$*{!Fxb2Xa$&ahi^lUiM0Y`3CP5G zv;fbY6ra%1zC%Z=+gk@hXe)nA<#oXuq530QmuzVYuGzxtE@vr|uZVY{{yvOyR?$f0 zO`1m|D&~^a(R2~VQOpRPCS2^@9z-JJMJ>~^q5Jhx`KOt@&>;Ff(Sd;Q0QW53hwOh* zJ8=59C}M*g=YF>rfSnQ&ELp>Y3-MKv1a*N@Gijn$(f)Ad1*P{0=(uFBtg^ zURlV_#KhT^PzN~aF8A!*yL;!We!qjjCeLrl03-CF!LC^VPQgV0fgpklRN^_th*-pa zLUW5a#D%X-yh{|e8u$x^ShaYvBKbHQBIW{5x0+|X;Lrb+m<9U(a$-_kI8X?R9AY From 44a1fcf7c0df004f2697393e9570dd8edba3e9e7 Mon Sep 17 00:00:00 2001 From: safwankdb Date: Thu, 23 Dec 2021 19:07:08 +0530 Subject: [PATCH 2/2] Moved images to asset folder --- README.md | 2 +- blue_robot.png => assets/blue_robot.png | Bin bluebase.png => assets/bluebase.png | Bin explode.png => assets/explode.png | Bin logo.jpeg => assets/logo.jpeg | Bin red_robot.png => assets/red_robot.png | Bin redbase.png => assets/redbase.png | Bin test_img.jpg => assets/test_img.jpg | Bin test_img2.jpg => assets/test_img2.jpg | Bin test_img3.jpg => assets/test_img3.jpg | Bin base.py | 4 ++-- main.py | 4 ++-- robot.py | 4 ++-- 13 files changed, 7 insertions(+), 7 deletions(-) rename blue_robot.png => assets/blue_robot.png (100%) rename bluebase.png => assets/bluebase.png (100%) rename explode.png => assets/explode.png (100%) rename logo.jpeg => assets/logo.jpeg (100%) rename red_robot.png => assets/red_robot.png (100%) rename redbase.png => assets/redbase.png (100%) rename test_img.jpg => assets/test_img.jpg (100%) rename test_img2.jpg => assets/test_img2.jpg (100%) rename test_img3.jpg => assets/test_img3.jpg (100%) 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/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