From d6540b4edbd3daf9b926ffb9ed5307ada95b23fd Mon Sep 17 00:00:00 2001 From: "Vgr E. Barry" Date: Tue, 26 Sep 2017 07:56:11 -0400 Subject: [PATCH] Fix some small issues --- src/gamemodes.py | 8 ++++---- src/wolfgame.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gamemodes.py b/src/gamemodes.py index c57abce..ec09a50 100644 --- a/src/gamemodes.py +++ b/src/gamemodes.py @@ -1142,10 +1142,10 @@ class SleepyMode(GameMode): if death_triggers: if mainrole == "priest": pl = evt.data["pl"] - turn_chance = 3/4 - seers = [p for p in get_all_players(("seer",)) if p in pl and random.random() < turn_chance] - harlots = [p for p in get_all_players(("harlot",)) if p in pl and random.random() < turn_chance] - cultists = [p for p in get_all_players(("cultist",)) if p in pl and random.random() < turn_chance] + turn_chance = 1#3/4 + seers = [p for p in get_players(("seer",)) if p in pl and random.random() < turn_chance] + harlots = [p for p in get_players(("harlot",)) if p in pl and random.random() < turn_chance] + cultists = [p for p in get_players(("cultist",)) if p in pl and random.random() < turn_chance] channels.Main.send(messages["sleepy_priest_death"]) for seer in seers: change_role(seer, "seer", "doomsayer") diff --git a/src/wolfgame.py b/src/wolfgame.py index e2a65af..0f184dc 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -2485,9 +2485,9 @@ def del_player(player, *, forced_death=False, devoice=True, end_game=True, death if var.ROLE_REVEAL in ("on", "team"): role = get_reveal_role(lover.nick) an = "n" if role.startswith(("a", "e", "i", "o", "u")) else "" - message = messages["lover_suicide"].format(lover.nick, an, role) + message = messages["lover_suicide"].format(lover, an, role) else: - message = messages["lover_suicide_no_reveal"].format(lover.nick) + message = messages["lover_suicide_no_reveal"].format(lover) channels.Main.send(message) debuglog("{0} ({1}) LOVE SUICIDE: {2} ({3})".format(lover, get_main_role(lover), player, mainrole)) del_player(lover, forced_death=True, end_game=False, killer_role=killer_role, deadlist=deadlist, original=original, ismain=False) @@ -2586,7 +2586,7 @@ def del_player(player, *, forced_death=False, devoice=True, end_game=True, death t.daemon = True t.start() - debuglog(player, "(time lord) TRIGGER") + debuglog(player.nick, "(time lord) TRIGGER") pl = refresh_pl(pl) # i herd u liek parameters @@ -2634,7 +2634,7 @@ def del_player(player, *, forced_death=False, devoice=True, end_game=True, death cmode.append(("-v", player.nick)) if not player.is_fake: lplayer = player.lower() - if lplayer.account not in var.DEADCHAT_PREFS_ACCS and lplayerhost not in var.DEADCHAT_PREFS: + if lplayer.account not in var.DEADCHAT_PREFS_ACCS and lplayer.host not in var.DEADCHAT_PREFS: deadchat.append(player) # devoice all players that died as a result, if we are in the original del_player if ismain: