Merge branch 'release/0.4.1' into release/0.4.2

hjwylde · Feb 4, 2016 · 6808cf3 · 6808cf3
2 parents a1fc3c2 + 65cba11
commit 6808cf3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,22 @@
 
 #### Upcoming
 
+*Revisions*
+
+* Fixed a bug causing the Witch being unable to heal themselves. ([#76](https://github.com/hjwylde/werewolf/issues/76))
+
 #### v0.4.2.0
 
 *Minor*
 
 * Added the Villager role. ([#37](https://github.com/hjwylde/werewolf/issues/37))
 
+#### v0.4.1.1
+
+*Revisions*
+
+* Fixed a bug causing the Witch being unable to heal themselves. ([#76](https://github.com/hjwylde/werewolf/issues/76))
+
 #### v0.4.1.0
 
 *Minor*

diff --git a/src/Game/Werewolf/Game.hs b/src/Game/Werewolf/Game.hs
@@ -139,13 +139,9 @@ stageAvailable _ Sunrise            = True
 stageAvailable _ Sunset             = True
 stageAvailable _ VillagesTurn       = True
 stageAvailable game WerewolvesTurn  = any isWerewolf (filterAlive $ game ^. players)
-stageAvailable game WitchsTurn      = and [
-    any isWitch (filterAlive $ game ^. players),
-    not (game ^. healUsed) || not (game ^. poisonUsed),
-    witch ^. name `notElem` [name | (DevourEvent name) <- game ^. events]
-    ]
-    where
-        witch = head . filterWitches $ game ^. players
+stageAvailable game WitchsTurn      =
+    (any isWitch (filterAlive $ game ^. players))
+    && (not (game ^. healUsed) || not (game ^. poisonUsed))
 
 getDevourEvent :: Game -> Maybe Event
 getDevourEvent game = listToMaybe [event | event@(DevourEvent _) <- game ^. events]
diff --git a/test/app/Main.hs b/test/app/Main.hs
@@ -115,7 +115,7 @@ allEngineTests = [
     testProperty "check villages' turn does nothing unless all voted" prop_checkVillagesTurnDoesNothingUnlessAllVoted,
 
     testProperty "check werewolves' turn advances to witch's turn" prop_checkWerewolvesTurnAdvancesToWitchsTurn,
-    testProperty "check werewolves' turn skips witch's turn when witch devoured" prop_checkWerewolvesTurnSkipsWitchsTurnWhenWitchDevoured,
+    testProperty "check werewolves' turn doesn't skip witch's turn when witch devoured" prop_checkWerewolvesTurnDoesntSkipWitchsTurnWhenWitchDevoured,
     testProperty "check werewolves' turn skips witch's turn when healed and poisoned" prop_checkWerewolvesTurnSkipsWitchsTurnWhenHealedAndPoisoned,
     testProperty "check werewolves' turn kills one player when consensus" prop_checkWerewolvesTurnKillsOnePlayerWhenConsensus,
     testProperty "check werewolves' turn kills no one when conflicted" prop_checkWerewolvesTurnKillsNoOneWhenConflicted,

diff --git a/test/src/Game/Werewolf/Test/Engine.hs b/test/src/Game/Werewolf/Test/Engine.hs
@@ -22,7 +22,7 @@ module Game.Werewolf.Test.Engine (
     prop_checkVillagesTurnDoesNothingUnlessAllVoted,
 
     prop_checkWerewolvesTurnAdvancesToWitchsTurn,
-    prop_checkWerewolvesTurnSkipsWitchsTurnWhenWitchDevoured,
+    prop_checkWerewolvesTurnDoesntSkipWitchsTurnWhenWitchDevoured,
     prop_checkWerewolvesTurnSkipsWitchsTurnWhenHealedAndPoisoned,
     prop_checkWerewolvesTurnKillsOnePlayerWhenConsensus,
     prop_checkWerewolvesTurnKillsNoOneWhenConflicted, prop_checkWerewolvesTurnResetsVotes,
@@ -179,12 +179,12 @@ prop_checkWerewolvesTurnAdvancesToWitchsTurn game =
         game'   = game { _stage = WerewolvesTurn }
         n       = length . filterWerewolves $ game' ^. players
 
-prop_checkWerewolvesTurnSkipsWitchsTurnWhenWitchDevoured :: Game -> Property
-prop_checkWerewolvesTurnSkipsWitchsTurnWhenWitchDevoured game =
+prop_checkWerewolvesTurnDoesntSkipWitchsTurnWhenWitchDevoured :: Game -> Property
+prop_checkWerewolvesTurnDoesntSkipWitchsTurnWhenWitchDevoured game =
     forAll (arbitraryWitch game) $ \witch ->
     let devourVoteCommands = map (\werewolf -> devourVoteCommand (werewolf ^. name) (witch ^. name)) (filterWerewolves $ game ^. players)
         game'' = foldl (flip $ run_ . apply) game' devourVoteCommands
-    in not . isWitchsTurn $ run_ checkStage game''
+    in isWitchsTurn $ run_ checkStage game''
     where
         game' = game { _stage = WerewolvesTurn }