Relay wolf shaman and do prefix hiding in wolfchat

Commands starting with ! will no longer be relayed regardless of if one
is in wolfchat or deadchat. All wolf roles that issue commands now have
their commands properly relayed, so hiding commands this way isn't
really any issue.
This commit is contained in:
skizzerz 2016-02-01 10:29:06 -06:00
parent 7a3b6d7274
commit f3a7be45d4
2 changed files with 6 additions and 3 deletions

View File

@ -367,6 +367,7 @@
"augur_success": "You have a vision; in this vision, you see that \u0002{0}\u0002 exudes a \u0002{1}\u0002 aura!",
"shaman_no_target_twice": "You gave your totem to \u0002{0}\u0002 last time, you must choose someone else.",
"shaman_success": "{0} have given a totem{1} to \u0002{2}\u0002.",
"shaman_wolfchat": "\u0002{0}\u0002 has given a totem to \u0002{1}\u0002.",
"doctor_fail": "You have run out of immunizations.",
"doctor_success": "You have given an immunization to \u0002{0}\u0002.",
"lycan_cured": "You feel as if a curse has been lifted from you... It seems that your lycanthropy is cured and you will no longer become a werewolf if targeted by the wolves!",

View File

@ -5907,6 +5907,8 @@ def totem(cli, nick, chan, rest, prefix="You"):
pm(cli, nick, messages["no_acting_on_succubus"].format("give a totem{0} to".format(totem)))
return
pm(cli, nick, messages["shaman_success"].format(prefix, totem, original_victim))
if role == "wolf shaman":
relay_wolfchat_command(cli, nick, messages["shaman_wolfchat"].format(nick, original_victim), ("wolf shaman",), is_wolf_command=True)
var.SHAMANS[nick] = (victim, original_victim)
debuglog("{0} ({1}) TOTEM: {2} ({3})".format(nick, role, victim, var.TOTEMS[nick]))
chk_nightdone(cli)
@ -6474,15 +6476,15 @@ def relay(cli, nick, chan, rest):
cli.msg(nick, messages["privmsg_idle_warning"].format(botconfig.CHANNEL))
var.IDLE_WARNED_PM.add(nick)
if rest.startswith(botconfig.CMD_CHAR):
return
badguys = var.list_players(var.WOLFCHAT_ROLES)
wolves = var.list_players(var.WOLF_ROLES)
if nick not in pl and var.ENABLE_DEADCHAT and nick in var.DEADCHAT_PLAYERS:
to_msg = var.DEADCHAT_PLAYERS - {nick}
if rest.startswith(botconfig.CMD_CHAR):
return
if rest.startswith("\u0001ACTION"):
rest = rest[7:-1]
mass_privmsg(cli, to_msg, "* \u0002{0}\u0002{1}".format(nick, rest))