From 25d46a1baf492465bad39849ab3f23b194a1e4b7 Mon Sep 17 00:00:00 2001
From: AleksandraMuczynska <alemuc2@st.amu.edu.pl>
Date: Thu, 24 Mar 2022 13:09:43 +0100
Subject: [PATCH] =?UTF-8?q?monsters=20v2=20(max=20b=C4=99dzie=20v4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/game.py                  |  14 ++++++--------
 logic/spawner.py               |   2 +-
 models/monster.py              |   6 +-----
 resources/textures/dragon2.png | Bin 0 -> 14273 bytes
 4 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 resources/textures/dragon2.png

diff --git a/logic/game.py b/logic/game.py
index fc6507e..1ce9d08 100644
--- a/logic/game.py
+++ b/logic/game.py
@@ -103,12 +103,12 @@ class Game:
         spawn_left_team.spawn()
         spawn_right_team.spawn()
 
-        spawned_monsters = self.generate_monster((monsters_sprite_group))
+        spawned_monsters = self.generate_monster(monsters_sprite_group)
 
         monster_spawn = Spawner(grid, spawned_monsters, width=MONSTER_SPAWN_WIDTH, height=MONSTER_SPAWN_HEIGHT,
                                 pos_row = MONSTER_SPAWN_FIRST_ROW, pos_column=MONSTER_SPAWN_FIRST_COL)
 
-        monster_spawn.spawn_monster()
+        monster_spawn.spawn_monsters()
 
         while running:
             self.screen.blit(self.bg, (0, 0))
@@ -127,9 +127,6 @@ class Game:
 
             knights_sprite_group.draw(self.screen)
             monsters_sprite_group.draw(self.screen)
-           # monster1 = Monster(self.screen)
-           # monster_list = pygame.sprite.Group()
-           # monster_list.add(monster1)
             pygame.display.update()
             self.clock.tick(FPS_COUNT)
 
@@ -145,7 +142,8 @@ class Game:
     @staticmethod
     def generate_monster(monsters_sprite_group):
         monsters = []
-        monster1 = Monster()
-        monsters.append(monster1)
-        monsters_sprite_group.add(monster1)
+        for i in range(2):
+            monster = Monster()
+            monsters.append(monster)
+            monsters_sprite_group.add(monster)
         return monsters
diff --git a/logic/spawner.py b/logic/spawner.py
index 69caea5..6194a0e 100644
--- a/logic/spawner.py
+++ b/logic/spawner.py
@@ -27,7 +27,7 @@ class Spawner:
             coords.pop(random_tile)
             obj.update()
 
-    def spawn_monster(self):
+    def spawn_monsters(self):
         coords = []
         for row in range(self.pos_row, (self.pos_row + self.width)):
             for column in range(self.pos_column, (self.pos_column + self.height)):
diff --git a/models/monster.py b/models/monster.py
index c6be1ca..e0363b4 100644
--- a/models/monster.py
+++ b/models/monster.py
@@ -8,14 +8,10 @@ class Monster(pygame.sprite.Sprite):
     def __init__(self):
         super().__init__()
 
-        self.image = pygame.image.load("./resources/textures/dragon.png")
+        self.image = pygame.image.load("./resources/textures/dragon2.png")
         self.image = pygame.transform.scale(self.image, (40, 40))
         self.images.append(self.image)
         self.rect = self.image.get_rect()
         monster_list = pygame.sprite.Group()
-        #x = 337 + 41 * 5
-        #y = 214 + 41 * 7
-        #pygame.draw.rect(screen, (255, 255, 255), pygame.Rect(x, y, 40, 40), 0, 0)
-        #screen.blit(self.image, (x, y))
         self.health = random.randrange(15, 25)
         self.attack = random.randrange(2, 10)
diff --git a/resources/textures/dragon2.png b/resources/textures/dragon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b67a258e40137a4e57efa9d1022d34318f76f641
GIT binary patch
literal 14273
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
ad~>B>L5~~1ho9zoB|n-nVQ<23^Zy%NCYw+I

literal 0
HcmV?d00001