Compare commits
11 Commits
dc1ba63fef
...
d51d6b9fd1
Author | SHA1 | Date |
---|---|---|
Artur Savitskiy | d51d6b9fd1 | |
Artur Savitskiy | 34e7474d52 | |
Artur Savitskiy | a689e9d9c5 | |
Artur Savitskiy | ce5dcdc592 | |
Artur Savitskiy | ce3f7e4ea5 | |
Artur Savitskiy | 0b6b754388 | |
Artur Savitskiy | 74761cf734 | |
Artur Savitskiy | 0d60c44581 | |
Artur Savitskiy | 178652bf37 | |
Artur Savitskiy | 85063e95a9 | |
Artur Savitskiy | f6b7bf0354 |
|
@ -24,7 +24,6 @@ class ShipField:
|
|||
self.ship_size = 4
|
||||
self.ship_direction = ShipDirection.VERTICAL
|
||||
|
||||
|
||||
def from_json(self, obj):
|
||||
self.field = obj['field']
|
||||
self.ships = obj['ships']
|
||||
|
@ -32,8 +31,7 @@ class ShipField:
|
|||
self.field_mode = obj['field_mode']
|
||||
self.ship_size = obj['ship_size']
|
||||
self.ship_direction = obj['ship_direction']
|
||||
|
||||
|
||||
|
||||
def __getitem__(self, item):
|
||||
if item is None:
|
||||
return None
|
||||
|
@ -46,7 +44,6 @@ class ShipField:
|
|||
|
||||
return None
|
||||
|
||||
|
||||
def action(self, row, col):
|
||||
self.clear_marker()
|
||||
|
||||
|
@ -60,7 +57,6 @@ class ShipField:
|
|||
elif self.field_mode == ShipMode.SHOOT:
|
||||
self.shoot(row, col)
|
||||
|
||||
|
||||
def target(self, row, col):
|
||||
self.clear_marker()
|
||||
|
||||
|
@ -79,10 +75,8 @@ class ShipField:
|
|||
self.field[row * self.field_size + c] = "p"
|
||||
else:
|
||||
self.field[row * self.field_size + c] = "r"
|
||||
|
||||
|
||||
else:
|
||||
self.field[row * self.field_size + col] = "+"
|
||||
self.field[row * self.field_size + col] += "+"
|
||||
|
||||
def clear_marker(self):
|
||||
for i in range(0, len(self.field)):
|
||||
|
|
|
@ -33,10 +33,11 @@ def colorize(field, buttons):
|
|||
bg = 'black'
|
||||
if field.field[i] == "p":
|
||||
bg = 'blue'
|
||||
if field.field[i] == "r":
|
||||
bg = 'red'
|
||||
if "+" in field.field[i]:
|
||||
bg = 'orange'
|
||||
if "r" in field[i]:
|
||||
bg = 'red'
|
||||
|
||||
buttons[i].configure(bg=bg)
|
||||
|
||||
|
||||
|
@ -111,5 +112,4 @@ loadbutton = Button(window, text='Load', width=20, height=2)
|
|||
loadbutton.bind('<Button-1>', loadbutton_click)
|
||||
loadbutton.grid(column=5, row=11, columnspan=4)
|
||||
|
||||
|
||||
window.mainloop()
|
||||
window.mainloop()
|
||||
|
|
Loading…
Reference in New Issue