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

Fix chk_nightdone and rework blessed villager template to actually do something

Browse Source
This commit is contained in:
skizzerz 2015-10-29 22:57:02 -05:00
parent 2f3e63a02e
commit b54dff0f89
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/wolfgame.py
View File

@ -2989,7 +2989,7 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
del_player(cli, ga, True, end_game = False, killer_role = nickrole, deadlist = deadlist, original = original, ismain = False) del_player(cli, ga, True, end_game = False, killer_role = nickrole, deadlist = deadlist, original = original, ismain = False)
pl.remove(ga) pl.remove(ga)
break break
elif "blessing" in var.ACTIVE_PROTECTIONS[target] or (var.GAMEPHASE == "day" and target in var.BLESSED): 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]: if "blessing" in var.ACTIVE_PROTECTIONS[target]:
var.ACTIVE_PROTECTIONS[target].remove("blessing") var.ACTIVE_PROTECTIONS[target].remove("blessing")
# don't message the channel whenever a blessing blocks a kill, but *do* let the assassin know so they don't try to report it as a bug # don't message the channel whenever a blessing blocks a kill, but *do* let the assassin know so they don't try to report it as a bug
@ -3107,9 +3107,9 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
break break
# do not kill blessed players, they had a premonition to step out of the way before the chemicals hit # do not kill blessed players, they had a premonition to step out of the way before the chemicals hit
if target1 in var.BLESSED: if target1 in var.ROLES["blessed villager"]:
target1 = None target1 = None
if target2 in var.BLESSED: if target2 in var.ROLES["blessed villager"]:
target2 = None target2 = None
if target1 in pl: if target1 in pl:
@ -3536,7 +3536,7 @@ def rename_player(cli, prefix, nick):
del var.PRAYED[prefix] del var.PRAYED[prefix]
for dictvar in (var.HVISITED, var.OBSERVED, var.GUARDED, var.OTHER_KILLS, var.TARGETED, for dictvar in (var.HVISITED, var.OBSERVED, var.GUARDED, var.OTHER_KILLS, var.TARGETED,
var.CLONED, var.LASTGUARDED, var.LASTGIVEN, var.LASTHEXED, var.CLONED, var.LASTGUARDED, var.LASTGIVEN, var.LASTHEXED, var.BLESSED,
var.BITE_PREFERENCES): var.BITE_PREFERENCES):
kvp = [] kvp = []
for a,b in dictvar.items(): for a,b in dictvar.items():
@ -3710,9 +3710,6 @@ def rename_player(cli, prefix, nick):
if prefix in var.TOBECHARMED: if prefix in var.TOBECHARMED:
var.TOBECHARMED.remove(prefix) var.TOBECHARMED.remove(prefix)
var.TOBECHARMED.add(nick) var.TOBECHARMED.add(nick)
if prefix in var.BLESSED:
var.BLESSED.remove(prefix)
var.BLESSED.add(nick)
if prefix in var.PRIESTS: if prefix in var.PRIESTS:
var.PRIESTS.remove(prefix) var.PRIESTS.remove(prefix)
var.PRIESTS.add(nick) var.PRIESTS.add(nick)
@ -4379,7 +4376,7 @@ def transition_day(cli, gameid=0):
protected[v] = "bodyguard" protected[v] = "bodyguard"
elif numkills <= 0: elif numkills <= 0:
var.ACTIVE_PROTECTIONS[v].append("bodyguard") var.ACTIVE_PROTECTIONS[v].append("bodyguard")
if v in var.BLESSED: if v in var.ROLES["blessed villager"]:
numkills -= 1 numkills -= 1
if numkills <= 0 and v not in protected: if numkills <= 0 and v not in protected:
protected[v] = "blessing" protected[v] = "blessing"
@ -4398,7 +4395,7 @@ def transition_day(cli, gameid=0):
for g in var.ROLES["bodyguard"]: for g in var.ROLES["bodyguard"]:
if var.GUARDED.get(g) == v: if var.GUARDED.get(g) == v:
var.ACTIVE_PROTECTIONS[v].append("bodyguard") var.ACTIVE_PROTECTIONS[v].append("bodyguard")
if v in var.BLESSED: if v in var.ROLES["blessed villager"]:
var.ACTIVE_PROTECTIONS[v].append("blessing") var.ACTIVE_PROTECTIONS[v].append("blessing")
fallenkills = set() fallenkills = set()
@ -4818,7 +4815,7 @@ def chk_nightdone(cli):
# TODO: alphabetize and/or arrange sensibly # TODO: alphabetize and/or arrange sensibly
pl = var.list_players() pl = var.list_players()
actedcount = sum(map(len, (var.SEEN, var.HVISITED, var.GUARDED, var.KILLS, actedcount = sum(map(len, (var.SEEN, var.HVISITED, var.GUARDED, var.KILLS,
var.OTHER_KILLS, var.PASSED, var.OBSERVED, var.OTHER_KILLS, var.PASSED, var.OBSERVED, var.BLESSED,
var.HEXED, var.SHAMANS, var.CURSED, var.CHARMERS))) var.HEXED, var.SHAMANS, var.CURSED, var.CHARMERS)))
nightroles = get_roles("seer", "oracle", "harlot", "succubus", "bodyguard", nightroles = get_roles("seer", "oracle", "harlot", "succubus", "bodyguard",
@ -4832,6 +4829,10 @@ def chk_nightdone(cli):
if not against.startswith("!"): if not against.startswith("!"):
nightroles.append(ghost) nightroles.append(ghost)
for nick, info in var.PRAYED:
if info[0] > 0:
actedcount += 1
if var.FIRST_NIGHT: if var.FIRST_NIGHT:
actedcount += len(var.MATCHMAKERS | var.CLONED.keys()) actedcount += len(var.MATCHMAKERS | var.CLONED.keys())
nightroles.extend(get_roles("matchmaker", "clone")) nightroles.extend(get_roles("matchmaker", "clone"))
@ -4851,6 +4852,11 @@ def chk_nightdone(cli):
if p in var.ROLES["hunter"] and p not in var.OTHER_KILLS: if p in var.ROLES["hunter"] and p not in var.OTHER_KILLS:
nightroles.remove(p) nightroles.remove(p)
for p in var.PRIESTS:
# similar to hunters, only remove one instance of their name
if p in var.ROLES["priest"] and p not in var.BLESSED:
nightroles.remove(p)
# but remove all instances of their name if they are silenced # but remove all instances of their name if they are silenced
nightroles = [p for p in nightroles if p not in var.SILENCED] nightroles = [p for p in nightroles if p not in var.SILENCED]
@ -5701,7 +5707,8 @@ def bless(cli, nick, chan, rest):
return return
var.PRIESTS.add(nick) var.PRIESTS.add(nick)
var.BLESSED.add(victim) var.BLESSED[nick] = victim
var.ROLES["blessed villager"].add(victim)
pm(cli, nick, "You have given a blessing to \u0002{0}\u0002".format(victim)) pm(cli, nick, "You have given a blessing to \u0002{0}\u0002".format(victim))
pm(cli, victim, "You suddenly feel very safe.") pm(cli, victim, "You suddenly feel very safe.")
debuglog("{0} ({1}) BLESS: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim))) debuglog("{0} ({1}) BLESS: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
@ -6896,6 +6903,7 @@ def transition_night(cli):
var.TOTEMS = {} var.TOTEMS = {}
var.CONSECRATING = set() var.CONSECRATING = set()
var.SICK = set() var.SICK = set()
var.BLESSED = {}
for nick in var.PRAYED: for nick in var.PRAYED:
var.PRAYED[nick][0] = 0 var.PRAYED[nick][0] = 0
var.PRAYED[nick][1] = None var.PRAYED[nick][1] = None
@ -7865,7 +7873,7 @@ def start(cli, nick, chan, forced = False, restart = ""):
var.TURNCOATS = {} var.TURNCOATS = {}
var.EXCHANGED_ROLES = [] var.EXCHANGED_ROLES = []
var.EXTRA_WOLVES = 0 var.EXTRA_WOLVES = 0
var.BLESSED = set() var.BLESSED = {}
var.PRIESTS = set() var.PRIESTS = set()
var.CONSECRATING = set() var.CONSECRATING = set()
var.ENTRANCED = set() var.ENTRANCED = set()
@ -7930,9 +7938,6 @@ def start(cli, nick, chan, forced = False, restart = ""):
var.ROLES["sharpshooter"].discard(None) var.ROLES["sharpshooter"].discard(None)
# Handle blessed villager
var.BLESSED.update(var.ROLES["blessed villager"])
if not restart: if not restart:
var.SPECIAL_ROLES["goat herder"] = [] var.SPECIAL_ROLES["goat herder"] = []
if var.GOAT_HERDER: if var.GOAT_HERDER: