Skip to content

Commit

Permalink
Revised #player_settings method to #player_marks which now returns on…
Browse files Browse the repository at this point in the history
…e array with two player marks corresponding with player order
  • Loading branch information
lisahamm committed Mar 11, 2015
1 parent 51a772d commit 72454bf
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions lib/game_helpers.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
module GameHelpers
def create_game(params)
player_settings = player_settings(params)
TicTacToe::Game.new(player_settings, player_settings[0][:mark])
player_marks = player_marks(params)
TicTacToe::Game.new(player_marks[0], player_marks[1], player_marks[0])
end

def player_settings(params)
player_settings = []
ai = computer_opponent(params) != nil
def player_marks(params)
if params[:player_order] == 'first'
player_settings[0] = {mark: params[:player_mark], ai: false}
player_settings[1] = {mark: opponent_mark(params[:player_mark]), ai: ai}
[params[:player_mark], opponent_mark(params[:player_mark])]
else
player_settings[0] = {mark: opponent_mark(params[:player_mark]), ai: ai}
player_settings[1] = {mark: params[:player_mark], ai: false}
[opponent_mark(params[:player_mark]), params[:player_mark]]
end
player_settings
end

def opponent_mark(mark)
Expand All @@ -24,16 +19,13 @@ def opponent_mark(mark)
def computer_opponent(params)
player_order = params[:player_order]
if params[:computer_opponent] == "yes"
if player_order == "first"
return "player2"
else
return "player1"
end
return player_order == "first" ? "player2" : "player1"
end
nil
end

def array_to_board(array)
TicTacToe::Board.new(cells: array)
end

end

0 comments on commit 72454bf

Please sign in to comment.