adding bold and italic to word cards

1 files changed, 1 insertions, 21 deletions

diff --git a/window.py b/window.py
index 3aee04b..9372280 100644
--- a/window.py
+++ b/window.py
@@ -306,24 +306,6 @@ def match_check(cardarray, cardtype):
         return False
     if (cardarray[0].color + cardarray[1].color + cardarray[2].color)%3 != 0:
         return False
-    '''
-    # code for checking 4 colors
-    if cardarray[0].color == cardarray[1].color and \
-       cardarray[1].color != cardarray[2].color:
-        return False
-    if cardarray[0].color != cardarray[1].color and \
-       cardarray[1].color != cardarray[2].color and \
-       cardarray[0].color == cardarray[2].color:
-        return False
-    if cardarray[0].color != cardarray[1].color and \
-       cardarray[1].color == cardarray[2].color and \
-       cardarray[0].color != cardarray[2].color:
-        return False
-    if cardarray[0].color == cardarray[1].color and \
-       cardarray[1].color == cardarray[2].color and \
-       cardarray[0].color != cardarray[2].color:
-        return False
-    '''
     # special case for the word game
     # only check fill when numbers are the same
     if cardtype == 'word':
@@ -334,9 +316,7 @@ def match_check(cardarray, cardtype):
     else:
         if (cardarray[0].fill + cardarray[1].fill + cardarray[2].fill)%3 != 0:
             return False
-    # don't check shape for word game
-    if cardtype != 'word' and \
-       (cardarray[0].shape + cardarray[1].shape + cardarray[2].shape)%3 != 0:
+    if (cardarray[0].shape + cardarray[1].shape + cardarray[2].shape)%3 != 0:
        return False
     return True