From fdb704af0868f88216fffaab85c88ac7b911e448 Mon Sep 17 00:00:00 2001 From: BigGamerGary Date: Thu, 5 Jan 2023 17:00:42 +1000 Subject: [PATCH] Added shuffling after 75% of cards played --- BlackJack.py | 25 +++++++++++++++---------- __pycache__/BlackJack.cpython-310.pyc | Bin 5139 -> 5571 bytes requirements.txt | 0 3 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 requirements.txt diff --git a/BlackJack.py b/BlackJack.py index 443d71c..70447c1 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -58,6 +58,12 @@ def getHandTotal(hand): i += card return i +def showDeck(deck): + string = "" + for card in deck: + string += convertNumberToCard(card) + return string + class BlackJack: def __init__(self): self.playerTurn = True @@ -78,7 +84,7 @@ class BlackJack: self.discard.extend(self.playerHand) self.playerHand.clear() self.discard.extend(self.dealerHand) - self.playerHand.clear() + self.dealerHand.clear() def deal(self): generateHand(self.playerHand, self.deck) @@ -136,9 +142,9 @@ class BlackJack: if playerStats is None: self.ledger.writeLedger(ID) playerStats = self.ledger.readLedger - + + self.deal() while not gameOver: - self.deal() playerWinState = self.checkHandState(self.playerHand) dealerWinState = self.checkHandState(self.dealerHand) gameOver = self.checkGameOver(playerWinState) or self.checkGameOver(dealerWinState) @@ -176,28 +182,27 @@ class BlackJack: if self.checkGameOver(dealerWinState): continue - + await send("Players hand = " + str(getHandTotal(self.playerHand)) + ": " + handNumbersToCards(self.playerHand) + "\n" + "Dealers hand = " + str(getHandTotal(self.dealerHand)) + ": " + handNumbersToCards(self.dealerHand)) if playerWinState == "w": await send("You won!") win = (2*bet, 1, 0, ID) - self.ledger.updateLedger(playerStats, win) + # self.ledger.updateLedger(playerStats, win) elif playerWinState == "l": await send("You busted!") loss = (-bet, 0, 1, ID) - self.ledger.updateLedger(playerStats, loss) + # self.ledger.updateLedger(playerStats, loss) elif dealerWinState == "w": await send("The Dealer reached 21 before you!") loss = (-bet, 0, 1, ID) - self.ledger.updateLedger(playerStats, loss) + # self.ledger.updateLedger(playerStats, loss) elif dealerWinState == "l": await send("The Dealer busted before you!") win = (2*bet, 1, 0, ID) - self.ledger.updateLedger(playerStats, win) + # self.ledger.updateLedger(playerStats, win) + self.returnCards() if len(self.deck) < 0.25 * 52: await send("Shuffling Deck") - self.returnCards() self.shuffle() - diff --git a/__pycache__/BlackJack.cpython-310.pyc b/__pycache__/BlackJack.cpython-310.pyc index cd158b54844b0793d9f6a4ed1d03849f26dbd1dd..257f6042298e6015ef77019c70b1575e60024e91 100644 GIT binary patch delta 2789 zcma)8&2t<_6`!83otd2-t+cZB5h-3fk?~?7OC}~b$c~9cEGI-UmW#q$fY@x0Rv+tK zrDqg}&8QYwT|%m;xcZPoDpgV{7o8x7q$mz4iX6DY37Eft3tT9;5%YUJUQ2dC6*JXu zx?jJ3-~HamGoPOg+J%Cr;mL1*TL0tNyG`8{F*a3tEq8t))7{ zUjNZCF))@fq9Q;;OSB)DJ1k-M^w;%eO$-95Kt)gWnc0-Rd5982*i60o=6V!&>+L&R zmroEMVp`NXFMJ)~&!usaSe6wAzHKWUzfLaj?(nMGQ6_#3})@p=Dcq_q5fPa+H zlYI%pOpIb)Cuw-(s&VOfYS*^5!WOR>skv5b@zmsyEk7}y9yke_i2UQRfQcvNUkzR$ zUKLY3fsdGwx6Q8{n<6TTi^&}3VHCd*C*}L*1p9~lwRvjdKwnC=113sz(oiR>R=p;8 zBqrs*%+sZ_#K3vLAYdjFr{y{8FYLT@?U#>}q^e8w->o&bLs7;W2RH08o0IR@lWdw~ zy(&%-{wV^a5Cl!&liE=%)>{oRNgEI2k_Ewu*4lT;(U-7!Q~_Pg$OCY0%HP}J2p>fb z1$+#dFrKxtqBAZ0o9;dBE9;Ev~&j4P}hji}PTe>#-gi(YQIH#eTNN z%EGXLDFEZ}+!$&+FwO|ReYF#VyZzNpKIvM~J4v211t1=T ze-L#(x~W0fZBUIpLN%nqgsMdMwlcod8N0O>mZ{^FUkg{;A}mwgMaOuq{9As^=0rmikkHEmd9|TIi&&)46rNi<}s;x9?cfzI0fb>dJU2406TDN$f0NE{+ zEsdLJOuMkdokLv%CKLPbmK)+1l8~}MR8V7JRSm-(iUfVGp3&U~pj^jIujyfd; vyW(X9{%e?Lfl$3&m2B05RD@LFRpC7+|5Q3XI@}kaJL8VwnGj(+{!s2eS#46_ delta 2462 zcma(SO>YxNbZ7R%v+K3vI3FZ|1QQ5glJH%sBA_%$O9E9C(FlZFHF7f*wsnko$p{HJYLFs$5anjHWyLxZlyqWhg@6EjT zY)~FeFQ!tC2H)ecjnb2@$LW1!`tjh~jtkWw7n!BSS~ZBQ;?j~= z<#`$z+$)s}iK@3eS`=K~)O)-4g9bkh$RIBKY2py~m0^gz@_{~{72Rk+kBoWHDSBWc zf71_j9|huXJemUn0#&@k!uA_49ZK1Uc%)k39k%s?uzV@O0iVF z3Q$5Xn;+5$qX7OCAP&i!(E`$d)Xva3#Cl+a+HDqC#vc_OkZYQ!Y@US(FCL{+B{ zwQi#iqjI%P99)|K$*YqPTz?_=1e?hd9uO|tTS zazIYmcIq6;D_@Bc>6Ufdw2H_*FTb`29?RVq2y@ zzYxsJ@7=lm$AB4;<%m?o5g_4G55n+Nk3-ulbE!O8l2=oYGRPP2BD#!dRQ{RjC--DB zU2A&}7}H_|*_aH7BNH5Ej5Q0RKlw&jTnlt2%%IfMJ6aVOd$V zLW^rP2$AT~N2yRM(W> zl8Mi$_V|yg;CyU!*D6K^%PzhxY7T@ITDL8u^AM>^Nz62%n6lF4mJ zhDJdWbDQApZz4IdWt43hol>G5JEH&dxM_CVVRSm*IVt~Woj!@LWTjg%h~Jod`4hPC^*6^^0+D%lFMQt@ZyPhANOJb5+@K{ zL!>HX1}XLQ29Uyz6W7nnNa1rVxV0r-Y--B8>g7gsVyvKl<^=`kZn0u7@QLbDEf81b zgSPn#-++|=10Z_efVP4ShAA*8HrRIHP|`zTWs?%Bz*VEWnUVSSQ&as%cJt{b$Zs;5 zfp(RJR+YiJwQEGa@oJ@QyI&p0CNeWuyyH#g)AHx`f%;o`Anbo}p}dIHB}6+lM@4BI zc`88Hk=m*Lio&KLh5+GSAIm<2Udqx;X9lwrW-Q5=%hWEYcbKcZE%Kc(iqnWxkX4~p g#S?p+P|;U;7?NLh9PUIrN;749neCXM+seBC0)X)Oi2wiq diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69de29..0000000