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

Allow hunter to change their kill at night using !kill without needing to !retract first

Browse Source
This commit is contained in:
skizzerz 2014-08-22 00:57:37 -05:00
parent 68bfe2b65d
commit d69cd50f8d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/wolfgame.py
View File

@ -3034,6 +3034,8 @@ def wolfretract(cli, nick, rest):
pm(cli, nick, ("You have already transformed into a crow, and "+ pm(cli, nick, ("You have already transformed into a crow, and "+
"cannot turn back until day.")) "cannot turn back until day."))
return return
elif role == "hunter" and nick in var.HUNTERS and nick not in var.OTHER_KILLS.keys():
return
if role in var.WOLF_ROLES and nick in var.KILLS.keys(): if role in var.WOLF_ROLES and nick in var.KILLS.keys():
del var.KILLS[nick] del var.KILLS[nick]
@ -3200,7 +3202,8 @@ def kill(cli, nick, rest):
if var.PHASE != "night": if var.PHASE != "night":
pm(cli, nick, "You may only kill people at night.") pm(cli, nick, "You may only kill people at night.")
return return
if role == "hunter" and nick in var.HUNTERS: if role == "hunter" and nick in var.HUNTERS and nick not in var.OTHER_KILLS:
# they are a hunter and did not kill this night (if they killed this night, this allows them to switch)
pm(cli, nick, "You have already killed someone this game.") pm(cli, nick, "You have already killed someone this game.")
return return
if nick in var.SILENCED: if nick in var.SILENCED:
@ -3308,7 +3311,8 @@ def kill(cli, nick, rest):
return return
var.OTHER_KILLS[nick] = rv var.OTHER_KILLS[nick] = rv
if role == "hunter": if role == "hunter":
var.HUNTERS.append(nick) if nick not in var.HUNTERS:
var.HUNTERS.append(nick)
if nick in var.PASSED: if nick in var.PASSED:
var.PASSED.remove(nick) var.PASSED.remove(nick)