diff --git a/BlackJack.py b/BlackJack.py index 770fdb1..37d59c1 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -42,26 +42,19 @@ def addCardToHand(hand, deck): hand.append(card) -def generateHand(hand, deck): +def generateHand(hand, deck, handSize = 2): i = 0 - while i < 2: + while i < handSize: addCardToHand(hand, deck) i += 1 - -def handNumbersToCards(hand): - cards = "" - for a in hand: - cards += convertNumberToCard(a) - return cards - +def handNumbersToCards(hand): return [convertNumberToCard(a) for a in hand] def getHandTotal(hand): + cardValue = lambda c: min(c % 13 + 1, 10) i = 0 for card in hand: - card = card % 13 + 1 - if card > 10: - card = 10 + card = cardValue(card) if (card == 1) and (i < 20): card = 11 if (i + card) > 21: