Merge branch 'issue/244' into release/1.4.0

hjwylde · Jul 20, 2016 · dae65d8 · dae65d8
2 parents b981bf8 + 4710441
commit dae65d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ Post v1 a change is further considered breaking if the state file format is inco
 
 ### Upcoming
 
+*Revisions*
+
+* Ignore the Jester when considering Necromancers win condition. ([#244](https://github.com/hjwylde/werewolf/issues/244))
+
 ### v1.4.0.0
 
 *Major*

diff --git a/src/Game/Werewolf/Game.hs b/src/Game/Werewolf/Game.hs
@@ -352,11 +352,13 @@ hasFallenAngelWon game = game ^. fallenAngelLynched
 
 -- | Queries whether the Necromancer has won. The 'Necromancer' wins if they and their zombies are
 --   the only players surviving.
+--
+--   N.B., the Jester is not considered when determining whether the 'Necromancer' has won.
 hasNecromancerWon :: Game -> Bool
 hasNecromancerWon game =
     not (hasEveryoneLost game)
     && allOf (players . traverse . alive)
-        (\player -> any ($ player) [is necromancer, is zombie]) game
+        (\player -> any ($ player) [is necromancer, is zombie, is jester]) game
 
 -- | Queries whether the 'Villagers' have won. The 'Villagers' win if they are the only players
 --   surviving.