From 9258b6a750ec8fe0ccd153d95b0f42715afb4d58 Mon Sep 17 00:00:00 2001
From: Jake Pullen <jake.pullen333@gmail.com>
Date: Sat, 8 Jun 2024 15:59:43 +0100
Subject: [PATCH] added dynamic rule checking

---
 __pycache__/card.cpython-310.pyc   | Bin 0 -> 557 bytes
 __pycache__/deck.cpython-310.pyc   | Bin 0 -> 1494 bytes
 __pycache__/player.cpython-310.pyc | Bin 0 -> 3014 bytes
 __pycache__/rules.cpython-310.pyc  | Bin 0 -> 1646 bytes
 main.py                            |  53 +++++++++++++++++------------
 player.py                          |  15 ++++----
 rules.json                         |   8 ++---
 rules.py                           |   6 ++--
 8 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 __pycache__/card.cpython-310.pyc
 create mode 100644 __pycache__/deck.cpython-310.pyc
 create mode 100644 __pycache__/player.cpython-310.pyc
 create mode 100644 __pycache__/rules.cpython-310.pyc

diff --git a/__pycache__/card.cpython-310.pyc b/__pycache__/card.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5b87096109a02520b60b81b8eb55efc3733636ec
GIT binary patch
literal 557
zcmd1j<>g{vU|`_oPD$Iqz`*br#6iZ)3=9ko3=9m#LJSNH?hGjmDU2-)DU8ibQ4A?e
z!3>(r$;hffY$liv83qQ1RE8+V6ox3K6vh;$7KSM16y_9`7KSL66xLt{O}1Ms$%#cN
z$sjvGIzbr32ASXtvQvP8fuV-6h9RDzhN*@jo-u_Xm_d`#Pm}2uOL1vt$t~8h#GKMp
zP3BuH#i==IMIe1eAOlu16tOZeF#M9y&&bbB)z3=IPSr0;Eyyp{&rK}V2id7tP<e|Z
zK0Y%qvm`zqq_3ETfq{XIk&Cg47c38xOJ)SQ3W`B&kojQ8fdZt4A&X%)LkeRJLl)y~
zhPlka44O=SRV)hmX$qQ5V5fi`rO8+XG9K(G2*Jj{z;KH_KEAl5C_Wy<DF!)0h_Q+X
zYCBlMPm>ko%Dlwf)cE*YT=DU_`6;D2AU02Yd|_!~4n(Gioq>U&hyz4`ybZAd%mSHQ
n1adV97lU{l3>=I+EMPG|O-3+{q#my67KaVQE<3PJu;Um2iL+$O

literal 0
HcmV?d00001

diff --git a/__pycache__/deck.cpython-310.pyc b/__pycache__/deck.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..30ea1bd1c06bfb4d032205336bd67e97b4e37b37
GIT binary patch
literal 1494
zcmd1j<>g{vU|<m8N=egUVPJR+;vi#Y1_lNP1_p*=H3kNT6owSW9EMzmC<aCln<<Ae
ziqV}Rg*k<#g&~EdnJJ1Xg(;Xpll3LY1Wm?UEXj#QDSpWy9x`TvnQ6noz>vxi#hAhn
z#gxLB!qmbL#SAemiY0|Lg{_4liZz8jg`<TbiY<jRg{y@jiamupg{OrfiX(+Lm_d{8
z7E4NMa&|H!lJOum$OdPSt0fp17}6PP7~&af7#1)tWMG8wm{J&m8CEj-X)@np1-Y^K
z7Hd*zW=_g2o|MdDkU)GvW=`r###=1KsX1vY8HzxG^h-uRBR@A)KPxdiRlg{;Air2Y
zH?dS7<N&>b%3B=q@tJv<CGqiWAd5i+8zToJ7h@GKSOrWL#jT*w<zQf70K3%)6vB)y
z46!1$j3o>yOexIGOfC$uJhe<U3|Wi|m`a#y7;BhPSbCWjGBPq0au$Mpp~>o}$#RP=
zxF9hlwfGjBM`~hGN%1WXm(0Z6{JfOnTddAGrAfsvL80=JkAZ<flj#;qacO4BE!MKc
zoYGWHmRqbviFxU%MXU@A47b=43kp*6Qi?zUsL5Q!$-ux+Bn%=%Km;fhz(G;O4dR0Q
z2x1h2#5oxG7{wTw{<HkA;sSdZ9H1z^1sMwRG1#}Dn5kjNVsK%IWvgW@VXR?n2KkB^
z6f;FEV247S#9C04nOCC81aS<=42TmzmV(`Ji={Xtzgz$o>RgOmj4c1FIKhqp$)LCa
z6b^7V_%JXqlrVrox0x}8F`K1GsDvqn3FM9%hAid<EFc+BSeJm}f{_uVlDUQ<p0R{=
z0UJyXoVu7nykG`R7QZ5p1yx$<MTtpCnR)37B^jv-MX9-onRy@{C}|Zdq!s1of+avs
ztP(2DC{0Vt0ZD@tgTyr1Z!zbj=7IfRBn}E{c5vjRR+OaXrQBjGO3X{i&%MPC(V1EV
zN<wIXQX~V))u1o|1q>e}D0(;;IT(2u*%;Xvt9U@x=t1>k1P~~Y!I30}8bC}%oS+Pz
z!i?~0h?^!;ktE28p!9>yCAYYfGg6bY<5P1BN-E_*E&`<+K1LQs7N#lzuse_xV7LX8
z6yR<FC71<_H4Iry3z!!&fTE^`A(#P@Tv&=gfm8%?GC1IFF&E?)V092zT4qskNjxYr
zR6y<lSs}#4!dS%*b`3(-Pm>drt@9FdQ{&@ramB~y=BJeAfY?0o@r9*{IS`p59+3Y*
zzA6HxYH-jO$%4e>K?FFVA_!29DFP)yP=FPKvLpus2O|e72P+2)2Nw?;SWc4}oCS-d
hK?Z;nBSkORD3B?)IBXyevI8Z$VvqxP7&w@Om;lmVBq0C*

literal 0
HcmV?d00001

diff --git a/__pycache__/player.cpython-310.pyc b/__pycache__/player.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7ed0e2ca82dd12881ccca4d1dfd975eaacbc3589
GIT binary patch
literal 3014
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
JNkCXc82~iHWX%8o

literal 0
HcmV?d00001

diff --git a/__pycache__/rules.cpython-310.pyc b/__pycache__/rules.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5db0c631ccd0ac33b94be7c847d1a11e3581585c
GIT binary patch
literal 1646
zcmd1j<>g{vU|@JHl9JZV!octt#6iZ)3=9ko3=9m#8Vn2!DGVu$ISf$@?hGkRDa<Vl
zDa_4GQH<^kDJ&_hEet8F%}h~DDU87knrtsYX80w8NMsB*O^ktoA(bJDF@+(DDTOtK
zIfbQ#F^U<Y_ZCY~X-=x&OOWnlRwV5pHWLE_gEPoIN(>APHH<Y3@eDOgH4O2LHOw^(
z@k})=H4O30DIjr{6oz01O(wsWj0_A6nyj~2ic2#~Zn2gn=9H%1Vo%P`%}vZpxy6;7
zSd<c<oL`z(a*GvAft9A_q!odzD`I0{U?^e-5gZH*3@aImxEUB2e#z=*<maa9XC-E*
z>KCOJ<QMDbCYI_KmFA=t>lIYq;)svW%*!l^k7oh76coU0j1b7hSj7wSogPeuCX1h+
zUlAx=G+99U@)C1X<Ku5}#mDF7r<CS^*gWy^g{6r(5Sb!gkXt~G0J{W2@PNcXAp<g}
z7-T6210Q1%NCXs!NI}TJ01^a8s19-zFs3lIFhntfBZ47{C51JGt%V_qHHAHeqlF=g
zErm0fL6hqi7s%<ZdFh#XsmY*Fg&7QDgUkg-3@B>T89)(}0wNi~k--Fw42VyeZ?S^I
z>K0c{VsS}4I7*5@;j7751PU#PufU!Jdky4g5Th6r8=!#XVyqHIxCI`V$sk9-90g*7
z!UOCm0Z?jT$YNN)Si`uGk&yxH97aD)rXnE*28LT~i3J6zc`2GqVC!$OfLw>>h+7<q
zDJk(F2|-Y#f=m}cbp=cw#TB4L1o9c!6)6l13?&RTjLnSwDz!`{j0>1*m=-eDGS@J>
zFvJSiveYmvU@l=vVajBvVOhf12X<)*YYJlx%WQ_ZOwEjp423-53@HpO3@i-I%n)A~
zG8Ai<Gcq!OU?c-XOq1EKipMb}B{f9><X|fWuwOLUZn5MSq~_gX$tupzyTy`|pO{hv
ziY;(Lxy4#gl$lqe$qESqPLP`Tw9K5;Ta0P9xIo4f$AiRfae~-jCfHO60g9blA|MmN
zK~x-{R+OI$RwM!nEj|VY1};V}Mh-?1Mgc~qe@g$V<dNbJo4#aF+`-}!6pEl^4GzU3
z1_p+7hFazthAajbhFGmymKv5U#uSE9#v&mQtA;U)F`KDavxX&$2`nlLV%0EaF+oL{
zQy8<Ei}Y()vY1O)YM7cCvzdzYYnT_X*05x;fl@~yYYlUec?#14_8R7ejKK^k%)tzr
zERbwk#j22)m!fcsL6ZZVc94n*P(0sa&PmNH0(lx-YTRPU%FoP$1u6@uu(`#O0V;Sn
zpe0c8EzWdMo(F|0BrM_S{uWnqMrv|4I7FpE!3avlER0-?VvJ&p5{x{IObtSeRia1%
ziBRvS$zB8s^&);y*#OcADLKILEe{e?2N7Vq5CkY1i$LicBvcH_iX03aj2x^S%slL1
paZTnT36MTe@&^kbIT@s<2xP)74jV|}Wd|x4z?qhVfsaXu0{{jvQ3C(~

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index 57a5dc6..d3f4e0b 100644
--- a/main.py
+++ b/main.py
@@ -6,16 +6,17 @@ from rules import Rule, RuleEngine
 
 import time 
 
-d = deck()
-d.shuffle()
-#d.show()
-d.first_card()
+deck = deck()
+deck.shuffle()
+#deck.show()
+deck.first_card()
 
 player_count = int(input('How many players do you want to play with? '))
 players = []
 for i in range(player_count):
     player_name = input(f'Enter the name of player {i+1}: ')
     players.append(HumanPlayer(player_name))
+    print(f'player {player_name} has been added')
 
 bot_count = int(input('How many bots do you want to play against? '))
 bots = []
@@ -34,9 +35,9 @@ for person in bots:
 # Now you can use your player objects
 for game_player in players:
     print(f'dealing 3 cards to {game_player.name}')
-    game_player.draw(d)
-    game_player.draw(d)
-    game_player.draw(d)
+    game_player.draw(deck)
+    game_player.draw(deck)
+    game_player.draw(deck)
 
 # In your main game loop
 rule_engine = RuleEngine()
@@ -51,20 +52,28 @@ for i in range(50):
     print(f'round: {round_counter}')
     for game_player in players:
         if isinstance(game_player, HumanPlayer):
-            has_played, given_command = game_player.play(d)
+            has_played, given_command = game_player.play(deck)
         else:
-            has_played, given_command = game_player.play(d)  # Bot player's turn
+            has_played, given_command = game_player.play(deck)  # Bot player's turn
 
         if has_played: # if the player has played a card
-            command = rule_engine.check_rule(d.discard_pile[-1], game_player.hand)
-            print(f'expected command: {command}')
+            if deck.discard_pile[-2].suit != deck.discard_pile[-1].suit and deck.discard_pile[-2].value != deck.discard_pile[-1].value:
+                print(f'player {game_player.name} has played a wrong card')
+                game_player.hand.append(deck.discard_pile.pop())
+                game_player.draw(deck)
+                continue
+            command = rule_engine.check_rule(deck.discard_pile[-1], game_player.hand)
+            print(f'{game_player.name} announced: {given_command}')
+            expected_command = ' and '.join(command)
+            print(f'expected command: {expected_command}')
             time.sleep(1)
-            if given_command != command:
+            given_command_set = set(given_command.split(' and '))
+            if given_command_set != command:
                 print(f'{game_player.name} made the wrong announcement')
                 #need to put the card back in the hand
-                game_player.hand.append(d.discard_pile.pop())
-                game_player.draw(d)
-            if given_command == command:
+                game_player.hand.append(deck.discard_pile.pop())
+                game_player.draw(deck)
+            if given_command_set == command:
                 print(f'{game_player.name} announced the correct rule')
             print(f'{game_player.name} has {game_player.check_hand()} cards left\n')
             time.sleep(1)
@@ -73,15 +82,15 @@ for i in range(50):
                 print(f'rounds played: {round_counter}')
                 exit()
         else:
-            game_player.draw(d) # if the player has not played a card, draw a card
+            game_player.draw(deck) # if the player has not played a card, draw a card
             print(f'{game_player.name} drew a card')
             print(f'{game_player.name} has {game_player.check_hand()} cards left\n')
             time.sleep(1)
-        if d.check_empty(): # if the deck is empty
-            d.shuffle()
-            d.first_card()
-        #game_player.draw(d)
+        if deck.check_empty(): # if the deck is empty
+            deck.shuffle()
+            deck.first_card()
+        #game_player.draw(deck)
 
-    print(f'discard  pile: {d.discard_pile[-1]}')
-    print(f'cards in deck: {len(d.cards)}\n')
+    print(f'discard  pile: {deck.discard_pile[-1]}')
+    print(f'cards in deck: {len(deck.cards)}\n')
 
diff --git a/player.py b/player.py
index 60b8cfe..e3198fc 100644
--- a/player.py
+++ b/player.py
@@ -42,7 +42,8 @@ class BotPlayer(player):
             if 'card_count' in rule and rule['card_count'] == len(self.hand):
                 commands.append(rule['command'])
         #print(f'Commands: {commands}')
-        return ' and '.join(commands) if commands else None
+        return ' and '.join(commands) if commands else ''
+    
     def play(self, deck):
         for card in self.hand:
             if card.suit == deck.discard_pile[-1].suit or card.value == deck.discard_pile[-1].value:
@@ -50,8 +51,8 @@ class BotPlayer(player):
                 deck.discard_pile.append(player_card)
                 print(f'{self.name} played {player_card}')
                 commands = self.command(player_card)
-                if commands is not None:
-                   print(f'{self.name} announced: {commands}')
+                #if commands is not None:
+                    #print(f'{self.name} announced: {commands}')
                 return True, commands
         else:
             print(f'{self.name} cannot play')
@@ -67,10 +68,10 @@ class HumanPlayer(player):
         print(f'Your hand:')
         for i, card in enumerate(self.hand):
             print(f'{i}: {card}')
-        card_index = input('Enter the index of the card you want to play(or type N to pass your go): ')
-        if card_index == 'N' or card_index == 'n':
+        card_index = input('Enter the index of the card you want to play(or type N to pass your go): ').lower()
+        if card_index == 'n':
             return False, None
         card = self.hand.pop(int(card_index))
         deck.discard_pile.append(card)
-        command = input('Enter your command: ')
-        return True, command
\ No newline at end of file
+        command = input('Enter your command: ').lower()
+        return True, command
diff --git a/rules.json b/rules.json
index bcdbb5b..2d48d69 100644
--- a/rules.json
+++ b/rules.json
@@ -1,8 +1,8 @@
 [
-    {"suit": "Hearts", "command": "Nah"},
-    {"suit": "Spades", "command":"Pass me the shovel"},
-    {"value": 1, "command": "Klondike"},
-    {"value": 7, "command": "Good Morning"},
+    {"suit": "Hearts", "command": "nah"},
+    {"suit": "Spades", "command":"pass me the shovel"},
+    {"value": 1, "command": "klondike"},
+    {"value": 7, "command": "good morning"},
     {"value": 8, "command": "bang"}, 
     {"value": 11, "command": "punch"},
     {"value": 13, "command": "god save the king"},
diff --git a/rules.py b/rules.py
index 6f8e53c..45406a4 100644
--- a/rules.py
+++ b/rules.py
@@ -25,11 +25,11 @@ class RuleEngine:
                 print(f'Added rule: {rule_json}')
     
     def check_rule(self, card, hand):
-        commands = []
+        commands = set()
         for game_rule in self.rules:
             if (game_rule.suit is not None and game_rule.suit == card.suit) or \
                (game_rule.value is not None and game_rule.value == card.value) or \
                (game_rule.card_count != 99 and game_rule.card_count == len(hand)):
-                commands.append(game_rule.command)
-        return ' and '.join(commands) if commands else ''
+                commands.add(game_rule.command)
+        return commands
         
\ No newline at end of file