From d8763c34a9e457c806e5f17a0721b76a01143715 Mon Sep 17 00:00:00 2001 From: Ammon Smith Date: Tue, 1 May 2018 15:41:28 -0700 Subject: [PATCH] Remove hardcoded English for players list. --- messages/en.json | 4 ++-- src/gamemodes.py | 2 +- src/roles/_seer_helper.py | 2 +- src/roles/angel.py | 4 ++-- src/roles/assassin.py | 2 +- src/roles/crazedshaman.py | 2 +- src/roles/detective.py | 2 +- src/roles/harlot.py | 2 +- src/roles/hunter.py | 2 +- src/roles/investigator.py | 2 +- src/roles/piper.py | 2 +- src/roles/shaman.py | 2 +- src/roles/succubus.py | 2 +- src/roles/vigilante.py | 2 +- src/roles/wolf.py | 6 +++--- src/wolfgame.py | 8 ++++---- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/messages/en.json b/messages/en.json index 9509c2e..72d7361 100644 --- a/messages/en.json +++ b/messages/en.json @@ -185,6 +185,8 @@ "no_votes": "No votes yet.", "vote_stats": "{0}\u0002{1}\u0002 players, \u0002{2}\u0002 votes required to lynch, \u0002{3}\u0002 players available to vote.", "vote_stats_abstain": " \u0002{0}\u0002 player{1} refrained from voting.", + "wolves_list": "Wolves: {0}", + "players_list": "Players: {0}", "cub_grow_up": "You have grown up into a wolf and vowed to take revenge for your dead parents!", "traitor_turn": "HOOOOOOOOOWL. You have become... a wolf!\nIt is up to you to avenge your fallen leaders!", "traitor_turn_channel": "\u0002The villagers, during their celebrations, are frightened as they hear a loud howl. The wolves are not gone!\u0002", @@ -198,7 +200,6 @@ "forever_aclone": "It appears that \u0002{0}\u0002 was cloning you, so you are now stuck as a clone forever. How sad.", "clone_success": "You will now be cloning \u0002{0}\u0002 if they die.", "clone_wolf": "\u0002{0}\u0002 cloned \u0002{1}\u0002 and has now become a wolf!", - "wolves_list": "Wolves: {0}", "no_other_wolves": "There are no other wolves.", "has_minions": "You have \u0002{0}\u0002 {1} at your command!", "lover_suicide": "Saddened by the loss of their lover, \u0002{0}\u0002, a{1} \u0002{2}\u0002, commits suicide.", @@ -639,7 +640,6 @@ "player_joined_deadchat": "\u0002{0}\u0002 has joined the deadchat.", "multiple_joined_deadchat": "\u0002{0}\u0002 and \u0002{1}\u0002 have joined the deadchat.", "joined_deadchat": "You are now in the deadchat.", - "list_deadchat": "Players: {0}", "force_leave_deadchat": "You have been forcibly removed from the deadchat by \u0002{0}\u0002.", "player_force_leave_deadchat": "\u0002{0}\u0002 has been removed from the deadchat by \u0002{1}\u0002.", "leave_deadchat": "You have left the deadchat.", diff --git a/src/gamemodes.py b/src/gamemodes.py index 5d71312..3746f51 100644 --- a/src/gamemodes.py +++ b/src/gamemodes.py @@ -1162,7 +1162,7 @@ class MaelstromMode(GameMode): pl[i] = "\u0002{0}\u0002 ({1}{2})".format(player, cursed, prole) elif player in var.ROLES["cursed villager"]: pl[i] = player.nick + " (cursed)" - wrapper.pm("Players: " + ", ".join(pl)) + wrapper.pm(messages["players_list"].format(", ".join(pl))) def role_attribution(self, evt, var, chk_win_conditions, villagers): self.chk_win_conditions = chk_win_conditions diff --git a/src/roles/_seer_helper.py b/src/roles/_seer_helper.py index d3e194c..020f365 100644 --- a/src/roles/_seer_helper.py +++ b/src/roles/_seer_helper.py @@ -54,7 +54,7 @@ def setup_variables(rolename): to_send = "seer_role_info" if seer.prefers_simple(): to_send = "seer_simple" - seer.send(messages[to_send].format(a, rolename, what), "Players: " + ", ".join(p.nick for p in pl), sep="\n") + seer.send(messages[to_send].format(a, rolename, what), messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("begin_day") def on_begin_day(evt, var): diff --git a/src/roles/angel.py b/src/roles/angel.py index de4baa7..1e6547f 100644 --- a/src/roles/angel.py +++ b/src/roles/angel.py @@ -245,7 +245,7 @@ def on_transition_night_end(evt, var): to_send = "bodyguard_notify" if bg.prefers_simple(): to_send = "bodyguard_simple" - bg.send(messages[to_send].format(warning), "Players: " + ", ".join(p.nick for p in pl), sep="\n") + bg.send(messages[to_send].format(warning), messages["players_list"].format(", ".join(p.nick for p in pl), sep="\n")) for gangel in get_all_players(("guardian angel",)): pl = ps[:] @@ -266,7 +266,7 @@ def on_transition_night_end(evt, var): to_send = "guardian_notify" if gangel.prefers_simple(): to_send = "guardian_simple" - gangel.send(messages[to_send].format(warning, gself), "Players: " + ", ".join(p.nick for p in pl), sep="\n") + gangel.send(messages[to_send].format(warning, gself), messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("assassinate") def on_assassinate(evt, var, killer, target, prot): diff --git a/src/roles/assassin.py b/src/roles/assassin.py index 953c1e2..9f4a9ee 100644 --- a/src/roles/assassin.py +++ b/src/roles/assassin.py @@ -80,7 +80,7 @@ def on_transition_night_end(evt, var): ass.send(messages["assassin_simple"]) else: ass.send(messages["assassin_notify"]) - ass.send("Players: " + ", ".join(p.nick for p in pl)) + ass.send(messages["players_list"].format(", ".join(p.nick for p in pl))) @event_listener("del_player") def on_del_player(evt, var, player, mainrole, allroles, death_triggers): diff --git a/src/roles/crazedshaman.py b/src/roles/crazedshaman.py index 95b4a76..2f059d4 100644 --- a/src/roles/crazedshaman.py +++ b/src/roles/crazedshaman.py @@ -93,7 +93,7 @@ def on_transition_night_end(evt, var): shaman.send(messages["shaman_simple"].format("crazed shaman")) else: shaman.send(messages["shaman_notify"].format("crazed shaman", "random ")) - shaman.send("Players: " + ", ".join(p.nick for p in pl)) + shaman.send(messages["players_list"].format(", ".join(p.nick for p in pl))) @event_listener("get_special") def on_get_special(evt, var): diff --git a/src/roles/detective.py b/src/roles/detective.py index c5a3521..e862e8d 100644 --- a/src/roles/detective.py +++ b/src/roles/detective.py @@ -85,7 +85,7 @@ def on_transition_night_end(evt, var): to_send = "detective_notify" if dttv.prefers_simple(): to_send = "detective_simple" - dttv.send(messages[to_send].format(warning), "Players: " + ", ".join(p.nick for p in pl), sep="\n") + dttv.send(messages[to_send].format(warning), messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("transition_night_begin") def on_transition_night_begin(evt, var): diff --git a/src/roles/harlot.py b/src/roles/harlot.py index b3015e7..dd01155 100644 --- a/src/roles/harlot.py +++ b/src/roles/harlot.py @@ -127,7 +127,7 @@ def on_transition_night_end(evt, var): to_send = "harlot_info" if harlot.prefers_simple(): to_send = "harlot_simple" - harlot.send(messages[to_send], "Players: " + ", ".join(p.nick for p in pl), sep="\n") + harlot.send(messages[to_send], messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("begin_day") def on_begin_day(evt, var): diff --git a/src/roles/hunter.py b/src/roles/hunter.py index 02c2b49..24a5d72 100644 --- a/src/roles/hunter.py +++ b/src/roles/hunter.py @@ -123,7 +123,7 @@ def on_transition_night_end(evt, var): to_send = "hunter_notify" if hunter.prefers_simple(): to_send = "hunter_simple" - hunter.send(messages[to_send], "Players: " + ", ".join(p.nick for p in pl), sep="\n") + hunter.send(messages[to_send], messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("succubus_visit") def on_succubus_visit(evt, var, succubus, target): diff --git a/src/roles/investigator.py b/src/roles/investigator.py index c0c23a2..f377e4f 100644 --- a/src/roles/investigator.py +++ b/src/roles/investigator.py @@ -115,7 +115,7 @@ def on_transition_night_end(evt, var): to_send = "investigator_notify" if inv.prefers_simple(): to_send = "investigator_simple" - inv.send(messages[to_send], "Players: " + ", ".join(p.nick for p in pl), sep="\n") + inv.send(messages[to_send], messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("transition_night_begin") def on_transition_night_begin(evt, var): diff --git a/src/roles/piper.py b/src/roles/piper.py index 9f6f9e2..f1fa948 100644 --- a/src/roles/piper.py +++ b/src/roles/piper.py @@ -191,7 +191,7 @@ def on_transition_night_end(evt, var): to_send = "piper_notify" if piper.prefers_simple(): to_send = "piper_simple" - piper.send(messages[to_send], "Players: " + ", ".join(p.nick for p in pl), sep="\n") + piper.send(messages[to_send], messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("exchange_roles") def on_exchange(evt, var, actor, target, actor_role, target_role): diff --git a/src/roles/shaman.py b/src/roles/shaman.py index a5ab0d3..ded72cf 100644 --- a/src/roles/shaman.py +++ b/src/roles/shaman.py @@ -96,7 +96,7 @@ def on_transition_night_end(evt, var): tmsg = messages["shaman_totem"].format(totem) tmsg += messages[totem + "_totem"] shaman.send(tmsg) - shaman.send("Players: " + ", ".join(p.nick for p in pl)) + shaman.send(messages["players_list"].format(", ".join(p.nick for p in pl))) @event_listener("get_special") def on_get_special(evt, var): diff --git a/src/roles/succubus.py b/src/roles/succubus.py index 7e4de7b..c1377a2 100644 --- a/src/roles/succubus.py +++ b/src/roles/succubus.py @@ -282,7 +282,7 @@ def on_transition_night_end(evt, var): succ.append("{0} (succubus)".format(p)) else: succ.append(p.nick) - succubus.send(messages[to_send], "Players: " + ", ".join(succ), sep="\n") + succubus.send(messages[to_send], messages["players_list"].format(", ".join(succ)), sep="\n") @event_listener("begin_day") def on_begin_day(evt, var): diff --git a/src/roles/vigilante.py b/src/roles/vigilante.py index 60024f7..7358679 100644 --- a/src/roles/vigilante.py +++ b/src/roles/vigilante.py @@ -105,7 +105,7 @@ def on_transition_night_end(evt, var): to_send = "vigilante_notify" if vigilante.prefers_simple(): to_send = "vigilante_simple" - vigilante.send(messages[to_send], "Players: " + ", ".join(p.nick for p in pl), sep="\n") + vigilante.send(messages[to_send], messages["players_list"].format(", ".join(p.nick for p in pl)), sep="\n") @event_listener("succubus_visit") def on_succubus_visit(evt, var, succubus, target): diff --git a/src/roles/wolf.py b/src/roles/wolf.py index 9d41934..eb3b33f 100644 --- a/src/roles/wolf.py +++ b/src/roles/wolf.py @@ -263,7 +263,7 @@ def on_exchange(evt, var, actor, target, actor_role, target_role): if notify: player.send_messages() - evt.data["actor_messages"].append("Players: " + ", ".join(to_send)) + evt.data["actor_messages"].append(messages["players_list"].format(", ".join(to_send))) if target_role in CAN_KILL and var.DISEASED_WOLVES: evt.data["actor_messages"].append(messages["ill_wolves"]) if var.ALPHA_ENABLED and target_role == "alpha wolf" and actor.nick not in var.ALPHA_WOLVES: @@ -296,7 +296,7 @@ def on_exchange(evt, var, actor, target, actor_role, target_role): if notify: player.send_messages() - evt.data["target_messages"].append("Players: " + ", ".join(to_send)) + evt.data["target_messages"].append(messages["players_list"].format(", ".join(to_send))) if actor_role in CAN_KILL and var.DISEASED_WOLVES: evt.data["target_messages"].append(messages["ill_wolves"]) if var.ALPHA_ENABLED and actor_role == "alpha wolf" and target.nick not in var.ALPHA_WOLVES: @@ -430,7 +430,7 @@ def on_transition_night_end(evt, var): else: players.append(player.nick) - wolf.send("Players: " + ", ".join(players)) + wolf.send(messages["players_list"].format(", ".join(players))) if role in CAN_KILL and var.DISEASED_WOLVES: wolf.send(messages["ill_wolves"]) # TODO: split the following out into their own files (alpha) diff --git a/src/wolfgame.py b/src/wolfgame.py index d3fe7ee..73d9d5b 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -773,7 +773,7 @@ def join_deadchat(var, *all_users): user.queue_message("[deadchat] " + msg) for user in to_join: user.queue_message(messages["joined_deadchat"]) - user.queue_message(messages["list_deadchat"].format(", ".join([user.nick for user in people]))) + user.queue_message(messages["players_list"].format(", ".join([user.nick for user in people]))) var.DEADCHAT_PLAYERS.update(to_join) var.SPECTATING_DEADCHAT.difference_update(to_join) @@ -3843,7 +3843,7 @@ def check_exchange(cli, actor, nick): for i, player in enumerate(pl): if player in get_roles("cursed villager"): # FIXME pl[i] = player + " (cursed)" - pm(cli, actor, "Players: " + ", ".join(pl)) + pm(cli, actor, messages["players_list"].format(", ".join(pl))) elif nick_role == "minion": wolves = list_players(var.WOLF_ROLES) random.shuffle(wolves) @@ -3861,7 +3861,7 @@ def check_exchange(cli, actor, nick): for i, player in enumerate(pl): if player in get_roles("cursed villager"): # FIXME pl[i] = player + " (cursed)" - pm(cli, nick, "Players: " + ", ".join(pl)) + pm(cli, nick, messages["players_list"].format(", ".join(pl))) elif actor_role == "minion": wolves = list_players(var.WOLF_ROLES) random.shuffle(wolves) @@ -4777,7 +4777,7 @@ def transition_night(): clone.send(messages["clone_simple"]) else: clone.send(messages["clone_notify"]) - clone.send("Players: "+", ".join(p.nick for p in pl)) + clone.send(messages["players_list"].format(", ".join(p.nick for p in pl))) for minion in get_all_players(("minion",)): wolves = get_players(var.WOLF_ROLES)