Cleanup

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -1,6 +1,4 @@
-{- |
-Creation of particles in the world.
- -}
+{- | Creation of particles in the world.  -}
 module Dodge.WorldEvent.SpawnParticle
     ( makeGasCloud
     , aFlameParticle
@@ -14,11 +12,8 @@ import Dodge.WorldEvent.Cloud
 import Dodge.WorldEvent.Flash
 import Dodge.SoundLogic
 import Dodge.RandomHelp
---import Dodge.Debug
 import Picture
 import Geometry
---import Geometry.Vector3D
---import Geometry.Data
 import qualified IntMapHelp as IM
 import LensHelp
 
@@ -35,7 +30,7 @@ aFlameParticle t pos vel maycid = PtZ
     { _ptDraw         = drawFlame vel
     , _ptUpdate       = moveFlame vel
     , _ptVel          = vel
-    , _btColor'       = red
+    , _ptColor        = red
     , _btPos'         = pos
     , _btPassThrough' = maycid
     , _btWidth'       = 4
@@ -47,15 +42,14 @@ drawFlame
     :: Point2 -- ^ Rotate direction
     -> Particle 
     -> Picture
-drawFlame rotd pt = thePic
+drawFlame rotd pt = pictures 
+    [ glow 
+    , aPic 3 prot2 25 (V2 (scaleChange + 1)   2  ) $ V4 2 (-1)  (-1) 0.5
+    , aPic 3 prot  22 (V2 (scaleChange + 0.5) 1) $ V4 1 0.5 0 2
+    , aPic 1 prot3 20 (V2  scaleChange        0.5  ) $ V4 1 1   1 1
+    ]
   where
     ep = _btPos' pt
-    thePic = pictures 
-        [ glow 
-        , aPic 3 prot2 25 (V2 (scaleChange + 1)   2  ) $ V4 2 (-1)  (-1) 0.5
-        , aPic 3 prot  22 (V2 (scaleChange + 0.5) 1) $ V4 1 0.5 0 2
-        , aPic 1 prot3 20 (V2  scaleChange        0.5  ) $ V4 1 1   1 1
-        ]
     aPic :: Int -> (Point2 -> Point2) -> Float -> Point2 -> Color -> Picture
     aPic lay offset depth (V2 scalex scaley) col
         = setLayer lay 
@@ -124,11 +118,11 @@ makeFlameletTimed
     -> World
 makeFlameletTimed (V2 x y) z vel maycid size time w = w
     & randGen   .~ g
-    & particles .:~ PtZ 
+    & instantParticles .:~ PtZ 
         { _ptDraw         = drawFlameletZ rot
         , _ptUpdate       = moveFlamelet
-        , _ptVel         = vel
-        , _btColor'       = red
+        , _ptVel          = vel
+        , _ptColor        = red
         , _btPos'         = V2 x y
         , _btPassThrough' = maycid
         , _btWidth'       = size
@@ -202,7 +196,7 @@ moveFlamelet w pt
     damcrs = w & creatures %~ IM.map damifclose
     isClose cr = dist ep (_crPos cr) < _crRad cr + size
     damifclose cr 
-        | isClose cr = cr & crState . crDamage %~ ( Flaming 3 sp ep ep : )
+        | isClose cr = cr & crState . crDamage .:~ Flaming 3 sp ep ep
         | otherwise  = cr
 -- | At writing the radius is half the size of the effect area
 makeGasCloud 
@@ -211,7 +205,7 @@ makeGasCloud
     -> World 
     -> World
 makeGasCloud pos vel w = w
-    & clouds    %~ (theCloud :)
+    & clouds    .:~ theCloud
     & randGen   .~ g
   where 
     theCloud = Cloud 
@@ -226,12 +220,10 @@ makeGasCloud pos vel w = w
         , _clEffect = cloudPoisonDamage
         }
     (col, g) = runState (takeOne [green,yellow]) $ _randGen w
-{-
-Attach poison cloud damage to creatures near cloud.
- -}
+{- Attach poison cloud damage to creatures near cloud.  -}
 cloudPoisonDamage :: Cloud -> World -> World
 cloudPoisonDamage c w = w & creatures %~ flip (foldr (IM.adjust doDam)) damagedCrs
   where 
     damagedCrs = IM.keys $ IM.filter f $ creaturesNearPoint (stripZ $ _clPos c) w
     f cr = dist3 (addZ 20 $ _crPos cr) (_clPos c) < _crRad cr + _clRad c + 10
-    doDam cr = cr & crState . crDamage %~ (PoisonDam 1 :)
+    doDam cr = cr & crState . crDamage .:~ PoisonDam 1