auto generated by makefile

uno.py

@@ -27,14 +27,13 @@ def print_stack():
     print_card(STACK[::-1][0])
 def compare_cards(card1, card2):
     global OVERFLOW, WANTED_COLOR
-    if card2[0] == "C":
+    if card2[0] in ["C", "+4"]:
         c = input("Color: ")
         while not c in COLORS:
             c = input("Color: ")
         WANTED_COLOR = c
         card2[1] = c
-        return True
-    if WANTED_COLOR != "NEUTRAL":
+    elif WANTED_COLOR != "NEUTRAL":
         ret = card2[1] == WANTED_COLOR
         if ret:
             WANTED_COLOR = "NEUTRAL"
@@ -45,6 +44,10 @@ def compare_cards(card1, card2):
     if ret:
         if card2[0] == "+2":
             OVERFLOW += 2
+            ret = True
+        elif card2[0] == "+4":
+            OVERFLOW += 4
+            ret = True
     return ret
 if not DEBUG:
     atexit.register(clear)
@@ -57,7 +60,7 @@ for color in COLORS:
     for n in range(0, 2):
         CARDS.append(("+2", color))
     CARDS.append(["C", "NEUTRAL"])
-
+    CARDS.append(["+4", "NEUTRAL"])
 #players
 p = input("Player: ")
 while p != "":
@@ -96,7 +99,7 @@ while len(PLAYERS) > 1:
                 if not compare_cards(STACK[::-1][0], PCARDS[player][card - 1]):
                     card = -1
         card -= 1 #python starts at 0
-        if PCARDS[player][card][0] != "+2" and OVERFLOW > 0:
+        if PCARDS[player][card][0] in ["+2", "+4"] and OVERFLOW > 0:
             print("\033[1;30;40m" + player + " muss " + str(OVERFLOW) + " Karten ziehen!")
             for n in range(0, OVERFLOW):
                 PCARDS[player].append(CARDS.pop())