Some changes in classes

test.py

@@ -1,5 +1,6 @@
 import pygame
 import game
+import levels
 import logger
 import weapons
 import GameObject
@@ -15,9 +16,7 @@ pygame.mouse.set_visible(True)
 #pygame.key.set_repeat(1, 30)
 screen = pygame.display.set_mode((1024,768)) #TODO Add fullscreen mode
 
-log = logger.log("logg.txt")
-
-logfile = open("log.txt", "w")
+log = logger.log("log.txt")
 
 clock = pygame.time.Clock()
 
@@ -26,31 +25,36 @@ SCHWARZ = (0,0,0)
 GRUEN = (0,255,0)
 ROT = (255,0,0)
 
-logfile.write(F"{time.strftime("%H:%M:%S")} Loading game...\n")
-log.writeln("TEST")
+log.writeln("Loading game...")
+log.writeln("Loading images...")
+
 
-logfile.write(F"{time.strftime("%H:%M:%S")} Loading images...\n")
 image_enemy = Utils.load_image("Rastergrafik.png")
 testimage = Utils.load_image("Rastergrafik.png")
-logfile.write(F"{time.strftime("%H:%M:%S")} Setup fonts...\n")
+
+log.writeln("Setup fonts...")
 font1 = pygame.font.Font("/usr/share/fonts/TTF/Inconsolata-UltraExpandedExtraBold.ttf", 30)
 font2 = pygame.font.Font("/usr/share/fonts/TTF/Inconsolata-UltraExpandedExtraBold.ttf", 12)
-logfile.write(F"{time.strftime("%H:%M:%S")} Get git revision hash...\n")
+
+log.writeln("Get git revision hash...")
 short_hash = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()
 hash_label = font2.render(F"git-hash: {short_hash}", 1, ROT)
-logfile.write(F"{time.strftime("%H:%M:%S")} Git-Hash: {short_hash}")
+log.writeln(F"Git-Hash: {short_hash}")
 
 #testimage.set_colorkey((255,0,255), pygame.RLEACCELOK)
 
 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()
+
 spawned_enemys = list()
 
 i = 0
 startpos_x = 50
 startpos_y = 30
-for enemys in range(80):
+for enemys in range(1):
     tmp_weapon = weapons.Laserblaster("Laserblaster", startpos_x, startpos_y, 5, 10, screen, testimage)
     tmp = GameObject.Enemy(F"Enemy-{i}", startpos_x,startpos_y,35,35, screen, testimage)
     tmp.give_weapon(tmp_weapon)
@@ -75,7 +79,7 @@ while(gamestate):
 
     for event in pygame.event.get():
         if(event.type == pygame.QUIT):
-            logfile.close()
+            del log
             gamestate = False
         player1.handle_input(event)
         player2.handle_input(event)