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

Fix chained deaths on lynch and also prophet

Browse Source
This commit is contained in:
skizzerz 2016-02-08 17:37:48 -06:00
parent c4cfbfca83
commit 610874c5a1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/en.json
View File

@ -659,7 +659,7 @@
"no_longer_entranced": "You are no longer entranced.",
"doomsayer_notify": "You are a \u0002doomsayer\u0002. You can see how bad luck will befall someone at night by using \"see <nick>\" on them. You may also use \"kill <nick>\" to kill a villager.",
"prophet_notify_both": "You are a \u0002prophet\u0002. Each night you may pray up to twice to learn one player who has a particular role. The first time, you are given a list of players and have a{0} {1}% chance of revealing yourself to someone with that role. If you did not reveal yourself, you may pray again to obtain the exact player name with a{2} {3}% chance of revealing yourself. Use \"pray <role>\" in PM to learn who has that role.",
"prophet_notify_second": "You are a \u0002prophet\u0002. Each night you may pray up to twice to learn one player who has a particular role. The first time, you are given a list of players with that role. You may pray again to obtain the exact player name, however this has a{2} {3}% chance of revealing yourself to that player. Use \"pray <role>\" in PM to learn who has that role.",
"prophet_notify_second": "You are a \u0002prophet\u0002. Each night you may pray up to twice to learn one player who has a particular role. The first time, you are given a list of players with that role. You may pray again to obtain the exact player name, however this has a{0} {1}% chance of revealing yourself to that player. Use \"pray <role>\" in PM to learn who has that role.",
"prophet_notify_none": "You are a \u0002prophet\u0002. Each night you may pray to learn one player who has a particular role. Use \"pray <role>\" in PM to learn who has that role.",
"prophet_simple": "You are a \u0002prophet\u0002.",
"dullahan_targets_dead": "All your targets are already dead!",

10
src/wolfgame.py
View File

@ -2205,6 +2205,7 @@ def chk_decision(cli, force = ""):
cli.msg(botconfig.CHANNEL, lmsg)
if chk_win(cli, winner="@" + votee):
return
deadlist = [votee]
# roles that eliminate other players upon being lynched
# note that lovers, assassin, clone, and vengeful ghost are handled in del_player() since they trigger on more than just lynch
if votee in var.DESPERATE:
@ -2219,7 +2220,8 @@ def chk_decision(cli, force = ""):
tmsg = messages["totem_desperation_no_reveal"].format(votee, target)
cli.msg(botconfig.CHANNEL, tmsg)
# we lie to this function so it doesn't devoice the player yet. instead, we'll let the call further down do it
del_player(cli, target, True, end_game=False, killer_role="shaman", ismain=False) # do not end game just yet, we have more killin's to do!
deadlist.append(target)
del_player(cli, target, True, end_game=False, killer_role="shaman", deadlist=deadlist, original=target, ismain=False) # do not end game just yet, we have more killin's to do!
# Other
if votee in var.ROLES["jester"]:
var.JESTERS.add(votee)
@ -2250,7 +2252,7 @@ def chk_decision(cli, force = ""):
cli.msg(botconfig.CHANNEL, lmsg)
if aftermessage != None:
cli.msg(botconfig.CHANNEL, aftermessage)
if del_player(cli, votee, True, killer_role="villager"):
if del_player(cli, votee, True, killer_role="villager", deadlist=deadlist, original=votee):
transition_night(cli)
break
@ -2896,7 +2898,7 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
message = messages["assassin_fail_bodyguard"].format(nick, target, ga)
cli.msg(botconfig.CHANNEL, message)
del_player(cli, ga, True, end_game = False, killer_role = nickrole, deadlist = deadlist, original = original, ismain = False)
pl.remove(ga)
pl = refresh_pl(pl)
break
elif "blessing" in var.ACTIVE_PROTECTIONS[target] or (var.GAMEPHASE == "day" and target in var.ROLES["blessed villager"]):
if "blessing" in var.ACTIVE_PROTECTIONS[target]:
@ -2930,7 +2932,7 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
if var.GUARDED.get(bg) == target:
cli.msg(botconfig.CHANNEL, messages["dullahan_die_bodyguard"].format(nick, target, bg))
del_player(cli, bg, True, end_game=False, killer_role=nickrole, deadlist=deadlist, original=original, ismain=False)
pl.remove(bg)
pl = refresh_pl(pl)
break
elif "blessing" in var.ACTIVE_PROTECTIONS[target] or (var.GAMEPHASE == "day" and target in var.ROLES["blessed villager"]):
if "blessing" in var.ACTIVE_PROTECTIONS[target]: