From 91a5b90571b938e716b213686c731cec1882dc43 Mon Sep 17 00:00:00 2001 From: "J. Michael Kasiewicz" Date: Sun, 18 Nov 2012 10:49:56 -0500 Subject: [PATCH 1/4] Complete Panda --- blackjack.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index b6dcda9..eefb506 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -14,7 +14,7 @@ def value end def to_s - "#{@value}-#{suit}" + "#{suit[0].upcase}#{@value}" end end From 2ddd4e64a5e082d0a74f2084189461cd36546689 Mon Sep 17 00:00:00 2001 From: "J. Michael Kasiewicz" Date: Sun, 18 Nov 2012 15:17:29 -0500 Subject: [PATCH 2/4] Completed Tiger and Eagle. --- blackjack.rb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/blackjack.rb b/blackjack.rb index eefb506..9e3df51 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -69,24 +69,36 @@ def initialize @deck = Deck.new @player_hand = Hand.new @dealer_hand = Hand.new + @hidden = true 2.times { @player_hand.hit!(@deck) } 2.times { @dealer_hand.hit!(@deck) } end def hit @player_hand.hit!(@deck) + stand if @player_hand.value > 21 + status end def stand + @hidden = false @dealer_hand.play_as_dealer(@deck) @winner = determine_winner(@player_hand.value, @dealer_hand.value) + status end def status + if @hidden == true + dealer_hand = "XX XX" + dealer_value = "XX" + else + dealer_hand = @dealer_hand.cards + dealer_value = @dealer_hand.value + end {:player_cards=> @player_hand.cards, :player_value => @player_hand.value, - :dealer_cards => @dealer_hand.cards, - :dealer_value => @dealer_hand.value, + :dealer_cards => dealer_hand, + :dealer_value => dealer_value, :winner => @winner} end @@ -135,7 +147,7 @@ def inspect it "should be formatted nicely" do card = Card.new(:diamonds, "A") - card.to_s.should eq("A-diamonds") + card.to_s.should eq("DA") end end From 25b9ab394e14031a8bac127a74659d84b20f026c Mon Sep 17 00:00:00 2001 From: "J. Michael Kasiewicz" Date: Sun, 18 Nov 2012 19:42:00 -0500 Subject: [PATCH 3/4] Fix dealer hand to show only one card until player stands. --- blackjack.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index 9e3df51..65d9ba2 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -89,7 +89,7 @@ def stand def status if @hidden == true - dealer_hand = "XX XX" + dealer_hand = ["XX", @dealer_hand.cards[1]] dealer_value = "XX" else dealer_hand = @dealer_hand.cards From 261d12ee25d1633c5a6ecfd3a8182a73ec740b21 Mon Sep 17 00:00:00 2001 From: "J. Michael Kasiewicz" Date: Sun, 18 Nov 2012 19:45:01 -0500 Subject: [PATCH 4/4] Simplify if statement in Game.status --- blackjack.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blackjack.rb b/blackjack.rb index 65d9ba2..d1dfaff 100644 --- a/blackjack.rb +++ b/blackjack.rb @@ -88,7 +88,7 @@ def stand end def status - if @hidden == true + if @hidden dealer_hand = ["XX", @dealer_hand.cards[1]] dealer_value = "XX" else