blackjack-cli 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bde97189c9a026e1875fb9f999139c0a5b1d1211
-  data.tar.gz: 156387374b9e8de4f30556912f2d353acd0e16f2
+  metadata.gz: 1334ff0a35abad7bcf3e3e852161d3b1c04b1f34
+  data.tar.gz: d582ec299b6db0172d4460ea0b8968b15c544d40
 SHA512:
-  metadata.gz: 14db6ae6d84ce4447cfed830dba949bcd0e34b716a5cbbcf0a6ec527a7280dbe44b566f2af3227a4b3a61dfbf643ad7fdf200119221f3f58eb80277f13de2aaa
-  data.tar.gz: a9481598b6437e9614bac60b114a89c69f89fde8dd8dfb12dff6eb3da58d4aa6faf0ef3001f9dd31c1ec20b25cbdc4e56f7be426548823b82df89e40f1b0e105
+  metadata.gz: b8a2bbfd115255593b6eb75e65c536a3ec96590c3448e1c3c306509519849c5124b52e79938e2dfac11b67d415674fbbccfe02b0a13f08ce5f1bd7b8d132a07b
+  data.tar.gz: 817dbd411d1d379c715d5f9d8e58b3ba6302a319d37518d4ea57fa3fb799a16f3eb8194cc0963855628628a9fd0a1c3697a4f964283b9f768c72537562e79cec

data/bin/blackjack

@@ -1,4 +1,4 @@
 #!usr/bin/env ruby
 require_relative '../config/environment.rb'
-
+system 'clear' or system 'cls'
 Cli.new.run

data/lib/Card.rb

@@ -1,9 +1,10 @@
 class Card
-  attr_accessor :name, :type
+  attr_accessor :name, :type, :value
 
-  def initialize(name, type)
+  def initialize(name, type, value=nil)
     @name = name
     @type = type
+    @value = value
   end
 
 end

data/lib/Cli.rb

@@ -8,17 +8,25 @@ class Cli
     puts "Incorrect input, please try again!"
   end
 
+  def clear_screen
+    system 'clear' or system 'cls'
+  end
+
   def initialize_game
+    clear_screen
     puts "Type start to begin or exit to exit program"
     input = gets.strip
     case input
       when "start"
+        clear_screen
         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
+        clear_screen
         puts "Game loaded"
         sleep(1)
+        clear_screen
         game.play
       when "exit"
         return
@@ -29,6 +37,7 @@ class Cli
   end
 
   def ask_for_player1_name
+    clear_screen
     puts "Player 1, What is your name?"
     input = gets.strip
     @player_1 = Human.new(input)
@@ -36,6 +45,7 @@ class Cli
   end
 
   def ask_for_player2_name
+    clear_screen
     puts "Player 2, What is your name?"
     input = gets.strip
     @player_2 = Human.new(input)

data/lib/Deck.rb

@@ -11,54 +11,54 @@ class Deck
       Card.new('Ace', 'Diamonds'),
       Card.new('Ace', 'Clubs'),
       Card.new('Ace', 'Spades'),
-      Card.new('2', 'Hearts'),
-      Card.new('2', 'Diamonds'),
-      Card.new('2', 'Clubs'),
-      Card.new('2', 'Spades'),
-      Card.new('3', 'Hearts'),
-      Card.new('3', 'Diamonds'),
-      Card.new('3', 'Clubs'),
-      Card.new('3', 'Spades'),
-      Card.new('4', 'Hearts'),
-      Card.new('4', 'Diamonds'),
-      Card.new('4', 'Clubs'),
-      Card.new('4', 'Spades'),
-      Card.new('5', 'Hearts'),
-      Card.new('5', 'Diamonds'),
-      Card.new('5', 'Clubs'),
-      Card.new('5', 'Spades'),
-      Card.new('6', 'Hearts'),
-      Card.new('6', 'Diamonds'),
-      Card.new('6', 'Clubs'),
-      Card.new('6', 'Spades'),
-      Card.new('7', 'Hearts'),
-      Card.new('7', 'Diamonds'),
-      Card.new('7', 'Clubs'),
-      Card.new('7', 'Spades'),
-      Card.new('8', 'Hearts'),
-      Card.new('8', 'Diamonds'),
-      Card.new('8', 'Clubs'),
-      Card.new('8', 'Spades'),
-      Card.new('9', 'Hearts'),
-      Card.new('9', 'Diamonds'),
-      Card.new('9', 'Clubs'),
-      Card.new('9', 'Spades'),
-      Card.new('10', 'Hearts'),
-      Card.new('10', 'Diamonds'),
-      Card.new('10', 'Clubs'),
-      Card.new('10', 'Spades'),
-      Card.new('Jack', 'Hearts'),
-      Card.new('Jack', 'Diamonds'),
-      Card.new('Jack', 'Clubs'),
-      Card.new('Jack', 'Spades'),
-      Card.new('Queen', 'Hearts'),
-      Card.new('Queen', 'Diamonds'),
-      Card.new('Queen', 'Clubs'),
-      Card.new('Queen', 'Spades'),
-      Card.new('King', 'Hearts'),
-      Card.new('King', 'Diamonds'),
-      Card.new('King', 'Clubs'),
-      Card.new('King', 'Spades')
+      Card.new('2', 'Hearts', 2),
+      Card.new('2', 'Diamonds', 2),
+      Card.new('2', 'Clubs', 2),
+      Card.new('2', 'Spades', 2),
+      Card.new('3', 'Hearts', 3),
+      Card.new('3', 'Diamonds', 3),
+      Card.new('3', 'Clubs', 3),
+      Card.new('3', 'Spades', 3),
+      Card.new('4', 'Hearts', 4),
+      Card.new('4', 'Diamonds', 4),
+      Card.new('4', 'Clubs', 4),
+      Card.new('4', 'Spades', 4),
+      Card.new('5', 'Hearts', 5),
+      Card.new('5', 'Diamonds', 5),
+      Card.new('5', 'Clubs', 5),
+      Card.new('5', 'Spades', 5),
+      Card.new('6', 'Hearts', 6),
+      Card.new('6', 'Diamonds', 6),
+      Card.new('6', 'Clubs', 6),
+      Card.new('6', 'Spades', 6),
+      Card.new('7', 'Hearts', 7),
+      Card.new('7', 'Diamonds', 7),
+      Card.new('7', 'Clubs', 7),
+      Card.new('7', 'Spades', 7),
+      Card.new('8', 'Hearts', 8),
+      Card.new('8', 'Diamonds', 8),
+      Card.new('8', 'Clubs', 8),
+      Card.new('8', 'Spades', 8),
+      Card.new('9', 'Hearts', 9),
+      Card.new('9', 'Diamonds', 9),
+      Card.new('9', 'Clubs', 9),
+      Card.new('9', 'Spades', 9),
+      Card.new('10', 'Hearts', 10),
+      Card.new('10', 'Diamonds', 10),
+      Card.new('10', 'Clubs', 10),
+      Card.new('10', 'Spades', 10),
+      Card.new('Jack', 'Hearts', 10),
+      Card.new('Jack', 'Diamonds', 10),
+      Card.new('Jack', 'Clubs', 10),
+      Card.new('Jack', 'Spades', 10),
+      Card.new('Queen', 'Hearts', 10),
+      Card.new('Queen', 'Diamonds', 10),
+      Card.new('Queen', 'Clubs', 10),
+      Card.new('Queen', 'Spades', 10),
+      Card.new('King', 'Hearts', 10),
+      Card.new('King', 'Diamonds', 10),
+      Card.new('King', 'Clubs', 10),
+      Card.new('King', 'Spades', 10)
     ]
   end
 end

data/lib/Game.rb

@@ -24,54 +24,63 @@ class Game
   #   current_player == @player_1 ? @player_2 : @player_1
   # end
 
-  def card_value(card, player=current_player)
-    case card.name
-      when "1"
-        return 1
-      when "2"
-        return 2
-      when "3"
-        return 3
-      when "4"
-        return 4
-      when "5"
-        return 5
-      when "6"
-        return 6
-      when "7"
-        return 7
-      when "8"
-        return 8
-      when "9"
-        return 9
-      when "10"
-        return 10
-      when "Jack"
-        return 10
-      when "Queen"
-        return 10
-      when "King"
-        return 10
-      when "Ace"
-        view_cards(player) if player.is_a?(Human)
-        puts "Would you like the Ace of #{card.type} to equal 1 or 11? Type 1 or 11" if player.is_a?(Human)
-        input = gets.strip if player.is_a?(Human)
-        input = player.get_ace_value if player.is_a?(Computer)
-        case input
-          when "1"
-            return 1
-          when "11"
-            return 11
-          else
-            Cli.new.error_message
-            card_value(card)
-        end
-      else
-        Cli.new.error_message
-        card_value(card)
+  def check_for_ace(card, player)
+    if card.name == "Ace" && card.value && player.is_a?(Human)
+      view_cards(player)
+      puts ""
+      puts "Total value of #{player.deck_value}"
+      puts ""
+      puts "You have an Ace in your hand. Would you like to change it's value? Current value #{card.value} : y/n"
+      input = gets.strip
+      case input
+        when 'y'
+          puts "Would you like it's value to be 1 or 11?"
+          input = gets.strip
+          case input
+            when '1'
+              card.value = 1
+            when '11'
+              card.value = 11
+            else
+              Cli.new.error_message
+              check_for_ace(card)
+          end
+        when 'n'
+          card.value
+        else
+          Cli.new.error_message
+          check_for_ace(card, player)
+      end
+    elsif card.name == "Ace" && player.is_a?(Human)
+      clear_screen
+      view_cards(player)
+      puts "You have an Ace in your hand. Would you like it's value to be 1 or 11?"
+      input = gets.strip
+      case input
+        when '1'
+          card.value = 1
+        when '11'
+          card.value = 11
+        else
+          Cli.new.error_message
+          check_for_ace(card)
+      end
+    elsif card.name == "Ace" && player.is_a?(Computer)
+      card.value = player.get_ace_value
     end
   end
 
+  def start_of_turn_values(player)
+    player.deck_value = 0
+    player.deck.each{|card| player.deck_value += card.value}
+  end
+
+  def get_card_values(player)
+    player.deck_value = 0
+    player.deck.each{|card| check_for_ace(card, player)}
+    player.deck.each{|card| player.deck_value += card.value}
+  end
+
   def deal_cards(player)
     player.deck.push(@deck[0])
     @deck.shift
@@ -81,13 +90,17 @@ class Game
 
   def hit(player)
     player.deck.push(@deck[0])
-    get_player_card_values(player)
+    get_card_values(player)
     @deck.shift
   end
 
+  def clear_screen
+    Cli.new.clear_screen
+  end
+
   def get_player_card_values(player)
     player.deck_value = 0
-    player.deck.each{|card| player.deck_value += card_value(card, player)}
+    player.deck.each{|card| player.deck_value += card.value}
     player.deck_value
   end
 
@@ -154,15 +167,20 @@ class Game
   def lost
     if bust(@player_1)
       puts "Player 1 busted!"
+      true
     elsif @player2 && bust(@player_2)
       puts "Player 2 busted!"
+      true
     elsif bust(@dealer)
       puts "Dealer busted!"
+      true
     end
   end
 
   def game_over
-    @turn_count == 3 ? true : false
+    return true if @turn_count == 3 if @player_2
+    return true if @turn_count == 2 if !@player_2
+
   end
 
   def show_hands
@@ -195,9 +213,10 @@ class Game
   end
 
   def turn
-    lost ? turn_count += 1 : nil
+    clear_screen
+    lost ? @turn_count += 1 : nil
     view_cards(current_player) if current_player.is_a?(Human)
-    get_player_card_values(current_player)
+    start_of_turn_values(current_player)
     puts "A total value of #{current_player.deck_value}" if current_player.is_a?(Human)
     puts "" if current_player.is_a?(Human)
     options
@@ -206,15 +225,19 @@ class Game
   def update_player_values
     puts "Updating #{@player_1.name}'s hand..."
     sleep(1)
-    get_player_card_values(@player_1)
+    clear_screen
+    get_card_values(@player_1)
     sleep(1)
+    clear_screen if @player_1.deck.detect {|x| x if x.name == "Ace"}
     puts "Updating #{@player_2.name}'s hand..." if @player_2
     sleep(1) if @player_2
-    get_player_card_values(@player_2) if @player_2
+    clear_screen if @player_2
+    get_card_values(@player_2) if @player_2
     sleep(1) if @player_2
+    clear_screen if @player_2 && @player_2.deck.detect {|x| x if x.name == "Ace"}
     puts "Updating Dealer's hand..."
     sleep(1)
-    get_player_card_values(@dealer)
+    get_card_values(@dealer)
     sleep(1)
   end
 
@@ -226,15 +249,17 @@ class Game
     case input
       when "hit"
         puts "#{current_player.name} draws a card!"
-        puts ""
+        sleep(2)
         hit(current_player)
       when "help"
+        clear_screen
         help
         options
       when "cards"
+        clear_screen
         view_cards(current_player)
         puts "A total value of #{current_player.deck_value}"
-        puts ""
+        get_card_values(current_player)
         options
       when "exit"
         exit
@@ -242,7 +267,7 @@ class Game
         Cli.new.initialize_players
       when "stand"
         puts "#{current_player.name} stands!"
-        puts ""
+        sleep(2)
         stand(current_player)
         @turn_count += 1
       else
@@ -255,16 +280,18 @@ class Game
     puts "Shuffling Deck..."
     @deck.shuffle!
     sleep(1)
+    clear_screen
     puts "Dealing Cards..."
     deal_cards(@player_1)
     deal_cards(@player_2) if @player_2
     deal_cards(@dealer)
     sleep(1)
+    clear_screen
     update_player_values
-    puts ""
     until game_over
       turn
     end
+    clear_screen
     puts "Players, show your hands!"
     puts ""
     sleep(1)
@@ -290,10 +317,10 @@ class Game
 
     case input
       when "menu"
-        puts ""
+        clear_screen
         Cli.new.initialize_players
       when "y"
-        puts ""
+        clear_screen
         if @type == "1 player"
           @player_1 = Human.new(@player_1.name)
           @dealer = Computer.new
@@ -307,7 +334,7 @@ class Game
       when "n"
         return
       else
-        puts ""
+        clear_screen
         Cli.new.error_message
         end_game
     end

data/lib/Player.rb

@@ -1,5 +1,5 @@
 class Player
-  attr_accessor :deck, :name, :deck_value, :status
+  attr_accessor :deck, :name, :deck_value, :status, :has_ace
 
   def initialize(name="Dealer")
     @deck = []

data/lib/players/Computer.rb

@@ -8,10 +8,12 @@ class Computer < Player
   end
 
   def get_ace_value
+    @deck_value = 0
+    @deck.each{|card| @deck_value += card.value if card.value}
     if @deck_value < 11
-      return "11"
+      return 11
     else
-      return "1"
+      return 1
     end
   end
 end

metadata

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