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

Move more cub stuff out of wolfgame.py

Browse Source
This commit is contained in:
skizzerz 2017-02-28 09:32:31 -06:00
parent c581801077
commit 750aa757e3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/roles/wolf.py
View File

@ -67,7 +67,7 @@ def wolf_kill(cli, nick, chan, rest):
return return
KILLS[nick] = victims KILLS[nick] = victims
if len(orig) > 1: if len(orig) > 1:
# need to expand this eventually # need to expand this eventually (only accomodates 2 kills, whereas we should ideally support arbitrarily many)
msg = messages["wolf_target_multiple"].format(orig[0], orig[1]) msg = messages["wolf_target_multiple"].format(orig[0], orig[1])
pm(cli, nick, messages["player"].format(msg)) pm(cli, nick, messages["player"].format(msg))
debuglog("{0} ({1}) KILL: {2} ({3}) and {4} ({5})".format(nick, role, victims[0], get_role(victims[0]), victims[1], get_role(victims[1]))) debuglog("{0} ({1}) KILL: {2} ({3}) and {4} ({5})".format(nick, role, victims[0], get_role(victims[0]), victims[1], get_role(victims[1])))
@ -98,6 +98,14 @@ def wolf_retract(cli, nick, chan, rest):
@event_listener("del_player") @event_listener("del_player")
def on_del_player(evt, cli, var, nick, nickrole, nicktpls, death_triggers): def on_del_player(evt, cli, var, nick, nickrole, nicktpls, death_triggers):
if death_triggers:
# TODO: split into cub
if nickrole == "wolf cub":
var.ANGRY_WOLVES = True
# TODO: split into alpha
if nickrole in var.WOLF_ROLES:
var.ALPHA_ENABLED = True
for a,b in list(KILLS.items()): for a,b in list(KILLS.items()):
for n in b: for n in b:
if n == nick: if n == nick:

4
src/wolfgame.py
View File

@ -2558,10 +2558,6 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
t.start() t.start()
debuglog(nick, "(time lord) TRIGGER") debuglog(nick, "(time lord) TRIGGER")
if nickrole == "wolf cub":
var.ANGRY_WOLVES = True
if nickrole in var.WOLF_ROLES:
var.ALPHA_ENABLED = True
if nickrole == "mad scientist": if nickrole == "mad scientist":
# kills the 2 players adjacent to them in the original players listing (in order of !joining) # kills the 2 players adjacent to them in the original players listing (in order of !joining)