battle_boats 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61b60dbcbc5c2bacf5a9690767c0e8cb0fb63b93
-  data.tar.gz: 2fd42e2e42aee3d500a4d80025183e5f545c82b8
+  metadata.gz: 0f62377f075c9e70f367ab75639126cf5b4c786c
+  data.tar.gz: 2c179de8a9b6c69d0622c0a97806c1fb4277da01
 SHA512:
-  metadata.gz: 97c3219a5f1dfa994cc2aabb0a4c716f5b044296a7a5f3efb862c5ecc5f889c68becb3a746ffece89770227137b9728c91e27c944636ad59549894cd371070a0
-  data.tar.gz: 5b165df1380372d778d6c5708a063de0269912f6c28bc85efe6444d1db770ecf990b0fc8892e30106ba6985c75c27ed88ec77e47c3d12948563c90bda119c2f1
+  metadata.gz: 7f8a5bab8721b38fe6f534f9512874464cb9b155a03d4a7ca5e2d0cdb04e64f3e6adab7c7e481ee4cf4585f45c1b902c304cbc3542947116963688e458c7fc8c
+  data.tar.gz: 5f7bb5eca963fa72efbf9bebfc8ae663140f3003b260b411a757b98cadefc9142d98a60692c988210d96132c7ea2af29205baf815b82861a0260eb73f0e9e638

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.0
+### New Features 
+- After placing your ships, you'll see two boards, yours and the computer player's
+- The computer play fires back at random, immediately after you strike it
+- Your ships are now green, instead of yellow
+- You can lose the game to the computer
+
 # 0.1.0
 ### New Features 
 - At the start of the game, the user will be prompted to place their ships on their board

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    battle_boats (0.1.0)
+    battle_boats (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/battle_boats/board.rb

@@ -66,6 +66,10 @@ module BattleBoats
       end
     end
 
+    def get_random_coordinate
+      BattleBoats::Coordinate.random(row: 0..9, column: 0..9)
+    end
+
     private
 
     def create_play_area
@@ -85,9 +89,5 @@ module BattleBoats
     def within_range?(coordinate:)
       coordinate.row.between?(0, 9) && coordinate.column.between?(0, 9)
     end
-
-    def get_random_coordinate
-      BattleBoats::Coordinate.random(row: 0..9, column: 0..9)
-    end
   end
 end

data/lib/battle_boats/board_formatter.rb

@@ -17,7 +17,7 @@ module BattleBoats
           board_string << if cell.occupied? && cell.hit?
                             "  #{cell.occupant.symbol.red}  "
                           elsif cell.occupied? && !hide_ships
-                            "  #{cell.occupant.symbol.yellow}  "
+                            "  #{cell.occupant.symbol.green}  "
                           elsif cell.hit?
                             "  #{'X'.yellow}  "
                           else

data/lib/battle_boats/colorize.rb

@@ -12,6 +12,10 @@ module BattleBoats
       def yellow
         "\e[33m#{self}\e[0m"
       end
+
+      def green
+        "\e[32m#{self}\e[0m"
+      end
     end
   end
 end

data/lib/battle_boats/console_ui.rb

@@ -56,6 +56,10 @@ module BattleBoats
       output.puts "You've won the game!"
     end
 
+    def lose
+      output.puts "You've lost the game!"
+    end
+
     private
 
     attr_reader :output, :input, :board_formatter

data/lib/battle_boats/engine.rb

@@ -16,8 +16,10 @@ module BattleBoats
         until ally_board.ship_deployed?(ship: ship)
           interface.display_ally_board(ally_board)
           interface.display_ship_data(ship: ship)
+
           coordinate = interface.get_coordinate
           orientation = interface.get_orientation
+
           ally_board.attempt_to_deploy_ship(ship: ship,
                                             coordinate: coordinate,
                                             orientation: orientation)
@@ -27,21 +29,45 @@ module BattleBoats
 
     def start
       interface.greet
-      until enemy_board.game_over?
+      until game_over?
+
+        interface.display_status_report(ally_board.status_report)
+        interface.display_ally_board(ally_board)
+
+        interface.display_status_report(enemy_board.status_report)
         interface.display_board(enemy_board)
+
         coordinate = interface.get_coordinate
         until enemy_board.strike_position(coordinate: coordinate)
           interface.display_status_report(enemy_board.status_report)
           coordinate = interface.get_coordinate
         end
-        interface.display_status_report(enemy_board.status_report)
+
+        enemy_coordinate = enemy_board.get_random_coordinate
+        until ally_board.strike_position(coordinate: enemy_coordinate)
+          enemy_coordinate = enemy_board.get_random_coordinate
+        end
+
       end
-      interface.win
-      interface.display_board(enemy_board)
+      end_game
     end
 
     private
 
+    def game_over?
+      enemy_board.game_over? || ally_board.game_over?
+    end
+
+    def end_game
+      interface.display_ally_board(ally_board)
+      interface.display_board(enemy_board)
+      if enemy_board.game_over?
+        interface.win
+      else
+        interface.lose
+      end
+    end
+
     attr_reader :interface, :enemy_board, :ally_board
   end
 end

data/lib/battle_boats/version.rb

@@ -1,3 +1,3 @@
 module BattleBoats
-  VERSION = "0.1.0".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: battle_boats
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Countz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler