From d54adddfaa6c5463c66d2a02a959502e36044e03 Mon Sep 17 00:00:00 2001
From: s444349 <kacbor2@st.amu.edu.pl>
Date: Fri, 3 Apr 2020 17:38:42 +0200
Subject: [PATCH] poprawa ruchu

---
 modele.py | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/modele.py b/modele.py
index 049584f..add60e7 100644
--- a/modele.py
+++ b/modele.py
@@ -40,31 +40,35 @@ class Smieciarka(pygame.sprite.Sprite):
             self.w_dol()
 
     def w_lewo(self):
-        if self.x > 0 or game.plansza[self.x - 1, self.y].jestPrzeszkoda is not True:
-            self.x -= 1
-            self.rect.x = MARGIN + self.x * WIDTH + self.x * MARGIN
-            if self.ruch == 2:
-                self.image = pygame.image.load(
-                    'resources/plansza/smieciarka.png')
-            self.ruch = 1
+        if self.x > 0:
+            if game.plansza[self.x - 1, self.y].jestPrzeszkoda is not True:
+                self.x -= 1
+                self.rect.x = MARGIN + self.x * WIDTH + self.x * MARGIN
+                if self.ruch == 2:
+                    self.image = pygame.image.load(
+                        'resources/plansza/smieciarka.png')
+                self.ruch = 1
 
     def w_prawo(self):
-        if self.x < 14 or game.plansza[self.x + 1, self.y].jestPrzeszkoda is not True:
-            self.x += 1
-            self.rect.x = MARGIN + self.x * WIDTH + self.x * MARGIN
-            if self.ruch == 1:
-                self.image = pygame.transform.flip(self.image, True, False)
-            self.ruch = 2
+        if self.x < 14:
+            if game.plansza[self.x + 1, self.y].jestPrzeszkoda is not True:
+                self.x += 1
+                self.rect.x = MARGIN + self.x * WIDTH + self.x * MARGIN
+                if self.ruch == 1:
+                    self.image = pygame.transform.flip(self.image, True, False)
+                self.ruch = 2
 
     def w_gore(self):
-        if self.y > 0 or game.plansza[self.x, self.y - 1].jestPrzeszkoda is not True:
-            self.y -= 1
-            self.rect.y = self.y * HEIGHT + self.y * MARGIN
+        if self.y > 0:
+            if game.plansza[self.x, self.y - 1].jestPrzeszkoda is not True:
+                self.y -= 1
+                self.rect.y = self.y * HEIGHT + self.y * MARGIN
 
     def w_dol(self):
-        if self.y < 14 or game.plansza[self.x, self.y + 1].jestPrzeszkoda is not True:
-            self.y += 1
-            self.rect.y = self.y * HEIGHT + self.y * MARGIN
+        if self.y < 14:
+            if game.plansza[self.x, self.y + 1].jestPrzeszkoda is not True:
+                self.y += 1
+                self.rect.y = self.y * HEIGHT + self.y * MARGIN
 
 
 class Kontener(pygame.sprite.Sprite):