notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix "already charmed" message for piper

Browse Source 
"For tonight" implies that charmed players are only charmed until the
night ends, which is certainly not true.
This commit is contained in:
nyuszika7h 2015-07-22 18:32:20 +02:00
parent 164785d589
commit a41d302607
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wolfgame.py
View File

@ -3950,6 +3950,7 @@ def transition_day(cli, gameid=0):
target in var.SEEN or target in var.SHAMANS or (target in list(var.GUARDED.keys()) and var.GUARDED[target])): target in var.SEEN or target in var.SHAMANS or (target in list(var.GUARDED.keys()) and var.GUARDED[target])):
pm(cli, crow, ("As the sun rises, you conclude that \u0002{0}\u0002 was not in "+ pm(cli, crow, ("As the sun rises, you conclude that \u0002{0}\u0002 was not in "+
"bed all night, and you fly back to your house.").format(target)) "bed all night, and you fly back to your house.").format(target))
else: else:
pm(cli, crow, ("As the sun rises, you conclude that \u0002{0}\u0002 was sleeping "+ pm(cli, crow, ("As the sun rises, you conclude that \u0002{0}\u0002 was sleeping "+
"all night long, and you fly back to your house.").format(target)) "all night long, and you fly back to your house.").format(target))
@ -5399,7 +5400,7 @@ def pass_cmd(cli, nick, chan, rest):
var.PASSED.append(nick) var.PASSED.append(nick)
elif nickrole == "piper": elif nickrole == "piper":
if nick in var.CHARMERS: if nick in var.CHARMERS:
pm(cli, nick, "You have already charmed players for tonight.") pm(cli, nick, "You have already charmed players tonight.")
return return
pm(cli, nick, "You have chosen not to charm anyone tonight.") pm(cli, nick, "You have chosen not to charm anyone tonight.")
if nick not in var.PASSED: if nick not in var.PASSED:
@ -5629,7 +5630,7 @@ def clone(cli, nick, chan, rest):
def charm(cli, nick, chan, rest): def charm(cli, nick, chan, rest):
"""Charm a player, slowly leading to your win!""" """Charm a player, slowly leading to your win!"""
if nick in var.CHARMERS: if nick in var.CHARMERS:
pm(cli, nick, "You have already charmed players for tonight.") pm(cli, nick, "You have already charmed players tonight.")
return return
pieces = re.split(" +",rest) pieces = re.split(" +",rest)