From bf24ff9ffd25841da5e20386548fb63ff191ed9a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 11 Jun 2016 23:00:13 +0200 Subject: Death & Unconsciousness --- src/Sequence/Contact/Types.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/Sequence/Contact') diff --git a/src/Sequence/Contact/Types.hs b/src/Sequence/Contact/Types.hs index 9854d92..80d4360 100644 --- a/src/Sequence/Contact/Types.hs +++ b/src/Sequence/Contact/Types.hs @@ -181,4 +181,10 @@ sDead :: Fold Stats (FormulaM Stats Bool) sDead = folding $ do maxVitality <- preview sMaxVitality damage <- view sTotalDamage - return $ liftM2 (>) <$> Just (return damage) <*> maxVitality + return $ liftM2 (>=) <$> Just (return damage) <*> maxVitality + +sUnconscious :: Fold Stats (FormulaM Stats Bool) +sUnconscious = folding $ do + maxVitality <- preview sMaxVitality + damage <- view sFatigue + return $ liftM2 (>=) <$> Just (return damage) <*> maxVitality -- cgit v1.2.3