diff options
Diffstat (limited to 'src/Sequence/Contact/Types/Internal.hs')
-rw-r--r-- | src/Sequence/Contact/Types/Internal.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Sequence/Contact/Types/Internal.hs b/src/Sequence/Contact/Types/Internal.hs index eaa1e19..f2052ee 100644 --- a/src/Sequence/Contact/Types/Internal.hs +++ b/src/Sequence/Contact/Types/Internal.hs | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | module Sequence.Contact.Types.Internal where | 3 | module Sequence.Contact.Types.Internal where |
4 | 4 | ||
5 | import Sequence.Formula (Formula, FormulaM, Table) | 5 | import Sequence.Formula (Formula, FormulaM, FormulaMT, Table) |
6 | 6 | ||
7 | import Data.Map (Map) | 7 | import Data.Map (Map) |
8 | import Data.Set (Set) | 8 | import Data.Set (Set) |
@@ -18,6 +18,8 @@ import Data.CaseInsensitive (CI) | |||
18 | 18 | ||
19 | import Data.ExtendedReal | 19 | import Data.ExtendedReal |
20 | 20 | ||
21 | import Control.Monad.Trans.Maybe (MaybeT) | ||
22 | |||
21 | newtype Hitzone = Hitzone { _hitzone :: CI String } | 23 | newtype Hitzone = Hitzone { _hitzone :: CI String } |
22 | deriving (Eq, Ord) | 24 | deriving (Eq, Ord) |
23 | 25 | ||
@@ -60,7 +62,7 @@ data DiceResult = CritSuccess { _rWith, _rBy :: Int } | |||
60 | 62 | ||
61 | data TestResult = TestResult | 63 | data TestResult = TestResult |
62 | { _rRoll :: DiceResult | 64 | { _rRoll :: DiceResult |
63 | , _rResult :: Effect | 65 | , _rResult :: Maybe Effect |
64 | } | 66 | } |
65 | 67 | ||
66 | data Test = Test | 68 | data Test = Test |
@@ -69,12 +71,12 @@ data Test = Test | |||
69 | , _tCritFailureMod | 71 | , _tCritFailureMod |
70 | , _tBaseDifficulty | 72 | , _tBaseDifficulty |
71 | , _tMod :: Int | 73 | , _tMod :: Int |
72 | , _tEffect :: DiceResult -> FormulaM Stats Effect | 74 | , _tEffect :: DiceResult -> FormulaMT MaybeT Stats Effect |
73 | } | 75 | } |
74 | 76 | ||
75 | data Modifier = Modifier (CI String) (Test -> FormulaM Stats Test) | 77 | data Modifier = Modifier (CI String) (Test -> FormulaM Stats Test) |
76 | 78 | ||
77 | data Effect = Effect (CI String) (FormulaM Stats (Maybe Stats)) | 79 | data Effect = Effect (CI String) (FormulaMT MaybeT Stats Stats) |
78 | 80 | ||
79 | data SeqVal = SeqVal | 81 | data SeqVal = SeqVal |
80 | { _seqRound :: Down Int | 82 | { _seqRound :: Down Int |