From 98e8f8eb28c28eae7dd2add23734e5b0cf034ffc Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Tue, 2 Jun 2015 20:06:56 -0400 Subject: [PATCH 1/9] Starting --- Card.py | 2 ++ Deck_file.py | 38 ++++++++++++++++++++++++++++++++++++++ Hand.py | 2 ++ Tests.py | 16 ++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 Card.py create mode 100644 Deck_file.py create mode 100644 Hand.py create mode 100644 Tests.py diff --git a/Card.py b/Card.py new file mode 100644 index 0000000..7edfd92 --- /dev/null +++ b/Card.py @@ -0,0 +1,2 @@ +class Card: + cards_in_hand = [] diff --git a/Deck_file.py b/Deck_file.py new file mode 100644 index 0000000..569cdb8 --- /dev/null +++ b/Deck_file.py @@ -0,0 +1,38 @@ +import random +import itertools +import Card + + +class Deck: + def init_deal(self): + self.suits = 'cdhs' + self.rank = '23456789TJQKA' + # print(list(itertools.product(suits, rank))) + self.deck = tuple(''.join(card) for card in itertools.product(self.suits, self.rank)) + self.deck = list(self.deck) + self.hand = random.sample(self.deck, 2) + # print(self.hand) + self.deck.remove(self.hand[0]) + self.deck.remove(self.hand[1]) + # print(self.deck) + return self.hand + + def hitme(self): + self.deal = random.choice(self.deck) + self.deck.remove(self.deck) + return self.deal + + def check_16(self): + if check_hand(self) == 16: + return False + + def ask(self): + self.hit_me_or = input("Hit me? or Stay?") + self.hit_me_or.lower() + if self.hit_me_or == "hit me": + hitme(self) + elif self.hit_me_or == "stay": + pass + else: + print("Hit me or Stay") + ask(self) diff --git a/Hand.py b/Hand.py new file mode 100644 index 0000000..a5d2921 --- /dev/null +++ b/Hand.py @@ -0,0 +1,2 @@ +class Hand: + pass diff --git a/Tests.py b/Tests.py new file mode 100644 index 0000000..f2c48e4 --- /dev/null +++ b/Tests.py @@ -0,0 +1,16 @@ +import Deck_file +from Deck_file import Deck + + +class Tests: + "Tests" + def test_init_deck(self): + self.new_deck = Deck() + # print(len(new_deck.init_deal()[0])) + try: + assert len(self.new_deck.init_deal()) == 2 + assert len(self.new_deck.init_deal()[0]) == 2 + except: + print("init_deal isn't working") + +print(Tests.test_init_deck()) From a9feb6612b646ac07af511296c3870e1cc486293 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Tue, 2 Jun 2015 23:27:14 -0400 Subject: [PATCH 2/9] Almost Done Finishing checking for Ace in the Card Class --- Card.py | 2 -- Card_file.py | 36 ++++++++++++++++++++++++++ Deck_file.py | 50 +++++++++++++++++++++++++++++-------- Game.py | 2 ++ Tests.py | 45 +++++++++++++++++++++++++-------- blackjack/tests/Tests.py | 24 ++++++++++++++++++ blackjack/tests/__init__.py | 0 7 files changed, 136 insertions(+), 23 deletions(-) delete mode 100644 Card.py create mode 100644 Card_file.py create mode 100644 Game.py create mode 100644 blackjack/tests/Tests.py create mode 100644 blackjack/tests/__init__.py diff --git a/Card.py b/Card.py deleted file mode 100644 index 7edfd92..0000000 --- a/Card.py +++ /dev/null @@ -1,2 +0,0 @@ -class Card: - cards_in_hand = [] diff --git a/Card_file.py b/Card_file.py new file mode 100644 index 0000000..76c7077 --- /dev/null +++ b/Card_file.py @@ -0,0 +1,36 @@ +class Card: + def count(self, hand): + self.count = 0 + for card in hand: + # print(card) + # print(card[0]) + # print(card[1]) + if card[0].isupper(): + self.count += 10 + if card[0] == 'A': + self.to_do = input("11 or 1 ") + if self.to_do == '11': + self.count += 11 + else: + self.count += 1 + if card[1].isupper(): + self.count += 10 + if card[1] == 'A': + self.to_do = input("11 or 1 ") + if self.to_do == '11': + self.count += 11 + else: + self.count += 1 + if card[0].isdigit(): + self.count += int(card[0]) + if card[1].isdigit(): + self.count += int(card[1]) + print("Your count is ", self.count) + if self.count == 21: + return "blackjack" + elif self.count > 21: + return "lose" + else: + pass + + # add together check if they go over 21 or equal 21 diff --git a/Deck_file.py b/Deck_file.py index 569cdb8..56d41d2 100644 --- a/Deck_file.py +++ b/Deck_file.py @@ -1,26 +1,56 @@ import random import itertools -import Card class Deck: - def init_deal(self): + def remove_from_deck(self, deck, remove): + # print(deck) + # print(remove) + self.dec = deck + try: + # print(self.dec) + self.dec.remove(remove[0]) + # print(self.dec) + self.dec.remove(remove[1]) + # print(self.dec) + return self.dec + except: + # self.dec.remove(remove[0]) + # print(self.dec) + return self.dec + + def shuffle(self): self.suits = 'cdhs' self.rank = '23456789TJQKA' # print(list(itertools.product(suits, rank))) - self.deck = tuple(''.join(card) for card in itertools.product(self.suits, self.rank)) + self.deck = tuple(''.join(card) for card in itertools.product( + self.suits, self.rank)) + self.deck = list(self.deck) - self.hand = random.sample(self.deck, 2) + return self.deck + + def init_deal(self, deck): + # print(deck) + self.hand = random.sample(deck, 2) # print(self.hand) - self.deck.remove(self.hand[0]) - self.deck.remove(self.hand[1]) # print(self.deck) - return self.hand + self.deck = Deck.remove_from_deck(self, deck, self.hand) + # print(self.deck) + return (self.hand, self.deck) - def hitme(self): + def hitme(self, tuple): + # print("Tuple", tuple) + self.hand = tuple[0] + # print("Type", type(self.hand)) + self.deck = tuple[1] self.deal = random.choice(self.deck) - self.deck.remove(self.deck) - return self.deal + # print("Random Deal", self.deal) + # print("Type Now", type(self.hand)) + # print(self.hand) + self.hand.append(self.deal) + # print(self.hand) + self.deck = Deck.remove_from_deck(self, self.deck, self.deal) + return (self.hand, self.deck) def check_16(self): if check_hand(self) == 16: diff --git a/Game.py b/Game.py new file mode 100644 index 0000000..214dc5d --- /dev/null +++ b/Game.py @@ -0,0 +1,2 @@ +import Deck_file +from Deck_file import Deck diff --git a/Tests.py b/Tests.py index f2c48e4..5ce95f5 100644 --- a/Tests.py +++ b/Tests.py @@ -1,16 +1,39 @@ import Deck_file from Deck_file import Deck +import Card_file +from Card_file import Card +new_deck = Deck() +new_card = Card() +shuffled = new_deck.shuffle() -class Tests: - "Tests" - def test_init_deck(self): - self.new_deck = Deck() - # print(len(new_deck.init_deal()[0])) - try: - assert len(self.new_deck.init_deal()) == 2 - assert len(self.new_deck.init_deal()[0]) == 2 - except: - print("init_deal isn't working") -print(Tests.test_init_deck()) +def test_init_deck(shuffled): + # print(shuffled) + # print(new_deck.init_deal(shuffled)) + try: + assert len(new_deck.init_deal(shuffled)[0]) == 2 + assert len(new_deck.init_deal(shuffled)[0][0]) == 2 + return new_deck.init_deal(shuffled) + except: + print("init_deal isn't working") + + +def test_init_hitme(tuple): + try: + assert len(tuple) == 2 + assert len(tuple[0]) == 3 + except: + print("Hit Me isnt working") + + +def test_card(hand): + try: + assert new_card.count(hand) == "lose" + except: + print("Card.count isnt working") + +# new_deck.hitme(new_deck.init_deal(shuffled)) +test_init_deck(shuffled) +test_init_hitme(new_deck.hitme(new_deck.init_deal(shuffled))) +test_card(['cT', 'A', 'd6']) diff --git a/blackjack/tests/Tests.py b/blackjack/tests/Tests.py new file mode 100644 index 0000000..638cce0 --- /dev/null +++ b/blackjack/tests/Tests.py @@ -0,0 +1,24 @@ +import Deck_file +from Deck_file import Deck + + +def test_init_deck(): + new_deck = Deck() + # print(len(new_deck.init_deal()[0])) + try: + assert len(new_deck.init_deal()) == 2 + assert len(new_deck.init_deal()[0]) == 2 + except: + print("init_deal isn't working") + + +def test_init_hitme(): + hitme = hitme() + try: + assert len(hitme.hitme()) == 1 + assert len(hitme.hitme()[0]) == 2 + except: + print("init_deal isn't working") + +test_init_deck() +test_init_hitme() diff --git a/blackjack/tests/__init__.py b/blackjack/tests/__init__.py new file mode 100644 index 0000000..e69de29 From 8803fec07d6f032ab94ef3cbf5c3013ceb6fe591 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Tue, 2 Jun 2015 23:31:26 -0400 Subject: [PATCH 3/9] Done Finished Deck and Card Class --- Card_file.py | 35 +++++++++++++++-------------------- Tests.py | 1 + 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Card_file.py b/Card_file.py index 76c7077..d550b58 100644 --- a/Card_file.py +++ b/Card_file.py @@ -5,26 +5,21 @@ def count(self, hand): # print(card) # print(card[0]) # print(card[1]) - if card[0].isupper(): - self.count += 10 - if card[0] == 'A': - self.to_do = input("11 or 1 ") - if self.to_do == '11': - self.count += 11 - else: - self.count += 1 - if card[1].isupper(): - self.count += 10 - if card[1] == 'A': - self.to_do = input("11 or 1 ") - if self.to_do == '11': - self.count += 11 - else: - self.count += 1 - if card[0].isdigit(): - self.count += int(card[0]) - if card[1].isdigit(): - self.count += int(card[1]) + if len(card) == 1: + self.to_do = input("11 or 1 ") + if self.to_do == '11': + self.count += 11 + else: + self.count += 1 + else: + if card[0].isupper(): + self.count += 10 + if card[1].isupper(): + self.count += 10 + if card[0].isdigit(): + self.count += int(card[0]) + if card[1].isdigit(): + self.count += int(card[1]) print("Your count is ", self.count) if self.count == 21: return "blackjack" diff --git a/Tests.py b/Tests.py index 5ce95f5..c697bae 100644 --- a/Tests.py +++ b/Tests.py @@ -29,6 +29,7 @@ def test_init_hitme(tuple): def test_card(hand): try: + print("Enter 11 for test") assert new_card.count(hand) == "lose" except: print("Card.count isnt working") From 0f929de2cbf77d5a075c0759c5c25c330fa886a0 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Wed, 3 Jun 2015 16:18:51 -0400 Subject: [PATCH 4/9] Almost Done, Programming the Dealer --- Dealer.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dealer.py diff --git a/Dealer.py b/Dealer.py new file mode 100644 index 0000000..3328834 --- /dev/null +++ b/Dealer.py @@ -0,0 +1,2 @@ +class Dealer: + From c71eb11378ec2ced36d9ed66ab55f96a4a40f37d Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Wed, 3 Jun 2015 16:19:48 -0400 Subject: [PATCH 5/9] Deck works, Tests Works, Programming Games --- Deck_file.py | 44 +++++++++++++++++++------------------------- Game.py | 13 +++++++++++++ Tests.py | 22 ++++++++++------------ 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/Deck_file.py b/Deck_file.py index 56d41d2..cdab69e 100644 --- a/Deck_file.py +++ b/Deck_file.py @@ -3,57 +3,51 @@ class Deck: - def remove_from_deck(self, deck, remove): + # deck = shuffle() + def remove_from_deck(self, remove): # print(deck) # print(remove) - self.dec = deck try: # print(self.dec) - self.dec.remove(remove[0]) + self.deck.remove(remove[0]) # print(self.dec) - self.dec.remove(remove[1]) + self.deck.remove(remove[1]) # print(self.dec) - return self.dec + return self.deck except: - # self.dec.remove(remove[0]) - # print(self.dec) - return self.dec + pass def shuffle(self): self.suits = 'cdhs' self.rank = '23456789TJQKA' - # print(list(itertools.product(suits, rank))) - self.deck = tuple(''.join(card) for card in itertools.product( + self.deck = list(''.join(card) for card in itertools.product( self.suits, self.rank)) - - self.deck = list(self.deck) return self.deck - def init_deal(self, deck): + def init_deal(self): # print(deck) - self.hand = random.sample(deck, 2) + # print("i'm here", self.deck) + self.hand = random.sample(self.deck, 2) # print(self.hand) + # print("now i'm here", self.deck) + self.deck = self.remove_from_deck(self.hand) + # print("and now i'm here", self.deck) # print(self.deck) - self.deck = Deck.remove_from_deck(self, deck, self.hand) - # print(self.deck) - return (self.hand, self.deck) + return (self.hand) - def hitme(self, tuple): - # print("Tuple", tuple) - self.hand = tuple[0] - # print("Type", type(self.hand)) - self.deck = tuple[1] + def hitme(self): + print(self.deck) self.deal = random.choice(self.deck) # print("Random Deal", self.deal) # print("Type Now", type(self.hand)) # print(self.hand) self.hand.append(self.deal) # print(self.hand) - self.deck = Deck.remove_from_deck(self, self.deck, self.deal) - return (self.hand, self.deck) + # self.deck = Deck.remove_from_deck(self, self.deck, self.deal) + return (self.hand) def check_16(self): - if check_hand(self) == 16: + if check_hand(self.hand) == 16: return False def ask(self): diff --git a/Game.py b/Game.py index 214dc5d..e20d7fe 100644 --- a/Game.py +++ b/Game.py @@ -1,2 +1,15 @@ import Deck_file from Deck_file import Deck +import Card_file +from Card_file import Card +import Dealer +from Dealer import Dealer + +new_dealer = Dealer +new_deck = Deck() +new_card = Card() +new_deck.shuffle() + +new_deck.init_deal() +test_init_hitme(new_deck.hitme()) +test_card(['cT', 'A', 'd6']) diff --git a/Tests.py b/Tests.py index c697bae..5776d1c 100644 --- a/Tests.py +++ b/Tests.py @@ -5,24 +5,22 @@ new_deck = Deck() new_card = Card() -shuffled = new_deck.shuffle() +new_deck.shuffle() -def test_init_deck(shuffled): - # print(shuffled) - # print(new_deck.init_deal(shuffled)) +def test_init_deck(): try: - assert len(new_deck.init_deal(shuffled)[0]) == 2 - assert len(new_deck.init_deal(shuffled)[0][0]) == 2 - return new_deck.init_deal(shuffled) + assert len(new_deck.init_deal()) == 2 + assert len(new_deck.init_deal()[0]) == 2 + return new_deck.init_deal() except: print("init_deal isn't working") -def test_init_hitme(tuple): +def test_init_hitme(hand): try: - assert len(tuple) == 2 - assert len(tuple[0]) == 3 + assert len(hand) == 3 + assert len(hand[0]) == 2 except: print("Hit Me isnt working") @@ -35,6 +33,6 @@ def test_card(hand): print("Card.count isnt working") # new_deck.hitme(new_deck.init_deal(shuffled)) -test_init_deck(shuffled) -test_init_hitme(new_deck.hitme(new_deck.init_deal(shuffled))) +test_init_deck() +test_init_hitme(new_deck.hitme()) test_card(['cT', 'A', 'd6']) From d3d70dadcd366b94e6686079ac78d71e235fde98 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Wed, 3 Jun 2015 17:44:44 -0400 Subject: [PATCH 6/9] Fixing Error on Card_file.py --- Card_file.py | 13 +++++-------- Dealer.py | 2 -- Dealer_file.py | 4 ++++ Deck_file.py | 15 ++++++--------- Game.py | 12 +++++++----- 5 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 Dealer.py create mode 100644 Dealer_file.py diff --git a/Card_file.py b/Card_file.py index d550b58..7e04272 100644 --- a/Card_file.py +++ b/Card_file.py @@ -2,10 +2,7 @@ class Card: def count(self, hand): self.count = 0 for card in hand: - # print(card) - # print(card[0]) - # print(card[1]) - if len(card) == 1: + if card[0] == 'A' or card[1] == 'A': self.to_do = input("11 or 1 ") if self.to_do == '11': self.count += 11 @@ -22,10 +19,10 @@ def count(self, hand): self.count += int(card[1]) print("Your count is ", self.count) if self.count == 21: - return "blackjack" + print("blackjack") + exit() elif self.count > 21: - return "lose" - else: - pass + print("Lose") + exit() # add together check if they go over 21 or equal 21 diff --git a/Dealer.py b/Dealer.py deleted file mode 100644 index 3328834..0000000 --- a/Dealer.py +++ /dev/null @@ -1,2 +0,0 @@ -class Dealer: - diff --git a/Dealer_file.py b/Dealer_file.py new file mode 100644 index 0000000..7e43553 --- /dev/null +++ b/Dealer_file.py @@ -0,0 +1,4 @@ +class Dealer: + def check_16(self): + if check_hand(self.hand) == 16: + return False diff --git a/Deck_file.py b/Deck_file.py index cdab69e..d316832 100644 --- a/Deck_file.py +++ b/Deck_file.py @@ -33,6 +33,7 @@ def init_deal(self): self.deck = self.remove_from_deck(self.hand) # print("and now i'm here", self.deck) # print(self.deck) + print("This is your hand", self.hand) return (self.hand) def hitme(self): @@ -42,21 +43,17 @@ def hitme(self): # print("Type Now", type(self.hand)) # print(self.hand) self.hand.append(self.deal) - # print(self.hand) + print("This is your hand", self.hand) # self.deck = Deck.remove_from_deck(self, self.deck, self.deal) - return (self.hand) - - def check_16(self): - if check_hand(self.hand) == 16: - return False + # return (self.hand) def ask(self): - self.hit_me_or = input("Hit me? or Stay?") + self.hit_me_or = input("Hit me? or Stay? ") self.hit_me_or.lower() if self.hit_me_or == "hit me": - hitme(self) + self.hitme() elif self.hit_me_or == "stay": pass else: print("Hit me or Stay") - ask(self) + self.ask() diff --git a/Game.py b/Game.py index e20d7fe..10259ac 100644 --- a/Game.py +++ b/Game.py @@ -2,14 +2,16 @@ from Deck_file import Deck import Card_file from Card_file import Card -import Dealer -from Dealer import Dealer +import Dealer_file +from Dealer_file import Dealer new_dealer = Dealer new_deck = Deck() new_card = Card() -new_deck.shuffle() +new_deck.shuffle() new_deck.init_deal() -test_init_hitme(new_deck.hitme()) -test_card(['cT', 'A', 'd6']) +while True: + new_deck.ask() + print(new_deck.hand) + new_card.count(new_deck.hand) From b201219f05c29b7f1df0f493a36785446c4df8a1 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Wed, 3 Jun 2015 22:12:56 -0400 Subject: [PATCH 7/9] Working on Dealer --- Card_file.py | 20 ++++++++++---------- Deck_file.py | 18 ------------------ Game.py | 5 +++-- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Card_file.py b/Card_file.py index 7e04272..b707c0b 100644 --- a/Card_file.py +++ b/Card_file.py @@ -1,27 +1,27 @@ class Card: def count(self, hand): - self.count = 0 + self.counter = 0 for card in hand: if card[0] == 'A' or card[1] == 'A': self.to_do = input("11 or 1 ") if self.to_do == '11': - self.count += 11 + self.counter += 11 else: - self.count += 1 + self.counter += 1 else: if card[0].isupper(): - self.count += 10 + self.counter += 10 if card[1].isupper(): - self.count += 10 + self.counter += 10 if card[0].isdigit(): - self.count += int(card[0]) + self.counter += int(card[0]) if card[1].isdigit(): - self.count += int(card[1]) - print("Your count is ", self.count) - if self.count == 21: + self.counter += int(card[1]) + print("Your count is ", self.counter) + if self.counter == 21: print("blackjack") exit() - elif self.count > 21: + elif self.counter > 21: print("Lose") exit() diff --git a/Deck_file.py b/Deck_file.py index d316832..fd8b35d 100644 --- a/Deck_file.py +++ b/Deck_file.py @@ -3,16 +3,10 @@ class Deck: - # deck = shuffle() def remove_from_deck(self, remove): - # print(deck) - # print(remove) try: - # print(self.dec) self.deck.remove(remove[0]) - # print(self.dec) self.deck.remove(remove[1]) - # print(self.dec) return self.deck except: pass @@ -25,27 +19,15 @@ def shuffle(self): return self.deck def init_deal(self): - # print(deck) - # print("i'm here", self.deck) self.hand = random.sample(self.deck, 2) - # print(self.hand) - # print("now i'm here", self.deck) self.deck = self.remove_from_deck(self.hand) - # print("and now i'm here", self.deck) - # print(self.deck) print("This is your hand", self.hand) return (self.hand) def hitme(self): - print(self.deck) self.deal = random.choice(self.deck) - # print("Random Deal", self.deal) - # print("Type Now", type(self.hand)) - # print(self.hand) self.hand.append(self.deal) print("This is your hand", self.hand) - # self.deck = Deck.remove_from_deck(self, self.deck, self.deal) - # return (self.hand) def ask(self): self.hit_me_or = input("Hit me? or Stay? ") diff --git a/Game.py b/Game.py index 10259ac..d1f5fa4 100644 --- a/Game.py +++ b/Game.py @@ -13,5 +13,6 @@ new_deck.init_deal() while True: new_deck.ask() - print(new_deck.hand) - new_card.count(new_deck.hand) + hand = new_deck.hand + new_card.count(hand) +# Count variable and count function are the same From e0485560d3f6c4bc6fb6c9c589c70fe1f6c990a4 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Wed, 3 Jun 2015 23:23:52 -0400 Subject: [PATCH 8/9] All Done --- Card_file.py | 18 +++++++++++++----- Dealer_file.py | 21 +++++++++++++++++---- Deck_file.py | 14 ++++++++++---- Game.py | 23 +++++++++++++++++------ Hand.py | 16 +++++++++++++++- 5 files changed, 72 insertions(+), 20 deletions(-) diff --git a/Card_file.py b/Card_file.py index b707c0b..6ce2691 100644 --- a/Card_file.py +++ b/Card_file.py @@ -1,13 +1,15 @@ class Card: - def count(self, hand): + def count(self, hand, person): self.counter = 0 for card in hand: - if card[0] == 'A' or card[1] == 'A': + if card[0] == 'A' or card[1] == 'A' and person == "player": self.to_do = input("11 or 1 ") if self.to_do == '11': self.counter += 11 else: self.counter += 1 + elif card[0] == 'A' or card[1] == 'A': + self.counter += 11 else: if card[0].isupper(): self.counter += 10 @@ -17,12 +19,18 @@ def count(self, hand): self.counter += int(card[0]) if card[1].isdigit(): self.counter += int(card[1]) - print("Your count is ", self.counter) - if self.counter == 21: + # print("Your count is ", self.counter) + if self.counter == 21 and person == "player": print("blackjack") exit() - elif self.counter > 21: + elif self.counter > 21 and person == "player": print("Lose") exit() + elif self.counter == 21 and person == "dealer": + print("Dealer Wins because of blackjack") + exit() + elif self.counter > 21 and person == "dealer": + print("You Win dealer busted at ", self.counter) + exit() # add together check if they go over 21 or equal 21 diff --git a/Dealer_file.py b/Dealer_file.py index 7e43553..18ff703 100644 --- a/Dealer_file.py +++ b/Dealer_file.py @@ -1,4 +1,17 @@ -class Dealer: - def check_16(self): - if check_hand(self.hand) == 16: - return False +import Deck_file +from Deck_file import Deck +import Card_file +from Card_file import Card + + +class Dealer(): + + def dealer_run(self): + # if self.check_16(hand): + # pass + hitme("dealer") + new_card.count(hand, "dealer") + + """def check_16(self): + if check_hand(hand) == 16: + return False""" diff --git a/Deck_file.py b/Deck_file.py index fd8b35d..e0261d7 100644 --- a/Deck_file.py +++ b/Deck_file.py @@ -21,19 +21,25 @@ def shuffle(self): def init_deal(self): self.hand = random.sample(self.deck, 2) self.deck = self.remove_from_deck(self.hand) + self.dealer_hand = random.sample(self.deck, 2) + self.deck = self.remove_from_deck(self.dealer_hand) print("This is your hand", self.hand) return (self.hand) - def hitme(self): + def hitme(self, person): self.deal = random.choice(self.deck) - self.hand.append(self.deal) - print("This is your hand", self.hand) + if person == "dealer": + self.dealer_hand.append(self.deal) + # print("This is your hand", self.dealer_hand) + if person == "player": + self.hand.append(self.deal) + print("This is your hand", self.hand) def ask(self): self.hit_me_or = input("Hit me? or Stay? ") self.hit_me_or.lower() if self.hit_me_or == "hit me": - self.hitme() + self.hitme("player") elif self.hit_me_or == "stay": pass else: diff --git a/Game.py b/Game.py index d1f5fa4..5ca6e05 100644 --- a/Game.py +++ b/Game.py @@ -4,15 +4,26 @@ from Card_file import Card import Dealer_file from Dealer_file import Dealer +import random +# import Hand +# from Hand import Hand -new_dealer = Dealer -new_deck = Deck() new_card = Card() - +new_dealer = Dealer() +new_deck = Deck() new_deck.shuffle() new_deck.init_deal() + while True: + dealer = random.random() new_deck.ask() - hand = new_deck.hand - new_card.count(hand) -# Count variable and count function are the same + new_card.count(new_deck.hand, "player") + + print("Your card add up to ", new_card.counter) + if dealer >= .5: + new_deck.hitme("dealer") + if dealer < .5: + print("Dealer Stayed") + + new_card.count(new_deck.dealer_hand, "dealer") + print("Your dealer card add up to ", new_card.counter) diff --git a/Hand.py b/Hand.py index a5d2921..f294f2f 100644 --- a/Hand.py +++ b/Hand.py @@ -1,2 +1,16 @@ +import Deck_file +from Deck_file import Deck +import Card_file +from Card_file import Card +import Dealer_file +from Dealer_file import Dealer + + class Hand: - pass + new_deck = Deck() + new_deck.shuffle() + self.dealer_hand = new_deck.init_deal() + + def player_going: + new_deck.ask() + self.player_hand = new_deck.init_deal() From b092ffe966825763f6b9e7a3310e051982d6a8f2 Mon Sep 17 00:00:00 2001 From: Bekk Blando Date: Tue, 18 Aug 2015 10:28:46 -0400 Subject: [PATCH 9/9] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e5d7b00..3c2275f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Blackjack - +Learned more about Object Oriented Programming * [Part 1](README_1.md) -* [Part 2](README_2.md) \ No newline at end of file +* [Part 2](README_2.md)