kutsaltotem/mau_mau_bot
1
0
Fork 0
forked from test/mau_mau_bot
Code Issues Pull requests Releases Wiki Activity

Update player.py

Browse source 
Correcting the code once again as the last commit.
This commit is contained in:
Karho 2017-02-17 22:47:16 +08:00 committed by GitHub
parent 75e3076285
commit 69dc39bb56
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
player.py
View file

@ -63,7 +63,7 @@ class Player(object):
self.drew = False self.drew = False
self.anti_cheat = 0 self.anti_cheat = 0
self.turn_started = datetime.now() self.turn_started = datetime.now()
self.waiting_time = 90 self.waiting_time = 60
def leave(self): def leave(self):
"""Removes player from the game and closes the gap in the list""" """Removes player from the game and closes the gap in the list"""
@ -173,14 +173,15 @@ class Player(object):
elif last.special == c.DRAW_FOUR and self.game.draw_counter: """and not card.special == c.DRAW_FOUR:""" elif last.special == c.DRAW_FOUR and self.game.draw_counter: """and not card.special == c.DRAW_FOUR:"""
self.logger.debug("Player has to draw and can't counter") self.logger.debug("Player has to draw and can't counter")
is_playable = False is_playable = False
elif (last.special == c.CHOOSE) and \ elif (last.special == c.CHOOSE or last.special == c.DRAW_FOUR) and \
(card.special == c.CHOOSE or card.special == c.DRAW_FOUR) or \ (card.special == c.CHOOSE or card.special == c.DRAW_FOUR):
(last.special == c.DRAW_FOUR and card.special == c.CHOOSE): """(last.special == c.CHOOSE and (card.special == c.CHOOSE or card.special == c.DRAW_FOUR)) or \
(last.special == c.DRAW_FOUR and card.special == c.CHOOSE):"""
self.logger.debug("Can't play colorchooser on another one") self.logger.debug("Can't play colorchooser on another one")
is_playable = False is_playable = False
# Prevent game being locked by choosing colors. # Prevent game being locked by choosing colors.
# When player is going to leave and he didn't selected a color, it cause game locks. # When player is going to leave and he didn't select a color, it cause game locks.
elif not last.color and not (last.special == c.CHOOSE or last.special == c.DRAW_FOUR): elif not last.color and (last.special != c.CHOOSE and last.special != c.DRAW_FOUR):
self.logger.debug("Last card has no color") self.logger.debug("Last card has no color")
is_playable = False is_playable = False