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

game endings cleaner, time limit on skip command

Browse source
This commit is contained in:
Jannes Höke 2016-04-30 13:26:50 +02:00
parent c57b278c1e
commit 27fff4b2e1
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bot.py
View file

@ -253,10 +253,12 @@ def close_game(bot, update):
if player is game.owner: if player is game.owner:
game.open = False game.open = False
send_async(bot, chat_id, text="Closed the lobby") send_async(bot, chat_id, text="Closed the lobby")
return
else: else:
send_async(bot, chat_id, send_async(bot, chat_id,
text="Only the game creator can do that", text="Only the game creator can do that",
reply_to_message_id=update.message.message_id) reply_to_message_id=update.message.message_id)
return
def open_game(bot, update): def open_game(bot, update):
@ -272,10 +274,12 @@ def open_game(bot, update):
if player is game.owner: if player is game.owner:
game.open = True game.open = True
send_async(bot, chat_id, text="Opened the lobby") send_async(bot, chat_id, text="Opened the lobby")
return
else: else:
send_async(bot, chat_id, send_async(bot, chat_id,
text="Only the game creator can do that", text="Only the game creator can do that",
reply_to_message_id=update.message.message_id) reply_to_message_id=update.message.message_id)
return
def skip_player(bot, update): def skip_player(bot, update):
@ -289,15 +293,29 @@ def skip_player(bot, update):
for player in players: for player in players:
if player in game.players: if player in game.players:
if player is game.owner: if player is game.owner:
started = game.current_player.turn_started
now = datetime.now()
delta = (now - started).seconds
if delta < 120:
send_async(bot, chat_id,
text="Please wait %d seconds"
% (120 - delta),
reply_to_message_id=
update.message.message_id)
return
game.current_player.anti_cheat += 1 game.current_player.anti_cheat += 1
game.turn() game.turn()
send_async(bot, chat_id, send_async(bot, chat_id,
text="Next player: %s" text="Next player: %s"
% display_name(game.current_player.user)) % display_name(game.current_player.user))
return
else: else:
send_async(bot, chat_id, send_async(bot, chat_id,
text="Only the game creator can do that", text="Only the game creator can do that",
reply_to_message_id=update.message.message_id) reply_to_message_id=update.message.message_id)
return
def help(bot, update): def help(bot, update):
@ -420,10 +438,11 @@ def do_play_card(bot, chat_id, game, player, result_id, user):
send_async(bot, chat_id, text="UNO!") send_async(bot, chat_id, text="UNO!")
if len(player.cards) == 0: if len(player.cards) == 0:
send_async(bot, chat_id, text="%s won!" % user.first_name) send_async(bot, chat_id, text="%s won!" % user.first_name)
gm.leave_game(user, chat_id) if len(game.players) < 3:
if len(game.players) < 2:
send_async(bot, chat_id, text="Game ended!") send_async(bot, chat_id, text="Game ended!")
gm.end_game(chat_id, user) gm.end_game(chat_id, user)
else:
gm.leave_game(user, chat_id)
if botan: if botan:
botan.track(Message(randint(1, 1000000000), user, datetime.now(), botan.track(Message(randint(1, 1000000000), user, datetime.now(),