Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #476

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 60 additions & 25 deletions app/main.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,69 @@
from __future__ import annotations
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you need this? Seems like you use ordinary types in annotation

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not, get_deck function returns Deck object, but it only one place where I using it, so would it be right if I deleted this and just wrote “Deck”, it also works



class Deck:
def __init__(self, row, column, is_alive=True):
pass
def __init__(
self,
row: int,
column: int,
is_alive: bool = True
) -> None:
self.row = row
self.column = column
self.is_alive = is_alive


class Ship:
def __init__(self, start, end, is_drowned=False):
# Create decks and save them to a list `self.decks`
pass
def __init__(
self,
start: tuple = (0, 0),
end: tuple = (0, 0),
is_drowned: bool = False
) -> None:
self.start = start
self.end = end
self.is_drowned = is_drowned
self.decks = []

def get_deck(self, row, column):
# Find the corresponding deck in the list
pass
if start[0] == end[0]:
for i in range(start[1], end[1] + 1):
self.decks.append(Deck(start[0], i))
elif start[1] == end[1]:
for i in range(start[0], end[0] + 1):
self.decks.append(Deck(i, start[1]))

def fire(self, row, column):
# Change the `is_alive` status of the deck
# And update the `is_drowned` value if it's needed
pass
def get_deck(self, row: int, column: int) -> Deck:
for deck in self.decks:
if deck.row == row and deck.column == column:
return deck

def fire(self, row: int, column: int) -> None:
deck = self.get_deck(row, column)
if deck:
deck.is_alive = False
if all(not deck.is_alive for deck in self.decks):
self.is_drowned = True


class Battleship:
def __init__(self, ships):
# Create a dict `self.field`.
# Its keys are tuples - the coordinates of the non-empty cells,
# A value for each cell is a reference to the ship
# which is located in it
pass

def fire(self, location: tuple):
# This function should check whether the location
# is a key in the `self.field`
# If it is, then it should check if this cell is the last alive
# in the ship or not.
pass

def __init__(self, ships: list) -> None:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

specify what data this list contains

self.ships = ships
self.field = {}

for ship in ships:
ship_instance = Ship(ship[0], ship[1])
for deck in Ship(ship[0], ship[1]).decks:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. You can use unpacking here
  2. In the loop use ship_instance variable

self.field[(deck.row, deck.column)] = ship_instance

def fire(self, location: tuple) -> str:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

specify what data this tuple contains

if location in self.field:
ship = self.field[location]
ship.fire(*location)

if ship.is_drowned:
return "Sunk!"
else:
return "Hit!"
else:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for else because if statement exactly returns something as there is another else statement

return "Miss!"
Loading