diff --git a/lib/game.rb b/lib/game.rb index 7b9fbd5..407df9f 100644 --- a/lib/game.rb +++ b/lib/game.rb @@ -64,6 +64,9 @@ class Game lead_card = @ui.choose_card(player1) follow_card = @ui.choose_card(player2) + player1.play + player2.play + if lead_card.suit != follow_card.suit && follow_card.suit != @trump_suit @trick_winner = @player1 elsif lead_card.suit == follow_card.suit && lead_card.strength > follow_card.strength @@ -72,9 +75,7 @@ class Game @trick_winner = @player2 end - if @trick_winner @trick_winner.add_point - end end def play diff --git a/lib/terminal_ui.rb b/lib/terminal_ui.rb index 544a2a4..ee4585c 100644 --- a/lib/terminal_ui.rb +++ b/lib/terminal_ui.rb @@ -32,7 +32,8 @@ class TerminalUI puts puts "Stock:" - puts game.stock + puts game.stock.length + puts end end diff --git a/main.rb b/main.rb index ef4d766..6f0627d 100644 --- a/main.rb +++ b/main.rb @@ -9,12 +9,21 @@ ui = TerminalUI.new game.determine_dealer game.deal -# ui.debug_game(game) + +# Première manche +# Premier pli +ui.debug_game(game) game.play_trick ui.display_trick_winner(game.trick_winner) -game.change_dealer -game.deal +# Second pli +ui.debug_game(game) +game.play_trick +ui.display_trick_winner(game.trick_winner) + +# Nouvelle manche +# game.change_dealer +# game.deal # ui.debug_game(game) # card = ui.choose_card(game.player1)