From 884e01b0e8454927a067250b5443d5dd2da47c82 Mon Sep 17 00:00:00 2001
From: ehermakov <ehermakov@gmail.com>
Date: Wed, 3 Jul 2024 19:12:30 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20active=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 HNS/.DS_Store                                 | Bin 6148 -> 6148 bytes
 HNS/Excercises/.DS_Store                      | Bin 8196 -> 8196 bytes
 HNS/Excercises/ShipCraft/.DS_Store            | Bin 0 -> 6148 bytes
 .../ShipCraft/Переделка/.idea/misc.xml        |   2 +-
 .../ShipCraft/Переделка/.idea/workspace.xml   |  35 +++++++++-----
 .../ShipCraft/Переделка/.idea/Переделка.iml   |   2 +-
 .../ShipCraft/Переделка/ShipView.py           |   4 +-
 .../__pycache__/GameMode.cpython-311.pyc      | Bin 1011 -> 1015 bytes
 .../__pycache__/ShipDirection.cpython-311.pyc | Bin 1020 -> 1024 bytes
 .../__pycache__/ShipField.cpython-311.pyc     | Bin 14568 -> 14813 bytes
 .../__pycache__/ShipMode.cpython-311.pyc      | Bin 995 -> 999 bytes
 .../__pycache__/ShipView.cpython-311.pyc      | Bin 877 -> 941 bytes
 .../__pycache__/ShootResult.cpython-311.pyc   | Bin 632 -> 634 bytes
 HNS/Excercises/ShipCraft/Переделка/main.py    |  44 +++++++++++-------
 15 files changed, 57 insertions(+), 30 deletions(-)
 create mode 100644 HNS/Excercises/ShipCraft/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 19e5e436e17226e37cb57b22c4e9cec27e7b4997..1b232ba1ce8684e55cc83bb24e559993172ccb65 100644
GIT binary patch
delta 180
zcmZoMXfc@J&&atkU^g=(=VTt1*Y(^C@j#f#kO#yiV74AZ0Yjx{PJVJyPJR*t1A_nq
z17kOk*82|zKo$c7H$w_TDnl_tHc(GKP`w_+1T<Yg(R490crf@eI3uf?%*A?8*wRc#
f!PvmCR!5=Q(#SwZ!Nk~X^F7wRjGNgx{_+C=5cDwc

delta 47
zcmZoMXfc@J&&a+pU^g=(`(z%L*OQZ3udo}L=qMN&nonN9V!yeTt&4GDL(XP)j=%f>
DWR4F>

diff --git a/HNS/.DS_Store b/HNS/.DS_Store
index e88d2b348cde42f369715326b5ae3514146fa479..3175dc3aeb0b3499e1be061384f99ab96257d42b 100644
GIT binary patch
delta 115
zcmZoMXfc@JFUrEez`)4BAi%(o$xy-&4}^LQ1)Ck2mosXEq`1LCnGAWz(hQZJIr+&+
zIr&LI6+oQ~>nEEqsZ3U3+A3^mrlVkNU|6f8P;F^sprc@7Y_|Cg(^Hns>>Pjj0TIL*
AjQ{`u

delta 72
zcmZoMXfc@JFUrioz`)4BAi%&-#E{I8$xzIY%22$yk$E{IBlBb@rnACECOQg6hUT?8
c3e}cI2098Rrbe5Un4hvtY%tr*&heKY05u;Gd;kCd

diff --git a/HNS/Excercises/.DS_Store b/HNS/Excercises/.DS_Store
index f9f9bb959b728110b7c5a5553cf11a208875d925..979d852e716a927af022a7ad7719aa6119bde246 100644
GIT binary patch
delta 661
zcmZp1XmOa}&nUbxU^hRb@MazXOQv{51_K6jAhuvI0+L1y#taH9vMdHHmMl&z7C^Q=
zivx=tizATd&0-4VyR%pTdDbijK(+~s9fJZxo@Y*ea#Buy5(5K+00RSKH;~r*4+abj
zlbwXTEmau|!KUM~!w6`)9oQaAps9{P8*EsNfFjnDGXxZv7=KQ#6LJ$kwS_5tbDdBy
zV>S=aU^Ae@Es>lr#UjFjrkueM=%{%xM*-Q~4Dmpi$&d%cC1AE5Ljgl2swIrFC|)@y
zEGC0R0o>Th=Y*%TTbk)87#kQ)?h&+~yjtXty%5kb;^1%uh856P7A)p0&cN`s2D1!U
f+<>$Ns;La?5ssZ$ICC?*#5a~iMC=SN?@a>$Kd7Q*

delta 73
zcmV-P0Ji^xK!iY$PXP?EP`eKS46_UnIRcZX5=gVJ6GQ=%lNFQ`H8U(AF*rDVEFgP1
fGB7M4G&M4lIu`Y@beaOQ2N?DQlfM>lv2>RLKI9jj

diff --git a/HNS/Excercises/ShipCraft/.DS_Store b/HNS/Excercises/ShipCraft/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..07bf8be3734be06c89af2324023ac31890cf6465
GIT binary patch
literal 6148
zcmeHKO>fgc5S>j8u?dxeM5SI3mbga6p`}vk#Z3zmS6smXP>Ab5EnGXY9il3Vlr#JX
z{sLEi3IBx?yxHBL#4%S|p`B><?Z><w?Q^{AB_h!qM_r;e5!rA?>lTU{<8k&iYv>*a
zDC8V5mDI;?hem7Bro$*;6u52*@VncR?`%vdEx*5)&y(ydOtKIWygeMjcYaAjZNVDR
zC7sa#eojN4r^5PHVKwOj(VUC-h)NFevl4xq0?ZpD@)^n@B^1^18XqdWJ9LWZ0=tp>
zXNF_Sk@-FPYBI~!eO+3eW8JqNTRwaberP?hyw#P7dzG9ujBrwnw1VHmQ4$xW=lu|k
z4eQ3urroq#_S@h*n*`;c92dPo{+e5-S(b#0`XGE64=4Th-Qz4R2XQ*gB_WQ62zm1=
zPNQtn%f@L`NN%78Y{z!`?d|Ebd$8YecfIbc<4zAAc^!9ecYii>?5zh64`1{@CKqY;
z8LNN^?BCKhH7?)_Dm5$n6y#}=rK~$MH`mpI%B*)@QH|$Y{uiNX?1~i7&)jZZQGS!w
zC}0%0z6$XE;KCVwjdO)^>p&r|06+`f(opA*1?IRKeT{R47=Z~z1uCl0R}7)(=y!FT
zuW_zW(MjmbhtQdYzM%-29rL>~oP@8?ltuxgz^Vcps@dlA|LNcF|Ena^G71<4{woE9
zbrPKPuq1u9t}TwwS{MEf&c<<bg_43oAIGx7NAWgX8pd3%0DX;fh3J8q4*@BIDU1UD
GRDs{0jjD72

literal 0
HcmV?d00001

diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml
index 94888fc..a6218fe 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.9" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" 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 6ed4e92..cb52cbc 100644
--- a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
@@ -5,12 +5,14 @@
   </component>
   <component name="ChangeListManager">
     <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$/../../../../HNC/Excercises/hw1.py" beforeDir="false" afterPath="$PROJECT_DIR$/../../../../HNC/Excercises/hw1.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../../HNC/Excercises/hw2.py" beforeDir="false" afterPath="$PROJECT_DIR$/../../../../HNC/Excercises/hw2.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../../HNC/Excercises/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/../../../../HNC/Excercises/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../../HNC/Excercises/тест.py" beforeDir="false" afterPath="$PROJECT_DIR$/../../../../HNC/Excercises/тест.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../13082023 ДЗ по фигурам JSON/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/../../13082023 ДЗ по фигурам JSON/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../13082023 ДЗ по фигурам JSON/shapes.json" beforeDir="false" afterPath="$PROJECT_DIR$/../../13082023 ДЗ по фигурам JSON/shapes.json" 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$/ShipView.py" beforeDir="false" afterPath="$PROJECT_DIR$/ShipView.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" />
@@ -46,11 +48,11 @@
   &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;Python.main.executor&quot;: &quot;Run&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;
+    &quot;last_opened_file_path&quot;: &quot;Z:/Documents/Обучение с Новым Кодом (Артур)/Git/hnc-eduard/HNS/Excercises/ShipCraft/Переделка&quot;
   }
 }</component>
   <component name="RunManager" selected="Python.main">
@@ -124,9 +126,9 @@
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="" />
+      <option name="SDK_HOME" value="$USER_HOME$/PycharmProjects/pythonProject/venv/bin/python" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
@@ -150,7 +152,7 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-python-sdk-babbdf50b680-746f403e7f0c-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-241.15989.155" />
+        <option value="bundled-python-sdk-67fca87a943a-d3b881c8e49f-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-233.11799.259" />
       </set>
     </attachedChunks>
   </component>
@@ -165,6 +167,17 @@
     </task>
     <servers />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="код по 22 части урока" />
     <option name="LAST_COMMIT_MESSAGE" value="код по 22 части урока" />
@@ -174,7 +187,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/main.py</url>
-          <line>129</line>
+          <line>135</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml b/HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
index 8388dbc..d0876a7 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="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipView.py b/HNS/Excercises/ShipCraft/Переделка/ShipView.py
index e9a33cb..b3f1247 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipView.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipView.py
@@ -4,7 +4,9 @@ from tkinter import StringVar
 
 class ShipView:
 
-    def __init__(self, ship_field, buttons):
+    def __init__(self, ship_field, buttons, enemy):
         self.ship_field = ship_field
         self.buttons = buttons
         self.remaining_ship_text = StringVar()
+        self.enemy = enemy
+        self.active = False
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/GameMode.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/GameMode.cpython-311.pyc
index 2633edbc84b9513590cfd2a457f63cd269a95eac..4d3f14ee0f4744433142bad8e910d694d436a660 100644
GIT binary patch
delta 188
zcmey&{+*q7IWI340}!0aZ%vEb$h(NKej1RcA6lGRRIHzxQkqzllCSTQpIn-onpaY+
ze_`H*jTf6QwqMwKVef?<7q%)~Y*e@~_rksln=W==*rRY^7Ld6Gi1#RHT$pgN;bId|
zaf7D5duEA#MqaWm#6W!yzhHgWisaOy<jmsKV*TKZ%mU}4#IzFq3-d1sY`xe3G<^#Y
h@4m3>!Up}xHcZBh){_gE)LB0;F!HKzp2ZZ&2mp%>RwV!c

delta 184
zcmey){+XS3IWI340}#}?SEOZb<XyyAKLyBhwu%WYPAw{qaZM>rEK13bami0E%}vcK
zDUP`?|6;?1eHS(Z$qg6w0O1ZWe-n_m_ri_~TNN%gDqNUwvEgFV#b&U~o){0m;FyfO
zWZhJ-VPLLnMRICUa%ORAaZGSVW`T22Vp<8%=nGpf@-<x8dSMF?@4m3>!iJd1c1*^M
TmXnK^)R`~v>ujFK6v+qxt#ns9

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-311.pyc
index 44876d4949a9800422573e02a45484dd7b961a88..45fb80f1820b6db3bfd84f5680f35558390f88a2 100644
GIT binary patch
delta 188
zcmeyv-oU}ToR^o20SM0Ix2BbC<Xy>FKO4x?4=qkDD%MX;DNQU&$=7$uPcF?(%_}L^
zzcBB@#*57t+b?Xru=m1_3tJT~HY!}0dtu*&O&7Z_>`}Nd3&`98#CsGpE=;)CaIp!f
zxIt6jJ+nkVBQIGOVxYc<U$DMwMRICUa%ORAv3_tyW`T22Vp@s*h4~i*wq9%in!W{y
hcVF0bVT1l;XC_-l+sTbg>Z~6a7<qLzuVxBl1OQpQRucdK

delta 184
zcmZqR_`}Y-oR^o20SM~cE7Dpw@~&j8p9$nSTg8MHrxq2*xTcgQ7Nz9Jxa237=BDPA
z6vtecf3e}hz6+ay<c14-fN%$xzX{0Odtt|gtqK<#6)sG;*l@AwVl!A~PmG6Oa7;#C
zvTiEaFfiA(B004vIkPymI3_qFv%tA1F|7n>^o6Y#`5G>4y|4v{cVF0bVMEMhS0-CV
T>&eYb>dY7T4L7f63S<NTdq!6$

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-311.pyc
index e74b867f0f6b06e291e8641bff487b467757d83b..8c7daebe0e71593d8a3389ade8937a743af68ecd 100644
GIT binary patch
delta 1590
zcmbtUTW=dh6!!WOvROOpTbtP3G``mB24`I-ZAyYlsyb<jlvt1y-eN_zqXd)-wu4Z)
z)PN8!<iTZ9QJ@Likdhz;$-#~k(FWxS@xa5ZwGswoQD`fbCrp0<Gvg2&df@@vd;Fbq
zzBy;+oU?QHrBb4CRi|rEpwIU+?~FUV8;vRT`45pQoK3{y2_Y7p8;eJ0gy2kMZYnmN
zObBoZZb)xS@4`*E4Y%N?O?uM?7vVSXE9rfB!v;S_Fpr)aHXdfAl=K!Nr@X@H$)qqb
z9r0BH3TK9fg}zrJv3O)M5laZe6O*&2;$!1U0e%Ygn^Foz&!gu${2FG3+yRYW-L-^v
zl~NQLwydD&=Ax-7(|LzsGwKW7^WBTXkg;KVi#W16x;!emkIL?&!~kBUExj1IM1vS5
zfQWn8M9`PRS##d{MR+}2wN-fp<#y<CrSdlgxT<$(%8Gj04hFSPT9Hr3XI(!8`U-)*
zoyd0`QXnJ;LdXopw4A4`LT<vT5p{}2<9zs9{Yqm&*N*Hc)K6Nj9{pF8S@VHhlP;~I
z@<7x(>;6>e>0SzatM}BE6&k}J1<Lw%1XUIU?S}pbSU)lJAI8iIzpPa6!<fj1e<w$w
zHO7tx3gy7*d#T(B<1$5k0Dd)f;`-^FVshnN*1q!kma5?CA(o=ekx?%+Tt0G9cat?{
zq6;sGhJ`7}I<fbuT+r-PpS(_0n$?&wyw`;zn=+Bbr)ADx*zYH5QEN>17nz6p!BVrE
zLnom565A}ZPB9{}-nHQRP=W2nd78k_%_ILs@PKJc8|oKDw}UH|V`L0`o2qOuKd`~(
z*&Tbqe+qkjr52lLUa@`@z7kFc=ZDhhi<(FKh_fmHZjRH+X-+<;{GaE`z1*sz(AEsJ
zHTRnBoGSF=?s)H2#JgLu>=B9UEbQ;Z+whi52W1lvwR}zK9!LZ|u45?tW3(3}U4Der
zv^Tfv3aJ8rkVNG=g;p;!2e0{L$MFJl98<YFHKiU|A1$z`;TjzWT>SGbxEEY)Fa9Q|
zbzBL!d2eo;w<(nx3jA_-Z~_ge!A-=yJw*CnRjU+&vd?UxH{kwN+mrH%XCJx>%(gwQ
zN0r&<7NcvC<rfLeectv4b$)HPpx8~D$h_hELUW;KzGu-18FV6wZWZ0D!m=PaI%G!&
zF_g?rmo*m$76#IN_tTxCU7W)-JnOU*-xn2>rK-5%_wD(JUTksHPF7`AH4?b$yLC47
zs2xv1rVaBeC%MV!FAd6OZ-Mb*BVTlQ(m`3<3ds-8F1~nZK5hkLlm-0We%sQu8=d_}
a*H!cr;I?q<P~cIyCm?f(<o@igzy2><^ZUL4

delta 1419
zcmbVLZD?C%6i#wenY~GFzRa4eANgoZ)8?!BXu70|n51g3ty?Sp2@NI5Xsz8eX<-($
z(fK1A5$}9ER?*_Mwsb;;%-ce7o$O~pl=ogPHXwn4mWjWL$bRjICpYcf#^w+6K6$v$
zIVb0wob%pV;g5Gz>q=#_1U~mpoj=pteO*<QFI)i`i=<vJ<no17B0D#c&z?)g&t>Lj
za%X1?Df}f@#6MsbxPo`!Y>WCkP&e^5-ZFC^m@&;2xevJuqGu=d^6+SC@@&SP6O)ND
zaXypFXQm3dLTYq!>g`y5;>;|h##@}Kh_~=2d~e|IaV5pJHTmQV7oex2q)JkyfvWB}
z9o#1=T7EH7jx3L2(hOk6*2h=IIeSR3hd|bJ2731L$;FeU_`jh#Otu0T4U@%|0RS)Z
zx1$yPrs<pXM!KOJK47S{7+J~+IvacE>6A>yOVH11D}l*w^p;{^0c+fq&OLvE_a|;;
zb_1M$MDUM*v8vWzReq{m$}j;=?GV%se1ro+qV+&T0|!q@RN8WS?bxb{S9-A0Q&p%x
zNnT3Qg{2s$FbfJZJ_7tu<%Nj63FeR?fFu&MtEbqwvP4KfM?a};1P5*1RXYf*djZ)r
z9s-{Tqc=2zpkKVN_cVi@5`9bxwgZ{`nIY+cMC9g2IzcaK1JGT)B>RzeMJg>Lhd$`V
zl#Q8Pov&C{-`gg5M-)4vRkM|rFE%grURK_wv~+gyO-8dg1AzdR*4yOaWoct|Dq3?X
zTnf{f<yVAOA8+tsgRiR4mIkZj<6P+P7JCaO`)gE-0A({A<-8W(80M)6rXnb090O<M
z@y<2lX;_j2-81&}VX|k7sKhsu*QrhFmWB7lurF3?Gc)>C(`V@~(xrHLxC93#tZ+dv
zcmZffe}etk)Y=qI%KlgP?4KQk6q@j}f0^fr#E-DA`t^PIk5+oQ)*x>PVneW|YZr7~
zSkd(#G3Z8TAEb1lyPZA)E4^%weT4Ad5mUomQm6&8ea$Uc`+2e-2Dksf;Knw_c`Ayj
z=sq$#o#>Y?_oLIhAHjAwlQP+_5;Wa26vsLrfET&3Hu14x2Ckgiw&2id059^*DdG9U
z$A%dgnO&}CdY;K%%dAW@(`?H1zSQ^b;Xu@-=fpcue@UAzM$6G<8z$QTjD6j^;^nLX
z!5RRGG#+ELZniLUjF$ly<E=>Rd~~X9)(3alUJnLm<BgG_*X(-qm1p<W!6z1;sc)a`
z5!<;<s;>+QdM8ghG3l&Y9i_OS=)fZCH>De_c@vtD8quEj_v4|%q}0P3K!Wc#i~ETM
OCo%af;OkoNv3~%aqzZum

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-311.pyc
index e7d1ce2a1d82e6ab32154a97ba27ae788a5022f5..51e36d4404fe27511642c57fc5843f0db8186a28 100644
GIT binary patch
delta 188
zcmaFN{+yk6IWI340}!0aZ%qr{$UB>{ej1RcA6lGRRIHzxQkqzllCSTQpIn-onpaY+
ze_`H*jTf6QwqMwKVef?<7q%)~Y*e@~_rksln=W==*rRY^7Ld6Gi1#RHT$pgN;bId|
zaf7D5duEA#MqaWm#6W!yzhHgWisaOy<jmsKV*TKZ%mU}4#IzFq3-d1sY`xe3G<^#Y
h@4m3>!Up}xrcB0+Hj^`%)LB0;F!HKzp3D@$2mopaRoegn

delta 184
zcmaFP{+OM2IWI340}#}?SEQwE<ekk}KLyBhwu%WYPAw{qaZM>rEK13bami0E%}vcK
zDUP`?|6;?1eHS(Z$qg6w0O1ZWe-n_m_ri_~TNN%gDqNUwvEgFV#b&U~o){0m;FyfO
zWZhJ-VPLLnMRICUa%ORAaZGSVW`T22Vp<8%=nGpf@-<x8dSMF?@4m3>!iJd1=1j(n
TR+F=t)R`~v>ujFR6u<}ojpJ7F

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-311.pyc
index f4a7be3ca30fe07487e071240a806ee003c89d3a..45adcd32da946fc7a2ff7f0253295e457d2318c4 100644
GIT binary patch
delta 450
zcmaFMww9f5IWI340}xy*Z%xx@oXEF9j0MDn0wy5M48)&PCSGw@t6{ETh=)t3Famk3
zFqJ6`!3>&Aer}p<lT{e?>u<59=B4IV-eOBkF3BuQ)nvKFQk<HTR>T2RU&IL_xPe45
z$S?&U_&N>9&<`z6Eh^SeO({(*O3BxE$xklLP0cGQ*1s_C!p4iu7uzpvy|DMfjtg5A
zE;cG$n0sO0g-sW`FYHmcFbl}s0>pb1G%ifI*l@AwqC@k=22FkU%o6>KykuR7iTWOX
z!TPQh$*D!jnZ>Ea`oS5Q1<pl@X(jp>=3m%)u>olM79iezVb_HX`jdY%>N4t0)?|_w
zx*;mn!P3KZLrfY-ad!aWWIrZdUVfm9S27d{0I4Fr$sJ5elB}#U9~dx+B7w<=nN*}i
qKnfwMfvjH~Ho5sJr8%i~MPic~naxev8G)KHiH{($FIXhNMgah9)`^?|

delta 386
zcmZ3>{+5kzIWI340}#}?SET)Bn8>$5j2Xm*0wy30;(zv-c*UJFg&~+hlhIF;WwIlq
ze!V91EtcZcoU|eipn@V!AW;lbs-U3obqbJnwu%WYPAw{qaZM>rEK13bami0E%}vcK
zDUP`?|6;?1eHS(Z$qg6w0O1ZWe-n_m_ri_~TNN%gDqNUwvEgFV#b&U~o){0m;FyfO
zWZhJ-VIZz%jB7=5YEg1#acXf)a7Jc<b5UYi3DE2dTY-AEUf2S}yD#jzupwr$K9eq^
z(&ShsdA1823P3cuk4cx87wE>73`KlEs)%Ru2__{;W>)<V446a_-(+TH6)7Q*LWpW0
k>lcSjZhlH>PO4pz$Ye)mb5mAEpk_?sBS`EE774IX0FIP?4gdfE

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-311.pyc
index 4a68babf596842b4f07d1ff27dc11e19ba70c44b..2ee730685e6eaf1e06b15d31beca8eeaca859d38 100644
GIT binary patch
delta 171
zcmeyt@{5IcIWI340}!0aZ%ymp$ji=HKNHB)4=qkDD%MX;DNQU&$=7$uPcF?(%_}L^
zzcBB@#*57t+b?Xru=m1_3tJT~HY!}0dtu*&O&7Z_>`}Nd3&`98#CsGpE=;)CaIp!f
zxIt6jJ+nkVBQIGOVxYc<U$DMwMRICUa%ORAv3_tyW`T22Vp@s*h4~i*wq9%in!W{y
PcVF0bVT1nUg^bq$zA;jg

delta 169
zcmeyx@`HtUIWI340}#}?SENnf$ji=HKOM+(wu%WYPAw{qaZM>rEK13bami0E%}vcK
zDUP`?|6;?1eHS(Z$qg6w0O1ZWe-n_m_ri_~TNN%gDqNUwvEgFV#b&U~o){0m;FyfO
zWZhJ-VPLLnMRICUa%ORAaZGSVW`T22Vp<8%=nGpf@-<x8dSMF?@4m3>!iJd1iy5y2
E0CaFuw*UYD

diff --git a/HNS/Excercises/ShipCraft/Переделка/main.py b/HNS/Excercises/ShipCraft/Переделка/main.py
index 77d9d44..b080607 100644
--- a/HNS/Excercises/ShipCraft/Переделка/main.py
+++ b/HNS/Excercises/ShipCraft/Переделка/main.py
@@ -11,10 +11,10 @@ from GameMode import GameMode
 active_view = {}
 
 
-def create_view(window):
+def create_view(window, enemy):
     field = ShipField()
     buttons = []
-    view = ShipView(field, buttons)
+    view = ShipView(field, buttons, enemy)
     for r in range(0, field.field_size):
         for c in range(0, field.field_size):
             btn = Button(window, text='', width=5, height=2)
@@ -43,7 +43,7 @@ def colorize(view):
     field = view.ship_field
     for i in range(len(field.field)):
         bg = "white"
-        if field[i] == "1":
+        if field[i] == "1" and not view.enemy:
             bg = 'pink'
         if field[i] == "\\":
             bg = 'red'
@@ -51,7 +51,7 @@ def colorize(view):
             bg = 'black'
         if field[i] == "p":
             bg = 'blue'
-        if "+" in field[i]:
+        if "+" in field[i] and view.enemy:
             bg = 'orange'
         if "r" in field[i]:
             bg = 'red'
@@ -61,9 +61,11 @@ def colorize(view):
 
 
 def keypress_handler(e):
-    global active_view
     if e.keysym.isnumeric():
-        active_view.ship_field.set_ship_size(e.keysym)
+        if my_view.active:
+            my_view.ship_field.set_ship_size(e.keysym)
+        elif enemy_view.active:
+            enemy_view.ship_field.set_ship_size(e.keysym)
 
 
 def left_button_click(view, row, col):
@@ -77,15 +79,19 @@ def right_button_click(view):
 
 
 def button_enter(view, row, col):
-    global active_view
-    active_view = view
-    if view == my_view:
-        enemy_view.ship_field.clear_marker()
-        my_view.ship_field.target(row, col)
-    elif view == enemy_view:
+    if view.enemy:
         my_view.ship_field.clear_marker()
         enemy_view.ship_field.target(row, col)
 
+        enemy_view.active = True
+        my_view.active = False
+    else:
+        enemy_view.ship_field.clear_marker()
+        my_view.ship_field.target(row, col)
+
+        enemy_view.active = False
+        my_view.active = True
+
     colorize(my_view)
     colorize(enemy_view)
 
@@ -99,13 +105,17 @@ def savebutton_click(view):
 
 def loadbutton_click(view):
     file_path = filedialog.askopenfilename(filetypes=[('JSON files', '*.json')])
+
+    load_field(view, file_path)
+
+
+def load_field(view, file_path):
     if os.path.isfile(file_path):
         with open(file_path) as lines:
             view.ship_field.from_json(json.load(lines)['shipField'])
 
     colorize(view)
 
-
 def refresh_remaining_ships_label(view):
     text = ''
     for i in range(1, 5):
@@ -151,6 +161,9 @@ def update_game_mode():
 
     elif game_mode == GameMode.PLAN:
         window.geometry('1020x640')
+
+        load_field(view, file_path)
+
         my_view.ship_field.set_field_mode(ShipMode.PUT)
         enemy_view.ship_field.set_field_mode(ShipMode.INACTIVE)
 
@@ -223,9 +236,8 @@ row_horizontal_separator = start_row_my_field + ShipField.field_size
 
 load_button_row = start_row_my_field + ShipField.field_size + 1
 
-my_view = create_view(window)
-enemy_view = create_view(window)
-active_view = my_view
+my_view = create_view(window, False)
+enemy_view = create_view(window, True)
 
 lbl_left_vertical = Label(window, text='', width=5, height=2)
 lbl_center_vertical = Label(window, text='', width=5, height=2)