From 464c23b5021aabd066a0cbeba3ba3fe6cf1c714b Mon Sep 17 00:00:00 2001 From: BigGamerGary Date: Wed, 19 Jul 2023 14:13:53 +1000 Subject: [PATCH] End of game messages --- BlackJack.py | 53 +++++++++++++++++++++++--- __pycache__/BlackJack.cpython-310.pyc | Bin 8129 -> 8694 bytes 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/BlackJack.py b/BlackJack.py index c69a4fb..c0b65c0 100644 --- a/BlackJack.py +++ b/BlackJack.py @@ -7,8 +7,6 @@ PLAYERTURN = 1 DEALERTURN = 2 FINISHED = 3 OVER = 5 -CHECKING = 6 - """ Class which describes playing cards @@ -150,9 +148,10 @@ class Hand(): # Dynamically add ace value based on ideal rules card = 11 for _ in range(aces): - if value < 20: + + if value <= 10: card = 11 - if (value + card) >= 21: + if value > 10: card = 1 value += card @@ -230,12 +229,54 @@ class BlackJack: gameState = FINISHED if gameState == FINISHED: - + + playerBlackJack = False + dealerBlackJack = False + playerBust = False + dealerBust = False + playerHigher = False + dealerHigher = False + tie = False + playerScore = int(repr(self.playerHand)) + dealerScore = int(repr(self.dealerHand)) await self.show_cards(send, True) - await send("You won or lost idk lmao") + if playerScore == 21: + playerBlackJack = True + if dealerScore == 21: + dealerBlackJack = True + + if playerScore > 21: + playerBust = True + if dealerScore > 21: + dealerBust = True + + if dealerScore > playerScore: + dealerHigher = True + elif playerScore > dealerScore: + playerHigher = True + else: + tie = True self.discard_hand(self.playerHand) self.discard_hand(self.dealerHand) + if tie: + await send("You tied") + elif playerBlackJack: + await send("You reached BlackJack!") + elif dealerBlackJack: + await send("The dealer reached BlackJack!") + elif playerBust: + await send("You busted!") + elif dealerBust: + await send("The dealer busted!") + elif playerHigher: + await send("You won!") + elif dealerHigher: + await send("You lost!") + else: + await send("Report this game to my creator!") + + if len(self.deck) < 0.25 * 51: self.deck.return_all_from_discard() self.deck.shuffle() diff --git a/__pycache__/BlackJack.cpython-310.pyc b/__pycache__/BlackJack.cpython-310.pyc index 8caf4f8a862a1ae726cfd067665f7a44245583ce..5a665c50ce94b68c333219fc25ede3be8c3a56b0 100644 GIT binary patch literal 8694 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 Rum0C6SA!3O9OBQP{XcAfiO&E4 delta 3696 zcmb7GTWlN072Vlgl1qwQQq()PEIN`OtZm7LB|EldS+d@dqd1aP*R{1^y;4e9Zs!%%-`Yy|sDl*vmYUi$s-4g&REjroy8e zYR;f}j5ol%0p?NQ#(4r}37ExTX7VJ=k}zxFDc<;|l8f63o-V3l#Ex$$OyO*vzHHOx z2R-2@Vc2(Zv$5m-f0``O022`hvZaWmY*25p4!NYx9Zuj96DG2gJ0t}oKkBWBinW** z{DAzkI@UuF=^Yu84g_!8o^>Z*TCty%Q(Aw2Gs?68$uinf)KfB0$z3UUhfumrzNh^H zOmg(2ow$#$7wvnlueqKGAkfZiNSN{?{djwgp%KdhIm*53|Jq>aE|3?(PUj{g_4Jh!;*@zs8 z_8vl?g7+v*Cd6Bw!?`A#&)TI4^XZ3oVvOr7|Pi@=zXJ+bj)lqsq}Nndvz;nkHN z2KKCcCwBSbUU_ZVS%x%0b9^0Zq{bfK^zud9dQ~`Oi`$FEmt<4JtpVC9T&TDem|r85~20!t~5SaVxi5d3abrYznqJ<4vZNn5U(lf8kne63_x z0{z-;K+=b<0es6U%D1m(dnF4Xgdf!PmwT%g2={A=p?;7qOdQ`4>i z(giZrLIYP&Ye>G>I6S;}XH1uB_4=Vgh1>tt^iskuJ9nxTgGhJf?;BqpArMX6LRf0V zIYg?a0;Oi1RPduq1#Z*T^}1Y6Ki5Bp>Q#HFXOcVWctT+49-{Pu{A2p&i3|+?#WG+z zX;6q?LN>*e$WHEUNZxdwJ(NFenpkqUwwx+cyJX{Qkvs?}4XO#!+ zn@2q0ZNR;qjm%QF6B?jD!8e2G#1Y=5PsnmTFoAC2^ThYW@?_u&Gau0EDs=FWO*TP}!Mv%kBp1V6=nae;r2%geU zFIx6R+v2*w8I{<%);TJ%$uv13BKi=3n$30jm)2}Yo%2wk{Zt-lyS|;4WF9GDYp5o8 z;K^NEFhTq%xAP^+$oFug7v(S8-g=%isl8A@i^y3*Qb2+y-iCYy7iu75xASG&a^b>Q z{!o6m-JPf29ukB_Sx!|$n_#QT>OrnhCKF)2(uwn+?Nc@XTrPBcI!$a#rc+?r-GgGXobwV2lpmZ{c&#!yW$y^Asow&0|GP zd>{TR@ThHEQy!_0;aTfx#M5AHLTdXCvJ>*qzP^r$HRZL)BZI4t8OX#*CJHh)WqDs` z@n&@;4lC~hlD?+$&|`I4;mQ1fYcx31o2`AygAa$qmLMP{Qpk0$dnw{%M^GqQ!3{j z`M1uK>m`u!V^^DC5c0J`#S;}&H72HKr{|}}$3z(w zDex5Yt2o8%sx}E<7xv;E;lN5Rin%lIvUj>ql)-7#19G*KcnGSppr@NU$qZF>) z2C@a8i;d1uV$2A`jTwuD;)b{_hcgemPNUeaDr))0U@2dIh3AJpSL7#|p7dRm!K1_7 zfr#RsY&qDyUZbU#^M%T1z;?qx!pvZ4Ce~qyO%QpOl{Lj6>Z?cu5)a7=l2s%wkeo3( zH9k5sJv$jZ_xq56y(ick5y>$#d(0+Ns@cHZZ0Kun%u3_U2eyV0_>Q_w7 PJY`-mUNAy2rvLjt8fv%C