From 8f3f54b0cf0a8d44cd1d9c2e3625ae10ff797852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artjoms=20Marians=20=C5=85e=C4=8Dajevs?=
 <anecajevs.e@rkg.lv>
Date: Mon, 26 Feb 2024 08:50:39 +0000
Subject: [PATCH] Update main.py

---
 main.py | 131 +++++++++++++++++++++-----------------------------------
 1 file changed, 49 insertions(+), 82 deletions(-)

diff --git a/main.py b/main.py
index 2fc60fa..91d34d6 100644
--- a/main.py
+++ b/main.py
@@ -75,20 +75,66 @@ class Bullet(pygame.sprite.Sprite):
     def update(self):
         self.rect.x += BULLET_SPEED * math.cos(math.radians(self.angle))
         self.rect.y += BULLET_SPEED * math.sin(math.radians(self.angle))
-        if not screen.get_rect().colliderect(self.rect):
-            self.kill()
+
+        # Проверка столкновения снаряда со стенами
+        if pygame.sprite.spritecollideany(self, walls):
+            self.kill()  # Удаляем снаряд, если он столкнулся со стеной
+
+            # Определение класса стены
+
+
+class Wall(pygame.sprite.Sprite):
+    def __init__(self, x, y, image):
+        super().__init__()
+        self.image = image
+        self.rect = self.image.get_rect(topleft=(x, y))
 
 
 # Создание групп спрайтов
 all_sprites = pygame.sprite.Group()
 tanks = pygame.sprite.Group()
 bullets = pygame.sprite.Group()
+walls = pygame.sprite.Group()  # Группа для всех стен
 
 # Создание игрока
 player = Tank(SCREEN_WIDTH // 4, SCREEN_HEIGHT // 2)
 all_sprites.add(player)
 tanks.add(player)
 
+# Создание стен
+wall_positions = [
+    (360, 40), (460, 730), (460, 830), (460, 930),
+    (960, 40), (960, 140), (960, 240),
+    (660, 240),
+    (960, 440), (960, 540), (960, 640), (960, 740),
+    (1260, 740), (1360, 740), (1460, 740), (1560, 740), (1660, 740),
+    (360, 240), (360, 340), (360, 440),
+    (0, 540), (60, 540), (260, 540), (360, 540), (460, 540),
+    (560, 540), (660, 540), (760, 540), (860, 540),
+    (1160, 240), (1260, 240), (1360, 240), (1460, 240), (1460, 340),
+    (1760, 340), (1860, 340)
+]
+
+for pos in wall_positions:
+    wall = Wall(*pos, stena)
+    all_sprites.add(wall)
+    walls.add(wall)
+
+# Создание стен "stenki"
+wall_stenki_positions = [
+    (-150, 0), (-150, 200), (-150, 400), (-150, 600), (-150, 800), (-150, 1000),
+    (0, -150), (200, -150), (400, -150), (600, -150), (800, -150), (1000, -150),
+    (1200, -150), (1400, -150), (1600, -150), (1800, -150), (1870, 0), (1870, 200),
+    (1870, 400), (1870, 600), (1870, 800), (1870, 1000), (0, 1030), (200, 1030),
+    (400, 1030), (600, 1030), (800, 1030), (1000, 1030), (1200, 1030), (1400, 1030),
+    (1600, 1030), (1800, 1030)
+]
+
+for pos in wall_stenki_positions:
+    wall_stenki = Wall(*pos, stenki)
+    all_sprites.add(wall_stenki)
+    walls.add(wall_stenki)
+
 # Основной игровой цикл
 clock = pygame.time.Clock()
 running = True
@@ -112,88 +158,9 @@ while running:
             screen.blit(background_image, (i * 960, j * 540))
 
     all_sprites.draw(screen)
-    screen.blit(stena, (360, 40))
-
-    screen.blit(stena, (460, 730))
-    screen.blit(stena, (460, 830))
-    screen.blit(stena, (460, 930))
-
-    screen.blit(stena, (960, 40))
-    screen.blit(stena, (960, 140))
-    screen.blit(stena, (960, 240))
-
-    screen.blit(stena, (660, 240))
-
-    screen.blit(stena, (960, 440))
-    screen.blit(stena, (960, 540))
-    screen.blit(stena, (960, 640))
-    screen.blit(stena, (960, 740))
-
-    screen.blit(stena, (1260, 740))
-    screen.blit(stena, (1360, 740))
-    screen.blit(stena, (1460, 740))
-    screen.blit(stena, (1560, 740))
-    screen.blit(stena, (1660, 740))
-
-    screen.blit(stena, (360, 240))
-    screen.blit(stena, (360, 340))
-    screen.blit(stena, (360, 440))
-
-    screen.blit(stena, (0, 540))
-    screen.blit(stena, (60, 540))
-    screen.blit(stena, (260, 540))
-    screen.blit(stena, (360, 540))
-    screen.blit(stena, (460, 540))
-    screen.blit(stena, (560, 540))
-    screen.blit(stena, (660, 540))
-    screen.blit(stena, (760, 540))
-    screen.blit(stena, (860, 540))
-
-    screen.blit(stena, (1160, 240))
-    screen.blit(stena, (1260, 240))
-    screen.blit(stena, (1360, 240))
-    screen.blit(stena, (1460, 240))
-    screen.blit(stena, (1460, 340))
-    screen.blit(stena, (1760, 340))
-    screen.blit(stena, (1860, 340))
-
-    screen.blit(stenki, (-150, 0))
-    screen.blit(stenki, (-150, 200))
-    screen.blit(stenki, (-150, 400))
-    screen.blit(stenki, (-150, 600))
-    screen.blit(stenki, (-150, 800))
-    screen.blit(stenki, (-150, 1000))
-    screen.blit(stenki, (0, -150))
-    screen.blit(stenki, (200, -150))
-    screen.blit(stenki, (400, -150))
-    screen.blit(stenki, (600, -150))
-    screen.blit(stenki, (800, -150))
-    screen.blit(stenki, (1000, -150))
-    screen.blit(stenki, (1200, -150))
-    screen.blit(stenki, (1400, -150))
-    screen.blit(stenki, (1600, -150))
-    screen.blit(stenki, (1800, -150))
-    screen.blit(stenki, (1870, 0))
-    screen.blit(stenki, (1870, 200))
-    screen.blit(stenki, (1870, 400))
-    screen.blit(stenki, (1870, 600))
-    screen.blit(stenki, (1870, 800))
-    screen.blit(stenki, (1870, 1000))
-    screen.blit(stenki, (0, 1030))
-    screen.blit(stenki, (200, 1030))
-    screen.blit(stenki, (400, 1030))
-    screen.blit(stenki, (600, 1030))
-    screen.blit(stenki, (800, 1030))
-    screen.blit(stenki, (1000, 1030))
-    screen.blit(stenki, (1200, 1030))
-    screen.blit(stenki, (1400, 1030))
-    screen.blit(stenki, (1600, 1030))
-    screen.blit(stenki, (1800, 1030))
-
-    # Остальной код отрисовки стен и спрайтов остается без изменений
 
     pygame.display.flip()
     clock.tick(FPS)
 
 # Завершение работы Pygame
-pygame.quit()
\ No newline at end of file
+pygame.quit()