summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-09 12:48:53 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-09 12:48:53 +0200
commitc95106d9230df8a8cd8536b6fd1710550ab68128 (patch)
treedb173e88ee608b1321c57bb058331b494e4a35fa
parenta8b735183cc3a137b463d61305e2287e4ffa350f (diff)
download2017-01-16_17:13:37-c95106d9230df8a8cd8536b6fd1710550ab68128.tar
2017-01-16_17:13:37-c95106d9230df8a8cd8536b6fd1710550ab68128.tar.gz
2017-01-16_17:13:37-c95106d9230df8a8cd8536b6fd1710550ab68128.tar.bz2
2017-01-16_17:13:37-c95106d9230df8a8cd8536b6fd1710550ab68128.tar.xz
2017-01-16_17:13:37-c95106d9230df8a8cd8536b6fd1710550ab68128.zip
no such thing as armor against fatigue
-rw-r--r--src/Sequence/Contact/Types.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Sequence/Contact/Types.hs b/src/Sequence/Contact/Types.hs
index 4bd9790..2e8adcb 100644
--- a/src/Sequence/Contact/Types.hs
+++ b/src/Sequence/Contact/Types.hs
@@ -194,7 +194,8 @@ absorb armor = absorb' Map.empty
194 return . Map.unionWith (+) (leftover mass dType . clamp $ dmg - armor') $ if old /= current then new else current 194 return . Map.unionWith (+) (leftover mass dType . clamp $ dmg - armor') $ if old /= current then new else current
195 195
196 wArmor :: DamageType -> Formula Stats 196 wArmor :: DamageType -> Formula Stats
197 wArmor Passthrough = return $ 0 197 wArmor Passthrough = 0
198 wArmor Fatigue = 0
198 wArmor Electric = (2 *) . maximum <$> mapM wArmor ([minBound..maxBound] \\ [Electric] :: [DamageType]) 199 wArmor Electric = (2 *) . maximum <$> mapM wArmor ([minBound..maxBound] \\ [Electric] :: [DamageType])
199 wArmor x = armor x 200 wArmor x = armor x
200 201