99_game 3.1.4 → 3.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzc0ODVkYmEzZmMxYTZjNmMzZGYzMTVjYzM3ZWQ1NWJiNjc1OWZlOQ==
+    NDIwODlkMTM2MzQ3NmFkMGRhZWNlZWZlZTAyNDA5YmFhNzYxNTU5ZA==
   data.tar.gz: !binary |-
-    OTMzZjU3MTkwYzE0YmJlNDlmYjA4NzdjZTg1YWUxMGJkODc5MzkxOQ==
+    ZTk5MmExMWRmOTVhNDlkNGI5Y2Q4NDRmYTJhMzg1YTNmMWY3NTFmMw==
 SHA512:
   metadata.gz: !binary |-
-    NTNhYjk4NGYwNmE4ZjEwOGNkZjdkNDQ1NjU4NGU4YTZjY2ViOTg3NGY0MDZj
-    YjAzOWEwZjE5YTkxM2VkMDdiNmE3ZDdhNzVhYWU4NGY2NzljYWQzODQ3NzVj
-    ODlkY2M3NjM1ZjRlYWQ0NGJhM2EwZGI2NDNlYjhkOWVlYmVjMTA=
+    NzMzNWE0MzgxZjJkMmQ4YWQyZTA2MDBiNjhlOWYzOWEwMDlmNjg5NjY0ODIw
+    ODQwOGYxZWY0OWM5M2NhODkwZWJlNjQzYjdiYmRkYTZjMDcxZjNjYzA3OWQ0
+    ZjA0MWU0YmQzZTM3OGM2NzA0NjkyYWUwNjU1NmFhMWRjOTQ1OTc=
   data.tar.gz: !binary |-
-    YTE3Nzk5NGEwNDIzZWU3NGNmNTE1ODE1ZGQwNDYxZmIxZTg2NDQxMDJjYWMz
-    NzE2N2ZiNjk0YjRhYTdlNzBhMmYxZmVmNmY1OWQ2ZGQ4NjNjYjFmNWYxNzJm
-    NDU0N2M0YjA3NmVlNDNjNjdjOGVlMDcyNjkyYTNkZDYzMzVlN2Q=
+    YmMyY2E1ZGU0NmQ4YWJlMzg4MGE5YTIwZjMwMWUwMDQ4NjdiNmQ3M2I3MDA4
+    YzQ0MDYxM2Q1OGQ3NDY0YzNlMDRlNTdiNGM5OTM3OTI1ZTVlNjMxYjQ4NGYw
+    NmE2Njk1OGJkZmI4MzZmZjEyNDVmNWNiYmFkOGNhMmM5NTNiNDI=

data/bin/99_game

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 require '99_game'
 include CardDeck
-deck = Deck.new jokers: true
-deck.cards.shuffle!
 BEGIN { # Looks at its arguements
 	ARGV[0] = "-h" if ARGV.first == "--help"
 	ARGV[0] = "-v" if ARGV[0] == "--version"
@@ -23,56 +21,54 @@ BEGIN { # Looks at its arguements
 			puts "\u00B7 Gameplay"
 			puts "\t\u00B7 Your goal is to get your opponent to bring the value over 99 by playing 1 of your 3 cards."
 			puts "\t\u00B7 A card will usually increase the value by itself, but there are a few exceptions:"
-			puts "\t\t\u00B7 Aces are worth 1"
-			puts "\t\t\u00B7 2 - 10 are worth themselves, with the exception of 4 and 9"
-			puts "\t\t\u00B7 4, 9, and Jacks are worth 0"
-			puts "\t\t\u00B7 Queens decrease the value by 10"
-			puts "\t\t\u00B7 Kings set the value to 99"
-			puts "\t\t\u00B7 Jokers set the value to 0"
+			puts "\t\u00B7 Aces are worth 1"
+			puts "\t\u00B7 2 - 10 are worth themselves, with the exception of 4 and 9"
+			puts "\t\u00B7 4, 9, and Jacks are worth 0"
+			puts "\t\u00B7 Queens decrease the value by 10"
+			puts "\t\u00B7 Kings set the value to 99"
+			puts "\t\u00B7 Jokers set the value to 0"
 			exit
   	end
 }
 END { # Thanks for playing
     sleep 1.5
-    puts "\n\tThanks for playing 99!"
+    puts "\nThanks for playing 99!"
     sleep 2.5
 }
 $value, value1, value2, value3, dealer, user = 0,0,0,0, Hand.new, Hand.new
 loop do
-    puts "\n\tIt is the dealer's turn!"
-    i = 1
+    puts "\nIt's the dealer's turn!"
+    i = 0
     for card in dealer.cards
-        case i
-	        when 1 then value1 = card_test card, $value
-	        when 2 then value2 = card_test card, $value
-	        when 3 then value3 = card_test card, $value
-        end
-        i += 1
+	case i += 1
+		when 1 then value1 = card_test card, $value
+        	when 2 then value2 = card_test card, $value
+        	when 3 then value3 = card_test card, $value
+    	end
     end
     if value1 >= value2 && value1 >= value3
-	$card = dealer.cards[0].num
-        dealer.play dealer.cards[0]
+	$card = dealer.play dealer.cards.first
     elsif value2 >= value1 && value2 >= value3
-    	$card = dealer.cards[1].num
-        dealer.play dealer.cards[1]
+    	$card = dealer.play dealer.cards[1]
     else
-   	$card = dealer.cards[2].num
-        dealer.play dealer.cards[2]
+   	$card = dealer.play dealer.cards[2]
     end
     pause 1.5 
-    puts "\tThe dealer played a(n) #{$card}"
+    puts "The dealer played a(n) #{$card}"
     pause(0.5)
-    puts "\tThe value is now #{$value}\n"
+    puts "The value is now #{$value}\n"
     pause(1.5)
     if $value > 99 # Runs when you win and exits loop
-	    puts "\tYou win!"
+	    puts "You win!"
 	    break
     end
-    puts "\tIt's your turn!"
+    puts "It's your turn!"
     pause 1
-    user.view
+    user.view_cards
     pause 0.5
-    print "\tPick a card to play by typing in the name of the card => "
+    puts "Pick a card to play by typing in the name of the card"
+    sleep 0.2
+    print "> "
     input, playing = gets.chomp, true
     user.cards.each do |card|
     	if card.num == converter(input) && playing
@@ -81,12 +77,12 @@ loop do
     	end
     end	
 	pause 1
-	puts "\tYou drew a(n) #{user.cards[2].num}"
-	pause(0.5)
-    puts "\tThe value is now #{$value}"
+	puts "You drew a(n) #{user.cards[2]}"
+	pause 0.5
+    puts "The value is now #{$value}"
     pause(1.5)
     if $value > 99 # Runs when dealer wins and exits loop
-	    puts "\tYou lose"
+	    puts "You lose..."
 	    break
     end
 end

data/lib/99_game.rb

@@ -1,11 +1,9 @@
 autoload :CardDeck, "card_deck"
 autoload :Card, "card"
 autoload :Hand, "hand"
-
 =begin
 @param card [CardDeck::Card]
 @param actual_value [Integer]
-@param test_value [Integer]
 @return [Integer]
 @note Used by the CPU to determine which card to play. Parameter card needs to be an instance of Card.
 =end
@@ -48,11 +46,11 @@ def converter(input)
 	raise(CardError, "Input cannot be blank") if input == String.new
 	if input.to_i.zero?
 		case input.capitalize
-			when ?$ then "Joker"
-			when ?K then "King"
-			when ?J then "Jack"
-			when ?Q then "Queen"
-			when ?A then "Ace"
+			when ?$, "Joker" then "Joker"
+			when ?K, "King" then "King"
+			when ?J, "Jack" then "Jack"
+			when ?Q, "Queen" then "Queen"
+			when ?A, "Ace" then "Ace"
 		end
 	else
 		input.to_i

data/lib/hand.rb

@@ -1,9 +1,10 @@
 require_relative "card.rb"
+$deck = Deck.new(jokers: true).cards.shuffle!
 class Hand # Creates an object that holds and can play cards. Interacts with Deck objects.
 	@@deck = Deck.new.cards.shuffle!
     	attr_accessor :cards # @return [Array<CardDeck::Card>]
     	def initialize
-		@cards = Array.new(3) {@@deck.shift}
+		@cards = Array.new(3) {$deck.shift}
 	end
 	
 =begin
@@ -12,6 +13,7 @@ class Hand # Creates an object that holds and can play cards. Interacts with Dec
 @note Gameplay method
 =end
 	def play(card)
+		raise "Card not found" unless @cards.include? card 
 		if card.num == "King"
 			$value = 99
 		elsif card.num == "Joker"
@@ -24,21 +26,22 @@ class Hand # Creates an object that holds and can play cards. Interacts with Dec
 			if index.num == card.num and not done
 				discard = @cards[i]
 				@cards.delete_at i
-				@cards.push @@deck.shift
-				@@deck.push discard
+				@cards.push $deck.shift
+				$deck.push discard
 				done = true
 			end
 			i += 1
 		end
+		card
 	end
 		
 =begin
 @return [void]
 Displays cards
 =end
-    	def view
-		print "\tThese are your cards: "
-        	@cards.each {|card| print "\t#{card.num}"}
+    	def view_cards
+		print "These are your cards: "
+        	@cards.each {|card| print "\t#{card}"}
     	end
     	alias inspect cards
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 99_game
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0
 platform: ruby
 authors:
 - Zachary Roth Perlmutter