From 0db2c1e5afc623cf04eae367c94ff5d7877472be Mon Sep 17 00:00:00 2001 From: ehermakov Date: Sun, 10 Mar 2024 13:10:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0?= =?UTF-8?q?=D1=8E=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=BA=D1=83?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D0=B5=D1=86=2014=20=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShipField (1).py => Переделка/ShipField.py} | 0 .../main (1).py => Переделка/main.py} | 12 ++++++------ .../ShipCraft/Переосмысление/.idea/.gitignore | 3 --- .../.idea/inspectionProfiles/profiles_settings.xml | 6 ------ .../ShipCraft/Переосмысление/.idea/misc.xml | 4 ---- .../ShipCraft/Переосмысление/.idea/modules.xml | 8 -------- .../.idea/попытка восстановить все.iml | 8 -------- 7 files changed, 6 insertions(+), 35 deletions(-) rename HNS/Excercises/ShipCraft/{Переосмысление/ShipField (1).py => Переделка/ShipField.py} (100%) rename HNS/Excercises/ShipCraft/{Переосмысление/main (1).py => Переделка/main.py} (96%) delete mode 100644 HNS/Excercises/ShipCraft/Переосмысление/.idea/.gitignore delete mode 100644 HNS/Excercises/ShipCraft/Переосмысление/.idea/inspectionProfiles/profiles_settings.xml delete mode 100644 HNS/Excercises/ShipCraft/Переосмысление/.idea/misc.xml delete mode 100644 HNS/Excercises/ShipCraft/Переосмысление/.idea/modules.xml delete mode 100644 HNS/Excercises/ShipCraft/Переосмысление/.idea/попытка восстановить все.iml diff --git a/HNS/Excercises/ShipCraft/Переосмысление/ShipField (1).py b/HNS/Excercises/ShipCraft/Переделка/ShipField.py similarity index 100% rename from HNS/Excercises/ShipCraft/Переосмысление/ShipField (1).py rename to HNS/Excercises/ShipCraft/Переделка/ShipField.py diff --git a/HNS/Excercises/ShipCraft/Переосмысление/main (1).py b/HNS/Excercises/ShipCraft/Переделка/main.py similarity index 96% rename from HNS/Excercises/ShipCraft/Переосмысление/main (1).py rename to HNS/Excercises/ShipCraft/Переделка/main.py index e2b7c1f..7140fb5 100644 --- a/HNS/Excercises/ShipCraft/Переосмысление/main (1).py +++ b/HNS/Excercises/ShipCraft/Переделка/main.py @@ -146,16 +146,16 @@ def left_button_click(field, buttons, row, col): if active_field == 0: field_mode = field_mode_left - ship_ + ship_size = ship_size_left + ship_direction = ship_direction_left else: field_mode = field_mode_right + ship_size = ship_size_right + ship_direction = ship_direction_right if field_mode == 0: - if check_possible(field, row, col): - if active_field == 0: - set_ship(field, row, col, ship_size_left, ship_direction_left) - else: - set_ship(field, row, col, ship_size_right, ship_direction_right) + if check_possible(field, row, col, ship_size, ship_direction): + set_ship(field, row, col, ship_size, ship_direction) elif field_mode == 1: shoot(field, row, col) colorize(field, buttons) diff --git a/HNS/Excercises/ShipCraft/Переосмысление/.idea/.gitignore b/HNS/Excercises/ShipCraft/Переосмысление/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/HNS/Excercises/ShipCraft/Переосмысление/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/HNS/Excercises/ShipCraft/Переосмысление/.idea/inspectionProfiles/profiles_settings.xml b/HNS/Excercises/ShipCraft/Переосмысление/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/HNS/Excercises/ShipCraft/Переосмысление/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/HNS/Excercises/ShipCraft/Переосмысление/.idea/misc.xml b/HNS/Excercises/ShipCraft/Переосмысление/.idea/misc.xml deleted file mode 100644 index a971a2c..0000000 --- a/HNS/Excercises/ShipCraft/Переосмысление/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/HNS/Excercises/ShipCraft/Переосмысление/.idea/modules.xml b/HNS/Excercises/ShipCraft/Переосмысление/.idea/modules.xml deleted file mode 100644 index 01e711a..0000000 --- a/HNS/Excercises/ShipCraft/Переосмысление/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/HNS/Excercises/ShipCraft/Переосмысление/.idea/попытка восстановить все.iml b/HNS/Excercises/ShipCraft/Переосмысление/.idea/попытка восстановить все.iml deleted file mode 100644 index d0876a7..0000000 --- a/HNS/Excercises/ShipCraft/Переосмысление/.idea/попытка восстановить все.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file