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

Remove left-behind debug message and fix bug if someone changes nicks during night causing night to not end properly

Browse Source
This commit is contained in:
skizzerz 2014-08-12 17:50:37 -05:00
parent dd46ea26a9
commit b39ecbace0
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/wolfgame.py
View File

@ -2175,17 +2175,11 @@ def transition_day(cli, gameid=0):
found = {} found = {}
for v in var.KILLS.values(): for v in var.KILLS.values():
if var.ANGRY_WOLVES: for p in v:
for p in v: if p in found:
if p in found: found[p] += 1
found[p] += 1
else:
found[p] = 1
else:
if v in found:
found[v] += 1
else: else:
found[v] = 1 found[p] = 1
maxc = 0 maxc = 0
victims = [] victims = []
@ -2498,7 +2492,6 @@ def transition_day(cli, gameid=0):
var.GUNNERS[victim] -= 1 # deduct the used bullet var.GUNNERS[victim] -= 1 # deduct the used bullet
for victim in dead: for victim in dead:
print("bywolves = {0}, diseased = {1}".format(victim in bywolves, victim in var.DISEASED))
if victim in bywolves and victim in var.DISEASED: if victim in bywolves and victim in var.DISEASED:
var.DISEASED_WOLVES = True var.DISEASED_WOLVES = True
@ -3209,29 +3202,23 @@ def kill(cli, nick, rest):
if victim in var.list_players(var.WOLFCHAT_ROLES) or victim2 in var.list_players(var.WOLFCHAT_ROLES): if victim in var.list_players(var.WOLFCHAT_ROLES) or victim2 in var.list_players(var.WOLFCHAT_ROLES):
pm(cli, nick, "You may only kill villagers, not other wolves.") pm(cli, nick, "You may only kill villagers, not other wolves.")
return return
if var.ANGRY_WOLVES: if var.ANGRY_WOLVES and victim2 != None:
if victim2 != None: if victim == victim2:
if victim == victim2: pm(cli, nick, "You should select two different players.")
pm(cli, nick, "You should select two different players.") return
return
else:
rv = choose_target(nick, victim)
rv2 = choose_target(nick, victim2)
if check_exchange(cli, nick, rv):
return
if check_exchange(cli, nick, rv2):
return
var.KILLS[nick] = [rv, rv2]
else: else:
rv = choose_target(nick, victim) rv = choose_target(nick, victim)
rv2 = choose_target(nick, victim2)
if check_exchange(cli, nick, rv): if check_exchange(cli, nick, rv):
return return
var.KILLS[nick] = [rv] if check_exchange(cli, nick, rv2):
return
var.KILLS[nick] = [rv, rv2]
else: else:
rv = choose_target(nick, victim) rv = choose_target(nick, victim)
if check_exchange(cli, nick, rv): if check_exchange(cli, nick, rv):
return return
var.KILLS[nick] = rv var.KILLS[nick] = [rv]
else: else:
rv = choose_target(nick, victim) rv = choose_target(nick, victim)
if nick not in var.VENGEFUL_GHOSTS.keys(): if nick not in var.VENGEFUL_GHOSTS.keys():