-
Notifications
You must be signed in to change notification settings - Fork 755
feat: created battleship #658
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
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,89 @@ | ||
| 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: int, | ||
| end: int, | ||
| is_drowned: bool = False | ||
| ) -> None: | ||
| self.start_x, self.start_y = start | ||
| self.end_x, self.end_y = end | ||
|
||
| self.is_drowned = is_drowned | ||
| self.decks = [] | ||
|
|
||
| def get_deck(self, row, column): | ||
| # Find the corresponding deck in the list | ||
| pass | ||
| if self.start_x == self.end_x: | ||
| for y_coord in range( | ||
| min(self.start_y, self.end_y), | ||
| max(self.start_y, self.end_y) + 1): | ||
| self.decks.append(Deck(self.start_x, y_coord)) | ||
|
|
||
| def fire(self, row, column): | ||
| # Change the `is_alive` status of the deck | ||
| # And update the `is_drowned` value if it's needed | ||
| pass | ||
| elif self.start_y < self.end_y: | ||
|
||
| for x_coord in range( | ||
| min(self.start_x, self.end_x), | ||
| max(self.start_x, self.end_x) + 1): | ||
| self.decks.append(Deck(x_coord, self.start_y)) | ||
| else: | ||
| return | ||
|
||
|
|
||
| def get_deck( | ||
| self, | ||
| row: int, | ||
| column: int | ||
| ) -> None: | ||
| for deck in self.decks: | ||
| if deck.row == row and deck.column == column: | ||
| return deck | ||
| return None | ||
|
|
||
| def fire( | ||
| self, | ||
| row: int, | ||
| column: int | ||
| ) -> None: | ||
| deck = self.get_deck(row, column) | ||
| if deck: | ||
| deck.is_alive = False | ||
| for _deck in self.decks: | ||
| if _deck.is_alive is True: | ||
| return | ||
| self.is_drowned = True | ||
|
|
||
|
|
||
| class Battleship: | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
| 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: | ||
| self.ships = [] | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
| self.field = {} | ||
| for start, end in ships: | ||
| new_ship = Ship(start, end) | ||
| self.ships.append(new_ship) | ||
|
|
||
| for ship in self.ships: | ||
| for deck in ship.decks: | ||
| coord = (deck.row, deck.column) | ||
| self.field[coord] = ship | ||
|
Comment on lines
+64
to
+77
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
|
|
||
| def fire( | ||
| self, | ||
| location: tuple | ||
| ) -> str: | ||
| if location not in self.field: | ||
| return "Miss!" | ||
| target_ship = self.field[location] | ||
| target_ship.fire(*location) | ||
| if target_ship.is_drowned: | ||
| return "Sunk!" | ||
| return "Hit!" | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These attributes (
start_x,start_y,end_x,end_y) are only used within the__init__method to create the decks. They are not used anywhere else in theShipclass. This violates checklist item #4: 'Remove unused attributes.' Consider using local variables within__init__instead of instance attributes.