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

improve previous clone commit

Browse Source
This commit is contained in:
jacob1 2014-07-18 22:09:06 -04:00
parent 78c964fcc5
commit a937775874
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/wolfgame.py
View File

@ -1301,26 +1301,21 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True)
del var.CLONED[nick] del var.CLONED[nick]
pm(cli, clone, "You will now be cloning \u0002{0}\u0002 if they die.".format(var.CLONED[clone])) pm(cli, clone, "You will now be cloning \u0002{0}\u0002 if they die.".format(var.CLONED[clone]))
elif role in var.WOLFCHAT_ROLES: elif role in var.WOLFCHAT_ROLES:
pl = var.list_players(var.WOLFCHAT_ROLES) wolves = var.list_players(var.WOLFCHAT_ROLES)
pl.remove(nick) # remove dead wolf from list wolves.remove(nick) # remove dead wolf from list
for player in pl: wolves.remove(clone) # remove self from list
wolfrole = var.get_role(player) for wolf in wolves:
if wolfrole in var.WOLFCHAT_ROLES: pm(cli, wolf, "\u0002{}\u0002 cloned \u0002{}\u0002 and has now become a wolf!".format(clone, nick))
pm(cli, player, "\u0002{}\u0002 cloned \u0002{}\u0002 and has now become a wolf!".format(clone, nick))
if var.PHASE == "day": if var.PHASE == "day":
random.shuffle(pl) random.shuffle(wolves)
pl.remove(clone) # remove self from list for i, wolf in enumerate(wolves):
for i, player in enumerate(pl): wolfrole = var.get_role(wolf)
wolfrole = var.get_role(player)
if wolfrole in var.WOLFCHAT_ROLES:
cursed = "" cursed = ""
if player in var.ROLES["cursed villager"]: if wolf in var.ROLES["cursed villager"]:
cursed = "cursed " cursed = "cursed "
pl[i] = "\u0002{0}\u0002 ({1}{2})".format(player, cursed, wolfrole) wolves[i] = "\u0002{0}\u0002 ({1}{2})".format(wolf, cursed, wolfrole)
elif player in var.ROLES["cursed villager"]:
pl[i] = player + " (cursed)"
pm(cli, clone, "Wolves: "+", ".join(pl)) pm(cli, clone, "Wolves: " + ", ".join(wolves))
elif nick == clone and nick in var.CLONED: elif nick == clone and nick in var.CLONED:
del var.CLONED[nick] del var.CLONED[nick]
@ -1999,20 +1994,17 @@ def transition_day(cli, gameid=0):
var.ROLES["lycan"].remove(victim) var.ROLES["lycan"].remove(victim)
var.ROLES["wolf"].append(victim) var.ROLES["wolf"].append(victim)
var.LYCANS.append(victim) var.LYCANS.append(victim)
pl = var.list_players(var.WOLFCHAT_ROLES) wolves = var.list_players(var.WOLFCHAT_ROLES)
random.shuffle(pl) random.shuffle(wolves)
pl.remove(victim) # remove self from list wolves.remove(victim) # remove self from list
for i, player in enumerate(pl): for i, wolf in enumerate(wolves):
role = var.get_role(player) role = var.get_role(wolf)
if role in var.WOLFCHAT_ROLES:
cursed = "" cursed = ""
if player in var.ROLES["cursed villager"]: if wolf in var.ROLES["cursed villager"]:
cursed = "cursed " cursed = "cursed "
pl[i] = "\u0002{0}\u0002 ({1}{2})".format(player, cursed, role) wolves[i] = "\u0002{0}\u0002 ({1}{2})".format(wolf, cursed, role)
elif player in var.ROLES["cursed villager"]:
pl[i] = player + " (cursed)"
pm(cli, victim, "Wolves: "+", ".join(pl)) pm(cli, victim, "Wolves: " + ", ".join(wolves))
novictmsg = False novictmsg = False
else: else:
if var.ROLE_REVEAL: if var.ROLE_REVEAL: