From 1b1be42f5b0374f99181dc9571dc85dc28209835 Mon Sep 17 00:00:00 2001
From: ehermakov <ehermakov@gmail.com>
Date: Sun, 12 May 2024 20:43:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D1=80=D0=B0=D0=B6=D0=B5=D1=81=D0=BA=D0=BE=D0=B3=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D1=81=D0=BE?=
 =?UTF-8?q?=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShipCraft/Переделка/.idea/workspace.xml   |  85 ++++++++++++++++++
 .../__pycache__/ShipModeDirection.cpython-311.pyc | Bin 923 -> 0 bytes
 .../__pycache__/test_ShipField.cpython-311.pyc | Bin 17714 -> 0 bytes
 HNS/Excercises/ShipCraft/Переделка/file_path  |   2 +-
 HNS/Excercises/ShipCraft/Переделка/game1.json |   7 --
 HNS/Excercises/ShipCraft/Переделка/game1.txt  |  10 ---
 HNS/Excercises/ShipCraft/Переделка/main.py    |  27 +++---
 HNS/Excercises/ShipCraft/Переделка/test.json  |   1 -
 8 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
 delete mode 100644 HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipModeDirection.cpython-311.pyc
 delete mode 100644 HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc
 delete mode 100644 HNS/Excercises/ShipCraft/Переделка/game1.json
 delete mode 100644 HNS/Excercises/ShipCraft/Переделка/game1.txt
 delete mode 100644 HNS/Excercises/ShipCraft/Переделка/test.json

diff --git a/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
new file mode 100644
index 0000000..8a9b710
--- /dev/null
+++ b/HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="b389cdea-22f5-4ba2-8b46-337091984b3c" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/file_path" beforeDir="false" afterPath="$PROJECT_DIR$/file_path" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/game1.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/game1.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test.json" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../../.." />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 0
+}]]></component>
+  <component name="ProjectId" id="2gNOqqOLo3TzX4nzxb9EIDfRt8A" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Python.main.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "C:/Users/Eduardo/Documents/Программирование с Артуром/HNS/hnc-eduard/HNS/Excercises/ShipCraft/Переделка"
+  }
+}]]></component>
+  <component name="RunManager">
+    <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>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.main" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-python-sdk-babbdf50b680-746f403e7f0c-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-241.15989.155" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="b389cdea-22f5-4ba2-8b46-337091984b3c" name="Changes" comment="" />
+      <created>1715534761567</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1715534761567</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipModeDirection.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipModeDirection.cpython-311.pyc
deleted file mode 100644
index c6ffea012cfe8fb18492e935572b66810e272cc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 923
zcmbVKJ8u&~5Z=9)&EX3P5r~2!B9#mH0SF;QwuOU&jbex5bkfPXT@**Yv)Q{t&>fEg
zx^$@!T@a#)080@h{D!sU!n&3!qA@Zw6o{R*FNmaLcK6$v{bpuoA8#znL_(}@zv-cv
zzk-p8K2s)<P<9YO1b2{+ZH$qEZXu#PM?|G~S4HTZ7*nwo$!UVqPjRY(s7BSTEHm0N
zvbbF=vWPJijEK=d#oQ5?MVxAtAojf(DW}YJa#5H&h$0&kWGe*QDp72Ws3KfT^Nr1R
z?@pIcrU<tq2&xtJH1E1W%criJny%}2N!$Uw;JOduR%gbjcQ=};-l*2=&9`U*d;WYS
zpmg2Y2q_Dl3W-~cbe(e7i+vhIp~GJf68?pM5V*$=MBA74dtn{&ecoRhJXzw~gJke@
z@JuoXPPNu>HUsY}mC2-8dE`;%wL=;@P<)BC?nfdu?~9N=|0u?1{)z8N5>8fbGwMa{
zZg8#ln8C$L(1a3R5|A9Xk$E;LjS5y$fyS)N^*^rFg369JmUqkGCB@yc9OTUdoDq=b
z?^V{DtEH8-)U4LmSM7SOxw6Izz{?8eK%371LQa-_Za%4w7S1QPp-qFpzgEnp8WrDy
z!QY#n9M)64$J#-}7Nq{L)rske?SAENOyB$_gU<t>B77-etYVBu=mP(@j|~OSjnQd%
t5q*c%AAc!R!HeK|61L0Wxd@&!%0$>m^u!+;mxsoc0a_lSWuA3;$Umbm>(c-L

diff --git a/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc b/HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-311.pyc
deleted file mode 100644
index f2c30bb057e89e3398b473899af5983eb370ee1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17714
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
CG{%4c

diff --git a/HNS/Excercises/ShipCraft/Переделка/file_path b/HNS/Excercises/ShipCraft/Переделка/file_path
index bdf64fb..60a44d5 100644
--- a/HNS/Excercises/ShipCraft/Переделка/file_path
+++ b/HNS/Excercises/ShipCraft/Переделка/file_path
@@ -1 +1 @@
-{"my_field": {"field": [" ", " ", " ", " ", " ", " ", "1", " ", " ", " ", " ", "1", "1", "1", "1", " ", "1", " ", " ", " ", " ", " ", " ", " ", " ", " ", "1", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", " ", "", " ", "", "", "", "1", " ", " ", " ", " ", "", " ", " ", " ", " ", "", " ", " ", " ", " ", "", " ", "1", " ", "", "", " ", " ", " ", " ", "", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", "p", "", "", " ", " ", " ", " ", " "], "ships": [3, 2, 2, 2, 1, 1], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
+{"shipField": {"field": [" ", " ", " ", " ", " ", " ", "1", " ", " ", " ", " ", "1", "1", "1", "1", " ", "1", " ", " ", " ", " ", " ", " ", " ", " ", " ", "1", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "1", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "p", ""], "ships": [3, 2, 2, 2, 1, 1, 1], "field_size": 10, "field_mode": "PUT", "ship_size": 1, "ship_direction": "VERTICAL"}}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/game1.json b/HNS/Excercises/ShipCraft/Переделка/game1.json
deleted file mode 100644
index 9aaf6a2..0000000
--- a/HNS/Excercises/ShipCraft/Переделка/game1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "my field": {
-    "field": [],
-    "ships": [],
-    "field_mode": "PUT"
-  }
-}
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/game1.txt b/HNS/Excercises/ShipCraft/Переделка/game1.txt
deleted file mode 100644
index 8ebffb6..0000000
--- a/HNS/Excercises/ShipCraft/Переделка/game1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, \\,
-0, 0, 0, 0, 0, 1, 0, 0, 0, \\,
-0, 0, 0, 0, 0, 1, 0, 0, 0, \\,
-0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 1, 0
\ No newline at end of file
diff --git a/HNS/Excercises/ShipCraft/Переделка/main.py b/HNS/Excercises/ShipCraft/Переделка/main.py
index 74005d2..6c2587d 100644
--- a/HNS/Excercises/ShipCraft/Переделка/main.py
+++ b/HNS/Excercises/ShipCraft/Переделка/main.py
@@ -83,22 +83,21 @@ def button_enter(buttons, row, col):
     colorize(enemy_field, enemy_buttons)
 
 
-def savebutton_click():
-    file_path = filedialog.asksaveasfilename(filetypes=[('JSON files', '*.json')])
+def savebutton_click(field):
+    file_path = filedialog.asksaveasfilename(filetypes=[("JSON files", "*.json")])
     if file_path:
-        with open("file_path", 'w') as f:
-            json.dump({'my_field': my_field}, f, default=ShipField.convert_to_json)
+        with open("file_path", "w") as f:
+            json.dump({"shipField": field}, f, default=ShipField.convert_to_json)
 
 
-def loadbutton_click():
-    global my_field
+def loadbutton_click(field, buttons):
 
     file_path = filedialog.askopenfilename(filetypes=[('JSON files', '*.json')])
     if os.path.isfile(file_path):
         with open("file_path") as lines:
-            my_field.from_json(json.load(lines)['my_field'])
+            my_field.from_json(json.load(lines)['shipField'])
 
-    colorize(my_field, my_buttons)
+    colorize(field, buttons)
 
 
 def refresh_remaining_ships_label():
@@ -131,14 +130,20 @@ enemy_buttons = draw_field(window, enemy_field, 11)
 lbl = Label(window, text='', width=5, height=2)
 lbl.grid(column=10, row=0)
 
-savebutton = Button(window, text='Save', width=20, height=2, command=savebutton_click)
+savebutton = Button(window, text='Save', width=20, height=2, command=lambda: savebutton_click(my_field))
 savebutton.grid(column=0, row=11, columnspan=4)
 
-loadbutton = Button(window, text='Load', width=20, height=2, command=loadbutton_click)
+loadbutton = Button(window, text='Load', width=20, height=2, command=lambda: loadbutton_click(my_field, my_buttons))
 loadbutton.grid(column=5, row=11, columnspan=4)
 
+savebutton_enemy = Button(window, text='Save_enemy', width=20, height=2, command=lambda: savebutton_click(enemy_field))
+savebutton_enemy.grid(column=11, row=11, columnspan=4)
+
+loadbutton_enemy = Button(window, text='Load_enemy', width=20, height=2, command=lambda: loadbutton_click(enemy_field, enemy_buttons))
+loadbutton_enemy.grid(column=16, row=11, columnspan=4)
+
 remainingShipsText = StringVar()
 lbl = Label(window, width=50, height=2, textvariable=remainingShipsText)
-lbl.grid(column=11, row=11, columnspan=10)
+lbl.grid(column=1, row=13, columnspan=10)
 
 window.mainloop()
diff --git a/HNS/Excercises/ShipCraft/Переделка/test.json b/HNS/Excercises/ShipCraft/Переделка/test.json
deleted file mode 100644
index c748bd8..0000000
--- a/HNS/Excercises/ShipCraft/Переделка/test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"my_field": {"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": 2, "ship_direction": "VERTICAL"}}
\ No newline at end of file