PinLin/mau_mau_bot
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update player.py

Browse Source
This commit is contained in:
Karho
2017-02-24 14:16:52 +08:00
committed by GitHub
parent 4c386218b0
commit 52296e6df8
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
player.py
View File

@ -168,17 +168,14 @@ class Player(object):
not card.special): not card.special):
self.logger.debug("Card's color or value doesn't match") self.logger.debug("Card's color or value doesn't match")
is_playable = False is_playable = False
elif last.value == c.DRAW_TWO and self.game.draw_counter: """and not \ elif last.value == c.DRAW_TWO and self.game.draw_counter:
(card.value == c.DRAW_TWO or 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.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:
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 or last.special == c.DRAW_FOUR) and \ elif (last.special == c.CHOOSE or last.special == c.DRAW_FOUR) and \
(card.special == c.CHOOSE or card.special == c.DRAW_FOUR): (card.special == c.CHOOSE or card.special == c.DRAW_FOUR):
"""(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.