Refactor damages
This commit is contained in:
+6
-6
@@ -114,9 +114,9 @@ useBulletPayload bu = case _buPayload bu of
|
||||
BulFlak -> makeFlak bu
|
||||
BulFrag -> makeFragBullets
|
||||
BulGas -> (`makeGasCloud` V2 0 0)
|
||||
BulBall IncBall -> incBallAt
|
||||
BulBall ConcBall -> \p -> cWorld . lWorld . shockwaves .:~ concBall p
|
||||
BulBall TeslaBall -> makeStaticBall
|
||||
BulBall FlamingBall -> incBallAt
|
||||
BulBall ExplosiveBall -> \p -> cWorld . lWorld . shockwaves .:~ concBall p
|
||||
BulBall ElectricalBall -> makeStaticBall
|
||||
BulBall FlashBall -> makeFlashBall
|
||||
|
||||
makeFragBullets :: Point2 -> World -> World
|
||||
@@ -164,12 +164,12 @@ hitEffFromBul w bu = case _buEffect bu of
|
||||
hitstream = thingsHit sp (sp + _buVel bu) w
|
||||
|
||||
setFromToDams :: Bullet -> Point2 -> [Damage]
|
||||
setFromToDams bu p = case _bu of
|
||||
BullPlain x -> [Piercing x p v]
|
||||
setFromToDams bu p = case _buPayload bu of
|
||||
BulPlain x -> [Piercing x p v]
|
||||
_ -> []
|
||||
where
|
||||
v = _buVel bu
|
||||
f = (dmFrom .~ _buPos bu) . (dmAt .~ p) . (dmTo .~ _buPos bu +.+ _buVel bu)
|
||||
-- f = (dmFrom .~ _buPos bu) . (dmAt .~ p) . (dmTo .~ _buPos bu +.+ _buVel bu)
|
||||
|
||||
damageThingHit :: Bullet -> (Point2, Either Creature Wall) -> World -> World
|
||||
damageThingHit bu (p, crwl) = case crwl of
|
||||
|
||||
Reference in New Issue
Block a user