Remove creature records
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
module Dodge.Shockwave.Update where
|
||||
|
||||
import Dodge.Creature.Radius
|
||||
import Data.Foldable
|
||||
import Dodge.Base.Collide
|
||||
import Dodge.Data.World
|
||||
@@ -36,7 +37,7 @@ moveShockwave w sw
|
||||
hitBlocks = map snd . overlapCircWalls p rad $ wlsNearCirc p rad w
|
||||
-- this is not expansive enough
|
||||
damCr cr
|
||||
| _crID cr `elem` is || dist (_crPos cr) p >= rad + _crRad cr = cr
|
||||
| _crID cr `elem` is || dist (_crPos cr) p >= rad + crRad (cr ^. crType) = cr
|
||||
| otherwise =
|
||||
cr & crState . csDamage
|
||||
.:~ Damage
|
||||
@@ -65,7 +66,7 @@ moveInverseShockwave w sw
|
||||
dams = over (cWorld . lWorld . creatures) (IM.map damCr) -- . flip (foldr (damageBlocksBy 1)) hitBlocks
|
||||
-- hitBlocks = wallsOnCirc' p rad $ wallsNearPoint' p w
|
||||
damCr cr
|
||||
| dist (_crPos cr) p >= rad + _crRad cr = cr
|
||||
| dist (_crPos cr) p >= rad + crRad (cr ^. crType) = cr
|
||||
| otherwise =
|
||||
cr & crState . csDamage
|
||||
.:~ Damage CONCUSSIVE 1 (cpos +.+ v) cpos (cpos -.- v) (PushBackDamage 25)
|
||||
|
||||
Reference in New Issue
Block a user