From 66908ae565034925534443b254e1cb9d3f61f4a1 Mon Sep 17 00:00:00 2001 From: smelc Date: Thu, 23 Sep 2021 18:00:17 +0200 Subject: [PATCH] Human: add reward after Level1 --- app/shared/Campaign.hs | 4 ++-- app/test/Main.hs | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/shared/Campaign.hs b/app/shared/Campaign.hs index 4a80809a..cb312f07 100644 --- a/app/shared/Campaign.hs +++ b/app/shared/Campaign.hs @@ -64,7 +64,7 @@ rewards level team = case (level, team) of (_, Evil) -> [] (Level0, Human) -> map (mkIDC team) [Card.Knight] - (Level1, Human) -> [] + (Level1, Human) -> map (mkIDC team) [Card.Ogre] (Level0, Undead) -> map (mkIDC team) [Card.Necromancer, Card.Specter] (Level1, Undead) -> [Card.IDI Card.SkBanner] where @@ -86,7 +86,7 @@ loot Draw level team = altTake _ (win, []) = win loot Loss level team = case pred level of - Nothing -> rewards level team & drop 1 + Nothing -> rewards level team & (\l -> if length l > 1 then drop 1 l else l) Just levelb -> rewards levelb team -- | All possible rewards that can have been obtained from the start, diff --git a/app/test/Main.hs b/app/test/Main.hs index 17b4cee3..5854363f 100644 --- a/app/test/Main.hs +++ b/app/test/Main.hs @@ -321,11 +321,10 @@ testRewards = ==> Campaign.augment [] level team `shouldAllSatisfy` (\deck -> natLength deck == Campaign.nbRewards level) -- TODO @smelc, test Evil too - xit "There is always at least one reward (except Evil)" $ - property $ do - \(outcome, level, team) -> - team /= Evil - ==> Campaign.loot outcome level team `shouldSatisfy` (not . null) + prop "There is always at least one reward (except Evil)" $ do + \(outcome, level, team) -> + team /= Evil + ==> Campaign.loot outcome level team `shouldSatisfy` (not . null) testItemsAI shared = describe "AI" $ do