blackjack-cli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df03bbf0092d4f4340b931d7a76f5a350ea9efe
-  data.tar.gz: 26df73639c4ea6d1546c7cc8c1eb054ee2258855
+  metadata.gz: 592a97e8422d8f7f00288f20bc9e35ec09a90275
+  data.tar.gz: 1c7777e0f5cfce1e5107d0ab2c1a90964a7066e1
 SHA512:
-  metadata.gz: bc22fc1bd0c8cac71145ccc0fff4aa238cdcd521a94c7165356160d206ea552c04387a368ca50aa7c2afa7fc6fb4612e08bc4f8ea14dd307684f216f7b12ba71
-  data.tar.gz: af207eadacdedd12bfab604a67027c838b2ec8492a70baec40a13cb24f7015aa4e489dd09b0611668bca72356cc10e1afe194010fd7c31250f7788bceb565e27
+  metadata.gz: 6768539fa479433625357f666660434477b4ad13e81bcaae452c76b3fa8cf52bbbff86babdea4938abd8f8dba41ca62e053bde8747007ba6fd8cf0896fd7ee42
+  data.tar.gz: 1c0c826bd27037c281d9ef39d1972e64b2e09639b1c40cf6262e2e40063a04b287406caffe413b6bb7459d438bcf396a4d2b27a6473251fc574f3b14a4f8af11

data/README.md

@@ -27,3 +27,6 @@ Smarter AI
 Feel free to log issues or request features!
 
 Thank you for playing!
+
+
+[![Gem Version](https://badge.fury.io/rb/blackjack-cli.svg)](https://badge.fury.io/rb/blackjack-cli)

data/lib/Cli.rb

@@ -15,9 +15,11 @@ class Cli
       when "start"
         puts "Loading Game..."
         sleep(2)
+        game = Game.new(@player_1, @player_2, @dealer, @type) if @player_2
+        game = Game.new(@player_1, @dealer, @type) if !@player_2
         puts "Game loaded"
         sleep(1)
-        Game.new(@player_1, @player_2, @type).play
+        game.play
       when "exit"
         return
       else
@@ -47,13 +49,14 @@ class Cli
     case input
       when "1"
         ask_for_player1_name
-        @player_2 = Computer.new
+        @dealer = Computer.new
         initialize_game
       when "2"
         ask_for_player1_name
         puts ""
         ask_for_player2_name
         puts ""
+        @dealer = Computer.new
         initialize_game
       when "exit"
         return

data/lib/Game.rb

@@ -1,21 +1,28 @@
 class Game
-  attr_accessor :deck, :player_1, :player_2, :turn_count
+  attr_accessor :deck, :player_1, :player_2, :dealer, :turn_count, :type
 
-  def initialize(player_1, player_2, type)
+  def initialize(player_1, player_2=nil, dealer, type)
     @deck = Deck.new.cards
     @player_1 = player_1
-    @player_2 = player_2
+    @player_2 = player_2 if player_2
+    @dealer = dealer
     @type = type
     @turn_count = 0
   end
 
   def current_player
-    @turn_count % 2 == 0 ? @player_1 : @player_2
+    if @turn_count == 0
+      @player_1
+    elsif @turn_count == 1 && @player_2
+      @player_2
+    else
+      @dealer
+    end
   end
 
-  def opposite_player
-    current_player == @player_1 ? @player_2 : @player_1
-  end
+  # def opposite_player
+  #   current_player == @player_1 ? @player_2 : @player_1
+  # end
 
   def card_value(card, player=current_player)
     case card.name
@@ -76,7 +83,6 @@ class Game
     player.deck.push(@deck[0])
     get_player_card_values(player)
     @deck.shift
-    @turn_count += 1
   end
 
   def get_player_card_values(player)
@@ -86,22 +92,49 @@ class Game
   end
 
   def draw?
-    @player_1.deck_value == @player_2.deck_value
+    @player_1.deck_value == @dealer.deck_value if !@player_2
+    @player_1.deck_value == @player_2.deck_value && @player_1.deck_value == @dealer.deck_value
   end
 
   def bust(player)
     player.deck_value > 21
   end
 
+  def two_player_won(player, player_2, player_3)
+    if player.deck_value > player_2.deck_value && bust(player_3) && !bust(player) && !bust(player_2)
+      player
+    elsif player.deck_value > player_3.deck_value && bust(player_2) && !bust(player) && !bust(player_3)
+      player
+    elsif player.deck_value > player_2.deck_value && player.deck_value > player_3.deck_value && !bust(player) && !bust(player_2) && !bust(player_3)
+      player
+    elsif !bust(player) && bust(player_2) && bust(player_3)
+      player
+    end
+  end
+
+  def one_player_won(player_1, player_2)
+    if player_1.deck_value > player_2.deck_value && !bust(player_1) && !bust(player_2)
+      player_1
+    elsif !bust(player_1) && bust(player_2)
+      player_1
+    end
+  end
+
   def won?
-    if @player_1.deck_value > @player_2.deck_value && !bust(@player_1)
-      @player_1
-    elsif @player_2.deck_value > @player_1.deck_value && !bust(@player_2)
-      @player_2
-    elsif bust(@player_1) && !bust(@player_2)
-      @player_2
-    elsif bust(@player_2) && !bust(@player_1)
-      @player_1
+    if @type == "2 player"
+      if winner = two_player_won(@player_1, @player_2, @dealer)
+        winner
+      elsif winner = two_player_won(@player_2, @player_1, @dealer)
+        winner
+      elsif winner = two_player_won(@dealer, @player_1, @player_2)
+        winner
+      end
+    else
+      if winner = one_player_won(@player_1, @dealer)
+        winner
+      elsif winner = one_player_won(@dealer, @player_1)
+        winner
+      end
     end
   end
 
@@ -114,17 +147,15 @@ class Game
   def lost
     if bust(@player_1)
       puts "Player 1 busted!"
-    elsif bust(@player_2)
+    elsif @player2 && bust(@player_2)
       puts "Player 2 busted!"
+    elsif bust(@dealer)
+      puts "Dealer busted!"
     end
   end
 
   def game_over
-    if @player_1.status == "stand" && @player_2.status == "stand"
-      true
-    elsif bust(@player_1) || bust(@player_2)
-      true
-    end
+    @turn_count == 3 ? true : false
   end
 
   def show_hands
@@ -132,8 +163,13 @@ class Game
     puts "Total card value: #{@player_1.deck_value}#{bust(@player_1) ? ' - Busted!' : nil}"
     sleep(1)
     puts ""
-    view_cards(@player_2)
-    puts "Total card value: #{@player_2.deck_value}#{bust(@player_2) ? ' - Busted!' : nil}"
+    view_cards(@player_2) if @player_2
+    puts "Total card value: #{@player_2.deck_value}#{bust(@player_2) ? ' - Busted!' : nil}" if @player_2
+    puts ""
+    view_cards(@dealer)
+    puts "Total card value: #{@dealer.deck_value}#{bust(@dealer) ? ' - Busted!' : nil}"
+    sleep(1)
+    puts ""
   end
 
   def stand(player)
@@ -152,11 +188,11 @@ class Game
   end
 
   def turn
-    @turn_count += 1 if current_player.status == "stand"
+    lost ? turn_count += 1 : nil
     view_cards(current_player) if current_player.is_a?(Human)
-    get_player_card_values(current_player) unless @turn_count == 0 || @turn_count == 1
+    get_player_card_values(current_player)
     puts "A total value of #{current_player.deck_value}" if current_player.is_a?(Human)
-    puts ""
+    puts "" if current_player.is_a?(Human)
     options
   end
 
@@ -165,9 +201,13 @@ class Game
     sleep(1)
     get_player_card_values(@player_1)
     sleep(1)
-    puts "Updating #{@player_2.name}'s hand..."
+    puts "Updating #{@player_2.name}'s hand..." if @player_2
+    sleep(1) if @player_2
+    get_player_card_values(@player_2) if @player_2
+    sleep(1) if @player_2
+    puts "Updating Dealer's hand..."
     sleep(1)
-    get_player_card_values(@player_2)
+    get_player_card_values(@dealer)
     sleep(1)
   end
 
@@ -210,7 +250,8 @@ class Game
     sleep(1)
     puts "Dealing Cards..."
     deal_cards(@player_1)
-    deal_cards(@player_2)
+    deal_cards(@player_2) if @player_2
+    deal_cards(@dealer)
     sleep(1)
     update_player_values
     puts ""
@@ -248,12 +289,13 @@ class Game
         puts ""
         if @type == "1 player"
           @player_1 = Human.new(@player_1.name)
-          @player_2 = Computer.new
-          Game.new(@player_1, @player_2, "1 player").play
+          @dealer = Computer.new
+          Game.new(@player_1, @dealer, "1 player").play
         else
           @player_1 = Human.new(@player_1.name)
           @player_2 = Human.new(@player_2.name)
-          Game.new(@player_1, @player_2, "2 player").play
+          @dealer = Computer.new
+          Game.new(@player_1, @player_2, @dealer, "2 player").play
         end
       when "n"
         return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blackjack-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Enoch Griffith