From d37cd7b41c65ffc48e0c20d9008d450781275666 Mon Sep 17 00:00:00 2001
From: ehermakov <ehermakov@gmail.com>
Date: Sun, 23 Jun 2024 19:51:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B3=D0=B5=D0=B9?=
 =?UTF-8?q?=D0=BC=20=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShipCraft/Переделка/ShipField.py          |  13 ++++++----
 .../__pycache__/ShipField.cpython-311.pyc     | Bin 14620 -> 14568 bytes
 HNS/Excercises/ShipCraft/Переделка/main.py    |  23 +++++++++++++++++-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipField.py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
index d4442c8..0501ff8 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
@@ -241,11 +241,14 @@ class ShipField:
         else:
             self.ship_direction = ShipDirection.VERTICAL
 
-    def toggle_field_mode(self):
-        if self.field_mode == ShipMode.PUT:
-            self.field_mode = ShipMode.SHOOT
-        else:
-            self.field_mode = ShipMode.PUT
+    def set_field_mode(self, value):
+        if value is None:
+            return
+
+        if type(value) is not ShipMode:
+            return
+
+        self.field_mode = value
 
     def print_field(self):
         print(self.ships)
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc
index 4ed20c507347260c8e0c67551a31fca2217ea375..e74b867f0f6b06e291e8641bff487b467757d83b 100644
GIT binary patch
delta 288
zcmbPJ^rDb=IWI340}%WPtVlE5$opS^@^W2KMxV)hb?xhG7~+{gav+ex5X?}d0c2=0
z7bya%B32L~1R`R9L@`LAf<lo5kh;ZJoLUl}mYJH95}%u&l3FDZoRL}J2IA|X%6tLo
z)CCd^3^%w1I&5$72z9tU<>sHj+G*WmEipIa0=F6vfrTGP$#<~y@OJ>=W*x&>OpJdw
wA2-%#V&vTX-Bf^ypPg0V0|T58nk;5<+}@pqQR)K&cJd=w{0k1*A}OGw0CFBn;{X5v

delta 270
zcmaD+IH!nrIWI340}#}?SELzj<o&NdIh9d#@=LvzdLf`_5i5w$0ulNkLJUY0GXe>P
zA_*XQORywAJv}EiJ}omfCnY{NKP9zFIyfV<zzxLL!;t&}(yk388W?VH^Y_@#&6tyO
ziCgOex7J-bwK;hmE<OGoK=>5M$>D(UHvce~#l-k)^JHUvCPuc+hfM{T_*q!BKQO=v
dp2?5QkK4PjFiL%3z)pSyi+{l(TO<W^5&(bBP7VM7

diff --git a/HNS/Excercises/ShipCraft/Переделка/main.py b/HNS/Excercises/ShipCraft/Переделка/main.py
index ef74718..0c7bb9d 100644
--- a/HNS/Excercises/ShipCraft/Переделка/main.py
+++ b/HNS/Excercises/ShipCraft/Переделка/main.py
@@ -4,6 +4,7 @@ import time
 from tkinter import *
 from tkinter import filedialog
 from ShipView import ShipView
+from ShipMode import ShipMode
 from ShipField import ShipField
 from GameMode import GameMode
 
@@ -113,7 +114,7 @@ def next_game_mode():
     elif game_mode == GameMode.BATTLE:
         game_mode = GameMode.END
 
-    game_mode_stringvar.set(str(game_mode))
+    update_game_mode()
 
 
 def prev_game_mode():
@@ -126,6 +127,26 @@ def prev_game_mode():
     elif game_mode == GameMode.PLAN:
         game_mode = GameMode.MENU
 
+    update_game_mode()
+
+
+def update_game_mode():
+    global game_mode
+
+    if game_mode == GameMode.MENU:
+        my_view.ship_field.set_field_mode(ShipMode.INACTIVE)
+        enemy_view.ship_field.set_field_mode(ShipMode.INACTIVE)
+
+    elif game_mode == GameMode.PLAN:
+        my_view.ship_field.set_field_mode(ShipMode.PUT)
+        enemy_view.ship_field.set_field_mode(ShipMode.INACTIVE)
+    elif game_mode == GameMode.BATTLE:
+        my_view.ship_field.set_field_mode(ShipMode.INACTIVE)
+        enemy_view.ship_field.set_field_mode(ShipMode.SHOOT)
+    elif game_mode == GameMode.END:
+        my_view.ship_field.set_field_mode(ShipMode.INACTIVE)
+        enemy_view.ship_field.set_field_mode(ShipMode.INACTIVE)
+
     game_mode_stringvar.set(str(game_mode))