From aac1cdea6fbc0ba2426bab14a67dd28ba507f981 Mon Sep 17 00:00:00 2001
From: Christian <christian@bobe-rabenau.de>
Date: Thu, 8 Aug 2024 13:03:12 +0200
Subject: [PATCH] Added new classes

---
 .gitignore       |   3 +++
 Enemy.py         |  17 ++++++++++++
 GameObject.py    |  22 +++++++++++++++
 Rastergrafik.png | Bin 0 -> 158 bytes
 test.py          |  68 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 110 insertions(+)
 create mode 100644 Enemy.py
 create mode 100644 GameObject.py
 create mode 100644 Rastergrafik.png
 create mode 100644 test.py

diff --git a/.gitignore b/.gitignore
index 0a44195..6f8c369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1674,3 +1674,6 @@ modules/__pycache__/Tileset.cpython-312.pyc
 modules/__pycache__/Tiletype.cpython-312.pyc
 modules/__pycache__/Utils.cpython-312.pyc
 __pycache__/Animation.cpython-312.pyc
+__pycache__/Enemy.cpython-312.pyc
+__pycache__/GameObject.cpython-312.pyc
+__pycache__/Object.cpython-312.pyc
diff --git a/Enemy.py b/Enemy.py
new file mode 100644
index 0000000..ceff145
--- /dev/null
+++ b/Enemy.py
@@ -0,0 +1,17 @@
+import pygame
+import GameObject
+import Utils
+
+class Enemy(object):
+    def __init__(self, name, pos_x, pos_y, image) -> None:
+        spawned_enemy = list()
+        self.name = name
+        self.image = image
+        self.pos_x = pos_x
+        self.pos_y = pos_y
+        self.obj = GameObject.GameObject("Enemy", 0, 0, image)
+        pass
+
+    def render(self, screen:pygame.Surface):
+        screen.blit(self.image, (self.pos_x, self.pos_y))
+    
\ No newline at end of file
diff --git a/GameObject.py b/GameObject.py
new file mode 100644
index 0000000..fb489c5
--- /dev/null
+++ b/GameObject.py
@@ -0,0 +1,22 @@
+import pygame
+
+class GameObject(object):
+    def __init__(self, name, pos_x, pos_y, image=None,) -> None:
+        self.name = name
+        self.pos_x = pos_x
+        self.pos_y = pos_y
+        self.image = image
+        pass
+    
+    def render(self, screen:pygame.Surface):
+        if(self.image is not None):
+            screen.blit(self.image, (self.pos_x, self.pos_y))
+        else:
+            print("Kein Image hinterlegt!")
+            
+
+
+    def setpos(self, pos_x, pos_y):
+        self.pos_x = pos_x
+        self.pos_y = pos_y
+
diff --git a/Rastergrafik.png b/Rastergrafik.png
new file mode 100644
index 0000000000000000000000000000000000000000..20b2eefbcc893dec23deff689c6b6c8d2172caf7
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3oCO|{#S9F5he4R}c>anMprB-l
zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt<Y~E{-7{oo~+?GBPl5Fe_}W
ye;#@8JUiEgl}qH#xNC`ZA5GdAp#!8I&1Mx`!fY8(+0h5o#^CAd=d#Wzp$PzLb1vNg

literal 0
HcmV?d00001

diff --git a/test.py b/test.py
new file mode 100644
index 0000000..e6b357e
--- /dev/null
+++ b/test.py
@@ -0,0 +1,68 @@
+import pygame
+import GameObject
+import Enemy
+import Utils
+
+pygame.init()
+
+
+pygame.display.set_caption("TESTFENSTER")
+pygame.mouse.set_visible(True)
+screen = pygame.display.set_mode((800,600))
+
+clock = pygame.time.Clock()
+
+image_enemy = Utils.load_image("Rastergrafik.png")
+testimage = Utils.load_image("Rastergrafik.png")
+
+#testimage.set_colorkey((255,0,255), pygame.RLEACCELOK)
+
+objects = list()
+
+enemy1 = Enemy.Enemy("Penner", 500, 500, image_enemy)
+
+
+gamestate = True
+pos_x = 50
+pos_y = 50
+
+while(gamestate):
+
+    screen.fill((255,255,255))
+
+    for event in pygame.event.get():
+        if(event.type == pygame.QUIT):
+            gamestate = False
+
+    image = screen.blit(testimage, (pos_x, pos_y))
+
+    mouse_pos = pygame.mouse.get_pos()
+
+    #print(mouse_pos)
+    #print(image.topleft) #Gibt die Position einen Surfaces "obenlinks" aus
+    #print(image.size) #Gibt die Größe eines Surfaces aus
+
+    max = tuple(map(lambda i, j : i+j, image.topleft, image.size))
+    #Wenn Mausposition X-Achse innerhalb Anfangsposition+Breite
+    if(mouse_pos[0] <= max[0] and mouse_pos[0] >= image.topleft[0]):
+        #Wenn Mausposition Y-Achse innerhalb Anfangsposition+Höhe
+        if(mouse_pos[1] <= max[1] and mouse_pos[1] >= image.topleft[1]):
+                print("Treffer")
+                pos_x = mouse_pos[0]
+                pos_y = mouse_pos[1]
+
+    #Rendere alle Objecte in objects Liste
+    for object in objects:
+        object:GameObject.GameObject
+
+        if(pygame.mouse.get_pressed()[0]):
+             object.setpos(mouse_pos[0], mouse_pos[1])
+
+        object.render(screen)
+        
+    enemy1.render(screen)
+    #if(mouse_pos <= (image.topleft+image.size) and mouse_pos >= image.topleft):
+    #    print("HIIIIITTT!!!!")
+
+    clock.tick(60)
+    pygame.display.flip()
\ No newline at end of file