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

Fix some small issues

Browse Source
This commit is contained in:
Vgr E. Barry 2017-09-26 07:56:11 -04:00
parent 90320ba6bc
commit d6540b4edb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gamemodes.py
View File

@ -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")

8
src/wolfgame.py
View File

@ -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: