Cleanup

src/Dodge/Data/Item/Params.hs

@@ -10,8 +10,7 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.ArcStep
-import Dodge.Data.Beam
-import Geometry.Data
+--import Dodge.Data.Beam
 
 data ItemParams
     = NoParams
@@ -28,17 +27,16 @@ data ItemParams
         , _lasCycle :: Int
         , _lasDamage :: Int
         }
-    | DualBeam
-        { _phaseV :: Float
-        , _lasColor :: Color
-        , _lasColor2 :: Color
-        , _lasCycle :: Int
-        , _lasDamage :: Int
-        , _lasBeam :: BeamType
-        , _subParams :: Maybe ItemParams
-        , _dbGap :: Float
-        }
-    | Attracting {_attractionPower :: Point2}
+--    | DualBeam
+--        { _phaseV :: Float
+--        , _lasColor :: Color
+--        , _lasColor2 :: Color
+--        , _lasCycle :: Int
+--        , _lasDamage :: Int
+--        , _lasBeam :: BeamType
+--        , _subParams :: Maybe ItemParams
+--        , _dbGap :: Float
+--        }
     | Arcing
         { _currentArc :: Maybe [ArcStep]
         , _arcSize :: Float

src/Dodge/Data/LWorld.hs

@@ -112,8 +112,8 @@ data LWorld = LWorld
     , _sparks :: [Spark]
     , _radarBlips :: [RadarBlip]
     , _flares :: [Flare]
-    , _newBeams :: WorldBeams
-    , _beams :: WorldBeams
+--    , _newBeams :: WorldBeams
+--    , _beams :: WorldBeams
     , _teslaArcs :: [TeslaArc]
     , _shockwaves :: [Shockwave]
     , _lasers :: [LaserStart]
@@ -147,18 +147,18 @@ data LWorld = LWorld
     , _lTestString :: [String]
     , _lTestInt :: Int
     }
-data WorldBeams = WorldBeams
-    { _blockingBeams :: [Beam]
-    , _lightBeams :: [Beam]
-    , _positronBeams :: [Beam]
-    , _electronBeams :: [Beam]
-    }
+--data WorldBeams = WorldBeams
+--    { _blockingBeams :: [Beam]
+--    , _lightBeams :: [Beam]
+--    , _positronBeams :: [Beam]
+--    , _electronBeams :: [Beam]
+--    }
 
 makeLenses ''LWorld
-makeLenses ''WorldBeams
+--makeLenses ''WorldBeams
 concat
     <$> mapM
         (deriveJSON defaultOptions)
-        [ ''WorldBeams
-        , ''LWorld
+        [-- ''WorldBeams
+         ''LWorld
         ]