Skip to content

Commit bd5d657

Browse files
authored
Update BlackjackGame.py (#334)
1 parent a3b538a commit bd5d657

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

Blackjack/BlackjackGame.py

+7-14
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def getScore(self):
5858
self.score = 0
5959
for card in self.cards:
6060
self.score += self.scoreDictionary[card]
61+
self.adjustAceValue()
6162
return self.score
6263

6364
def adjustAceValue(self):
@@ -145,25 +146,17 @@ def playRound3(self):
145146
print("My Money: " + str(player.money))
146147

147148
def removeLossers(self):
148-
i = 0
149-
for player in self.playerlist:
150-
if player.money <= 0:
151-
self.playerlist.pop(i)
152-
i += 1
149+
self.playerlist = [player for player in self.playerlist if player.money > 0]
153150

154151
def refreshPlayerCard(self):
155152
for player in self.playerlist:
156153
player.cards = []
157-
dealer.cards = []
154+
self.dealer.cards = []
158155

159156
def genDeck(self):
160-
cardType = ['2','3','4','5','6','7','8','9','10','J','Q','K','A']
161-
self.cardDeck = []
162-
for card in cardType:
163-
self.cardDeck.append(card)
164-
self.cardDeck.append(card)
165-
self.cardDeck.append(card)
166-
self.cardDeck.append(card)
157+
cardType = ['2', '3', '4', '5', '6', '7', '8', '9', '10', 'J', 'Q', 'K', 'A']
158+
self.cardDeck = [card for card in cardType for _ in range(4)]
159+
random.shuffle(self.cardDeck)
167160

168161
# Set betting limits
169162
min_bet = 5
@@ -192,4 +185,4 @@ def genDeck(self):
192185
game1.drawCardsRound2()
193186
game1.playRound3()
194187
game1.removeLossers()
195-
gameRound += 1
188+
gameRound += 1

0 commit comments

Comments
 (0)