From 1cc445bec846fdd86f3c0d7ebf4aa20e4c6317d7 Mon Sep 17 00:00:00 2001
From: eduard ermakov <ehermakov@gmail.com>
Date: Mon, 10 Jun 2024 23:08:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShipCraft/Переделка/.idea/misc.xml        |   2 +-
 .../ShipCraft/Переделка/.idea/workspace.xml   |  36 ++++++++++--------
 .../ShipCraft/Переделка/.idea/Переделка.iml   |   2 +-
 .../ShipCraft/Переделка/GameMode.py           |  16 ++++++++
 .../ShipCraft/Переделка/ShipField.py          |   4 +-
 .../ShipCraft/Переделка/ShipMode.py           |   4 +-
 .../__pycache__/GameMode.cpython-39.pyc       | Bin 0 -> 649 bytes
 .../__pycache__/ShipDirection.cpython-39.pyc  | Bin 659 -> 659 bytes
 .../__pycache__/ShipField.cpython-39.pyc      | Bin 6925 -> 7048 bytes
 .../__pycache__/ShipMode.cpython-39.pyc       | Bin 634 -> 635 bytes
 .../__pycache__/ShipView.cpython-39.pyc       | Bin 591 -> 591 bytes
 .../__pycache__/ShootResult.cpython-39.pyc    | Bin 440 -> 440 bytes
 .../__pycache__/test_ShipField.cpython-39.pyc | Bin 0 -> 7788 bytes
 HNS/Excercises/ShipCraft/Переделка/main.py    |  16 +++++---
 14 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/GameMode.py
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/__pycache__/GameMode.cpython-39.pyc
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-39.pyc

diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml
index a6218fe..94888fc 100644
--- a/HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.11" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
index d6e083c..6ed4e92 100644
--- a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
@@ -4,7 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b389cdea-22f5-4ba2-8b46-337091984b3c" name="Changes" comment="код по 22 части урока" />
+    <list default="true" id="b389cdea-22f5-4ba2-8b46-337091984b3c" name="Changes" comment="код по 22 части урока">
+      <change afterPath="$PROJECT_DIR$/GameMode.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/Переделка.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/Переделка.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ShipField.py" beforeDir="false" afterPath="$PROJECT_DIR$/ShipField.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ShipMode.py" beforeDir="false" afterPath="$PROJECT_DIR$/ShipMode.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -34,21 +42,20 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Python.ShipField.executor": "Run",
-    "Python.main (1).executor": "Run",
-    "Python.main.executor": "Debug",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "C:/Users/Eduardo/Documents/Программирование с Артуром/HNS/hnc-eduard/HNS/Excercises/ShipCraft"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Python.ShipField.executor&quot;: &quot;Run&quot;,
+    &quot;Python.main (1).executor&quot;: &quot;Run&quot;,
+    &quot;Python.main.executor&quot;: &quot;Debug&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/Eduardo/Documents/Программирование с Артуром/HNS/hnc-eduard/HNS/Excercises/ShipCraft&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="Python.main">
     <configuration name="ShipField" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Переделка" />
-      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -70,7 +77,6 @@
     </configuration>
     <configuration name="ShipView" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Переделка" />
-      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -92,7 +98,6 @@
     </configuration>
     <configuration name="main (1)" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Переделка" />
-      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -114,7 +119,6 @@
     </configuration>
     <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="Переделка" />
-      <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -170,7 +174,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/main.py</url>
-          <line>133</line>
+          <line>129</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml b/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
index d0876a7..8388dbc 100644
--- a/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/GameMode.py b/HNS/Excercises/ShipCraft/Переделка/GameMode.py
new file mode 100644
index 0000000..8ae75d1
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/GameMode.py
@@ -0,0 +1,16 @@
+from enum import Enum
+
+
+class GameMode(Enum):
+    MENU = 'MENU'
+    PLAN = 'PLAN'
+    BATTLE = 'BATTLE'
+    END = 'END'
+
+    @staticmethod
+    def from_string(raw_value):
+        if raw_value:
+            value = raw_value.upper()
+            if value in GameMode.__members__:
+                return GameMode[value]
+        return GameMode.MENU
diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipField.py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
index 467a5b0..d4442c8 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
@@ -21,7 +21,7 @@ class ShipField:
                       ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ']
 
         self.ships = [4, 3, 3, 2, 2, 2, 1, 1, 1, 1]
-        self.field_mode = ShipMode.PUT
+        self.field_mode = ShipMode.INACTIVE
         self.ship_size = 4
         self.ship_direction = ShipDirection.VERTICAL
 
@@ -76,7 +76,7 @@ class ShipField:
                             self.field[row * ShipField.field_size + c] = "p"
                         else:
                             self.field[row * ShipField.field_size + c] = "r"
-        else:
+        elif self.field_mode == ShipMode.SHOOT:
             self.field[row * ShipField.field_size + col] += "+"
 
     def clear_marker(self):
diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipMode.py b/HNS/Excercises/ShipCraft/Переделка/ShipMode.py
index f9e97b8..dbffd33 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipMode.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipMode.py
@@ -4,7 +4,7 @@ from enum import Enum
 class ShipMode(Enum):
     PUT = 'PUT'
     SHOOT = 'SHOOT'
-    UNKNOWN = 'UNKNOWN'
+    INACTIVE = 'INACTIVE'
 
     @staticmethod
     def from_string(raw_value):
@@ -12,6 +12,6 @@ class ShipMode(Enum):
             value = raw_value.upper()
             if value in ShipMode.__members__:
                 return ShipMode[value]
-        return ShipMode.UNKNOWN
+        return ShipMode.INACTIVE
 
 
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/GameMode.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/GameMode.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a3548ccc476247290e93390c2460ec565b7d9635
GIT binary patch
literal 649
zcmYjOy>8S%5T5m}@0`mW6%7qaL4gZ+0EAFNFb7g%Azf%JODp5q%Nd>Tj$Jz>=#Y?-
z_aKyX6r@RB!nE5`@c{J9`b6ZhzR&aL@%&_?(EyzI$J2rV{BDg73DS27W`_s?*&Iri
zFa~2l5BUWkSL~c89*PNs{vXPMkXaEe>N0mmS2!8F1oMzcLBbH|LzZy#5`jGNQ6xRp
zM<06^aL$qd`&2Zr!8j|`;S!Y<hf)02iZ=&)vF$zIJ32auERW(BIrV-k9%&By1oMDs
z4f_5XF5w$|W@}cl_udJ4D$?)41jy#}8y1Jc`t@q1w04c!Z7EAtzEj#rsofqz&u;1L
zqddvxwX%Nu`VM+Xp}((*UOq|3MU~DL`6GpOrZIgLPtxc#S2{0@GU;SitoC&_t<vUe
zbM@;>bJhGL+%(tCkM#eHk5^}Qd#abEG?gwE$L>C+J(4F_zy^d*cW;wBiE+4P11T4@
zD=F=Ox?f^FcluDu4|O)*MA}ibPgQl#QJ=^TO_fzeUaD%gM19Bk-B=wOIn(XMZNj)<
nz{KY9Jl00ykXxbX@Y-#^b#)4~^;{JjJl%Bm%pJ|R+#&x5I~kT|

literal 0
HcmV?d00001

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-39.pyc
index a2549606a900b7b771b4efcebd41ade8c22a2f31..d96d04c5c1d9369d5d28302edb231bfeeb6e6947 100644
GIT binary patch
delta 20
acmbQtI+>L_k(ZZ?0SIPZP20%b!2|#;@&wxe

delta 20
acmbQtI+>L_k(ZZ?0SG+Hyf<=pFaZE50R#~M

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-39.pyc
index f6a2fe3f7dc8d26f160e90b0487f3a23262116a4..7ed55d52c612f8fa1f7631fe320997c896d91d51 100644
GIT binary patch
literal 7048
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

literal 6925
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

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-39.pyc
index c4d34e1b435e26ed054dbf921bb572b1ec51786a..23aaee9df177908599d4162297a3bf475b20f20c 100644
GIT binary patch
delta 35
pcmeyx@|%S>k(ZZ?0SMkQrl+M$<Xz3l;pyk-9O4<~y79m+MgXrZ3Wxvz

delta 34
ocmey(@{5Hxk(ZZ?0SG+HywegV@~-A!5B2l*^AGpicyJdZ0H9F{761SM

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-39.pyc
index 39ee5d8561ef9f149a3e636ed9b25151bfcf159e..3ff97a5f74b2062ff7184faf6ba9ac9e22484071 100644
GIT binary patch
delta 101
zcmX@la-M}dk(ZZ?0SLBSNZZKG$jEqWGB2YhBj;pu#-*a%K=C3@RDx^rM@ADZbU~n+
ZTO2mI`6;D2sdkJ&UNH-h;9=xp1_1W?5#Im+

delta 101
zcmX@la-M}dk(ZZ?0SLTmyf<<)GBQR@=4I4m<d|&ExKtD*QN)2ta8CZnXrhHK2vl>6
X!zMRBr8FnijuFT!W&sjBj6BQ$g7px5

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-39.pyc
index 0f87191779e144f968efe4082e245fbe7a276282..f4d78ee9d950c78edff52788f67d411ad3f506b5 100644
GIT binary patch
delta 20
acmdnNyn~rLk(ZZ?0SLBSNZZK0mJt9n5CvNR

delta 20
acmdnNyn~rLk(ZZ?0SG+Hyf<>MWdr~&fCPI0

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8316be07621ec0cf51bcb34695cce533b6ef5399
GIT binary patch
literal 7788
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

literal 0
HcmV?d00001

diff --git a/HNS/Excercises/ShipCraft/Переделка/main.py b/HNS/Excercises/ShipCraft/Переделка/main.py
index 5cf8d83..3004a88 100644
--- a/HNS/Excercises/ShipCraft/Переделка/main.py
+++ b/HNS/Excercises/ShipCraft/Переделка/main.py
@@ -5,7 +5,9 @@ from tkinter import *
 from tkinter import filedialog
 from ShipView import ShipView
 from ShipField import ShipField
+from GameMode import GameMode
 
+game_mode = GameMode.MENU
 active_view ={}
 
 def create_view(window, col_offset=0, row_offset=0):
@@ -50,9 +52,6 @@ def keypress_handler(e):
     global active_view
     if e.keysym.isnumeric():
         active_view.ship_field.set_ship_size(e.keysym)
-    else:
-        if e.keysym == 'm':
-            active_view.ship_field.toggle_field_mode()
 
 
 def left_button_click(view, row, col):
@@ -106,7 +105,7 @@ def refresh_remaining_ships_label(view):
 
 window = Tk()
 window.title("Ship Craft!")
-window.geometry('1020x540')
+window.geometry('1020x640')
 window.bind_all('<KeyPress>', keypress_handler)
 
 start_column_my_field = 1
@@ -150,6 +149,13 @@ savebutton_enemy = Button(window, text='Save', width=20, height=2, command=lambd
 savebutton_enemy.grid(column=start_column_enemy_field, row=load_button_row, columnspan=4)
 
 loadbutton_enemy = Button(window, text='Load', width=20, height=2, command=lambda: loadbutton_click(enemy_view))
-loadbutton_enemy.grid(column=start_column_enemy_field + 6, row=load_button_row, columnspan=4)
+loadbutton_enemy.grid(column=start_column_enemy_field + 6, row=load_button_row + 1, columnspan=4)
+
+prev_button = Button(window, text='<=', width=20, height=2)
+prev_button.grid(column=start_column_enemy_field, row=load_button_row, columnspan=4)
+
+
+next_button = Button(window, text='>=', width=20, height=2)
+next_button.grid(column=start_column_enemy_field + 6, row=load_button_row, columnspan=4)
 
 window.mainloop()