[3] correct infinite game

check that all a player boats are sunk

Author: Célande Adrien

tests/test_battleship.py

@@ -1,10 +1,25 @@
 import unittest
 
-from torpydo.battleship import parse_position
+from torpydo.battleship import parse_position, is_fleet_down
+from torpydo.ship import Color, Letter, Position, Ship
 
 class TestBattleship(unittest.TestCase):
+    def setUp(self):
+        self.ships = []
+        self.ships.append(init_ship(Ship("Test", 2, Color.RED), [Position(Letter.A, 1), Position(Letter.A, 2)]))
+
     def test_parse_position_true(self):
         self.assertTrue(parse_position("A1"))
 
+    def test_is_fleet_down(self):
+        self.assertFalse(is_fleet_down(self.ships))
+        self.ships[0].is_sunk = True
+        self.assertTrue(is_fleet_down(self.ships))
+
+def init_ship(ship: Ship, positions: list):
+    ship.positions = positions
+
+    return ship
+
 if '__main__' == __name__:
     unittest.main()

tests/test_game_controller.py

@@ -10,6 +10,7 @@ def setUp(self):
 
     def test_check_is_hit_true(self):
         self.assertTrue(GameController.check_is_hit(self.ships, Position(Letter.A, 1)))
+        self.assertTrue(self.ships[0].positions[0].is_shot)
 
     def test_check_is_hit_false(self):
         self.assertFalse(GameController.check_is_hit(self.ships, Position(Letter.B, 1)))

tests/test_ship.py

@@ -0,0 +1,23 @@
+import unittest
+
+from torpydo.ship import Color, Letter, Position, Ship
+from torpydo.game_controller import GameController
+
+class TestBattleship(unittest.TestCase):
+    def setUp(self):
+        self.ships = []
+        self.ships.append(init_ship(Ship("Test", 2, Color.RED), [Position(Letter.A, 1), Position(Letter.A, 2)]))
+
+    def test_check_sunk(self):
+        self.assertFalse(self.ships[0].is_sunk)
+        GameController.check_is_hit(self.ships, Position(Letter.A, 1))
+        self.assertFalse(self.ships[0].is_sunk)
+        GameController.check_is_hit(self.ships, Position(Letter.A, 2))
+        self.assertTrue(self.ships[0].is_sunk)
+
+def init_ship(ship: Ship, positions: list):
+    ship.positions = positions
+
+    return ship
+if '__main__' == __name__:
+    unittest.main()

torpydo/__init__.py

@@ -74,6 +74,7 @@ def start_game():
     while True:
         print()
 
+        # Player
         start_colouring(Fore.GREEN)
         print("Player, it's your turn")
         print("Coordinates should be written in the following format 'LetterNumber' as in C1, F4")
@@ -85,6 +86,9 @@ def start_game():
         start_colouring(right_colour(is_hit))
         print("Yeah ! Nice hit !" if is_hit else "Miss")
         TelemetryClient.trackEvent('Player_ShootPosition', {'custom_dimensions': {'Position': str(position), 'IsHit': is_hit}})
+        if is_fleet_down(enemyFleet):
+            print("Congratulations! You are the winner \o/")
+            break
 
         print( r'''
             \          .  ./
@@ -100,15 +104,14 @@ def start_game():
 
         print("\n\nComputer is thinking...")
         time.sleep(3)
+        # Computer
         position = get_random_position()
         is_hit = GameController.check_is_hit(myFleet, position)
         start_colouring(right_colour(is_hit))
 
         print()
         print(f"Computer shoot in {str(position)} and {'hit your ship!' if is_hit else 'miss'}")
         TelemetryClient.trackEvent('Computer_ShootPosition', {'custom_dimensions': {'Position': str(position), 'IsHit': is_hit}})
-
-
         print(r'''
             \          .  ./
           \   .:"";'.:..""   /
@@ -119,11 +122,18 @@ def start_game():
              -\  \     /  /-
                \  \   /  /''')
         end_colouring()
+        if is_fleet_down(myFleet):
+            print("Sorry, you lost...")
+            break
+
+    print("Thank you for playing!")
+
+def is_fleet_down(fleet):
+    return all(ship.is_sunk for ship in fleet)
 
 def parse_position(input: str):
     letter = Letter[input.upper()[:1]]
     number = int(input[1:])
-    position = Position(letter, number)
 
     return Position(letter, number)
 

torpydo/battleship.py

@@ -13,6 +13,8 @@ def check_is_hit(ships: list, shot: Position):
         for ship in ships:
             for position in ship.positions:
                 if position == shot:
+                    position.is_shot = True
+                    ship.check_sunk()
                     return True
 
         return False
@@ -27,7 +29,7 @@ def initialize_ships():
 
     def is_ship_valid(ship: Ship):
         is_valid = len(ship.positions) == ship.size
-        
+
         return is_valid
 
     def get_random_position(size: int):

torpydo/game_controller.py

@@ -21,6 +21,7 @@ class Position(object):
     def __init__(self, column: Letter, row: int):
         self.column = column
         self.row = row
+        self.is_shot = False
 
     def __eq__(self, other):
         return self.__dict__ == other.__dict__
@@ -36,14 +37,17 @@ def __init__(self, name: str, size: int, color: Color):
         self.size = size
         self.color = color
         self.positions = []
+        self.is_sunk = False
 
     def add_position(self, input: str):
         letter = Letter[input.upper()[:1]]
         number = int(input[1:])
-        position = Position(letter, number)
 
         self.positions.append(Position(letter, number))
 
+    def check_sunk(self):
+        self.is_sunk = all(position.is_shot for position in self.positions)
+
     def __str__(self):
         return f"{self.color.name} {self.name} ({self.size}): {self.positions}"