From 376c0df788875ca43ce71aa347c97048f7b2200e Mon Sep 17 00:00:00 2001
From: s464859 <@>
Date: Sat, 16 Apr 2022 20:14:55 +0200
Subject: [PATCH] trawa

---
 assets/sprites/grass.png | Bin 0 -> 7020 bytes
 classes/ai.py            |   8 ++++----
 classes/minesweeper.py   |  10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 assets/sprites/grass.png

diff --git a/assets/sprites/grass.png b/assets/sprites/grass.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1302e52a55509aba6f8a5ec08ab41cb55b004d6
GIT binary patch
literal 7020
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
Zq$Q1C3frRM3f3KjWa(gWY4fj9{{mZQGNk|j

literal 0
HcmV?d00001

diff --git a/classes/ai.py b/classes/ai.py
index d41bddf..633d801 100644
--- a/classes/ai.py
+++ b/classes/ai.py
@@ -11,7 +11,7 @@ class AI:
     the_way:list
     
     #jak True to można się poruszać strzałkami, jak False sam się porusza
-    user_controlled=False
+    user_controlled=True
     
     def __init__(self, window, current_map, saper):
         self.window = window
@@ -54,11 +54,11 @@ class AI:
         if keys[pygame.K_DOWN]:
             self.saper.move(0)
         elif keys[pygame.K_UP]:
-            self.saper.move()
+            self.saper.move(180)
         elif keys[pygame.K_LEFT]:
-            self.saper.rotate("left")
+            self.saper.move(270)
         elif keys[pygame.K_RIGHT]:
-            self.saper.rotate("right")
+            self.saper.move(90)
     
     def chaos_controls(self):
         dir = randrange(4)
diff --git a/classes/minesweeper.py b/classes/minesweeper.py
index 415897e..3cd145a 100644
--- a/classes/minesweeper.py
+++ b/classes/minesweeper.py
@@ -84,6 +84,10 @@ class Map:
         image = pygame.image.load("assets/sprites/stone.png")
         image = pygame.transform.scale(image, (tile_size,tile_size))
         self.tile_palette[10]=image
+
+        image = pygame.image.load("assets/sprites/grass.png")
+        image = pygame.transform.scale(image, (tile_size,tile_size))
+        self.tile_palette[5]=image
     
     def generate(self):
         #generowanie terenu
@@ -108,6 +112,8 @@ class Map:
                 rng = randrange(10)
                 if ok and rng==0 and not (i<2 and j<3):
                     matrix[i].append(10)
+                elif ok and rng>8 and not (i<2 and j<3):
+                    matrix[i].append(5)
                 elif ok and rng<2 and not (i<2 and j<3):
                     matrix[i].append(0)
                     rand_rotate = 0#randrange(4)*90
@@ -255,6 +261,8 @@ class Minesweeper:
             pygame.mixer.Channel(1).stop()
             self.offset_y=0
             self.offset_x=0
+            if self.current_map.terrain_matrix[self.position_y][self.position_x]<5:
+                self.speed=1
         
     
     def draw(self, window, delta:float):
@@ -326,6 +334,8 @@ class Minesweeper:
                     move_legal=False
 
         if move_legal:
+            if self.current_map.terrain_matrix[next_y][next_x]>4:
+                self.speed=0.5
             pygame.mixer.Channel(1).set_volume(0.3)
             pygame.mixer.Channel(1).play(pygame.mixer.Sound("assets/sounds/moving.wav"))
             if dir==0: