Modularise item data, change tesla arc from projectile to particle

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -16,7 +16,7 @@ import Dodge.Particle.Bullet.Draw
 import Dodge.Particle.Bullet.Update
 import Dodge.SoundLogic
 import Dodge.RandomHelp
-import Dodge.Debug
+--import Dodge.Debug
 import Picture
 import Geometry
 import qualified IntMapHelp as IM
@@ -237,54 +237,59 @@ cloudPoisonDamage c w = w & creatures %~ flip (foldr (IM.adjust doDam)) damagedC
     damagedCrs = IM.keys $ IM.filter f $ creaturesNearPoint (_clPos c) w
     f cr = dist (_crPos cr) (_clPos c) < _crRad cr + _clRad c + 10
     doDam cr = cr & crState . crDamage %~ (:) (PoisonDam 1)
-
-{-
-TODO: make tesla arc a particle.
- -}
-makeTeslaArcAt :: Int -> Point2 -> Float -> Projectile
-makeTeslaArcAt i pos dir = Projectile
-    { _pjPos = pos
-    , _pjStartPos = pos
-    , _pjVel = (0,0)
-    , _pjDraw = \_ -> onLayer PtLayer $ line [(0,0),(0,0)]
-    , _pjID = i
-    , _pjUpdate = \_ -> moveTeslaArc pos dir i
+makeTeslaArcAt :: Point2 -> Float -> Particle
+makeTeslaArcAt pos dir = LinearParticle
+    { _ptPoints = [pos]
+    , _ptDraw = drawTeslaArc
+    , _ptUpdate' = moveTeslaArc pos dir
+    , _ptTimer = 2
+    , _ptColor = white
     }
-
-moveTeslaArc 
-    :: Point2   -- ^ Emmission position
-    -> Float    -- ^ Emmission direction
-    -> Int      -- ^ Projectile id
-    -> World 
-    -> World
-moveTeslaArc p d i w = 
-        set (projectiles . ix i . pjDraw) (\_ -> pic)
-                            $ set (projectiles . ix i . pjUpdate) 
-                                  (\_ -> pjTimerF 2 i)
-                            $ set randGen g
-                            $ createSpark 8 nc q2 (argV sv + d1) Nothing
-                            $ foldr damCrs w hitCrs
- where 
+drawTeslaArc :: Particle -> Picture
+drawTeslaArc pt = pic
+  where
+    ps' = _ptPoints pt
     pic = setLayer 1 $ pictures 
-             [ onLayer PtLayer $ color (f2 nc) $ line ps'
+             [ onLayer PtLayer $ color (_ptColor pt) $ line ps'
              , onLayer UPtLayer $ color (withAlpha 0.02 cyan) $ lineOfThickness 20 ps'
              , onLayer UPtLayer $ color (withAlpha 0.02 cyan) $ lineOfThickness 25 ps'
              , onLayer UPtLayer $ color (withAlpha 0.02 cyan) $ lineOfThickness 30 ps'
              ]
-    ps' = lightningMids d pers ps
+-- todo: fix electrical damage location
+moveTeslaArc 
+    :: Point2   -- ^ Emmission position
+    -> Float    -- ^ Emmission direction
+    -> World 
+    -> Particle
+    -> (World, Maybe Particle)
+moveTeslaArc p d w pt
+    | t == 2 = 
+        (foldr damCrs w hitCrs & randGen .~ g
+            & createSpark 8 nc q2 (argV sv + d1) Nothing
+        , Just $ pt & ptTimer -~ 1
+                            & ptPoints .~ ps'
+                            & ptColor .~ theColor)
+    | t < 1 = (w , Nothing)
+    | otherwise = (w , Just $ pt & ptTimer -~ 1)
+ where 
+    t = _ptTimer pt
     ps = take 15 $ p : map f (crsLightChain p d 0 w)
     f (E3x1 cr) = _crPos cr
     f (E3x2 p1) = p1
     f (E3x3 p1) = p1
+    ps' = lightningMids d pers ps
     pers = evalState (sequence $ repeat $ randInCirc 5) $ _randGen w
     (nc,g) = randomR (0::Int,11) $ _randGen w
-    f1 (E3x1 cr) = Just $ _crID cr
-    f1 _         = Nothing
-    hitCrs       = mapMaybe f1 $ take 14 $ crsLightChain p d 0 w
-    damCrs cid = over (creatures . ix cid . crHP) (\hp -> hp - 5)
+    theColor = f2 nc
     f2 0 = cyan
     f2 1 = azure
     f2 _ = white
+    f1 (E3x1 cr) = Just $ _crID cr
+    f1 _         = Nothing
+    hitCrs       = mapMaybe f1 $ take 14 $ crsLightChain p d 0 w
+    damCrs cid = over (creatures . ix cid . crState . crDamage) (Electrical 5 cpos cpos cpos :)
+      where 
+        cpos = _crPos (_creatures w IM.! cid)
     q1 = last $ init ps'
     q2 = last ps'
     hitWall = reflectPointWalls q1 ((2 *.* q2) -.- q1) $ wallsNearPoint q1 w