Added Fullscreenmode
Added keybind esc for gamequit
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
.venv/
|
.venv/
|
||||||
__pycache__/
|
__pycache__/
|
||||||
test.spec
|
test.spec
|
||||||
|
log.txt
|
||||||
|
|||||||
11
game.py
11
game.py
@@ -3,5 +3,16 @@
|
|||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
import GameObject
|
import GameObject
|
||||||
|
from levels import *
|
||||||
import pygame
|
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
|
||||||
29
levels.py
29
levels.py
@@ -3,43 +3,16 @@ import logger
|
|||||||
|
|
||||||
levels_list = list()
|
levels_list = list()
|
||||||
|
|
||||||
class level(object):
|
class level(object):
|
||||||
id:int = 0
|
|
||||||
|
|
||||||
def __init__(self, name, size:tuple, num_enemys, spawn_waves) -> None:
|
def __init__(self, name, size:tuple, num_enemys, spawn_waves) -> None:
|
||||||
self.id += 1
|
|
||||||
self.name = name
|
self.name = name
|
||||||
self.size = size
|
self.size = size
|
||||||
self.num_enemys = num_enemys
|
self.num_enemys = num_enemys
|
||||||
self.spawn_waves = spawn_waves
|
self.spawn_waves = spawn_waves
|
||||||
self._completed = False
|
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):
|
class first_level(level):
|
||||||
def __init__(self, name, size: tuple, num_enemys, spawn_waves) -> None:
|
def __init__(self, name, size: tuple, num_enemys, spawn_waves) -> None:
|
||||||
super().__init__(name, size, num_enemys, spawn_waves)
|
super().__init__(name, size, num_enemys, spawn_waves)
|
||||||
tmp_level = {str(self.id):self}
|
|
||||||
levels_list.append(tmp_level)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
12
log.txt
12
log.txt
@@ -1,6 +1,6 @@
|
|||||||
09:58:49: Loading game...
|
13:24:17: Loading game...
|
||||||
09:58:49: Loading images...
|
13:24:17: Loading images...
|
||||||
09:58:49: Setup fonts...
|
13:24:17: Setup fonts...
|
||||||
09:58:49: Get git revision hash...
|
13:24:17: Get git revision hash...
|
||||||
09:58:49: Git-Hash: 0bbe702
|
13:24:17: Git-Hash: fb55785
|
||||||
09:58:51: Log closed!
|
13:24:32: Log closed!
|
||||||
|
|||||||
17
test.py
17
test.py
@@ -13,8 +13,14 @@ import subprocess
|
|||||||
pygame.init()
|
pygame.init()
|
||||||
pygame.display.set_caption("TESTFENSTER")
|
pygame.display.set_caption("TESTFENSTER")
|
||||||
pygame.mouse.set_visible(True)
|
pygame.mouse.set_visible(True)
|
||||||
|
|
||||||
|
RENDERING_SIZE = (1024,768)
|
||||||
|
WINDOWED_DEF_SIZE = (1024,768)
|
||||||
#pygame.key.set_repeat(1, 30)
|
#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")
|
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)
|
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)
|
player2 = GameObject.Player2("Player2", screen,(screen.get_size()[0]/2)-17, screen.get_size()[1]-100, 35, 35, testimage)
|
||||||
|
|
||||||
|
game.loadlevels()
|
||||||
levels.level.load()
|
|
||||||
|
|
||||||
spawned_enemys = list()
|
spawned_enemys = list()
|
||||||
|
|
||||||
@@ -74,13 +79,14 @@ milliseconds = pygame.time.get_ticks()
|
|||||||
seconds = milliseconds/1000
|
seconds = milliseconds/1000
|
||||||
|
|
||||||
while(gamestate):
|
while(gamestate):
|
||||||
frametime = clock.get_time()
|
|
||||||
screen.fill((8,31,61))
|
screen.fill((8,31,61))
|
||||||
|
|
||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
if(event.type == pygame.QUIT):
|
if(event.type == pygame.QUIT):
|
||||||
del log
|
del log
|
||||||
gamestate = False
|
gamestate = False
|
||||||
|
if(event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE):
|
||||||
|
gamestate = False
|
||||||
player1.handle_input(event)
|
player1.handle_input(event)
|
||||||
player2.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(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))
|
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):
|
#if(mouse_pos <= (image.topleft+image.size) and mouse_pos >= image.topleft):
|
||||||
# print("HIIIIITTT!!!!")
|
# print("HIIIIITTT!!!!")
|
||||||
frametime = 0
|
frametime = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user