Allow piper to select a single target at all times

Per request from @jacob1 and some evidence from a game. It makes it easier for piper to win.
This commit is contained in:
Emanuel Barry 2015-05-27 14:30:40 -04:00
parent 019a9c3b34
commit 4393f3413a

View File

@ -4950,7 +4950,7 @@ def charm(cli, nick, chan, rest):
if nick in (victim, victim2):
pm(cli, nick, "You may not charm yourself.")
return
if victim in var.CHARMED or victim2 in var.CHARMED:
if victim in var.CHARMED or victim2 and victim2 in var.CHARMED:
if victim in var.CHARMED and victim2 and victim2 in var.CHARMED:
pm(cli, nick, "\u0002{0}\u0002 and \u0002{1}\u0002 are already charmed!".format(victim, victim2))
return
@ -4959,10 +4959,6 @@ def charm(cli, nick, chan, rest):
pm(cli, nick, "\u0002{0}\u0002 is already charmed!".format(victim in var.CHARMED and victim or victim2))
return
elif not victim2 and len(var.list_players()) - len(var.ROLES["piper"]) - len(var.CHARMED) - 2 >= 0:
pm(cli, nick, "Not enough parameters.")
return
var.CHARMERS.add(nick)
var.CHARMED.add(victim)