Tweak energyballs
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
-- | Creation of particles in the world.
|
||||
module Dodge.WorldEvent.SpawnParticle (
|
||||
makeGasCloud,
|
||||
makeStaticBall,
|
||||
concBall,
|
||||
) where
|
||||
|
||||
@@ -11,19 +10,6 @@ import LensHelp
|
||||
import Picture
|
||||
import RandomHelp
|
||||
|
||||
randEnergyBallAt :: (Point2 -> State StdGen EnergyBall) -> Point2 -> World -> World
|
||||
randEnergyBallAt f p w =
|
||||
w
|
||||
& cWorld . lWorld . energyBalls .:~ thepart
|
||||
& randGen .~ g
|
||||
where
|
||||
(thepart, g) = runState (f p) (_randGen w)
|
||||
|
||||
makeStaticBall :: Point2 -> World -> World
|
||||
makeStaticBall p = randEnergyBallAt aStaticBall p . (cWorld . lWorld . posEvents .:~ thesparker)
|
||||
where
|
||||
thesparker = PosEvent SparkSpawner 10 p
|
||||
|
||||
concBall :: Point2 -> Shockwave
|
||||
concBall p =
|
||||
Shockwave
|
||||
@@ -38,40 +24,6 @@ concBall p =
|
||||
, _swTimer = 10
|
||||
}
|
||||
|
||||
aStaticBall :: Point2 -> State g EnergyBall
|
||||
aStaticBall p =
|
||||
return
|
||||
EnergyBall
|
||||
{ _ebVel = 0
|
||||
, _ebPos = p
|
||||
, _ebTimer = 20
|
||||
, _ebEff = ElectricalBall
|
||||
}
|
||||
|
||||
{- | Note damgeInRadius by itself never destroys the particle
|
||||
damageInRadius :: Float -> Particle -> World -> World
|
||||
damageInRadius size pt = damageInArea isClose closeWls pt
|
||||
where
|
||||
p = _ptPos pt
|
||||
closeWls wl = uncurry segOnCirc (_wlLine wl) p size
|
||||
isClose cr = dist p (_crPos cr) < _crRad cr + size
|
||||
-}
|
||||
|
||||
--damageInArea :: (Creature -> Bool) -> (Wall -> Bool) -> Particle -> World -> World
|
||||
--{-# INLINE damageInArea #-}
|
||||
--damageInArea crt wlt pt w = damwls damcrs
|
||||
-- where
|
||||
-- p = _ptPos pt
|
||||
-- damcrs = foldl' (flip $ \cr -> fst . hiteff (S.yield (p,Left cr))) w $ IM.filter crt $ _creatures w
|
||||
-- damwls w' = runIdentity
|
||||
-- . S.fold_
|
||||
-- (flip $ \wl -> fst . hiteff (S.yield (p,Right wl)))
|
||||
-- w'
|
||||
-- id
|
||||
-- . S.filter wlt
|
||||
-- $ wlsNearPoint p w'
|
||||
-- hiteff = _ptHitEff pt pt
|
||||
|
||||
-- | At writing the radius is half the size of the effect area
|
||||
makeGasCloud ::
|
||||
-- | Position
|
||||
@@ -98,16 +50,3 @@ makeGasCloud pos vel w =
|
||||
(col, g) = runState (takeOne [green, yellow]) $ _randGen w
|
||||
|
||||
{- Attach poison cloud damage to creatures near cloud. -}
|
||||
|
||||
{- Update of a flamelet.
|
||||
Applies movement and attaches damage to nearby creatures. -}
|
||||
-- This should be unified in many ways with moveFlame
|
||||
--moveFlamelet :: World -> Particle -> (World, Maybe Particle)
|
||||
--moveFlamelet w pt
|
||||
-- | _ptTimer pt <= 0 = ( w, Nothing)
|
||||
-- | otherwise = (ptFlicker pt $ damageInRadius 5 mvPt' w, Just mvPt')
|
||||
-- where
|
||||
-- mvPt' = pt
|
||||
-- & ptTimer -~ 1
|
||||
-- & ptPos .~ _ptPos pt +.+ _ptVel pt
|
||||
-- & ptVel .*.*~ 0.8
|
||||
|
||||
Reference in New Issue
Block a user