Combining with "patch" branch (#29)

* Update unobot.po

* Update test_player.py

* Update test_player.py

* Update test_player.py

* Update test_player.py

* Update player.py

* Update player.py

* Update internationalization.py

* Update internationalization.py

* Update test_player.py

* Update test_player.py

* Update test_player.py

* Update player.py

* Update player.py

* Update player.py

* Update test_player.py

* Update test_player.py

* revert play 4 then 4 rule

* Update test_player.py

* Update player.py

* Update player.py

* Update player.py

* Update game.py

* Update game_manager.py

* Update game_manager.py

* Update game_manager.py

* Update player.py

* Update test_player.py

* Update player.py

* Update bot.py

* Update credentials.py

* Update credentials.py

* Update bot.py

* Update game.py

* Update game_manager.py

* Update game_manager.py

* Update player.py
This commit is contained in:
Karho
2017-02-16 18:43:44 +08:00
committed by GitHub
parent 284eb91633
commit 615bb35359
5 changed files with 228 additions and 12 deletions

10
bot.py
View File

@ -694,9 +694,10 @@ def do_call_bluff(bot, player):
if player.prev.bluffing:
send_async(bot, chat.id,
text=__("Bluff called! Giving 4 cards to {name}",
text=__("Bluff called! Giving {numbers} cards to {name}",
multi=game.translate)
.format(name=player.prev.user.first_name))
.format(name=player.prev.user.first_name,
numbers=game.draw_counter))
try:
player.prev.draw()
@ -708,10 +709,11 @@ def do_call_bluff(bot, player):
else:
game.draw_counter += 2
send_async(bot, chat.id,
text=__("{name1} didn't bluff! Giving 6 cards to {name2}",
text=__("{name1} didn't bluff! Giving {numbers} cards to {name2}",
multi=game.translate)
.format(name1=player.prev.user.first_name,
name2=player.user.first_name))
name2=player.user.first_name,
numbers=game.draw_counter))
try:
player.draw()
except DeckEmptyError: