games_bfox 0.3.0 → 0.4.0

data/lib/games/tictactoe/players_factory.rb

@@ -1,11 +1,55 @@
-require_relative 'player'
+require_relative 'human_player'
+require_relative 'computer_player_expert'
+require_relative 'computer_player_novice'
 
 module TTT
-  class PlayersFactory
-    def generate_players(config)
-      player_1 = TTT::Player.new(value: config.player_1_value, name: config.player_1_name, type: :human)
-      player_2 = TTT::Player.new(value: config.player_2_value, name: config.player_2_name, type: config.player_2_type, difficulty_level: config.computer_difficulty_level)
+  class PlayersFactory < Shared::PlayersFactory
+    def generate_players
+      player_1 = generate_player_1_new
+      player_2 = generate_player_2(player_1.value)
       [player_1, player_2]
     end
+
+    def generate_player_2(player_value_taken)
+      player_2_type = io_helpers.get_player_2_type
+      if player_2_type == :human
+        generate_player_2_human(player_value_taken)
+      else #second_player_computer
+        computer_knowledge_level = io_helpers.get_computer_knowledge_level
+        if computer_knowledge_level == :novice
+          generate_player_2_computer_novice(player_value_taken)
+        else
+          generate_player_2_computer_expert(player_value_taken)
+        end
+      end
+    end
+
+    def generate_player_1_new
+      player_name = io_helpers.get_player_1_name
+      player_value = io_helpers.get_player_value(player_name, "")
+      TTT::HumanPlayer.new(name: player_name, value: player_value)
+    end
+
+    def generate_player_2_human(player_value_taken)
+      player_name = io_helpers.get_player_2_name
+      player_value = io_helpers.get_player_value(player_name, player_value_taken )
+      TTT::HumanPlayer.new(name: player_name, value: player_value)
+    end
+
+    def generate_player_2_computer_novice(player_value_taken)
+      TTT::ComputerPlayerNovice.new(name: "Computer", value: computer_value(player_value_taken))
+    end
+
+    def generate_player_2_computer_expert(player_value_taken)
+      TTT::ComputerPlayerExpert.new(name: "Computer", value: computer_value(player_value_taken))
+    end
+
+    def computer_value(taken)
+      if taken != "O"
+        "O"
+      else
+        "X"
+      end
+    end
   end
 end

data/lib/games/tictactoe/square.rb

@@ -1,13 +1,10 @@
 module TTT
   class Square
     attr_accessor :value, :display_value
-    attr_reader :row, :col
 
     def initialize(args)
       @value = args[:value]
       @display_value = args[:display_value]
-      @row = args[:row]
-      @col = args[:col]
     end
 
     def change_value(new_value)

data/lib/games/tictactoe/squares.rb

@@ -40,7 +40,7 @@ module TTT
 
     def full?
       collection_of_squares.each do |row|
-        return false if row.all? { |square| square.full? } == false
+        return false if !(row.all? { |square| square.full? })
       end
       return true
     end

data/lib/games/tictactoe/squares_factory.rb

@@ -2,7 +2,7 @@ require_relative 'squares'
 require_relative 'square'
 
 module TTT
-  module SquaresFactory
+  class SquaresFactory
     def self.build_custom_squares(config, squares_class = Squares)
 
       rows_and_cols = config.length
@@ -14,7 +14,7 @@ module TTT
 
       squares.each_with_index do |element, row|
         element.each_index do |col|
-          squares[row][col] = create_custom_square(config[row][col][0],config[row][col][1], row, col)
+          squares[row][col] = create_custom_square(config[row][col][0],config[row][col][1])
         end
       end
 
@@ -23,11 +23,9 @@ module TTT
     end
 
 
-    def self.create_custom_square(display_value, value, row, col, square_class = Square)
+    def self.create_custom_square(display_value, value, square_class = Square)
       square_class.new(display_value: display_value,
-                       value: value,
-                       row: row,
-                       col: col )
+                       value: value)
     end
 
     def self.build_empty_squares(rows_and_cols, squares_class = Squares)
@@ -38,7 +36,7 @@ module TTT
       i = 1
       squares.each_with_index do |element, row|
         element.each_index do |col|
-          squares[row][col] = create_empty_square(i, row, col)
+          squares[row][col] = create_empty_square(i)
           i += 1
         end
       end
@@ -46,11 +44,9 @@ module TTT
       squares_class.new(collection_of_squares: squares)
     end
 
-    def self.create_empty_square(display_value, row, col, square_class = Square)
+    def self.create_empty_square(display_value, square_class = Square)
       square_class.new(display_value: display_value,
-                       value: nil,
-                       row: row,
-                       col: col )
+                       value: nil)
     end
   end
 end

data/lib/games/tictactoe.rb

@@ -4,10 +4,17 @@ Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'tictactoe', '*.rb')].ea
 class TicTacToe
   def self.run
     io = Shared::IOTerminal.new
+    io_helpers = TTT::IOHelpers.new(io)
     board_presenter = TTT::BoardPresenterTerminal.new
+    board_builder = TTT::BoardBuilder.new
+    players_factory = TTT::PlayersFactory.new(io_helpers)
 
-    game = TTT::Game.new(game_module: TTT, io: io, board_presenter: board_presenter)
-    # game.setup
+    game = TTT::Game.new(
+                         io_helpers: io_helpers,
+                         board_presenter: board_presenter,
+                         board_builder: board_builder,
+                         players_factory: players_factory,
+    )
     game.play
   end
 end

data/lib/games/version.rb

@@ -1,3 +1,3 @@
 module Games
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: games_bfox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Brett Fox
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,8 +86,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
-description: In order to play, download the gem, and type \"tictactoe\" or \"mastermind\"
-  at your terminal.
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: In order to play, download the gem, and type "tictactoe" or "mastermind"
+  at your terminal. Type "exit" to quit the game.
 email:
 - brettfox11@gmail.com
 executables:
@@ -103,6 +117,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- config/application.yml
 - exe/mastermind
 - exe/setup
 - exe/tictactoe
@@ -112,35 +127,35 @@ files:
 - lib/games/mastermind/board.rb
 - lib/games/mastermind/board_builder.rb
 - lib/games/mastermind/board_presenter_terminal.rb
-- lib/games/mastermind/colors.rb
+- lib/games/mastermind/computer_player_expert.rb
+- lib/games/mastermind/computer_player_novice.rb
 - lib/games/mastermind/game.rb
-- lib/games/mastermind/game_config.rb
-- lib/games/mastermind/game_resetter.rb
-- lib/games/mastermind/game_state_changer.rb
 - lib/games/mastermind/guess_evaluator.rb
-- lib/games/mastermind/input_helper.rb
-- lib/games/mastermind/move_generator.rb
+- lib/games/mastermind/guess_evaluator_result.rb
+- lib/games/mastermind/human_player.rb
+- lib/games/mastermind/io_helpers.rb
 - lib/games/mastermind/peg.rb
 - lib/games/mastermind/pegs.rb
 - lib/games/mastermind/pegs_factory.rb
 - lib/games/mastermind/players_factory.rb
-- lib/games/shared/array_iterator.rb
+- lib/games/mastermind/secret_code.rb
 - lib/games/shared/game.rb
-- lib/games/shared/input_helper.rb
+- lib/games/shared/io_helpers.rb
 - lib/games/shared/io_terminal.rb
 - lib/games/shared/player.rb
+- lib/games/shared/player_factory.rb
+- lib/games/shared/players_factory.rb
 - lib/games/shared/version.rb
 - lib/games/tictactoe.rb
 - lib/games/tictactoe/board.rb
 - lib/games/tictactoe/board_builder.rb
 - lib/games/tictactoe/board_presenter_terminal.rb
+- lib/games/tictactoe/computer_player_expert.rb
+- lib/games/tictactoe/computer_player_novice.rb
 - lib/games/tictactoe/game.rb
-- lib/games/tictactoe/game_config.rb
-- lib/games/tictactoe/game_resetter.rb
-- lib/games/tictactoe/game_state_changer.rb
-- lib/games/tictactoe/input_helper.rb
+- lib/games/tictactoe/human_player.rb
+- lib/games/tictactoe/io_helpers.rb
 - lib/games/tictactoe/minimax.rb
-- lib/games/tictactoe/move_generator.rb
 - lib/games/tictactoe/player.rb
 - lib/games/tictactoe/players_factory.rb
 - lib/games/tictactoe/square.rb

data/lib/games/mastermind/colors.rb

@@ -1,14 +0,0 @@
-module MM
-  class Colors
-    def self.key
-      {
-        1 => :red,
-        2 => :green,
-        3 => :blue,
-        4 => :orange,
-        5 => :yellow,
-        6 => :brown
-      }
-    end
-  end
-end

data/lib/games/mastermind/game_config.rb

@@ -1,48 +0,0 @@
-module MM
-  class GameConfig
-    attr_accessor :input_helper
-
-    attr_accessor :player_1_name
-    attr_accessor :code_setter
-    attr_accessor :secret_code
-    attr_accessor :number_of_rows
-    attr_accessor :number_of_cols
-
-    def initialize(input_helper)
-      @input_helper = input_helper
-      @number_of_rows = 12
-      @number_of_cols = 4
-
-    end
-
-    def one_time_setup
-      self.player_1_name = input_helper.get_player_1_name
-      #defaults set above. uncomment to ask the player to choose
-      # self.number_of_rows = input_helper.get_number_of_rows
-      # self.number_of_cols = input_helper.get_number_of_cols
-    end
-
-    def every_time_setup
-      self.code_setter = input_helper.computer_or_human_code_setter_inquiry(player_1_name)
-      self.secret_code = get_secret_code
-    end
-
-    def get_secret_code
-      code = nil
-      if code_setter == :human
-        code = input_helper.get_secret_code_from_user(player_1_name)
-      elsif code_setter == :computer
-        code = set_secret_code
-      end
-      code
-    end
-
-    def set_secret_code
-      secret_code = []
-      4.times do
-        secret_code.push((1..6).to_a.sample)
-      end
-      secret_code
-    end
-  end
-end

data/lib/games/mastermind/game_resetter.rb

@@ -1,19 +0,0 @@
-module MM
-  class GameResetter
-    attr_accessor :game
-
-    def reset_game(game)
-      @game = game
-      reset_board
-      game.number_of_turns_taken = 0
-      game.won_flag = false
-      game.secret_code = game.set_secret_code
-      game.current_guess = []
-      game.current_result = []
-    end
-
-    def reset_board
-      game.board = game.generate_empty_board(game.config)
-    end
-  end
-end

data/lib/games/mastermind/game_state_changer.rb

@@ -1,41 +0,0 @@
-module MM
-  class GameStateChanger
-    attr_accessor :game
-
-    def change_game_state(guess, game)
-      @game = game
-      game.current_guess = guess
-      game.current_result = game.evaluate_guess(secret_code, current_guess)
-      change_pegs(guess, game.current_result)
-      if !game.won?
-        game.move_forward_one_turn
-      end
-    end
-
-    def change_pegs(guess, current_result)
-      current_row.each_with_index do |peg, index|
-        peg.change_value(guess[index])
-      end
-
-      result_pegs_current_row.each_with_index do |peg, index|
-        peg.change_value(current_result[index])
-      end
-    end
-
-    def current_row
-      game.pegs_current_row
-    end
-
-    def result_pegs_current_row
-      game.result_pegs_current_row
-    end
-
-    def secret_code
-      game.secret_code
-    end
-
-    def current_guess
-      game.current_guess
-    end
-  end
-end

data/lib/games/mastermind/input_helper.rb

@@ -1,67 +0,0 @@
-require_relative '../shared/input_helper'
-
-module MM
-  class InputHelper < Shared::InputHelper
-    def computer_or_human_code_setter_inquiry(name)
-      user_choice = get_user_input("#{name}, please enter \"1\" if you would like to be the code-guesser. Enter \"2\" if you would like to set the code and have the computer guess.", "Invalid entry. Please enter either 1(computer picks code) or 2 (you pick code)") do |input|
-        input == 1 || input == 2
-      end
-      if user_choice == 1
-        return :computer
-      elsif user_choice == 2
-        return :human
-      end
-    end
-
-    def get_secret_code_from_user(name)
-      user_choice = get_user_input("#{name}, please enter a secret code consisting of four numbers that each correspond to a color. Do not separate with punctuation. The computer will try to guess this code.", "Please re-enter a secret code, using only 4 numbers, 1 through 6.") do |input|
-        input.to_s =~ /^[1-6]{4}$/
-      end
-      user_choice.to_s.chars.map(&:to_i)
-    end
-
-    def get_player_choice(game)
-      user_choice = get_user_input("#{game.current_player_name}, please enter a secret code consisting of 4 numbers that correspond to the color of your guess. Do not separate with punctuation.", "Please re-enter a secret code guess, using exactly 4 numbers, each being a digit 1 through 6.") do |input|
-        input.to_s =~ /^[1-6]{4}$/
-      end
-      user_choice.to_s.chars.map(&:to_i)
-    end
-
-    def draw_prompt
-      io.present_with_new_line("No such luck! Please try again.")
-    end
-
-    def initial_instructions
-      io.present_with_new_line("MASTERMIND")
-      io.present_with_new_line("__________")
-      io.present_with_new_line("Game Instructions: Try to guess a 4 digit code that contains a collection of numbers 1-6 (\"6241\", for example).")
-      io.present_with_new_line("After each guess, the \"Result\" section will generate an \"X\" for each digit in the guess that is perfect(correct number and correct spot) and an \"O\" for each digit that is the correct number but in the wrong spot.")
-      io.present_with_new_line("Type \"Exit\" to quit the game.")
-      io.present_with_new_line("___________")
-    end
-
-    def winning_prompt(current_player_name)
-      io.present_with_new_line("#{current_player_name} wins!")
-    end
-
-    def no_winner_prompt
-      io.present_with_new_line("Game over!")
-    end
-
-    def custom_final_message(game)
-      io.present_with_new_line("The secret code was #{game.secret_code.join(",")}")
-    end
-
-    def get_number_of_rows
-      get_user_input("Please choose how many rows of pegs you would like, from 4 to 12.", "Please choose a number between 4 and 12.") do |input|
-        input.to_i >=4 && input.to_i <=12
-      end
-    end
-
-    def get_number_of_cols
-      get_user_input("Please choose how many pegs you would like in each row, from 4 to 6.", "Please choose a number between 4 and 6.") do |input|
-        input.to_i >=4 && input.to_i <=6
-      end
-    end
-  end
-end

data/lib/games/mastermind/move_generator.rb

@@ -1,46 +0,0 @@
-module MM
-  class MoveGenerator
-
-    attr_accessor :game
-
-    def get_player_choice(game)
-      @game = game
-      get_move
-    end
-
-    def get_move
-      if human?
-        input_helper.get_player_choice(game)
-      elsif computer?
-        input_helper.computer_choosing_graphic
-        computer_move
-      end
-    end
-
-    def computer_move
-      secret_code = []
-      4.times do
-        secret_code.push((1..6).to_a.sample)
-      end
-      secret_code
-    end
-
-
-    def current_player
-      game.current_player
-    end
-
-    def input_helper
-      game.input_helper
-    end
-
-    def human?
-      game.current_player_human?
-    end
-
-    def computer?
-      game.current_player_computer?
-    end
-  end
-end
-

data/lib/games/shared/array_iterator.rb

@@ -1,28 +0,0 @@
-#from Design Patterns by Russ Olsen pg 128-129
-module Shared
-  class ArrayIterator
-    def initialize(array)
-      @array = array
-      @index = 0
-    end
-
-    def has_next?
-      @index < @array.length
-    end
-
-    def item
-      @array[@index]
-    end
-
-    def peek
-      @array[@index]
-    end
-
-    def next_item
-      value = @array[@index]
-      @index += 1
-      value
-    end
-  end
-end
-

data/lib/games/tictactoe/game_config.rb

@@ -1,73 +0,0 @@
-module TTT
-  class GameConfig
-    attr_accessor :input_helper
-
-    attr_accessor :player_1_name
-    attr_accessor :player_1_value
-    attr_accessor :player_2_type
-    attr_accessor :player_2_name
-    attr_accessor :player_2_value
-    attr_accessor :computer_difficulty_level
-    attr_accessor :number_of_rows_cols
-
-    def initialize(input_helper)
-      @input_helper = input_helper
-    end
-
-    def one_time_setup
-      set_player_1_values
-      set_player_2_values
-      set_board_rows_cols
-    end
-
-    def every_time_setup
-
-    end
-
-    def set_player_1_values
-      self.player_1_name = input_helper.get_player_1_name
-      self.player_1_value = input_helper.get_player_1_value(player_1_name)
-    end
-
-    def set_player_2_values
-      self.player_2_type = input_helper.get_player_2_type
-      if player_2_human?
-        self.player_2_name = input_helper.get_player_2_name
-        self.player_2_value = input_helper.get_player_2_value(player_1_value)
-      elsif player_2_computer?
-        self.player_2_name = "Computer"
-        self.player_2_value = get_computer_value
-        self.computer_difficulty_level = input_helper.get_computer_difficulty_level
-      end
-    end
-
-    def set_board_rows_cols
-      #need this if else logic because if computer is difficult, it runs minimax, which is too slow to allow for more than 3 rows/cols
-      if computer_difficult?
-        self.number_of_rows_cols = input_helper.get_number_of_rows_cols_max_3
-      else
-        self.number_of_rows_cols = input_helper.get_number_of_rows_cols_max_9
-      end
-    end
-
-    def player_2_human?
-      player_2_type == :human
-    end
-
-    def player_2_computer?
-      player_2_type == :computer
-    end
-
-    def computer_difficult?
-      computer_difficulty_level == :difficult
-    end
-
-    def get_computer_value
-      if player_1_value != "O"
-        "O"
-      else
-        "X"
-      end
-    end
-  end
-end

data/lib/games/tictactoe/game_resetter.rb

@@ -1,16 +0,0 @@
-module TTT
-  class GameResetter
-    attr_accessor :game
-
-    def reset_game(game)
-      @game = game
-      reset_board
-      game.number_of_turns_taken = 0
-      game.won_flag = false
-    end
-
-    def reset_board
-      game.board = game.generate_empty_board(game.config)
-    end
-  end
-end

data/lib/games/tictactoe/game_state_changer.rb

@@ -1,17 +0,0 @@
-module TTT
-  class GameStateChanger
-    attr_accessor :game
-
-    def change_game_state(player_choice, game)
-      @game = game
-      change_square(player_choice)
-    end
-
-    def change_square(display_value)
-      game.change_square(display_value, game.current_player_value)
-      if !game.won?
-        game.move_forward_one_turn
-      end
-    end
-  end
-end