alex_butirskiy_sea_battle 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde9f524ae8ec16ef02bb04d79f042afba67ac1e
-  data.tar.gz: 96db225f177af746dd41ed7d23154209da8ff9c2
+  metadata.gz: 47828dccda84920c1d86bdc3db02502d81d645ae
+  data.tar.gz: 980c519a16556b68308951ad4081da38501f14b1
 SHA512:
-  metadata.gz: 0ab5faff90d92efa0a8a717e38eaf884298cbdd26c3b1c518842b0494c59ed45e51cf0fd3f6c544c2188b72cf8a820d26c832f57ea2e72e6db95fcc2c4db55f7
-  data.tar.gz: 636b684e0602fc8952425d82521ed4fc36a7c30e1e8cd7c16d619124261ed998c4a5621db289299afcd659de676f0631b49d1afa4d36e1443829d8c7d6128ffd
+  metadata.gz: 8cf20eced52bd7eab6c2b61803f8c3b403afdd72cdcdc5ae17ebcde8d05a501499f3a9e89bd7849d90a8d6d8ebfb0abd56f00a0c4b200df4b339bbd0b0539dbd
+  data.tar.gz: 275986c680ab7f0d0f94de2f43585fbee194b6e251c6eb84b19063a5d8d1ef217635f4ab88e4d83c107329686737ed954826ee9fa42069b1b94aa34447d5b0fd

data/bin/sea_battle

@@ -2,4 +2,4 @@
 
 require_relative '../lib/alex_butirskiy_sea_battle.rb'
 
-Game.new.run
+Sea_battle::Game.new.run

data/lib/alex_butirskiy_sea_battle.rb

@@ -1 +1,6 @@
-require_relative './game.rb'
+require_relative 'sea_battle/game.rb'
+
+module Sea_battle
+  class Game < Game
+  end
+end

data/lib/{board.rb → sea_battle/board.rb}

@@ -11,6 +11,8 @@ class Board
   include Direction
   include State
 
+  attr_accessor :player_name
+
   def initialize(size_x = 10, size_y = 10, name = '')
     unless (1..20).include?(size_x) && (1..20).include?(size_y)
       fail BoardSizeError, 'size should be in (1..20) range'
@@ -115,7 +117,7 @@ class Board
     false
   end
 
-  def display(str)
+  def display(str, hide_ships = false)
     fail TypeError, 'str should be Fixnum' unless str.class == Fixnum
     offset = 2
     res = ''
@@ -132,7 +134,7 @@ class Board
       res << '|'
       @size_x.times do |x|
         case @cells[x][@size_y - 1 - (str - offset)].state
-        when SHIP then res << 'O'
+        when SHIP then hide_ships ? (res << ' ') : (res << 'O')
         when BROKEN then res << 'X'
         when MISSED then res << '*'
         else res << ' '

data/lib/sea_battle/game.rb

@@ -0,0 +1,213 @@
+require 'pry'
+
+require_relative  'board.rb'
+
+## Default setting constants
+module Defaults
+  SIZE_X = 20
+  SIZE_Y = 10
+  PLAYER_1_NAME   = 'Player 1'
+  PLAYER_2_NAME   = 'Player 2'
+  PLAYER_NAME     = 'Human'
+  COMPUTER_NAME   = 'Computer'
+  COMPUTER_1_NAME = 'Computer 1'
+  COMPUTER_2_NAME = 'Computer 2'
+
+  SHIP_1_COUNT = 5
+  SHIP_2_COUNT = 4
+  SHIP_3_COUNT = 3
+  SHIP_4_COUNT = 2
+  SHIP_5_COUNT = 1
+
+  SHIPS_COUNT = [SHIP_1_COUNT, SHIP_2_COUNT, SHIP_3_COUNT,
+                 SHIP_4_COUNT, SHIP_5_COUNT]
+end
+
+# Main game class
+# Use Game.new.run
+class Game
+  include Defaults
+  def initialize(name_0 = PLAYER_NAME, name_1 = COMPUTER_NAME)
+    @alphabet = ('A'..'Z').map { |a| a }
+    @board = [Board.new(SIZE_X, SIZE_Y, name_0),
+              Board.new(SIZE_X, SIZE_Y, name_1)]
+    @board[0].generate(*SHIPS_COUNT)
+    @board[1].generate(*SHIPS_COUNT)
+    @delay = 1 * 0.2
+    @current_player = 0
+    @player_name = [name_0, name_1]
+    @auto = :OFF
+  end
+
+  def display(b1, b2, hide_0 = false, hide_1 = false)
+    system('clear')
+    (SIZE_Y + 5).times do |i|
+      puts b1.display(i, hide_0) << ' ' * 3 << b2.display(i, hide_1)
+    end
+    puts "Turn: #{@player_name[@current_player]}"
+  end
+
+
+  def random_shoot
+    1000.times do
+      shoot = [rand(SIZE_X), rand(SIZE_Y)]
+      result = @board[@current_player - 1].shoot(*shoot)
+      if result != 'ALREADY SHOT'
+        return [result, shoot]
+      end
+    end
+    fail
+  end
+
+  def human_shoot
+    loop do
+      print 'Enter the cell: '
+      inp = gets.chop.upcase
+      if inp == 'QUIT' then return ['QUIT', [0,0]] end
+      if inp == 'AUTO' then return ['AUTO', [0,0]] end
+      x = ('A'..'Z').to_a.index inp[0]
+      y = inp.scan(/\d+/).first
+      if x == nil || y == nil
+        puts 'Wrong format. Example: E5'
+        next
+      end
+
+      begin
+        result = @board[@current_player - 1].shoot(x, y.to_i)
+      rescue OutOfBoardError
+        puts 'You have shot out of board. Try again.'
+        next
+      end
+
+      if result == 'ALREADY SHOT'
+        puts 'You have already shot there. Try again'
+        next
+      end
+      return [result, [x,y]]
+    end
+  end
+
+  def shoot 
+
+    @auto == :ON ? random_shoot : human_shoot
+
+  end
+
+  def process_result(result)
+    case result
+    when 'MISSED'
+      @current_player == 0 ? (@current_player = 1) : (@current_player = 0)
+    when 'INJURED'
+      sleep(@delay)
+    when 'KILLED'
+      if @board[@current_player - 1].is_ship_alive? == false
+        congratulation @player_name[@current_player]
+        return 'GAME OVER'
+      end
+      sleep(@delay)
+    when 'QUIT'
+      return 'QUIT'
+    end
+    sleep(@delay)
+  end
+
+  def congratulation(name)
+    puts "\nCONGRATULATION!!!"
+    puts "#{name} has won"
+    puts 'GAME OVER'
+    sleep(2)
+  end
+
+  def comp_vs_comp
+    @player_name[0] = @board[0].player_name = COMPUTER_1_NAME
+    @player_name[1] = @board[1].player_name = COMPUTER_2_NAME
+    display(*@board)
+    @auto = :ON
+    loop do
+      result, hit = (@auto == :OFF ? human_shoot : random_shoot)
+      return if result == 'QUIT'
+      if result == 'AUTO'
+        @auto = :ON
+        next
+      end
+      display(*@board)
+      puts "Hit: #{@alphabet[hit[0]]}#{hit[1]} - #{result}"
+      return if process_result(result) == 'GAME OVER'
+    end
+  end
+
+  def human_vs_comp
+    @player_name[0] = @board[0].player_name = PLAYER_NAME
+    @player_name[1] = @board[1].player_name = COMPUTER_NAME
+    system('clear')
+    print 'Enter your name: '
+    name = gets.chop
+    @player_name[0] = @board[0].player_name = name if name.length != 0
+    display(*@board, false, true)
+    loop do
+      result, hit = (@current_player == 0 ? human_shoot : random_shoot)
+      return if result == 'QUIT'
+
+      display(*@board, false, true)
+      puts "Hit: #{@alphabet[hit[0]]}#{hit[1]} - #{result}"
+      return if process_result(result) == 'GAME OVER'
+    end
+  end
+
+
+
+  def human_vs_human
+    @player_name[0] = @board[0].player_name = PLAYER_1_NAME
+    @player_name[1] = @board[1].player_name = PLAYER_2_NAME
+    system('clear')
+    print 'Enter Players 1 name: '
+    name = gets.chop
+    @player_name[0] = @board[0].player_name = name if name.length != 0
+    print 'Enter Players 2 name: '
+    name = gets.chop
+    @player_name[1] = @board[1].player_name = name if name.length != 0
+    player_last = -1
+    hit = nil
+    result = nil
+    loop do
+      if player_last != @current_player
+        player_last = @current_player
+        display(*@board, true, true)
+        
+        puts 'Press Enter when ready'
+        gets
+      end
+
+      @current_player == 0 ? display(*@board, false, true) : display(*@board, true, false)
+      puts "Hit: #{@alphabet[hit[0]]}#{hit[1]} - #{result}" if hit != nil && result != nil
+      result, hit = human_shoot
+      return if result == 'QUIT'
+      @current_player == 0 ? display(*@board, false, true) : display(*@board, true, false)
+      puts "Hit: #{@alphabet[hit[0]]}#{hit[1]} - #{result}"
+      return if process_result(result) == 'GAME OVER'
+    end
+  end
+
+  def run
+    system('clear')
+    greeting
+    input = gets.chop
+    case input
+    when '1' then comp_vs_comp
+    when '2' then human_vs_comp
+    when '3' then human_vs_human
+    when 'q', 'Q' then
+    end
+  end
+
+  private
+
+  def greeting
+    puts "\n\n\n************** NAVAL BATTLE****************"
+    puts 'Choose game mode:'
+    puts '1 - Computer vs Computer'
+    puts '2 - Human vs Computer'
+    puts '3 - Human vs Human'
+    puts
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: alex_butirskiy_sea_battle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Butirskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   A simple computr game.  Just type sea_battle after instalation
-
-
-  Only the demo mode (Computer vs Computer) works at the momemt/..
+  There are three modes of playing
 email: butirskiy@gmail.com
 executables:
 - sea_battle
@@ -23,10 +21,10 @@ extra_rdoc_files: []
 files:
 - bin/sea_battle
 - lib/alex_butirskiy_sea_battle.rb
-- lib/board.rb
-- lib/cell.rb
-- lib/game.rb
-- lib/ship.rb
+- lib/sea_battle/board.rb
+- lib/sea_battle/cell.rb
+- lib/sea_battle/game.rb
+- lib/sea_battle/ship.rb
 homepage: https://github.com/alexbutirskiy/sea_battle
 licenses:
 - MIT

data/lib/game.rb

@@ -1,134 +0,0 @@
-require_relative  'board.rb'
-
-## Default setting constants
-module Defaults
-  SIZE_X = 20
-  SIZE_Y = 10
-  PLAYER_1_NAME   = 'Player 1'
-  PLAYER_2_NAME   = 'Player 2'
-  PLAYER_NAME     = 'Human'
-  COMPUTER_NAME   = 'Computer'
-  COMPUTER_1_NAME = 'Computer 1'
-  COMPUTER_2_NAME = 'Computer 2'
-
-  SHIP_1_COUNT = 5
-  SHIP_2_COUNT = 4
-  SHIP_3_COUNT = 3
-  SHIP_4_COUNT = 2
-  SHIP_5_COUNT = 1
-
-  SHIPS_COUNT = [SHIP_1_COUNT, SHIP_2_COUNT, SHIP_3_COUNT,
-                 SHIP_4_COUNT, SHIP_5_COUNT]
-end
-
-# Main game class
-# Use Game.new.run
-class Game
-  include Defaults
-  def initialize
-    @alphabet = ''
-    ('A'..'Z').each { |a| @alphabet << a }
-  end
-
-  def display(b1, b2)
-    system('clear')
-    (SIZE_Y + 5).times do |i|
-      puts b1.display(i) << ' ' * 3 << b2.display(i)
-    end
-  end
-
-  def comp_vs_comp
-    board = [Board.new(SIZE_X, SIZE_Y, COMPUTER_1_NAME),
-             Board.new(SIZE_X, SIZE_Y, COMPUTER_2_NAME)]
-
-    board[0].generate(*SHIPS_COUNT)
-    board[1].generate(*SHIPS_COUNT)
-
-    player_name = [COMPUTER_1_NAME, COMPUTER_2_NAME]
-
-    current_player = 0
-    result = ' '
-    auto = :OFF
-    delay = 1
-    loop do
-      if auto == :OFF
-        display(*board)
-        puts "Turn: #{player_name[current_player]}\n"
-        puts "Press:Enter to continue\tQ+Enter - exit\tA+Enter - demo mode"
-        inp = gets.chop
-        case inp
-        when 'Q', 'q' then return
-        when 'A', 'a' then auto = :ON
-        when 'AF', 'af'
-          auto = :ON
-          delay = 0.2
-        end
-      end
-
-      hit = loop do
-        hit = [rand(SIZE_X), rand(SIZE_Y)]
-        result = board[current_player - 1].shoot(*hit)
-        break hit if result != 'ALREADY SHOT'
-      end
-
-      display(*board)
-      puts "Turn: #{player_name[current_player]}"
-      puts "Hit: #{@alphabet[hit[0]]}#{hit[1]} - #{result}"
-
-      case result
-      when 'MISSED'
-        current_player == 0 ? (current_player = 1) : (current_player = 0)
-      when 'INJURED'
-        sleep(delay)
-        next
-      when 'KILLED'
-        if board[current_player - 1].is_ship_alive? == false
-          congratulation player_name[current_player]
-          return
-        end
-        sleep(delay)
-      end
-      sleep(delay)
-    end
-  end
-
-  def congratulation(name)
-    puts "\nCONGRATULATION!!!"
-    puts "#{name} has won"
-    puts 'GAME OVER'
-    sleep(2)
-  end
-
-  def human_vs_human
-    puts "\nUnder construction. Try later..."
-  end
-
-  def human_vs_comp
-    puts "\nUnder construction. Try later..."
-  end
-
-  def run
-    system('clear')
-
-    greeting
-    input = gets.chop
-
-    case input
-    when '1' then comp_vs_comp
-    when '2' then human_vs_comp
-    when '3' then human_vs_human
-    when 'q', 'Q' then
-    end
-  end
-
-  private
-
-  def greeting
-    puts "\n\n\n************** NAVAL BATTLE****************"
-    puts 'Choose game mode:'
-    puts '1 - Computer vs Computer'
-    puts '2 - Human vs Computer'
-    puts '3 - Human vs Human'
-    puts
-  end
-end