From ca9e0add3458465e429130c8711a31e9bc305033 Mon Sep 17 00:00:00 2001
From: dmitrium12 <belicdima8@gmail.com>
Date: Sat, 28 Jan 2023 11:51:05 +0700
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8,=20=D1=81=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D1=80=D0=B5=D0=B2=D0=B0=D1=80=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/config.ini         |  2 +-
 modules/Book.py         |  8 +++--
 modules/DB.py           | 67 ++++++++++++++++++++++++++++++++++++++---
 modules/RewardWindow.py | 31 +++++++++++++++++++
 modules/Swamp.py        |  2 +-
 5 files changed, 100 insertions(+), 10 deletions(-)

diff --git a/conf/config.ini b/conf/config.ini
index b7678ab..72b1e1d 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -1,4 +1,4 @@
 [Settings]
-difficulty = Средняя
+difficulty = Простая
 sound = True
 
diff --git a/modules/Book.py b/modules/Book.py
index 8c59e93..589cb4e 100644
--- a/modules/Book.py
+++ b/modules/Book.py
@@ -37,7 +37,9 @@ class Book:  # Окно с необходимой информацией
     @staticmethod
     def info(screen, event):
         db = DB.UseDB("game")
-        response = db.find_document({})[0]
+        response = db.find_document(
+            {}
+        )[0]
         pg.draw.rect(screen, (38, 33, 55), (85, 0, 520, 500))
         pg.draw.rect(screen, (255, 255, 255), (100, 90, 495, 280), 1)
         texts = [f'День {response["day"]}', 'Сегодня произошло следующее:',
@@ -53,8 +55,8 @@ class Book:  # Окно с необходимой информацией
             frogs.append((i["name"], [i["hp"], i["hunger"]]))
 
         font = pg.font.Font(None, 15)  # Здесь будет указана информация о некоторых лягушках
-        for col in range(1):
-            for row in range(1):
+        for col in range((len(frogs) - 1) % 4 + 1):
+            for row in range((len(frogs) - 1) // 4 + 1):
                 if col == 0:
                     i = row
                 elif col == 1:
diff --git a/modules/DB.py b/modules/DB.py
index d1dc27b..fb02efb 100644
--- a/modules/DB.py
+++ b/modules/DB.py
@@ -61,11 +61,68 @@ class UseDB:
         self.series_collection.drop()
         self.series_collection.insert_one({
             "day": 0,
-            "frogs": [{
-                "name": "Квакуша",
-                "hp": 100,
-                "hunger": 0
-            }],
+            "frogs": [
+                {
+                    "name": "Квакуша",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Квакша",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Квак",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Ква",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Кваква",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Джабба-хатт",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Квендальф",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Лягуша",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Жаба",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Абажаю",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Пучеглазый",
+                    "hp": 100,
+                    "hunger": 0
+                },
+                {
+                    "name": "Вафля",
+                    "hp": 100,
+                    "hunger": 0
+                }
+            ],
             "money": 0,
             "save": {
                 "name": "start",
diff --git a/modules/RewardWindow.py b/modules/RewardWindow.py
index 900fbd2..f7c9223 100644
--- a/modules/RewardWindow.py
+++ b/modules/RewardWindow.py
@@ -17,10 +17,41 @@ class RewardWindow:
             event_string = "ничего не было"
         elif event == 1:
             event_string = "была мина, попрощайся с лягушкой"
+            # TODO: сделать уничтожение лягушек, как сделают перемещение
         elif event == 2:
             event_string = "было 2 мухи, теперь они твои"
+            from modules.DB import UseDB
+            db = UseDB("game")
+            db.update_document(
+                {
+                    "save.name": "start"
+                },
+                {
+                    "money": db.find_document({})[0]["money"] + 2
+                }
+            )
         elif event == 5:
             event_string = "было 5 мух, теперь они твои"
+            from modules.DB import UseDB
+            db = UseDB("game")
+            db.update_document(
+                {
+                    "save.name": "start"
+                },
+                {
+                    "money": db.find_document({})[0]["money"] + 5
+                }
+            )
         elif event == 10:
             event_string = "было 10 мух, теперь они твои"
+            from modules.DB import UseDB
+            db = UseDB("game")
+            db.update_document(
+                {
+                    "save.name": "start"
+                },
+                {
+                    "money": db.find_document({})[0]["money"] + 10
+                }
+            )
         return event_string
diff --git a/modules/Swamp.py b/modules/Swamp.py
index f5b9c3e..fc0c455 100644
--- a/modules/Swamp.py
+++ b/modules/Swamp.py
@@ -98,7 +98,7 @@ class Swamp:
                     self.cell_info = self.board[cell_coords[1]][cell_coords[0]]
                 except IndexError:
                     self.cell_info = self.board[-1][cell_coords[0]]
-                self.time_to_close = 10
+                self.time_to_close = 1
                 return cell_coords
         if 0 <= mouse_pos[0] <= 40 and 0 <= mouse_pos[1] <= 40:
             from modules.minigames.arkady import start