From a2bc915a4a27557cb9fd245a0a03d43e1e69fb71 Mon Sep 17 00:00:00 2001
From: ehermakov <ehermakov@gmail.com>
Date: Mon, 3 Jun 2024 16:08:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=20=D0=BA=D0=BE=D0=B4=20=D0=BF=D0=BE=2022=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShipCraft/Переделка/.idea/.gitignore      |   3 +
 .../ShipCraft/Переделка/.idea/modules.xml     |   8 +++
 .../ShipCraft/Переделка/.idea/workspace.xml   |  34 +++++----
 .../ShipCraft/Переделка/.idea/Переделка.iml   |   8 +++
 HNS/Excercises/ShipCraft/Переделка/3.json     |   1 +
 .../ShipCraft/Переделка/ShipField.py          |  68 +++++++++---------
 .../__pycache__/ShipDirection.cpython-311.pyc | Bin 1020 -> 977 bytes
 .../__pycache__/ShipField.cpython-311.pyc     | Bin 13924 -> 14293 bytes
 .../__pycache__/ShipMode.cpython-311.pyc      | Bin 994 -> 951 bytes
 .../__pycache__/ShipView.cpython-311.pyc      | Bin 877 -> 834 bytes
 .../__pycache__/ShootResult.cpython-311.pyc   | Bin 632 -> 589 bytes
 HNS/Excercises/ShipCraft/Переделка/json4      |   1 +
 HNS/Excercises/ShipCraft/Переделка/json4.json |   1 +
 HNS/Excercises/ShipCraft/Переделка/json5      |   1 +
 HNS/Excercises/ShipCraft/Переделка/json5.json |   1 +
 HNS/Excercises/ShipCraft/Переделка/main.py    |  51 +++++++------
 16 files changed, 101 insertions(+), 76 deletions(-)
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/.idea/.gitignore
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/.idea/modules.xml
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/3.json
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/json4
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/json4.json
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/json5
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/json5.json

diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/.gitignore b/HNS/Excercises/ShipCraft/Переделка/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/modules.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/modules.xml
new file mode 100644
index 0000000..d1a7964
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Переделка.iml" filepath="$PROJECT_DIR$/.idea/Переделка.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
index 2ebfb14..4cd2d83 100644
--- a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b389cdea-22f5-4ba2-8b46-337091984b3c" name="Changes" comment="">
+    <list default="true" id="b389cdea-22f5-4ba2-8b46-337091984b3c" name="Changes" comment="код по 22 части урока">
       <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$/ShipView.py" beforeDir="false" afterPath="$PROJECT_DIR$/ShipView.py" afterDir="false" />
@@ -27,6 +27,9 @@
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/main.py" root0="SKIP_INSPECTION" />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 0
 }</component>
@@ -35,20 +38,20 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <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.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 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": "Y:/Downloads/временный гит/hnc-eduard/HNS/Excercises/ShipCraft/Переделка"
   }
-}</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 +73,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 +94,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 +115,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>
@@ -161,12 +161,16 @@
     </task>
     <servers />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="код по 22 части урока" />
+    <option name="LAST_COMMIT_MESSAGE" value="код по 22 части урока" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/main.py</url>
-          <line>139</line>
+          <line>136</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml b/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
new file mode 100644
index 0000000..d0876a7
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/3.json b/HNS/Excercises/ShipCraft/Переделка/3.json
new file mode 100644
index 0000000..9eb1a04
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/3.json
@@ -0,0 +1 @@
+{"shipField": {"field": [" ", " ", " ", "", " ", " ", " ", "", "", "1", "", "1", "1", "", "1", "1", " ", "", "", "1", "", "", "", "", "", "", " ", "", "", "1", "", "", "", "", "1", "1", " ", "", "", "1", "1", "1", "1", "", "", "", " ", " ", " ", "", "", "", "", "", "", "1", "1", "1", " ", " ", "", "", "", "", "", " ", " ", " ", " ", " ", "", "1", "", "1", "", "1", " ", "", "1", " ", " ", "", "", "", "", "", " ", " ", " ", " ", " ", " ", " ", "", "", "", "", " ", " ", " "], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 4, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipField.py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
index 459ba91..d4b0519 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
@@ -6,6 +6,7 @@ from ShipMode import ShipMode
 
 
 class ShipField:
+    field_size = 10
 
     def __init__(self):
         self.field = [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
@@ -20,7 +21,6 @@ class ShipField:
                       ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ']
 
         self.ships = [4, 3, 3, 2, 2, 2, 1, 1, 1, 1]
-        self.field_size = 10
         self.field_mode = ShipMode.PUT
         self.ship_size = 4
         self.ship_direction = ShipDirection.VERTICAL
@@ -28,7 +28,7 @@ class ShipField:
     def from_json(self, obj):
         self.field = obj['field']
         self.ships = obj['ships']
-        self.field_size = obj['field_size']
+        ShipField.field_size = obj['field_size']
         self.field_mode = ShipMode.from_string(obj['field_mode'])
         self.ship_size = obj['ship_size']
         self.ship_direction = ShipDirection.from_string(obj['ship_direction'])
@@ -66,18 +66,18 @@ class ShipField:
                 if self.ship_direction == ShipDirection.VERTICAL:
                     for r in range(row, row + self.ship_size):
                         if self.ship_size in self.ships:
-                            self.field[r * self.field_size + col] = "p"
+                            self.field[r * ShipField.field_size + col] = "p"
                         else:
-                            self.field[r * self.field_size + col] = "r"
+                            self.field[r * ShipField.field_size + col] = "r"
 
                 if self.ship_direction == ShipDirection.HORIZONTAL:
                     for c in range(col, col + self.ship_size):
                         if self.ship_size in self.ships:
-                            self.field[row * self.field_size + c] = "p"
+                            self.field[row * ShipField.field_size + c] = "p"
                         else:
-                            self.field[row * self.field_size + c] = "r"
+                            self.field[row * ShipField.field_size + c] = "r"
         else:
-            self.field[row * self.field_size + col] += "+"
+            self.field[row * ShipField.field_size + col] += "+"
 
     def clear_marker(self):
         for i in range(0, len(self.field)):
@@ -88,22 +88,22 @@ class ShipField:
                 self.field[i] = self.field[i].replace("+", "")
 
     def set_ship(self, row, col):
-        if row < 0 or row > self.field_size:
+        if row < 0 or row > ShipField.field_size:
             return
-        if col < 0 or col > self.field_size:
+        if col < 0 or col > ShipField.field_size:
             return
-        index = row * self.field_size + col
+        index = row * ShipField.field_size + col
         if self.ship_direction == ShipDirection.VERTICAL:
-            if self.field_size - row < self.ship_size:
+            if ShipField.field_size - row < self.ship_size:
                 return
             for r in range(row, row + self.ship_size):
-                index = r * self.field_size + col
+                index = r * ShipField.field_size + col
                 self.field[index] = "1"
         if self.ship_direction == ShipDirection.HORIZONTAL:
-            if self.field_size - col < self.ship_size:
+            if ShipField.field_size - col < self.ship_size:
                 return
             for c in range(col, col + self.ship_size):
-                index = row * self.field_size + c
+                index = row * ShipField.field_size + c
                 self.field[index] = "1"
 
         if self.ship_size in self.ships:
@@ -111,22 +111,22 @@ class ShipField:
         self.print_field()
 
     def get_ship(self, row, col):
-        if row < 0 or row > self.field_size:
+        if row < 0 or row > ShipField.field_size:
             return
-        if col < 0 or col > self.field_size:
+        if col < 0 or col > ShipField.field_size:
             return
 
-        self.field[row * self.field_size + col] = ""
+        self.field[row * ShipField.field_size + col] = ""
 
         ship_size = 1
         ship_direction = ShipDirection.UNKNOWN
 
         # проверим вертикаль
-        for r in range(row + 1, self.field_size):
+        for r in range(row + 1, ShipField.field_size):
             if self.check_ship(r, col):
                 ship_size += 1
                 ship_direction = ShipDirection.VERTICAL
-                self.field[r * self.field_size + col] = ""
+                self.field[r * ShipField.field_size + col] = ""
             else:
                 break
 
@@ -134,18 +134,18 @@ class ShipField:
             if self.check_ship(r, col):
                 ship_size += 1
                 ship_direction = ShipDirection.VERTICAL
-                self.field[row * self.field_size + col] = ""
+                self.field[row * ShipField.field_size + col] = ""
             else:
                 break
 
         if ship_direction == ShipDirection.UNKNOWN:
 
             # проверим горизонталь
-            for c in range(col + 1, self.field_size):
+            for c in range(col + 1, ShipField.field_size):
                 if self.check_ship(row, c):
                     ship_size += 1
                     ship_direction = ShipDirection.HORIZONTAL
-                    self.field[row * self.field_size + c] = ""
+                    self.field[row * ShipField.field_size + c] = ""
                 else:
                     break
 
@@ -153,7 +153,7 @@ class ShipField:
                 if self.check_ship(row, c):
                     ship_size += 1
                     ship_direction = ShipDirection.HORIZONTAL
-                    self.field[row * self.field_size + c] = ""
+                    self.field[row * ShipField.field_size + c] = ""
                 else:
                     break
         self.set_ship_direction(ship_direction)
@@ -161,11 +161,11 @@ class ShipField:
         self.ships.append(ship_size)
 
     def shoot(self, row, col):
-        if row < 0 or row > self.field_size - 1:
+        if row < 0 or row > ShipField.field_size - 1:
             return ShootResult.UNDEFINED
-        if col < 0 or col > self.field_size - 1:
+        if col < 0 or col > ShipField.field_size - 1:
             return ShootResult.UNDEFINED
-        index = row * self.field_size + col
+        index = row * ShipField.field_size + col
         if (self.field[index]).strip() == "":
             self.field[index] = "0"
             return ShootResult.EMPTY
@@ -178,14 +178,14 @@ class ShipField:
     def check_ship(self, row, col):
         # функция должна возвражать тру, если в заданной клетке есть корабль
         # в противном случае фолс
-        return self.field[row * self.field_size + col].strip() == "1"
+        return self.field[row * ShipField.field_size + col].strip() == "1"
 
     def check_possible(self, row, col):
         # Функция должна возвращать True, если можно поставить сюда корабль,
         # в противном случае - False
         if self.ship_direction == ShipDirection.VERTICAL:
             # Здесь мы знаем, что корабль помещается на поле.
-            if self.field_size - row >= self.ship_size:
+            if ShipField.field_size - row >= self.ship_size:
                 # Теперь нужно проверить, не заблокировано ли какое-то из полей,
                 for r in range(row, row + self.ship_size):
                     if not self.check_blocked(r, col):
@@ -193,7 +193,7 @@ class ShipField:
                 return True
 
         if self.ship_direction == ShipDirection.HORIZONTAL:
-            if self.field_size - col >= self.ship_size:
+            if ShipField.field_size - col >= self.ship_size:
                 for c in range(col, col + self.ship_size):
                     if not self.check_blocked(row, c):
                         return False
@@ -206,8 +206,8 @@ class ShipField:
         # либо находятся за пределами поля, либо в них нет корабля/они пустые
         for r in range(row - 1, row + 2):
             for c in range(col - 1, col + 2):
-                if 0 <= r < self.field_size and 0 <= c < self.field_size:
-                    cell = (self.field[r * self.field_size + c]).strip()
+                if 0 <= r < ShipField.field_size and 0 <= c < ShipField.field_size:
+                    cell = (self.field[r * ShipField.field_size + c]).strip()
                     if cell != '' and cell != 'p':
                         return False
         return True
@@ -246,12 +246,12 @@ class ShipField:
 
     def print_field(self):
         print(self.ships)
-        for r in range(0, self.field_size):
+        for r in range(0, ShipField.field_size):
             blocked_string = ""
             ship_string = ""
-            for c in range(0, self.field_size):
+            for c in range(0, ShipField.field_size):
                 blocked_string += str(self.check_blocked(r, c))[0] + ", "
-                ship_string += self.field[r * self.field_size + c] + ', '
+                ship_string += self.field[r * ShipField.field_size + c] + ', '
             print(ship_string[:-2])
             # print(blocked_string[:-2] + '          ' + ship_string[:-2])
         print("********************************************************************")
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-311.pyc
index 0747ff55f40d92fdbb60398f89e9679100bf606b..1b0ea2f2806324877163e13c72421f521ebafcbc 100644
GIT binary patch
delta 68
zcmeyvevzGfIWI340}yC6#ct$Y&8U?JWJg-Xxa61T<>V)(6vtfHbg|*W)(d-pc<+V1
W7rQU)RJgGD!j6kgo4J`jG6Dck)*eX!

delta 111
zcmcb}{)e4=IWI340}%N2#cbqW%@{fp$ac1h2`x@7DvohYDNQU&$&Yc#PcF?(%_}L6
zxiJ4?!-ahpHUr5G7xn<*4lsWckhk~3jtg5AE;cG$m~gS-V$;QDu*{wq55M5e4;Vi(
F0su(gH<ADV

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc
index 43800dbc3415c906f6cbda14702067fd7e732a0b..5a945b970f5b1124210c4e85282e712a54f8f8ef 100644
GIT binary patch
delta 5359
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

delta 5009
zcmc&1YfM|$`5wP8_>G^}4{RX8*o2qCK!HMN5=u}O(u7ParOgAAmV|`l+UX`{3TrzJ
zMQn2Rb*r~gg=(y$YczSy)<$dAhbB$?6YXB=sfaBtle!;FTZPtD+Nx>Ycg{5i@@T8=
zM~;2Jd(Zj4^PO|P_xb(U`=iDm8w^Dpw*B84Jn@gpi^i9WFJSLkZkQV&F>XK+BTsV|
z#p4~rwpj7g+zW_%iITH6V2@c3aUt7s;i1Py&UTLskH&_`IuhRse3bZncmcjjLh6_@
z$sK{`Y<@4k)$4RI74|giy@U}Ccx^DEu}rG>hhiU-fKZ6Iy8tHd!kU|xoV+{7&TnDz
zZU~*N9x7T@aa=#QN^M8bAy}oBB<R<{Dm5~}um!AAD;6jS6)mezP+MG9$I&d~%SEhr
zBt9}e46UlZ!{0%oU9E$M<HJIHa8K;~F(EcKxO;5q{ORE{iTI#+NtzO07q1}9h}ZCU
zmGxi7-mk=~;x7Wy*8*Znnv$NBo?@75gFX8X!4=hU4P8Fo2Of2}V9D*BR?V1TkGfs|
z7aV?;OOhDjIasN-!Sm`$H(EVC6>Eut^)HS)se-?$gY|j;z-ekekKW=dru;CSwMP>q
zS~#uYj|vt<2v!Pg6gUus3I$3om?>a*y27&VgfMpcNIW5ooOyK943vLvnnG|<I_22$
zlX1G=KtSN(@0v<-0z3s?o!gfl&AO}DQFj&WBAzSXDCj3vHb*s*7(Tr*=>zT05&gr$
zH;9gHjjk^g!)cwH*kD@M;F1>-#=g9)92y&qQ|$-Xa&PPYMLcj_&nprNc)jp2`2cnr
zs>mXY8bYKWzH6vgwoND@WAxY^F_Pp?Qk!8di6Q5t9**)3$4o^`aeI_vrX4x)7HUwe
zonnd+z6eQUJ?Vs>8hy9$rK{*6U~<}TW}C<O+hg1zZvEM^v`ll<)Y)$oLb#+Xd08N|
zyMqF%HGwI@j$g}a;n<l+hh>E_B{FqVO)eMp^c~zg(6_(8Yu}4%!3F;`1qctkxr|Ig
zySbc*aMa9`9vC-=`+CS4r?U5uG+FZaXFC@9FAs>GX8bShzCXQtws-E_LgVF5DcE}T
zkQCf0dAme!*UFty@R2z*`I$W9xXckL*naigEj(|7TJsnTlqG{^&bEt)*8A2Jbl39U
z*YuphGSi!ir~7A*NY3z%g}CI5i24TnXY~!4xTJ5DdlDPNZ^46t8Y1v~(01ir%Ryph
z#zsaq%yXyp71_vKkD&TxcRhuZ(4%!psxS`z<MKy!NoqxGoPtwSL7bqVYL=;JpSE#S
zXHqeaUuc?ZMLbj+OfKR6&6AU493uvfs32pvTk}?nV}vnNLCWYW<R?@~Op>^Pb~|s$
zr^=+V9huL#8S}3j%+9U66?f#VU`JrQ2lxr~ZMLnJx6K^pmi6d<=>ciOZ>{{ragTF?
ze^VbWd0jA~<>5D8H@s15gqIz~PMsWjwwktJgB3?Dae>(xM!RiumQD^}grDM;bjFnB
zLi2QUY6wlUZ_!aDI;xiR#nauNf-zfDv1i64^Y#U$WUiW4FX>EKUCEECvt=!dx)xE_
zvShN(OwL&))3&+9{1c0&sA!5VnH?$34ZAztFsGc0&BJ?6UQd^lTvZE0lB*unt}@&0
zCW7b;8a(OP?3m=L&Jap^&h<dfkk&AS-N}#&a)tyoJa5VuO|mX9UU{I@U`NF#X!Vn8
zm<g0rF(_n6H8?f9xraL^)UXq6>j&=Q=3r8Zcno3_%0ym4m{0NwoKP`^ZY-uoP8<!6
znwd_*B?{q7?x6DjV<|hzI?JRA0tPQHT;6gF#chtE!DD!QnitUZUSiRgo>|y(B>1J<
zQ?;>qwo*<qva@NZaF|cXr}@A`PxCoBSATBKNp4OHq{0rbVxjuH*8z5)#fXxm$)B}3
z9YfoF<p!EkRzJZO(hC;o^_3DkjQZN_H2Mhj6htVHvou`uxzYaL@s%FzLK*yT_P-Ko
z#AIBQYDn8={gSnEp+U0NNZMNXLW!$rPBm|mEOl8+9h@y`bhosoRL>Np>(hzZNy$@_
zu}Yps$s85UQFx=IcV}xmLpRLX=KYeVF4G`+nj~|xXl`CH+gEh_a}Q^IkwslZ)I~nh
za1IYTkL7#KbGzsJBzt4l-Uu0gqr1H$wfmXgbbPLV{)psn%$$?_Et2gX(RL4f-{1Rb
z=uiAT=tooKyeo~m+2TjWoS$3|IN{rsb{ocCyr|@&wNZ}HkVA$)Eij|nXqmxUQVBn+
ztbvD0O_oh#)Sj^F_><aZMn<=iUoSNUZz0cd#Mg%R9pd0(r33gfor_hj9f(~fb;5o4
z{+JAg3eZ5h$|5B<nZ_PO$EiDGDMU-Ji)AH&-(vR`>sUA@d21IPwW6aI#4=luhObRy
zH>@RDYo(~KT-q8S!B8&b#QX@dMKN#6ZcNMsUMu$z1=_R?<G2a_U0&>0%EctBBM;y-
zp$@^OiY>COys?Jua!tdTZ8PKPa%Ow(+Dy6Rj%H0w@0i*bP3@AYBWvn-vwYFCN7U{S
z<Rb400)MQjZri&>+WAz8Tv<Cs%Oy@|O57oBDm|EYMV^NP+gkwB<4yeX=~3o}nf!MA
zHl<4Br(*oB*I6J~;c{wks?g-rW`l<+cAyteR|LtQAyeV9t>p8~g6gty(bOcGn&3vo
zfPEvMY#?sHyA>gLJh&ZoG8^Pc1YQY7u#8&`){dOO0Ip0bhZJ8?oMO>R(4mO(aZ5IT
z;ouns;bxpjsrn4cdl}^p<dKiKtX?K?snQ3p728?bey_5;^U;~9SOMPjwfp5;7rTkk
zNdmQEA&Q{8Kco^`Xpb2MD^96pgfv)?c85YJlCz--vINhD4jiu%tyPOw3RzxfU)YiV
z8IpNGtn0!5B7;|L*ZlIAJc@A18`xZ_J|G1<vfj>jJl%_)ZpqV=_4L5La2Q26xPymO
z_^)lu<7j{msfAK}Ei3WLBb3wamQg?h@Qb;tj{5OqqvwY=3d2{c<{77XFDqLHkTj2^
zbN3<`_rhCMR;aCh5J}&vc`k5Mg>w%jbkdnrUDS`eYsPb=n=V6?in`5K(kE&k^T_2Z
zqShO&3uxT=FbSltjh2T>xY*zbU{Ubo1c@mo6!<6;%&6r#>}JG>Y)I6HMWteMTBZpY
zeplCO%GV3b`;}-6Ug)SdkOQ!<zLq=%$@<A~!Ls@+UKtbeb#g=P58_h7VG5`Lps-yK
zjzm%SM<d&|zl}pv+zqW^IyQ4s((+j?FKYQ47Dwt_dfRNRWC>?2VfabJV`uf0y(Vj~
zS>qIjUM%|&!XF|n&V|_JF)4iSn?wqCW&QWP*)RF`O6I*#)zFCIJlgPU4HKsWLXGtm
z?DHYI8>)_wLMXx4vPKw=pC3)+bqG_9-z=c=-5+v*ExMh!p))$tOh*KI@fPUioB>+u
z##>N>Q~BST%B+sAae1%}-j7CfZEKuWEd$ur)Me<#6DZX=2tpI!UNy}jjl2d#n`c$@
F^S_QiT!{bx

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-311.pyc
index 78fa41e11ae30904a05353b339c455e7aa7ab068..a3b69e1c2a43d54e557ca5ee5d3804fa355fc193 100644
GIT binary patch
delta 68
zcmaFFzMY+WIWI340}yC6#ct%D!>E-BWJg-Xxa61T<>V)(6vtfHbg|*W)(d-pc<+V1
W7rQU)RJgGD!j6kgoBuFAV*~&~3?AkH

delta 111
zcmdna{)nA>IWI340}%N2#cbrB!x%aR$ac1h2`x@7DvohYDNQU&$&Yc#PcF?(%_}L6
zxiJ4?!-ahpHUr5G7xn<*4lsWckhk~3jtg5AE;cG$m~gS-V$;QDu*{wq55M5e7a5;1
F0st!jH!uJI

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-311.pyc
index b010ba3be8a1dc9b6c0cc6929c80d980128987f8..1f1f4c0ff936c96f2d77f29995db03a116f35f7d 100644
GIT binary patch
delta 68
zcmaFMc8HC8IWI340}yC6#ct$IX4J|AvLmfxT=L8Fa`F>XieoNpy4Y}G>xDf)y!XQ1
Wi`^G?DqPrnVaLU$&4(FRF#-TO%pObt

delta 111
zcmX@a_Lhx%IWI340}xnDkJ-qb%osWa$ac1h2`x@7DvohYDNQU&$&Yc#PcF?(%_}L6
zxiJ4?!-ahpHUr5G7xn<*4lsWckhk~3jtg5AE;cG$m~gS-V$;QDu*{wq55M5eGZ<Gf
F0st6>Hi-ZL

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-311.pyc
index 59f8d041d33ccf8f74ef83473b974890f8d66ef7..0e00a7077401e4d9bda8e80515cf9f65b9e19322 100644
GIT binary patch
delta 68
zcmeyta+ZaAIWI340}yC6#ct&0WYo$5vLmfxT=L8Fa`F>XieoNpy4Y}G>xDf)y!XQ1
Vi`^G?DqPrnVaLU$&6$k+i~uX)9TETl

delta 111
zcmX@h@`HtYIWI340}%N2#cbr}WDK1SWIJ2Mgche3700-ylqMFX<j1(=Czs}?=9Lu3
zT$q2c;ljQPn}Otp3wwZY2bjMJ$lH5i$Azs57aJ8WOt{!^vFTznSY}U*hhOk!J4Sv+
E00Rd#TmS$7

diff --git a/HNS/Excercises/ShipCraft/Переделка/json4 b/HNS/Excercises/ShipCraft/Переделка/json4
new file mode 100644
index 0000000..ac72a75
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/json4
@@ -0,0 +1 @@
+{"shipField": {"field": [" ", " ", "1", " ", " ", " ", " ", " ", " ", "1", "1", " ", " ", " ", " ", "1", "1", "1", " ", " ", "", " ", "1", " ", " ", "", "", "", " ", " ", "", "", "1", " ", "", "", "", "", "", "", "", "", "1", " ", "", "1", "1", "1", "", " ", "", "", "1", " ", " ", "", "", "", " ", "", "", "", "", " ", "1", "", "", " ", " ", "", "", "", " ", " ", "1", "", "1", "1", " ", " ", "", "1", "1", " ", "", "", " ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", "1", " "], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/json4.json b/HNS/Excercises/ShipCraft/Переделка/json4.json
new file mode 100644
index 0000000..d27a688
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/json4.json
@@ -0,0 +1 @@
+{"shipField": {"field": ["1", "", "", "", " ", " ", "1", " ", "1", " ", "1", "", "", "", " ", " ", " ", " ", " ", " ", "1", "", "", "1", "", "", "1", " ", "", " ", "1", "", "", "1", "", "", "1", " ", "", " ", " ", " ", "", "1", "", "", "1", " ", "", " ", " ", "1", " ", "", "", " ", " ", " ", "1", "", " ", " ", " ", "", "", "", "", "", "", "", " ", "1", "", "1", "1", "", "", "", "", "", " ", "1", "", "", " ", " ", " ", "", "", "", " ", " ", " ", " ", " ", "", "1", "1", "", ""], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/json5 b/HNS/Excercises/ShipCraft/Переделка/json5
new file mode 100644
index 0000000..d27a688
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/json5
@@ -0,0 +1 @@
+{"shipField": {"field": ["1", "", "", "", " ", " ", "1", " ", "1", " ", "1", "", "", "", " ", " ", " ", " ", " ", " ", "1", "", "", "1", "", "", "1", " ", "", " ", "1", "", "", "1", "", "", "1", " ", "", " ", " ", " ", "", "1", "", "", "1", " ", "", " ", " ", "1", " ", "", "", " ", " ", " ", "1", "", " ", " ", " ", "", "", "", "", "", "", "", " ", "1", "", "1", "1", "", "", "", "", "", " ", "1", "", "", " ", " ", " ", "", "", "", " ", " ", " ", " ", " ", "", "1", "1", "", ""], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/json5.json b/HNS/Excercises/ShipCraft/Переделка/json5.json
new file mode 100644
index 0000000..ac72a75
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/json5.json
@@ -0,0 +1 @@
+{"shipField": {"field": [" ", " ", "1", " ", " ", " ", " ", " ", " ", "1", "1", " ", " ", " ", " ", "1", "1", "1", " ", " ", "", " ", "1", " ", " ", "", "", "", " ", " ", "", "", "1", " ", "", "", "", "", "", "", "", "", "1", " ", "", "1", "1", "1", "", " ", "", "", "1", " ", " ", "", "", "", " ", "", "", "", "", " ", "1", "", "", " ", " ", "", "", "", " ", " ", "1", "", "1", "1", " ", " ", "", "1", "1", " ", "", "", " ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", "1", " "], "ships": [], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/main.py b/HNS/Excercises/ShipCraft/Переделка/main.py
index 7844661..5cf8d83 100644
--- a/HNS/Excercises/ShipCraft/Переделка/main.py
+++ b/HNS/Excercises/ShipCraft/Переделка/main.py
@@ -11,15 +11,16 @@ active_view ={}
 def create_view(window, col_offset=0, row_offset=0):
     field = ShipField()
     buttons = []
+    view = ShipView(field, buttons)
     for r in range(0, field.field_size):
         for c in range(0, field.field_size):
             btn = Button(window, text='', width=5, height=2)
             btn.grid(column=c + col_offset, row=r + row_offset)
-            btn.bind('<Button-1>', lambda e, x=r, y=c: left_button_click(x, y))
-            btn.bind('<Button-3>', right_button_click)
-            btn.bind('<Enter>', lambda e, x=r, y=c: button_enter(buttons, x, y))
+            btn.bind('<Button-1>', lambda e, x=r, y=c: left_button_click(view, x, y))
+            btn.bind('<Button-3>', lambda e: right_button_click(view))
+            btn.bind('<Enter>', lambda e, x=r, y=c: button_enter(view, x, y))
             buttons.append(btn)
-    view = ShipView(field, buttons)
+
     colorize(view)
     return view
 
@@ -42,6 +43,8 @@ def colorize(view):
             bg = 'red'
         view.buttons[i].configure(bg=bg)
 
+    refresh_remaining_ships_label(view)
+
 
 def keypress_handler(e):
     global active_view
@@ -52,28 +55,22 @@ def keypress_handler(e):
             active_view.ship_field.toggle_field_mode()
 
 
-def left_button_click(row, col):
+def left_button_click(view, row, col):
+    view.ship_field.action(row, col)
+    colorize(view)
+
+
+def right_button_click(view):
+    view.ship_field.toggle_ship_direction()
+    colorize(view)
+
+def button_enter(view, row, col):
     global active_view
-
-    active_view.ship_field.action(row, col)
-    colorize(active_view)
-    refresh_remaining_ships_label(active_view)
-
-
-def right_button_click(unused):
-    global active_view
-    active_view.ship_field.toggle_ship_direction()
-
-def button_enter(buttons, row, col):
-    global active_view
-
-    if buttons == my_view.buttons:
-        active_view = my_view
+    active_view = view
+    if view == my_view:
         enemy_view.ship_field.clear_marker()
         my_view.ship_field.target(row, col)
-
-    elif buttons == enemy_view.buttons:
-        active_view = enemy_view
+    elif view == enemy_view:
         my_view.ship_field.clear_marker()
         enemy_view.ship_field.target(row, col)
 
@@ -115,13 +112,13 @@ window.bind_all('<KeyPress>', keypress_handler)
 start_column_my_field = 1
 start_row_my_field = 1
 
-start_column_enemy_field = start_column_my_field + 10 + 1
+start_column_enemy_field = start_column_my_field + ShipField.field_size + 1
 start_row_enemy_field = start_row_my_field
 
-col_vertical_separator = start_column_my_field + 10
-row_horizontal_separator = start_row_my_field + 10
+col_vertical_separator = start_column_my_field + ShipField.field_size
+row_horizontal_separator = start_row_my_field + ShipField.field_size
 
-load_button_row = start_row_my_field + 10 + 1
+load_button_row = start_row_my_field + ShipField.field_size + 1
 
 my_view = create_view(window, start_column_my_field, start_row_my_field)
 enemy_view = create_view(window, start_column_enemy_field, start_row_enemy_field)