Refactor beams

src/Dodge/Data.hs

@@ -10,6 +10,7 @@ circular imports are probably not a good idea.
 {-# LANGUAGE DerivingStrategies #-}
 module Dodge.Data 
     ( module Dodge.Data
+    , module Dodge.Data.Beam
     , module Dodge.Data.Targeting
     , module Dodge.Data.ItEffect
     , module Dodge.Data.Hammer
@@ -66,6 +67,7 @@ module Dodge.Data
     , module Dodge.Data.RadarBlip
     , module Dodge.Data.PathGraph
     ) where
+import Dodge.Data.Beam
 import Dodge.Data.Targeting
 import Dodge.Data.ItEffect
 import Dodge.Data.Hammer
@@ -434,15 +436,6 @@ data Item = Item
     , _itValue      :: ItemValue
     , _itParams     :: ItemParams
     }
-data Targeting
-    = NoTargeting
-    | Targeting
-        { _tgPos    :: Maybe Point2
-        , _tgUpdate :: TargetUpdate --Item -> Creature -> World -> Targeting -> (World, Targeting)
-        , _tgDraw   :: TargetDraw --Item -> Creature -> Configuration -> World -> Picture
-        , _tgID     :: Maybe Int
-        , _tgActive :: Bool
-        }
 
 data IntID a = IntID Int a
 
@@ -452,27 +445,6 @@ data WorldBeams = WorldBeams
     ,_positronBeams :: [Beam]
     ,_electronBeams :: [Beam]
     }
-{- | Linear beams. Last only one frame.
- - Can interact with one another in a limited manner
- - can probably be moved to a separate file
- -}
-data Beam = Beam
-    { _bmDraw   :: Beam -> Picture
-    , _bmPos    :: Point2
-    , _bmDir    :: Float
-    , _bmDamage :: Int
-    , _bmColor  :: Color
-    , _bmPoints :: [Point2]
-    , _bmFirstPoints :: [Point2]
-    , _bmRange  :: Float
-    , _bmPhaseV :: Float
-    , _bmOrigin :: Maybe Int
-    , _bmType   :: BeamType
-    }
-data BeamType 
-    = BeamCombine 
-        {_beamCombine :: (Point2 , (Point2,Point2,Beam) , (Point2,Point2,Beam)) -> World -> World}
-    | BeamSimple
 
 {- Objects without ids.
 Update themselves, perhaps with side effects.  -}
@@ -1226,13 +1198,10 @@ makeLenses ''ItemParams
 makeLenses ''ItemTweaks
 makeLenses ''Gust
 makeLenses ''GunBarrels
-makeLenses ''Targeting
 makeLenses ''Nozzle
 makeLenses ''TerminalLine
 makeLenses ''Equipment
 makeLenses ''ScreenLayer
-makeLenses ''Beam
-makeLenses ''BeamType
 makeLenses ''WorldBeams
 makeLenses ''TerminalCommand
 makeLenses ''TerminalInput