загружаю правки с разбора на уроке 2
This commit is contained in:
parent
925efe8ac8
commit
cf5a947782
|
@ -34,7 +34,7 @@ class ShootResult(Enum):
|
||||||
UNDEFINED = "UNDEFINED"
|
UNDEFINED = "UNDEFINED"
|
||||||
|
|
||||||
|
|
||||||
def set_ship(row, col, ship_size, direction):
|
def set_ship(field, row, col, ship_size, direction):
|
||||||
if row < 0 or row > field_size:
|
if row < 0 or row > field_size:
|
||||||
return
|
return
|
||||||
if col < 0 or col > field_size:
|
if col < 0 or col > field_size:
|
||||||
|
@ -45,13 +45,13 @@ def set_ship(row, col, ship_size, direction):
|
||||||
return
|
return
|
||||||
for r in range(row, row + ship_size):
|
for r in range(row, row + ship_size):
|
||||||
index = r * field_size + col
|
index = r * field_size + col
|
||||||
my_field[index] = "1"
|
field[index] = "1"
|
||||||
if direction == 1:
|
if direction == 1:
|
||||||
if field_size - col < ship_size:
|
if field_size - col < ship_size:
|
||||||
return
|
return
|
||||||
for c in range(col, col + ship_size):
|
for c in range(col, col + ship_size):
|
||||||
index = row * field_size + c
|
index = row * field_size + c
|
||||||
my_field[index] = "1"
|
field[index] = "1"
|
||||||
|
|
||||||
|
|
||||||
def shoot(field, row, col):
|
def shoot(field, row, col):
|
||||||
|
@ -113,7 +113,7 @@ def keypress_handler(e):
|
||||||
def left_button_click(field, row, col):
|
def left_button_click(field, row, col):
|
||||||
if field_mode == 0:
|
if field_mode == 0:
|
||||||
if check_possible(field, row, col):
|
if check_possible(field, row, col):
|
||||||
set_ship(row, col, ship_size, ship_direction)
|
set_ship(field, row, col, ship_size, ship_direction)
|
||||||
elif field_mode == 1:
|
elif field_mode == 1:
|
||||||
shoot(field, row, col)
|
shoot(field, row, col)
|
||||||
colorize(field, buttons)
|
colorize(field, buttons)
|
||||||
|
@ -185,9 +185,9 @@ window = Tk()
|
||||||
window.title("Ship Craft!")
|
window.title("Ship Craft!")
|
||||||
window.geometry('450x410')
|
window.geometry('450x410')
|
||||||
window.bind_all('<KeyPress>', keypress_handler)
|
window.bind_all('<KeyPress>', keypress_handler)
|
||||||
set_ship(1, 1, 4, 1)
|
set_ship(my_field, 1, 1, 4, 1)
|
||||||
set_ship(0, 6, 3, 0)
|
set_ship(my_field,0, 6, 3, 0)
|
||||||
set_ship(7, 3, 1, 0)
|
set_ship(my_field, 7, 3, 1, 0)
|
||||||
draw_field(window, my_field)
|
draw_field(window, my_field)
|
||||||
window.mainloop()
|
window.mainloop()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue