From 3f31cf441c94c9cb3bbf21d5b5ec01d49c0dde10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Artjoms=20Marians=20=C5=85e=C4=8Dajevs?=
 <anecajevs.e@rkg.lv>
Date: Mon, 12 Feb 2024 09:43:28 +0000
Subject: [PATCH] Update main.py

---
 main.py | 70 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/main.py b/main.py
index 6a852a1..0a478bb 100644
--- a/main.py
+++ b/main.py
@@ -13,11 +13,9 @@ stenki = pygame.transform.scale(pygame.image.load("stena.jpeg").convert(), (200,
 tank = pygame.transform.scale(pygame.image.load("ntank-removebg-preview.png").convert_alpha(), (150, 150))
 tank2 = pygame.transform.scale(pygame.image.load("ntank-removebg-preview.png").convert_alpha(), (150, 150))
 
-
 player_pos1 = pygame.Vector2(screen.get_width() / 2, screen.get_height() / 2)
 player_pos2 = pygame.Vector2(screen.get_width() / 2, screen.get_height() / 2)
 
-
 dt = 0
 
 clock = pygame.time.Clock()
@@ -29,7 +27,6 @@ while running:
         if event.type == pygame.QUIT:
             running = False
 
-
     screen.fill("purple")
     screen.blit(normal_image, (0, 0))
     screen.blit(normal_image, (960, 0))
@@ -38,6 +35,30 @@ while running:
 
     screen.blit(stena, (360, 40))
 
+    screen.blit(tank, player_pos1)
+    keys = pygame.key.get_pressed()
+    if keys[pygame.K_w]:
+        player_pos1.y -= 300 * dt
+    if keys[pygame.K_s]:
+        player_pos1.y += 300 * dt
+    if keys[pygame.K_a]:
+        player_pos1.x -= 300 * dt
+    if keys[pygame.K_d]:
+        player_pos1.x += 300 * dt
+
+    screen.blit(tank2, player_pos2)
+    keys = pygame.key.get_pressed()
+    if keys[pygame.K_UP]:
+        player_pos2.y -= 300 * dt
+    if keys[pygame.K_DOWN]:
+        player_pos2.y += 300 * dt
+    if keys[pygame.K_LEFT]:
+        player_pos2.x -= 300 * dt
+    if keys[pygame.K_RIGHT]:
+        player_pos2.x += 300 * dt
+
+    screen.blit(stena, (360, 40))
+
     screen.blit(stena, (460, 730))
     screen.blit(stena, (460, 830))
     screen.blit(stena, (460, 930))
@@ -48,7 +69,6 @@ while running:
 
     screen.blit(stena, (660, 240))
 
-
     screen.blit(stena, (960, 440))
     screen.blit(stena, (960, 540))
     screen.blit(stena, (960, 640))
@@ -60,7 +80,6 @@ while running:
     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))
@@ -116,32 +135,23 @@ while running:
     screen.blit(stenki, (1600, 1030))
     screen.blit(stenki, (1800, 1030))
 
-    screen.blit(tank, player_pos1)
-
-    keys = pygame.key.get_pressed()
-    if keys[pygame.K_w]:
-        player_pos1.y -= 300 * dt
-    if keys[pygame.K_s]:
-        player_pos1.y += 300 * dt
-    if keys[pygame.K_a]:
-        player_pos1.x -= 300 * dt
-    if keys[pygame.K_d]:
-        player_pos1.x += 300 * dt
-
-
-    screen.blit(tank2, player_pos2)
-
-    keys = pygame.key.get_pressed()
-    if keys[pygame.K_UP]:
-        player_pos2.y -= 300 * dt
-    if keys[pygame.K_DOWN]:
-        player_pos2.y += 300 * dt
-    if keys[pygame.K_LEFT]:
-        player_pos2.x -= 300 * dt
-    if keys[pygame.K_RIGHT]:
-        player_pos2.x += 300 * dt
-
+    if player_pos1.x < 0:
+        player_pos1.x = 0
+    if player_pos1.x > screen.get_width() - tank.get_width():
+        player_pos1.x = screen.get_width() - tank.get_width()
+    if player_pos1.y < 0:
+        player_pos1.y = 0
+    if player_pos1.y > screen.get_height() - tank.get_height():
+        player_pos1.y = screen.get_height() - tank.get_height()
 
+    if player_pos2.x < 0:
+        player_pos2.x = 0
+    if player_pos2.x > screen.get_width() - tank2.get_width():
+        player_pos2.x = screen.get_width() - tank2.get_width()
+    if player_pos2.y < 0:
+        player_pos2.y = 0
+    if player_pos2.y > screen.get_height() - tank2.get_height():
+        player_pos2.y = screen.get_height() - tank2.get_height()
 
     pygame.display.flip()