Jerry/mau_mau_bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix waiting time display and reset

Browse source
This commit is contained in:
Jannes Höke 2016-05-08 17:13:01 +02:00
parent 1d10388d8e
commit 4c1a5537eb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bot.py
View file

@ -360,13 +360,13 @@ def skip_player(bot, update):
game.current_player.anti_cheat += 1 game.current_player.anti_cheat += 1
game.current_player.waiting_time -= 30 game.current_player.waiting_time -= 30
game.current_player.cards.append(game.deck.draw()) game.current_player.cards.append(game.deck.draw())
game.turn()
send_async(bot, chat_id, send_async(bot, chat_id,
text="Waiting time to skip this player has " text="Waiting time to skip this player has "
"been reduced to %d seconds.\n" "been reduced to %d seconds.\n"
"Next player: %s" "Next player: %s"
% (game.current_player.waiting_time, % (game.current_player.waiting_time,
display_name(game.current_player.user))) display_name(game.current_player.user)))
game.turn()
return return
elif len(game.players) > 2: elif len(game.players) > 2:
@ -479,6 +479,11 @@ def process_result(bot, update):
logger.debug("Selected result: " + result_id) logger.debug("Selected result: " + result_id)
if player.waiting_time < 90:
player.waiting_time = 90
send_async(bot, chat_id, text="Waiting time for %s has been reset to "
"90 seconds" % display_name(user))
result_id, anti_cheat = result_id.split(':') result_id, anti_cheat = result_id.split(':')
last_anti_cheat = player.anti_cheat last_anti_cheat = player.anti_cheat
player.anti_cheat += 1 player.anti_cheat += 1
@ -508,10 +513,6 @@ def process_result(bot, update):
def do_play_card(bot, chat_id, game, player, result_id, user): def do_play_card(bot, chat_id, game, player, result_id, user):
if player.waiting_time < 90:
player.waiting_time = 90
send_async(bot, chat_id, text="Waiting time for %s has been reset to "
"90 seconds" % display_name(user))
card = c.from_str(result_id) card = c.from_str(result_id)
game.play_card(card) game.play_card(card)
player.cards.remove(card) player.cards.remove(card)