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

Fix local variable name clashing with global function

Browse Source
This commit is contained in:
Vgr E.Barry 2016-08-03 12:07:28 -04:00
parent cd3f9fc345
commit 5db2a5d0f2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wolfgame.py
View File

@ -2768,28 +2768,28 @@ def chk_win_conditions(lpl, lwolves, lcubs, lrealwolves, lmonsters, ldemoniacs,
message = messages["piper_win"].format("s" if lpipers > 1 else "", "s" if lpipers == 1 else "") message = messages["piper_win"].format("s" if lpipers > 1 else "", "s" if lpipers == 1 else "")
elif lrealwolves == 0 and ltraitors == 0 and lcubs == 0: elif lrealwolves == 0 and ltraitors == 0 and lcubs == 0:
if ldemoniacs > 0: if ldemoniacs > 0:
plural = "s" if ldemoniacs > 1 else "" s = "s" if ldemoniacs > 1 else ""
message = (messages["demoniac_win"]).format(plural) message = (messages["demoniac_win"]).format(s)
winner = "demoniacs" winner = "demoniacs"
elif lmonsters > 0: elif lmonsters > 0:
plural = "s" if lmonsters > 1 else "" s = "s" if lmonsters > 1 else ""
message = messages["monster_win"].format(plural, "" if plural else "s") message = messages["monster_win"].format(s, "" if s else "s")
winner = "monsters" winner = "monsters"
else: else:
message = messages["villager_win"] message = messages["villager_win"]
winner = "villagers" winner = "villagers"
elif lwolves == lpl / 2: elif lwolves == lpl / 2:
if lmonsters > 0: if lmonsters > 0:
plural = "s" if lmonsters > 1 else "" s = "s" if lmonsters > 1 else ""
message = messages["monster_wolf_win"].format(plural) message = messages["monster_wolf_win"].format(s)
winner = "monsters" winner = "monsters"
else: else:
message = messages["wolf_win"] message = messages["wolf_win"]
winner = "wolves" winner = "wolves"
elif lwolves > lpl / 2: elif lwolves > lpl / 2:
if lmonsters > 0: if lmonsters > 0:
plural = "s" if lmonsters > 1 else "" s = "s" if lmonsters > 1 else ""
message = messages["monster_wolf_win"].format(plural) message = messages["monster_wolf_win"].format(s)
winner = "monsters" winner = "monsters"
else: else:
message = messages["wolf_win"] message = messages["wolf_win"]