Cleanup and reorganise

src/Dodge/Item/Weapon/UseEffect.hs

@@ -4,15 +4,9 @@ These are typically item effects, and typical occur when an item is explictly us
 module Dodge.Item.Weapon.UseEffect
     where
 import Dodge.Data
-import Dodge.Base
 import Dodge.Zone
 import Dodge.Picture.Layer
---import Dodge.Item.Weapon.Decoration
---import Dodge.Item.Weapon.TriggerType
---import Dodge.WorldEvent.Flash
---import Dodge.WorldEvent.ThingsHit
 import Picture
-import ShapePicture
 import Geometry
 
 import Data.Maybe
@@ -105,84 +99,4 @@ mvRadar x p w pt =
                 | otherwise = fromIntegral x / 10
     --colHelper y = color (withAlpha (y * globalAlpha) red)
 
-aTractorBeam :: Item -> Creature -> World -> World
-aTractorBeam _ cr w = over props (IM.insert i (tractorBeamAt i spos outpos dir)) w
-  where 
-    i = newProjectileKey w
-    cpos = _crPos cr
-    spos = cpos +.+ (_crRad cr + 10) *.* unitVectorAtAngle dir
-    xpos = cpos +.+ 400 *.* unitVectorAtAngle dir
-    dir = _crDir cr
-    outpos = collidePointWalls cpos xpos
-        $ wallsAlongLine cpos xpos w
-
-tractorBeamAt :: Int -> Point2 -> Point2 -> Float -> Prop
-tractorBeamAt i pos outpos dir = ProjectileTimed
-    { _pjPos = pos
-    , _pjStartPos = outpos
-    , _pjVel = d
-    , _prDraw = tractorSPic
-    , _pjID = i
-    , _pjUpdate = updateTractor
-    , _pjTime = 10
-    }
-  where 
-    d  = unitVectorAtAngle dir
-
-{- |
-The interaction of this with objects, walls etc needs more thought.  -}
-updateTractor :: Prop -> World -> World
-updateTractor pj w
-    | _pjTime pj <= 0 = w & props %~ IM.delete i
-    | otherwise = w
-        & props . ix i . pjTime -~ 1
-        & creatures     %~ IM.map (tractCr   pullVel pos outpos)
-        & floorItems    %~ IM.map (tractFlIt pullVel pos outpos)
-  where 
-    i = _pjID pj
-    pullVel = _pjVel pj
-    pos = _pjPos pj
-    outpos = _pjStartPos pj
-
-tractFlIt :: Point2 -> Point2 -> Point2 -> FloorItem -> FloorItem
-tractFlIt q p1 outpos it 
-    | circOnSeg p1 outpos (_flItPos it) 10 = it & flItPos %~ tractorPullPos q p1
-    | otherwise = it
-
-tractCr :: Point2 -> Point2 -> Point2 -> Creature -> Creature
-tractCr q p1 outpos cr
-    | circOnSeg p1 outpos (_crPos cr) 10 = cr & crPos %~ tractorPullPos q p1
-    | otherwise = cr
-
-tractorPullPos :: Point2 -> Point2 -> Point2 -> Point2
-tractorPullPos q p1 p = p -.- m *.* (0.3/ x' *.* q +.+ g y *.* p4)
-  where
-    x' = abs y + 1
-    y = errorClosestPointOnLineParam 1 p1 p3 p
-    m | dist p p1 < 350 = 1
-      | otherwise        = (400 - dist p p1) / 50
-    g x | x > 5 = (10 - x) / 250
-        | x > 1 = 0.02
-        | x > -1 = x * 0.02
-        | x > -5 = -0.02
-        | otherwise = (x - 10) / 250
-    --p4 = vNormal p5
-    p4 = vNormal $ safeNormalizeV q
-    p3 = p1 +.+ p4
-
-tractorSPic :: Prop -> SPic
-tractorSPic pj = (,) mempty $ setLayer 1 $ setDepth 20 $ color (withAlpha 0.5 col) $ polygon 
-    [ spos  -- not sure if this is anticlockwise...
-    , spos +.+ size *.* (d +.+ n)
-    , xpos +.+ size *.* n
-    , xpos -.- size *.* n
-    , spos +.+ size *.* (d -.- n)
-    ]
-  where
-    size = fromIntegral (_pjTime pj)
-    spos = _pjPos pj
-    xpos = _pjStartPos pj
-    d = safeNormalizeV $ spos -.- xpos
-    n = vNormal d
-    col = mixColors 0.5 0.5 white blue