From 700ccc262970bafcb79db45f603341e5473bdbac Mon Sep 17 00:00:00 2001 From: skizzerz Date: Thu, 28 Jul 2016 18:22:22 -0500 Subject: [PATCH] Revert nobody wins to allow non-team wins to happen, fix messages --- messages/en.json | 4 ++-- src/wolfgame.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/messages/en.json b/messages/en.json index f328d47..620458c 100644 --- a/messages/en.json +++ b/messages/en.json @@ -100,7 +100,7 @@ "\u0002{0}\u0002 went spelunking and never made it back." ], "fool_win": "Game over! The fool has been lynched, causing them to win.", - "no_win": "Game over! There are no players remaining. Nobody wins.", + "no_win": "Game over! There are no players remaining.", "piper_win": "Game over! Everyone has fallen victim to the charms of the piper{0}. The piper{0} lead{1} the villagers away from the village, never to return...", "monster_win": "Game over! All the wolves are dead! As the villagers start preparing the BBQ, the monster{0} quickly kill{1} the remaining villagers, causing the monster{0} to win.", "monster_wolf_win": "Game over! There are the same number of wolves as uninjured villagers. The wolves overpower the villagers but then get destroyed by the monster{0}, causing the monster{0} to win.", @@ -497,7 +497,7 @@ "doctor_notify": "You are a \u0002doctor\u0002. You can give out immunizations to villagers by using \"give \" in PM during the daytime. An immunized villager will die instead of turning into a wolf due to the alpha wolf's or lycan's power.", "doctor_simple": "You are a \u0002doctor\u0002.", "doctor_immunizations": "You have \u0002{0}\u0002 immunization{1}.", - "fool_notify": "You are a \u0002fool\u0002. The game immediately ends with you being the only winner if you are lynched during the day. You cannot otherwise win this game.", + "fool_notify": "You are a \u0002fool\u0002. The game immediately ends with you as the winner if you are lynched during the day. You cannot otherwise win this game.", "fool_simple": "You are a \u0002fool\u0002.", "jester_notify": "You are a \u0002jester\u0002. You will win alongside the normal winners if you are lynched during the day. You cannot otherwise win this game.", "jester_simple": "You are a \u0002jester\u0002.", diff --git a/src/wolfgame.py b/src/wolfgame.py index d1719b5..cd75906 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -2754,7 +2754,8 @@ def chk_win_conditions(lpl, lwolves, lcubs, lrealwolves, lmonsters, ldemoniacs, message = messages["fool_win"] elif lpl < 1: message = messages["no_win"] - winner = "" + # still want people like jesters, dullahans, etc. to get wins if they fulfilled their win conds + winner = "no_team_wins" elif var.PHASE == "day" and lpl - lsuccubi == lentranced: winner = "succubi" message = messages["succubus_win"].format(plural("succubus", lsuccubi), plural("has", lsuccubi), plural("master's", lsuccubi))