summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-10 19:14:05 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-10 19:14:05 +0200
commitd4a5f97465cb58c05e17dcf65db573b154cbac35 (patch)
treef9b79a69f4855c98073219e5a0459fbf4f8afa66
parent1f7f1f67c87ed5c5580dde228f88ce55bccd9b77 (diff)
download2017-01-16_17:13:37-d4a5f97465cb58c05e17dcf65db573b154cbac35.tar
2017-01-16_17:13:37-d4a5f97465cb58c05e17dcf65db573b154cbac35.tar.gz
2017-01-16_17:13:37-d4a5f97465cb58c05e17dcf65db573b154cbac35.tar.bz2
2017-01-16_17:13:37-d4a5f97465cb58c05e17dcf65db573b154cbac35.tar.xz
2017-01-16_17:13:37-d4a5f97465cb58c05e17dcf65db573b154cbac35.zip
Vehicles donĀ“t have infinite electrical resistance
-rw-r--r--src/Sequence/Contact/Types.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Sequence/Contact/Types.hs b/src/Sequence/Contact/Types.hs
index 1d057fd..ca7da1f 100644
--- a/src/Sequence/Contact/Types.hs
+++ b/src/Sequence/Contact/Types.hs
@@ -204,7 +204,7 @@ absorb armor dType (Finite -> dmg) = fmap ensureFinite <$> absorb' Map.empty dTy
204 wArmor :: DamageType -> FormulaM Stats Int' 204 wArmor :: DamageType -> FormulaM Stats Int'
205 wArmor Passthrough = 0 205 wArmor Passthrough = 0
206 wArmor Fatigue = 0 206 wArmor Fatigue = 0
207 wArmor Electric = (2 *) . maximum <$> mapM wArmor ([minBound..maxBound] \\ [Electric] :: [DamageType]) 207 wArmor Electric = (2 *) . maximum . filter isFinite <$> mapM wArmor ([minBound..maxBound] \\ [Electric] :: [DamageType])
208 wArmor x = armor x 208 wArmor x = armor x
209 209
210 clamp n 210 clamp n