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

Respect settings if GA can guard self.

Browse Source
This commit is contained in:
Vgr E.Barry 2015-02-26 07:14:29 -05:00
parent 02ec5e9309
commit c75ec4f559
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/wolfgame.py
View File

@ -5215,6 +5215,10 @@ def transition_night(cli):
for gangel in var.ROLES["guardian angel"]: for gangel in var.ROLES["guardian angel"]:
pl = ps[:] pl = ps[:]
random.shuffle(pl) random.shuffle(pl)
gself = "You may also guard yourself. "
if not var.GUARDIAN_ANGEL_CAN_GUARD_SELF:
pl.remove(gangel)
gself = ""
if gangel in var.LASTGUARDED: if gangel in var.LASTGUARDED:
if var.LASTGUARDED[gangel] in pl: if var.LASTGUARDED[gangel] in pl:
pl.remove(var.LASTGUARDED[gangel]) pl.remove(var.LASTGUARDED[gangel])
@ -5227,7 +5231,7 @@ def transition_night(cli):
pm(cli, gangel, ('You are a \u0002guardian angel\u0002. '+ pm(cli, gangel, ('You are a \u0002guardian angel\u0002. '+
'It is your job to protect the villagers. {0}If you guard '+ 'It is your job to protect the villagers. {0}If you guard '+
'a victim, they will live. You may not guard the same person two nights in a row. ' + 'a victim, they will live. You may not guard the same person two nights in a row. ' +
'You may also guard yourself. Use "guard <nick>" to guard a player.').format(warning)) '{1}Use "guard <nick>" to guard a player.').format(warning, gself))
else: else:
pm(cli, gangel, "You are a \02guardian angel\02.") # !simple pm(cli, gangel, "You are a \02guardian angel\02.") # !simple
pm(cli, gangel, "Players: " + ", ".join(pl)) pm(cli, gangel, "Players: " + ", ".join(pl))