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

Add vigilante

Browse Source
This commit is contained in:
Vgr E. Barry 2015-10-29 17:46:23 -04:00
parent e1a3ed7bf2
commit 922842b49c
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/wolfgame.py
View File

@ -4261,12 +4261,19 @@ def transition_day(cli, gameid=0):
onlybywolves.discard(monster) onlybywolves.discard(monster)
wolfghostvictims = [] wolfghostvictims = []
dead_vigilantes = set()
for k, d in var.OTHER_KILLS.items(): for k, d in var.OTHER_KILLS.items():
victims.append(d) victims.append(d)
onlybywolves.discard(d) onlybywolves.discard(d)
killers[d].append(k) killers[d].append(k)
if var.VENGEFUL_GHOSTS.get(k) == "villagers": if var.VENGEFUL_GHOSTS.get(k) == "villagers":
wolfghostvictims.append(d) wolfghostvictims.append(d)
if k in var.ROLES["vigilante"]:
if d not in var.WOLF_ROLES | {"monster", "succubus", "demoniac"}:
victims.append(k)
onlybywolves.discard(k)
dead_vigilantes.add(k)
# clear list so that it doesn't pm hunter / ghost about being able to kill again # clear list so that it doesn't pm hunter / ghost about being able to kill again
var.OTHER_KILLS = {} var.OTHER_KILLS = {}
@ -4348,7 +4355,7 @@ def transition_day(cli, gameid=0):
pl = var.list_players() pl = var.list_players()
for v in pl: for v in pl:
if v in victims_set: if v in victims_set:
if v in var.ENTRANCED_DYING: if v in var.ENTRANCED_DYING | dead_vigilantes:
continue # bypass protections continue # bypass protections
numkills = victims.count(v) numkills = victims.count(v)
numtotems = var.PROTECTED.count(v) numtotems = var.PROTECTED.count(v)
@ -4436,7 +4443,7 @@ def transition_day(cli, gameid=0):
# can play. Harlot visiting wolf doesn't play special events if they die via other means since # can play. Harlot visiting wolf doesn't play special events if they die via other means since
# that assumes they die en route to the wolves (and thus don't shoot/give out gun/etc.) # that assumes they die en route to the wolves (and thus don't shoot/give out gun/etc.)
for v in victims_set: for v in victims_set:
if v in var.ENTRANCED_DYING: if v in var.ENTRANCED_DYING | dead_vigilantes:
victims.append(v) victims.append(v)
elif v in var.ROLES["bodyguard"] and var.GUARDED.get(v) in victims_set: elif v in var.ROLES["bodyguard"] and var.GUARDED.get(v) in victims_set:
vappend.append(v) vappend.append(v)
@ -4818,7 +4825,7 @@ def chk_nightdone(cli):
"guardian angel", "wolf", "werecrow", "alpha wolf", "guardian angel", "wolf", "werecrow", "alpha wolf",
"sorcerer", "hunter", "hag", "shaman", "crazed shaman", "sorcerer", "hunter", "hag", "shaman", "crazed shaman",
"augur", "werekitten", "warlock", "piper", "wolf mystic", "augur", "werekitten", "warlock", "piper", "wolf mystic",
"fallen angel") "fallen angel", "dullahan", "vigilante")
for ghost, against in var.VENGEFUL_GHOSTS.items(): for ghost, against in var.VENGEFUL_GHOSTS.items():
if not against.startswith("!"): if not against.startswith("!"):
@ -5500,7 +5507,7 @@ def kill(cli, nick, chan, rest):
wolfroles = var.WOLF_ROLES - {"wolf cub"} wolfroles = var.WOLF_ROLES - {"wolf cub"}
if role in var.WOLFCHAT_ROLES and role not in wolfroles: if role in var.WOLFCHAT_ROLES and role not in wolfroles:
return # they do this a lot. return # they do this a lot.
if role not in wolfroles | {"hunter"} and nick not in var.VENGEFUL_GHOSTS.keys(): if role not in wolfroles | {"hunter", "dullahan", "vigilante"} and nick not in var.VENGEFUL_GHOSTS.keys():
return return
if nick in var.VENGEFUL_GHOSTS.keys() and var.VENGEFUL_GHOSTS[nick][0] == "!": if nick in var.VENGEFUL_GHOSTS.keys() and var.VENGEFUL_GHOSTS[nick][0] == "!":
# ghost was driven away by retribution # ghost was driven away by retribution
@ -6346,6 +6353,11 @@ def pass_cmd(cli, nick, chan, rest):
return return
pm(cli, nick, "You have chosen not to charm anyone tonight.") pm(cli, nick, "You have chosen not to charm anyone tonight.")
var.PASSED.add(nick) var.PASSED.add(nick)
elif nickrole == "vigilante":
if nick in var.OTHER_KILLS:
del var.OTHER_KILLS[nick]
pm(cli, nick, "You have chosen not to kill anyone tonight.")
var.PASSED.add(nick)
debuglog("{0} ({1}) PASS".format(nick, var.get_role(nick))) debuglog("{0} ({1}) PASS".format(nick, var.get_role(nick)))
chk_nightdone(cli) chk_nightdone(cli)
@ -7326,6 +7338,19 @@ def transition_night(cli):
pm(cli, succubus, "You are a \u0002succubus\u0002.") pm(cli, succubus, "You are a \u0002succubus\u0002.")
pm(cli, succubus, "Players: " + ", ".join(("{0} ({1})".format(x, var.get_role(x)) if x in var.ROLES["succubus"] else x for x in pl))) pm(cli, succubus, "Players: " + ", ".join(("{0} ({1})".format(x, var.get_role(x)) if x in var.ROLES["succubus"] else x for x in pl)))
for vigilante in var.ROLES["vigilante"]:
pl = ps[:]
random.shuffle(pl)
pl.remove(vigilante)
if vigilante in var.PLAYERS and not is_user_simple(vigilante):
pm(cli, vigilante, ('You are a \u0002vigilante\u0002. Each night, you may kill someone by '
'doing "kill <nick>", or use "pass" to pass. If the person you kill is '
'one of the wolves or an evil neutral, you will survive. Otherwise, you '
'will die alongside your victim.'))
else:
pm(cli, vigilante, "You are a \u0002vigilante\u0002.")
pm(cli, vigilante, "Players: " + ", ".join(pl))
for ms in var.ROLES["mad scientist"]: for ms in var.ROLES["mad scientist"]:
pl = ps[:] pl = ps[:]
index = var.ALL_PLAYERS.index(ms) index = var.ALL_PLAYERS.index(ms)