it-as
/
hnc-eduard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

небольшие изменения

This commit is contained in:
eduard ermakov 2024-06-10 23:08:50 +03:00
parent 5e0cf283d6
commit 1cc445bec8
14 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HNS/Excercises/ShipCraft/Переделка/.idea/misc.xml
View File

@ -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.11" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
</project>

36
HNS/Excercises/ShipCraft/Переделка/.idea/workspace.xml
View File

@ -4,7 +4,15 @@
<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 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$/.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$/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" />
@ -34,21 +42,20 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<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": "C:/Users/Eduardo/Documents/Программирование с Артуром/HNS/hnc-eduard/HNS/Excercises/ShipCraft"
<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.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;
}
}]]></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 +77,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 +98,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 +119,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>
@ -170,7 +174,7 @@
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>133</line>
<line>129</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>

2
HNS/Excercises/ShipCraft/Переделка/.idea/Переделка.iml
View File

@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

16
HNS/Excercises/ShipCraft/Переделка/GameMode.py Normal file
View File

@ -0,0 +1,16 @@
from enum import Enum
class GameMode(Enum):
MENU = 'MENU'
PLAN = 'PLAN'
BATTLE = 'BATTLE'
END = 'END'
@staticmethod
def from_string(raw_value):
if raw_value:
value = raw_value.upper()
if value in GameMode.__members__:
return GameMode[value]
return GameMode.MENU

4
HNS/Excercises/ShipCraft/Переделка/ShipField.py
View File

@ -21,7 +21,7 @@ class ShipField:
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ']
self.ships = [4, 3, 3, 2, 2, 2, 1, 1, 1, 1]
self.field_mode = ShipMode.PUT
self.field_mode = ShipMode.INACTIVE
self.ship_size = 4
self.ship_direction = ShipDirection.VERTICAL
@ -76,7 +76,7 @@ class ShipField:
self.field[row * ShipField.field_size + c] = "p"
else:
self.field[row * ShipField.field_size + c] = "r"
else:
elif self.field_mode == ShipMode.SHOOT:
self.field[row * ShipField.field_size + col] += "+"
def clear_marker(self):

4
HNS/Excercises/ShipCraft/Переделка/ShipMode.py
View File

@ -4,7 +4,7 @@ from enum import Enum
class ShipMode(Enum):
PUT = 'PUT'
SHOOT = 'SHOOT'
UNKNOWN = 'UNKNOWN'
INACTIVE = 'INACTIVE'
@staticmethod
def from_string(raw_value):
@ -12,6 +12,6 @@ class ShipMode(Enum):
value = raw_value.upper()
if value in ShipMode.__members__:
return ShipMode[value]
return ShipMode.UNKNOWN
return ShipMode.INACTIVE

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/GameMode.cpython-39.pyc Normal file
View File

Binary file not shown.

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipDirection.cpython-39.pyc
View File

Binary file not shown.

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipField.cpython-39.pyc
View File

Binary file not shown.

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipMode.cpython-39.pyc
View File

Binary file not shown.

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/ShipView.cpython-39.pyc
View File

Binary file not shown.

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/ShootResult.cpython-39.pyc
View File

Binary file not shown.

BIN
HNS/Excercises/ShipCraft/Переделка/__pycache__/test_ShipField.cpython-39.pyc Normal file
View File

Binary file not shown.

16
HNS/Excercises/ShipCraft/Переделка/main.py
View File

@ -5,7 +5,9 @@ from tkinter import *
from tkinter import filedialog
from ShipView import ShipView
from ShipField import ShipField
from GameMode import GameMode
game_mode = GameMode.MENU
active_view ={}
def create_view(window, col_offset=0, row_offset=0):
@ -50,9 +52,6 @@ def keypress_handler(e):
global active_view
if e.keysym.isnumeric():
active_view.ship_field.set_ship_size(e.keysym)
else:
if e.keysym == 'm':
active_view.ship_field.toggle_field_mode()
def left_button_click(view, row, col):
@ -106,7 +105,7 @@ def refresh_remaining_ships_label(view):
window = Tk()
window.title("Ship Craft!")
window.geometry('1020x540')
window.geometry('1020x640')
window.bind_all('<KeyPress>', keypress_handler)
start_column_my_field = 1
@ -150,6 +149,13 @@ savebutton_enemy = Button(window, text='Save', width=20, height=2, command=lambd
savebutton_enemy.grid(column=start_column_enemy_field, row=load_button_row, columnspan=4)
loadbutton_enemy = Button(window, text='Load', width=20, height=2, command=lambda: loadbutton_click(enemy_view))
loadbutton_enemy.grid(column=start_column_enemy_field + 6, row=load_button_row, columnspan=4)
loadbutton_enemy.grid(column=start_column_enemy_field + 6, row=load_button_row + 1, columnspan=4)
prev_button = Button(window, text='<=', width=20, height=2)
prev_button.grid(column=start_column_enemy_field, row=load_button_row, columnspan=4)
next_button = Button(window, text='>=', width=20, height=2)
next_button.grid(column=start_column_enemy_field + 6, row=load_button_row, columnspan=4)
window.mainloop()