From 112b9a1394054f2d98bad33cbcc278b52a3916a2 Mon Sep 17 00:00:00 2001
From: eduard ermakov <ehermakov@gmail.com>
Date: Mon, 15 Jul 2024 21:30:26 +0300
Subject: [PATCH] fix some bugs

---
 .../ShipCraft/Переделка/.idea/workspace.xml   |   6 +++++-
 .../ShipCraft/Переделка/ShipField.py          |   2 +-
 .../__pycache__/ShipField.cpython-39.pyc      | Bin 8156 -> 8290 bytes
 HNS/Excercises/ShipCraft/Переделка/main.py    |   4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
index cacc51f..85e0d35 100644
--- a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
@@ -4,7 +4,11 @@
     <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ShipField.py" beforeDir="false" afterPath="$PROJECT_DIR$/ShipField.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" />
diff --git a/HNS/Excercises/ShipCraft/Переделка/ShipField.py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
index 5c52ae4..e2a1486 100644
--- a/HNS/Excercises/ShipCraft/Переделка/ShipField.py
+++ b/HNS/Excercises/ShipCraft/Переделка/ShipField.py
@@ -102,7 +102,7 @@ class ShipField:
             if shoot_result == ShootResult.KILLED:
                 self.fill_empty_killed(row, col)
 
-            return shoot_result == ShootResult.UNDEFINED
+            return shoot_result == ShootResult.EMPTY
 
         return False
 
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-39.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-39.pyc
index 3d066aa40467cb459a60bf147a048d4636144dd4..8a908fb51588a4fc1c42099d211161e6e130d839 100644
GIT binary patch
delta 478
zcmca(|Hy$ak(ZZ?0SNA=Pfe3CoXEF^@yx{C+oe);QgmAwq9jwLQuI>vTNs)dqoh*|
zf*CXoH@7g_bF#6z`UZqVZa&ME&cV2BvZ-)Q{hSoG8ip*E8fF`Y8iobzHH<Y(3z>?h
zl`v&-1Tz3hPB6(F%#gwWG=|-;h!JRO5jTji1roOy4T>Cq^e@I3O|BwVkgy_%U;+}i
zI79thT-`kVTwRKIKz!EXlA_FlB6E-eZ4hC`Fxgqeicw~Aorv`0*&>;2-XKxk$%!Ju
ztSUg}^T|r0x|8>c=<;ha`4xGBBz++&0y%|^c#|_yle6Pf5_1#NQ&ZjmC5l1TGB8$&
z2WMm!xMim1r0Aijnd~GQ!st7Bx~LxG`^m>deK>r8$~75_cqYG-lHlfqs7=jF`MlXy
zOoNf}+vYTJbw)<-$$b*$jNFrtNxWqgo4iGGJ)^?p6saAIT9aj^*D@MxJ}qs;$bO5p
zpeQr1WHOU%Dx>A(4B5You9MT`^nrexCYQ$OH~EL0JzFf$wjxoG?<NPxb21uDj*^#Q
U735&$V4hqlFT)r$d78W%0M$x=;s5{u

delta 396
zcmaFlaL1l6k(ZZ?0SJ<frlg%Rn8>$=@yNv8+l5jkQ*=^vTNs)dqoh*wf*CaRH}^2w
zb8>Np`nkBedHT7!Y`(~q&cV2DvZZiM{gM>68ip*E8fF`Y8iobzHH<Y(3z>@Mm2jl6
zH#0IalrUv+27^d0Fv%Rukiq~olEbfv5omJ}H;AwW61Nx)iX4FSFUFWCHt)=woYWLe
z?jlx@v?7RL0ukmQf(J<4Vl6Hy$}G6W>MGzH5E5CW4HhdX%FHX7Y$#&OC^tD@M4FLf
za;HcZn-@rv?&O2=!mKJl=8MUKqPmmMh`KZSO%@T;V|+W=S<Hvgck%==O~#L#cZq2*
zGJe_oSX`Zv(Q7idq&Xw!WM|2@j3Sc_rPc$DeJHhqQDgEf>9ve{n>}QV7+H&afM!l^
zluczcpZr|*FQfD1r*is?(vwBy(<V2_TQkN?Hc$|Uc!UF}ve;nqJ$V^sAr98b|K(*E
KBPYu!xB&oGW@oMd

diff --git a/HNS/Excercises/ShipCraft/Переделка/main.py b/HNS/Excercises/ShipCraft/Переделка/main.py
index bff55d1..dc1f71f 100644
--- a/HNS/Excercises/ShipCraft/Переделка/main.py
+++ b/HNS/Excercises/ShipCraft/Переделка/main.py
@@ -74,12 +74,12 @@ def left_button_click(view, row, col):
 
     action_result = view.ship_field.action(row, col)
 
-    if action_result and view_enemy and game_mode == GameMode.Battle:
+    if action_result and view.enemy and game_mode == GameMode.BATTLE:
         # Ход соперника
         enemy_shoot_result = ShootResult.UNDEFINED
 
         while enemy_shoot_result != ShootResult.EMPTY:
-            my_row = random.randint(0, ShipField.field_size)
+            my_row = random.randint(0, ShipField.field_size - 1)
             my_col = random.randint(0, ShipField.field_size - 1)
 
             enemy_shoot_result = my_view.ship_field.shoot(my_row, my_col)