99_game 3.2.0 → 3.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDIwODlkMTM2MzQ3NmFkMGRhZWNlZWZlZTAyNDA5YmFhNzYxNTU5ZA==
+    M2JlNmYzM2M3YzNlZjBmM2EwYTFlMjNmMGYyYWJlMzNhN2YyNDNmOA==
   data.tar.gz: !binary |-
-    ZTk5MmExMWRmOTVhNDlkNGI5Y2Q4NDRmYTJhMzg1YTNmMWY3NTFmMw==
+    ZGNkNjVhYTE2NDcxZTAzYmU0NmZlNjk0MzE4MjRlY2FmNzZjMzVhOA==
 SHA512:
   metadata.gz: !binary |-
-    NzMzNWE0MzgxZjJkMmQ4YWQyZTA2MDBiNjhlOWYzOWEwMDlmNjg5NjY0ODIw
-    ODQwOGYxZWY0OWM5M2NhODkwZWJlNjQzYjdiYmRkYTZjMDcxZjNjYzA3OWQ0
-    ZjA0MWU0YmQzZTM3OGM2NzA0NjkyYWUwNjU1NmFhMWRjOTQ1OTc=
+    Y2E2NDdkNDBhZDBmNzU1MDZkZjU5M2QwN2NmMWEyMGE3YjI4OWI2MzA5ZWEx
+    M2JlODk0ODk3ODA2N2M1OTMxMjFmY2Q0ZjZmYWYzODBhNWE5YzM1YzA0NmM4
+    ZDM4ZTkzNDlmNjc1NmQ5MWEzNTQzNGZmZThkMjViN2ExZGI0MTQ=
   data.tar.gz: !binary |-
-    YmMyY2E1ZGU0NmQ4YWJlMzg4MGE5YTIwZjMwMWUwMDQ4NjdiNmQ3M2I3MDA4
-    YzQ0MDYxM2Q1OGQ3NDY0YzNlMDRlNTdiNGM5OTM3OTI1ZTVlNjMxYjQ4NGYw
-    NmE2Njk1OGJkZmI4MzZmZjEyNDVmNWNiYmFkOGNhMmM5NTNiNDI=
+    YjA2NGE1YzgzMmM3NjBlNGZiNjZlN2VlY2VlNjI1ZTZhNjc0ZjJjN2Y5MDVj
+    YmM5Y2FlNzFjODY5ZDYxOTIyMzIwZjJmNDFhNTFjMzQwZTNlZWM2ODgwMTIw
+    ZDJkZmFlODk1NGQ1YmQ3ZmU2ZjcwODdmMGY3NTFiZmUxMDNlZTI=

data/bin/99_game

@@ -6,13 +6,13 @@ BEGIN { # Looks at its arguements
 	ARGV[0] = "-v" if ARGV[0] == "--version"
 	case ARGV[0]
 		when "-v"
-    			puts "3.1.2"
+    			puts "3.2.2"
     			exit
 		when "-h"
 			puts "\u00B7 Commands"
 			puts "\t\u00b7 -v/--version - display version"
 			puts "\t\u00B7 -h/--help - shows this message\n"
-			puts "\u00B7 Abbrevations"
+			puts "\u00B7 Abbrevations can be used instead of inputting the whole name of a card"
 			puts "\t\u00B7 J -> Jack"
 			puts "\t\u00b7 Q -> Queen"
 			puts "\t\u00b7 K -> King"
@@ -21,12 +21,11 @@ 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\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"
+			puts "\t\t\u00B7 Aces are worth 1"
+			puts "\t\tu00B7 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"
 			exit
   	end
 }
@@ -37,54 +36,59 @@ END { # Thanks for playing
 }
 $value, value1, value2, value3, dealer, user = 0,0,0,0, Hand.new, Hand.new
 loop do
-    puts "\nIt's the dealer's turn!"
-    i = 0
-    for card in dealer.cards
-	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
+  	puts "\nIt's the dealer's turn!"
+    	i = 0
+	for card in dealer.cards
+		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
-    end
-    if value1 >= value2 && value1 >= value3
-	$card = dealer.play dealer.cards.first
-    elsif value2 >= value1 && value2 >= value3
-    	$card = dealer.play dealer.cards[1]
-    else
-   	$card = dealer.play dealer.cards[2]
-    end
-    pause 1.5 
-    puts "The dealer played a(n) #{$card}"
-    pause(0.5)
-    puts "The value is now #{$value}\n"
-    pause(1.5)
-    if $value > 99 # Runs when you win and exits loop
-	    puts "You win!"
-	    break
-    end
-    puts "It's your turn!"
-    pause 1
-    user.view_cards
-    pause 0.5
-    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
-    		user.play card
-    		playing = false
+    	if value1 >= value2 && value1 >= value3
+		$card = dealer.play dealer.cards.first
+    	elsif value2 >= value1 && value2 >= value3
+    		$card = dealer.play dealer.cards[1]
+    	else
+   		$card = dealer.play dealer.cards.last
     	end
-    end	
+    	pause 1.5 
+    	puts "The dealer played #{$card}"
+    	pause(0.5)
+    	puts "The value is now #{$value}\n"
+    	pause(1.5)
+    	if $value > 99 # Runs when you win and exits loop
+		puts "You win!"
+	    	break
+    	end
+    	puts "It's your turn!"
+    	pause 1
+    	user.view_cards
+    	pause 0.5
+    	puts "Pick a card to play by typing in the name of the card"
+    	sleep 0.2
+    	playing = true
+    	while playing
+		print "> "
+		input = gets.chomp
+    		user.cards.each do |card|
+    			if card.num == converter(input) && playing
+    				user.play card
+				playing = false
+    			end
+    		end
+		sleep 0.2
+		puts "Illegal input. Please enter a legal card" if playing
+    	end	
 	pause 1
-	puts "You drew a(n) #{user.cards[2]}"
+	puts "You drew #{user.cards.last}"
 	pause 0.5
-    puts "The value is now #{$value}"
-    pause(1.5)
-    if $value > 99 # Runs when dealer wins and exits loop
-	    puts "You lose..."
-	    break
-    end
+    	puts "The value is now #{$value}"
+    	pause(1.5)
+    	if $value > 99 # Runs when dealer wins and exits loop
+		puts "You lose..."
+	    	break
+    	end
 end
 __END__
 Programmed by: Zachary Perlmutter

data/lib/99_game.rb

@@ -8,15 +8,14 @@ autoload :Hand, "hand"
 @note Used by the CPU to determine which card to play. Parameter card needs to be an instance of Card.
 =end
 	def card_test(card, actual_value)
-        	if card.num == "King"
-			test_value = 99
-        	elsif card.num == "Joker"
-        		test_value = 0
+		test_value = case card.num
+			when "King" then 99
+        		when "Joker" then 0
         	else
-        		test_value = actual_value + card.value
+			actual_value + card.value
 	    	end
-	    	test_value = -100 if test_value > 99
-		return test_value
+	    	test_value = -1 if test_value > 99
+		test_value
     	end
 # Tests if obj is not nil.
 	def not_nil?(obj)

data/lib/hand.rb

@@ -7,11 +7,9 @@ class Hand # Creates an object that holds and can play cards. Interacts with Dec
 		@cards = Array.new(3) {$deck.shift}
 	end
 	
-=begin
-@param card [CardDeck::Card] the card played
-@return [void]
-@note Gameplay method
-=end
+# @param card [CardDeck::Card] the card played
+# @return [void]
+# @note Gameplay method
 	def play(card)
 		raise "Card not found" unless @cards.include? card 
 		if card.num == "King"
@@ -29,19 +27,18 @@ class Hand # Creates an object that holds and can play cards. Interacts with Dec
 				@cards.push $deck.shift
 				$deck.push discard
 				done = true
+				$deck.shuffle!
 			end
 			i += 1
 		end
 		card
 	end
 		
-=begin
-@return [void]
-Displays cards
-=end
+# @return [void]
+# Displays cards
     	def view_cards
-		print "These are your cards: "
-        	@cards.each {|card| print "\t#{card}"}
+		print "These are your cards:  "
+        	@cards.each {|card| print "#{card}  "}
     	end
     	alias inspect cards
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: 99_game
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Zachary Roth Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card_deck