From 806894c6ebeab371e1481fee4c5be6540f39453c Mon Sep 17 00:00:00 2001 From: Kacper Borkowski Date: Sun, 29 Mar 2020 11:09:48 +0000 Subject: [PATCH 1/2] usuniecie pliku --- smieciarka_odwrocona.png | Bin 4255 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 smieciarka_odwrocona.png diff --git a/smieciarka_odwrocona.png b/smieciarka_odwrocona.png deleted file mode 100644 index ae7990e4a5d3252400ce02c719bad27a4a24d9c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4255 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 Date: Sun, 29 Mar 2020 13:15:46 +0200 Subject: [PATCH 2/2] doddany folder resources --- game.py | 16 ++++++++-------- .../pojemnik_metal.png | Bin .../pojemnik_organiczne.png | Bin .../pojemnik_papier.png | Bin .../pojemnik_plastik.png | Bin .../pojemnik_szklo.png | Bin smieciarka.png => resources/smieciarka.png | Bin .../smieciarka_odwrocona.png | Bin wysypisko.jpg => resources/wysypisko.jpg | Bin 9 files changed, 8 insertions(+), 8 deletions(-) rename pojemnik_metal.png => resources/pojemnik_metal.png (100%) rename pojemnik_organiczne.png => resources/pojemnik_organiczne.png (100%) rename pojemnik_papier.png => resources/pojemnik_papier.png (100%) rename pojemnik_plastik.png => resources/pojemnik_plastik.png (100%) rename pojemnik_szklo.png => resources/pojemnik_szklo.png (100%) rename smieciarka.png => resources/smieciarka.png (100%) rename smieciarka_odwrocona.png => resources/smieciarka_odwrocona.png (100%) rename wysypisko.jpg => resources/wysypisko.jpg (100%) diff --git a/game.py b/game.py index 34996c8..f3a6194 100644 --- a/game.py +++ b/game.py @@ -6,7 +6,7 @@ class Smieciarka(pygame.sprite.Sprite): def __init__(self, x, y): self.x = x self.y = y - self.image = pygame.image.load('smieciarka.png') + self.image = pygame.image.load('resources/smieciarka.png') self.ruch = 0 pygame.sprite.Sprite.__init__(self) self.rect = pygame.Rect(self.x * WIDTH + MARGIN * self.x + MARGIN, self.y * HEIGHT + MARGIN * self.y, WIDTH, @@ -17,7 +17,7 @@ class Smieciarka(pygame.sprite.Sprite): self.x -= 1 self.rect.x = MARGIN + self.x * WIDTH + self.x * MARGIN if self.ruch == 2: - self.image = pygame.image.load('smieciarka.png') + self.image = pygame.image.load('resources/smieciarka.png') self.ruch = 1 def w_prawo(self): @@ -92,15 +92,15 @@ clock = pygame.time.Clock() smieciarka = Smieciarka(10, 10) kontener_plastik = Kontener(0, 0) -kontener_plastik.image = pygame.image.load("pojemnik_plastik.png") +kontener_plastik.image = pygame.image.load("resources/pojemnik_plastik.png") kontener_metal = Kontener(0, 4) -kontener_metal.image = pygame.image.load("pojemnik_metal.png") +kontener_metal.image = pygame.image.load("resources/pojemnik_metal.png") kontener_organiczne = Kontener(2, 2) -kontener_organiczne.image = pygame.image.load("pojemnik_organiczne.png") +kontener_organiczne.image = pygame.image.load("resources/pojemnik_organiczne.png") kontener_papier = Kontener(4, 0) -kontener_papier.image = pygame.image.load("pojemnik_papier.png") +kontener_papier.image = pygame.image.load("resources/pojemnik_papier.png") kontener_szklo = Kontener(4, 4) -kontener_szklo.image = pygame.image.load("pojemnik_szklo.png") +kontener_szklo.image = pygame.image.load("resources/pojemnik_szklo.png") kontener_list = pygame.sprite.Group() smieciarka_list = pygame.sprite.Group() @@ -149,7 +149,7 @@ while not done: (MARGIN + HEIGHT) * row + MARGIN, WIDTH, HEIGHT]) - screen.blit(pygame.image.load("wysypisko.jpg"), (5, 5)) + screen.blit(pygame.image.load("resources/wysypisko.jpg"), (5, 5)) all_sprites_list.draw(screen) # Limit to 60 frames per second diff --git a/pojemnik_metal.png b/resources/pojemnik_metal.png similarity index 100% rename from pojemnik_metal.png rename to resources/pojemnik_metal.png diff --git a/pojemnik_organiczne.png b/resources/pojemnik_organiczne.png similarity index 100% rename from pojemnik_organiczne.png rename to resources/pojemnik_organiczne.png diff --git a/pojemnik_papier.png b/resources/pojemnik_papier.png similarity index 100% rename from pojemnik_papier.png rename to resources/pojemnik_papier.png diff --git a/pojemnik_plastik.png b/resources/pojemnik_plastik.png similarity index 100% rename from pojemnik_plastik.png rename to resources/pojemnik_plastik.png diff --git a/pojemnik_szklo.png b/resources/pojemnik_szklo.png similarity index 100% rename from pojemnik_szklo.png rename to resources/pojemnik_szklo.png diff --git a/smieciarka.png b/resources/smieciarka.png similarity index 100% rename from smieciarka.png rename to resources/smieciarka.png diff --git a/smieciarka_odwrocona.png b/resources/smieciarka_odwrocona.png similarity index 100% rename from smieciarka_odwrocona.png rename to resources/smieciarka_odwrocona.png diff --git a/wysypisko.jpg b/resources/wysypisko.jpg similarity index 100% rename from wysypisko.jpg rename to resources/wysypisko.jpg