diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 0a508b8..7c2f270 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -1465,8 +1465,7 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, role = var.get_reveal_role(target) an = "n" if role[0] in ("a", "e", "i", "o", "u") else "" message = ("Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat. " + - "The village {2} of a{3} \u0002{4}\u0002.").format(nick, target, - "mourns the loss" if var.mourn(role) else "celebrates the death", an, role) + "The village mourns the loss of a{2} \u0002{3}\u0002.").format(nick, target, an, role) else: message = "Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat.".format(nick, target) cli.msg(botconfig.CHANNEL, message) @@ -2492,8 +2491,8 @@ def transition_day(cli, gameid=0): if var.ROLE_REVEAL: role = var.get_reveal_role(victim) an = "n" if role[0] in ("a", "e", "i", "o", "u") else "" - message.append(("The dead body of \u0002{0}\u0002, a{1} \u0002{2}\u0002, is found.{3}").format(victim, an, role, - " Those remaining mourn the tragedy." if var.mourn(role) else "")) + message.append(("The dead body of \u0002{0}\u0002, a{1} \u0002{2}\u0002, is found. " + + "Those remaining mourn the tragedy.").format(victim, an, role)) else: message.append(("The dead body of \u0002{0}\u0002 is found. " + "Those remaining mourn the tragedy.").format(victim)) @@ -3226,13 +3225,10 @@ def shoot(cli, nick, chann_, rest): var.LOGGER.logMessage("{0} is a lousy shooter and missed!".format(nick)) else: if var.ROLE_REVEAL: - role = var.get_reveal_role(nick) cli.msg(chan, ("Oh no! \u0002{0}\u0002's gun was poorly maintained and has exploded! "+ - "The village {1} a gunner-\u0002{2}\u0002's death.").format(nick, - "mourns" if var.mourn(role) else "cheers on", role)) + "The village mourns a gunner-\u0002{1}\u0002.").format(nick, var.get_reveal_role(nick))) var.LOGGER.logMessage(("Oh no! {0}'s gun was poorly maintained and has exploded! "+ - "The village {1} a gunner-\u0002{2}\u0002's death.").format(nick, - "mourns" if var.mourn(role) else "cheers on", role)) + "The village mourns a gunner-{1}.").format(nick, var.get_reveal_role(nick))) else: cli.msg(chan, ("Oh no! \u0002{0}\u0002's gun was poorly maintained and has exploded!").format(nick)) var.LOGGER.logMessage(("Oh no! {0}'s gun was poorly maintained and has exploded!").format(nick)) diff --git a/settings/wolfgame.py b/settings/wolfgame.py index 77da5c0..a81d185 100644 --- a/settings/wolfgame.py +++ b/settings/wolfgame.py @@ -235,9 +235,6 @@ def get_reveal_role(nick): else: return get_role(nick) -def mourn(role): - return not (role in WOLFTEAM_ROLES or role == "monster") - def del_player(pname): prole = get_role(pname) ROLES[prole].remove(pname)