From 201a6af435574d6fb8519eba90e3fabef550c0a8 Mon Sep 17 00:00:00 2001 From: nitikayad96 Date: Sun, 19 Apr 2015 00:01:01 -0400 Subject: [PATCH 1/2] fixed winner method --- CardClass.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CardClass.py b/CardClass.py index 26fc0fe..02184ab 100644 --- a/CardClass.py +++ b/CardClass.py @@ -34,11 +34,11 @@ def __init__(self,card1,card2,card3,card4): self.card4 = card4 def winner(self): - cards = [self.card2,self.card3,self.card4] - win = 0 + cards = [self.card1,self.card2,self.card3,self.card4] + win = self.card1 for i in cards: if suit(i) == suit(self.card1): - if value(i) > value(self.card1): + if value(i) > value(win) win = cards.index(i) + 1 return win \ No newline at end of file From c7ef9feb5ed98a1a10f01293498951b6bfe67b3e Mon Sep 17 00:00:00 2001 From: nitikayad96 Date: Sun, 19 Apr 2015 00:09:29 -0400 Subject: [PATCH 2/2] fixed winner method --- CardClass.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CardClass.py b/CardClass.py index 02184ab..42b6836 100644 --- a/CardClass.py +++ b/CardClass.py @@ -1,3 +1,4 @@ +''' def suit(card): check_suit = card/13 if check_suit == 0: @@ -24,6 +25,7 @@ def value(card): def name_of_card(card): return value(card) + " if " + suit(card) +''' class Card: @@ -34,11 +36,12 @@ def __init__(self,card1,card2,card3,card4): self.card4 = card4 def winner(self): - cards = [self.card1,self.card2,self.card3,self.card4] - win = self.card1 + cards = [self.card2,self.card3,self.card4] + winner = self.card1 + win = 0 for i in cards: if suit(i) == suit(self.card1): - if value(i) > value(win) + if i%13 > winner%13: win = cards.index(i) + 1 return win \ No newline at end of file