Merge pull request 'refactoring_1.0' (#2) from refactoring_1.0 into master

Reviewed-on: #2
This commit is contained in:
Bartosz Wieczorek 2022-03-11 12:56:05 +01:00
commit 049cc5126f
3 changed files with 45 additions and 33 deletions

View File

@ -5,7 +5,6 @@ class trashmaster(pygame.sprite.Sprite):
def __init__(self):
super().__init__()
self.images = []
self.image = pygame.image.load("resources/textures/trashmaster_blu.png")
self.image = pygame.transform.scale(self.image, (16, 16))

76
main.py
View File

@ -2,41 +2,53 @@ import pygame
from map import preparedMap
from agent import trashmaster
pygame.init()
#config
SCREEN_SIZE = [512, 512]
BACKGROUND_COLOR = '#ffffff'
class WalleGame():
def __init__(self):
self.SCREEN_SIZE = [512, 512]
self.BACKGROUND_COLOR = '#ffffff'
pygame.init()
pygame.display.set_caption('Wall-e')
self.screen = pygame.display.set_mode(self.SCREEN_SIZE)
self.screen.fill(pygame.Color(self.BACKGROUND_COLOR))
# krata
self.map = preparedMap(self.SCREEN_SIZE)
self.screen.blit(self.map, (0,0))
def update_window(self):
pygame.display.update()
def draw_trashmaster(self, smieciara: trashmaster):
smieciara_list = pygame.sprite.Group()
smieciara_list.add(smieciara)
smieciara_list.draw(self.screen)
if __name__ == '__main__':
def main():
game = WalleGame()
game.update_window()
smieciara_object = trashmaster()
game.draw_trashmaster(smieciara_object)
pygame.init()
game.update_window()
# tytul okna
pygame.display.set_caption('Wall-e')
screen = pygame.display.set_mode(SCREEN_SIZE)
screen.fill(pygame.Color(BACKGROUND_COLOR))
# krata
map = preparedMap(SCREEN_SIZE)
screen.blit(map, (0,0))
# update okna
pygame.display.update()
smieciara1 = trashmaster()
smieciara_list = pygame.sprite.Group()
smieciara_list.add(smieciara1)
smieciara_list.draw(screen)
pygame.display.update()
running = True
while running:
for event in pygame.event.get():
if event.type == pygame.QUIT:
running = False
running = True
while running:
for event in pygame.event.get():
if event.type == pygame.QUIT:
running = False
pygame.quit()
pygame.quit()
pygame.quit()
if __name__ == '__main__':
main()

1
requirements.txt Normal file
View File

@ -0,0 +1 @@
pygame==2.1.2