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

Modify the decorators so that nicks may be used for commands

Browse Source 
Also add framework so that custom roles can modify what roles are part
of a pack of tetrahedron wolves more easily, but no other part has been
done to help that.
This commit is contained in:
Vgr E. Barry 2016-08-15 23:38:33 -04:00
parent 2e11f67e7e
commit 9333588126
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/decorators.py
View File

@ -58,7 +58,8 @@ class handle_error:
class cmd:
def __init__(self, *cmds, raw_nick=False, flag=None, owner_only=False,
chan=True, pm=False, playing=False, silenced=False, phases=(), roles=()):
chan=True, pm=False, playing=False, silenced=False,
phases=(), roles=(), nicks=None):
self.cmds = cmds
self.raw_nick = raw_nick
@ -70,6 +71,7 @@ class cmd:
self.silenced = silenced
self.phases = phases
self.roles = roles
self.nicks = nicks # iterable of nicks that can use the command at any time (should be a mutable object)
self.func = None
self.aftergame = False
self.name = cmds[0]
@ -145,20 +147,21 @@ class cmd:
if self.playing and (nick not in list_players() or nick in var.DISCONNECTED):
return
if self.roles:
for role in self.roles:
if nick in var.ROLES[role]:
break
for role in self.roles:
if nick in var.ROLES[role]:
break
else:
if (self.nicks is not None and nick not in self.nicks) or self.roles:
return
if self.silenced and nick in var.SILENCED:
if chan == nick:
pm(cli, nick, messages["silenced"])
else:
return
if self.silenced and nick in var.SILENCED:
if chan == nick:
pm(cli, nick, messages["silenced"])
else:
cli.notice(nick, messages["silenced"])
return
cli.notice(nick, messages["silenced"])
return
if self.roles or (self.nicks is not None and nick in self.nicks):
return self.func(*largs) # don't check restrictions for role commands
forced_owner_only = False

7
src/roles/vengefulghost.py
View File

@ -12,13 +12,10 @@ from src.events import Event
KILLS = {} # type: Dict[str, str]
GHOSTS = {} # type: Dict[str, str]
@cmd("kill", chan=False, pm=True, playing=False, phases=("night",))
@cmd("kill", chan=False, pm=True, playing=False, silenced=True, phases=("night",), nicks=GHOSTS)
def vg_kill(cli, nick, chan, rest):
"""Take revenge on someone each night after you die."""
if nick not in GHOSTS or GHOSTS[nick][0] == "!":
return
if nick in var.SILENCED:
pm(cli, nick, messages["silenced"])
if GHOSTS[nick][0] == "!":
return
victim = get_victim(cli, nick, re.split(" +",rest)[0], False)

15
src/roles/wolf.py
View File

@ -10,17 +10,14 @@ from src.messages import messages
from src.events import Event
KILLS = {} # type: Dict[str, List[str]]
# tetrahedron wolves consist of a pack of wolves without any wolf cube
TETRAHEDRON_WOLVES = set(var.WOLF_ROLES - {"wolf cub"}) # type: Set[str]
@cmd("kill", chan=False, pm=True, playing=True, phases=("night",))
@cmd("kill", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=TETRAHEDRON_WOLVES)
def wolf_kill(cli, nick, chan, rest):
"""Kills one or more players as a wolf."""
role = get_role(nick)
# eventually cub will listen on targeted_command and block kills that way
if role not in var.WOLF_ROLES - {"wolf cub"}:
return
if nick in var.SILENCED:
pm(cli, nick, messages["silenced"])
return
if var.DISEASED_WOLVES:
pm(cli, nick, messages["ill_wolves"])
return
@ -215,7 +212,7 @@ def on_chk_nightdone(evt, cli, var):
if not var.DISEASED_WOLVES:
evt.data["actedcount"] += len(KILLS)
# eventually wolf cub will remove itself from nightroles in wolfcub.py
evt.data["nightroles"].extend(list_players(var.WOLF_ROLES - {"wolf cub"}))
evt.data["nightroles"].extend(list_players(TETRAHEDRON_WOLVES))
@event_listener("chk_nightdone", priority=20)
def on_chk_nightdone2(evt, cli, var):
@ -312,7 +309,7 @@ def on_transition_night_end(evt, cli, var):
pl[i] = player + " (cursed)"
pm(cli, wolf, "Players: " + ", ".join(pl))
if role in var.WOLF_ROLES - {"wolf cub"} and var.DISEASED_WOLVES:
if role in TETRAHEDRON_WOLVES and var.DISEASED_WOLVES:
pm(cli, wolf, messages["ill_wolves"])
# TODO: split the following out into their own files (mystic, cub and alpha)
if role == "wolf mystic":
@ -320,7 +317,7 @@ def on_transition_night_end(evt, cli, var):
# # of special villagers = # of players - # of villagers - # of wolves - # of neutrals
numvills = len(ps) - len(list_players(var.WOLFTEAM_ROLES)) - len(list_players(("villager", "vengeful ghost", "time lord", "amnesiac", "lycan"))) - len(list_players(var.TRUE_NEUTRAL_ROLES))
pm(cli, wolf, messages["wolf_mystic_info"].format("are" if numvills != 1 else "is", numvills, "s" if numvills != 1 else ""))
if not var.DISEASED_WOLVES and var.ANGRY_WOLVES and role in var.WOLF_ROLES - {"wolf cub"}:
if not var.DISEASED_WOLVES and var.ANGRY_WOLVES and role in TETRAHEDRON_WOLVES:
pm(cli, wolf, messages["angry_wolves"])
if var.ALPHA_ENABLED and role == "alpha wolf" and wolf not in var.ALPHA_WOLVES:
pm(cli, wolf, messages["wolf_bite"])