diff --git a/.gitignore b/.gitignore index d3d07fb..909876d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .venv/ __pycache__/ test.spec +log.txt diff --git a/game.py b/game.py index a64cff6..9c4ec09 100644 --- a/game.py +++ b/game.py @@ -3,5 +3,16 @@ ############################################################ import GameObject +from levels import * import pygame +import logger +#Leveldefinitions +levels_list.append(first_level("First Level", (500,500), 10, 2)) + + +#Override +def loadlevels(): + for level in levels_list: + print(level) + pass \ No newline at end of file diff --git a/levels.py b/levels.py index 8dee342..321fa0b 100644 --- a/levels.py +++ b/levels.py @@ -3,43 +3,16 @@ import logger levels_list = list() -class level(object): - id:int = 0 - +class level(object): def __init__(self, name, size:tuple, num_enemys, spawn_waves) -> None: - self.id += 1 self.name = name self.size = size self.num_enemys = num_enemys self.spawn_waves = spawn_waves self._completed = False - - @staticmethod - def load(): - first_level("First Level", (500, 500), 15, 5) - for level in levels_list: - level:dict - print("TEST") - print(level) - for key, object in level.items(): - print(key, object) - - def run(): - - pass - - def __spawn(self): - for wave in range(self.spawn_waves): - print("Spawning wave") - for enemy in range(self.num_enemys): - print("Spawning enemys") class first_level(level): def __init__(self, name, size: tuple, num_enemys, spawn_waves) -> None: super().__init__(name, size, num_enemys, spawn_waves) - tmp_level = {str(self.id):self} - levels_list.append(tmp_level) - - diff --git a/log.txt b/log.txt index 3b21ff3..bf4eef4 100644 --- a/log.txt +++ b/log.txt @@ -1,6 +1,6 @@ -09:58:49: Loading game... -09:58:49: Loading images... -09:58:49: Setup fonts... -09:58:49: Get git revision hash... -09:58:49: Git-Hash: 0bbe702 -09:58:51: Log closed! +13:24:17: Loading game... +13:24:17: Loading images... +13:24:17: Setup fonts... +13:24:17: Get git revision hash... +13:24:17: Git-Hash: fb55785 +13:24:32: Log closed! diff --git a/test.py b/test.py index 322ed42..47b297a 100644 --- a/test.py +++ b/test.py @@ -13,8 +13,14 @@ import subprocess pygame.init() pygame.display.set_caption("TESTFENSTER") pygame.mouse.set_visible(True) + +RENDERING_SIZE = (1024,768) +WINDOWED_DEF_SIZE = (1024,768) #pygame.key.set_repeat(1, 30) -screen = pygame.display.set_mode((1024,768)) #TODO Add fullscreen mode +window = pygame.display.set_mode((2440,1200), pygame.FULLSCREEN) +screen = pygame.Surface(RENDERING_SIZE) + +#screen = pygame.display.set_mode((1024,768)) #TODO Add fullscreen mode log = logger.log("log.txt") @@ -46,8 +52,7 @@ log.writeln(F"Git-Hash: {short_hash}") player1 = GameObject.Player("Player", screen,(screen.get_size()[0]/2)-17, screen.get_size()[1]-100, 35, 35, testimage) player2 = GameObject.Player2("Player2", screen,(screen.get_size()[0]/2)-17, screen.get_size()[1]-100, 35, 35, testimage) - -levels.level.load() +game.loadlevels() spawned_enemys = list() @@ -74,13 +79,14 @@ milliseconds = pygame.time.get_ticks() seconds = milliseconds/1000 while(gamestate): - frametime = clock.get_time() screen.fill((8,31,61)) for event in pygame.event.get(): if(event.type == pygame.QUIT): del log gamestate = False + if(event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE): + gamestate = False player1.handle_input(event) player2.handle_input(event) @@ -213,6 +219,9 @@ while(gamestate): screen.blit(fps_label, (screen.get_size()[0]-fps_label.get_size()[0]-10, screen.get_size()[1]-25)) screen.blit(hash_label, (25, screen.get_size()[1] -25)) + frametime = clock.get_time() + scaled_win = pygame.transform.smoothscale(screen, window.get_size()) + window.blit(scaled_win, (0, 0)) #if(mouse_pos <= (image.topleft+image.size) and mouse_pos >= image.topleft): # print("HIIIIITTT!!!!") frametime = 0