summaryrefslogtreecommitdiff
path: root/src/Sequence/Contact
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-06-11 01:34:07 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-06-11 01:34:07 +0200
commitfb065aeac90ce0766a3f74b84c34547cd087da77 (patch)
treea84887655dc8cc0e66ff32162ac81e1124f8c7d1 /src/Sequence/Contact
parent49d5fbcf0ac5322ba010230f0340b701d89d7fc2 (diff)
download2017-01-16_17:13:37-fb065aeac90ce0766a3f74b84c34547cd087da77.tar
2017-01-16_17:13:37-fb065aeac90ce0766a3f74b84c34547cd087da77.tar.gz
2017-01-16_17:13:37-fb065aeac90ce0766a3f74b84c34547cd087da77.tar.bz2
2017-01-16_17:13:37-fb065aeac90ce0766a3f74b84c34547cd087da77.tar.xz
2017-01-16_17:13:37-fb065aeac90ce0766a3f74b84c34547cd087da77.zip
trigger effects on taking damage
Diffstat (limited to 'src/Sequence/Contact')
-rw-r--r--src/Sequence/Contact/Archetypes.hs1
-rw-r--r--src/Sequence/Contact/Types.hs1
-rw-r--r--src/Sequence/Contact/Types/Internal.hs5
3 files changed, 5 insertions, 2 deletions
diff --git a/src/Sequence/Contact/Archetypes.hs b/src/Sequence/Contact/Archetypes.hs
index 30aa2b6..1ad26bb 100644
--- a/src/Sequence/Contact/Archetypes.hs
+++ b/src/Sequence/Contact/Archetypes.hs
@@ -110,6 +110,7 @@ human = Humanoid
110 , _sCripple = fromJust . flip Map.lookup [ ("Kopf", def 110 , _sCripple = fromJust . flip Map.lookup [ ("Kopf", def
111 & set seVal (sDamage' "Kopf" . to return) 111 & set seVal (sDamage' "Kopf" . to return)
112 & set seBar (sMaxVitality . mapping (scaled 0.5)) 112 & set seBar (sMaxVitality . mapping (scaled 0.5))
113 & set seReBar (sMaxVitality . mapping (scaled 0.2))
113 & set seEffect (cTable [ (1, 10, Effect "Tod" headshot) 114 & set seEffect (cTable [ (1, 10, Effect "Tod" headshot)
114 , (11, 25, effect "Blind") 115 , (11, 25, effect "Blind")
115 , (26, 35, effect "Blind, Rechts") 116 , (26, 35, effect "Blind, Rechts")
diff --git a/src/Sequence/Contact/Types.hs b/src/Sequence/Contact/Types.hs
index 47687b7..9854d92 100644
--- a/src/Sequence/Contact/Types.hs
+++ b/src/Sequence/Contact/Types.hs
@@ -107,6 +107,7 @@ instance Default ShockEffect where
107 def = ShockEffect { _seApplied = False 107 def = ShockEffect { _seApplied = False
108 , _seVal = ignored 108 , _seVal = ignored
109 , _seBar = ignored 109 , _seBar = ignored
110 , _seReBar = ignored
110 , _seEffect = def 111 , _seEffect = def
111 } 112 }
112 113
diff --git a/src/Sequence/Contact/Types/Internal.hs b/src/Sequence/Contact/Types/Internal.hs
index e4a2eef..0fe6266 100644
--- a/src/Sequence/Contact/Types/Internal.hs
+++ b/src/Sequence/Contact/Types/Internal.hs
@@ -55,8 +55,9 @@ data SeqVal = SeqVal
55 55
56data ShockEffect = ShockEffect 56data ShockEffect = ShockEffect
57 { _seApplied :: Bool 57 { _seApplied :: Bool
58 , _seVal :: Getting (First (Formula Stats)) Stats (Formula Stats) 58 , _seVal
59 , _seBar :: Getting (First (Formula Stats)) Stats (Formula Stats) 59 , _seBar
60 , _seReBar :: Getting (First (Formula Stats)) Stats (Formula Stats)
60 , _seEffect :: Table Effect 61 , _seEffect :: Table Effect
61 } 62 }
62 63