Cleanup combining code, flatten modules

src/Dodge/Data/DoubleTree.hs

@@ -51,8 +51,8 @@ instance Functor (LabelDoubleTree b) where
 
 instance Bifunctor LabelDoubleTree where
     second = fmap
-    first f (LDT x l r) = LDT x (map (first f . second (first f)) l)
-        (map (first f . second (first f)) r)
+    first f (LDT x l r) = LDT x (map (bimap f (first f)) l)
+        (map (bimap f (first f)) r)
 
 makeLenses ''DoubleTree
 makeLenses ''LabelDoubleTree

src/Dodge/Data/Item/Params.hs

@@ -5,12 +5,10 @@
 
 module Dodge.Data.Item.Params where
 
-import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.ArcStep
---import Dodge.Data.Beam
 
 data ItemParams
     = NoParams
@@ -20,23 +18,6 @@ data ItemParams
         {_shrinkGunStatus :: ShrinkGunStatus}
     | FlatShieldParams
         {_flatShieldWlMIX :: Maybe Int}
-    | Refracting
-        { _phaseV :: Float
-        , _lasColor :: Color
-        , _lasColor2 :: Color
-        , _lasCycle :: Int
-        , _lasDamage :: Int
-        }
---    | DualBeam
---        { _phaseV :: Float
---        , _lasColor :: Color
---        , _lasColor2 :: Color
---        , _lasCycle :: Int
---        , _lasDamage :: Int
---        , _lasBeam :: BeamType
---        , _subParams :: Maybe ItemParams
---        , _dbGap :: Float
---        }
     | Arcing
         { _currentArc :: Maybe [ArcStep]
         , _arcSize :: Float