Cleanup combining code, flatten modules

src/Dodge/Item/Held/BatteryGuns.hs

@@ -7,16 +7,10 @@ module Dodge.Item.Held.BatteryGuns
 
 import Dodge.SoundLogic.ExternallyGeneratedSounds
 import Dodge.Default.Item
---import Dodge.Base
---import Dodge.Data.Beam
-import Color
 import Control.Lens
---import qualified Data.Map.Strict as M
 import Dodge.Data.Item
---import Dodge.Reloading.Action
 import Dodge.Tesla.ItemParams
 import Geometry.Data
---import qualified IntMapHelp as IM
 
 sparkGun :: Item
 sparkGun =
@@ -54,14 +48,14 @@ lasGun =
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ LasGunFlare
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleLaser
-        & itParams
-            .~ Refracting
-                { _phaseV = 1
-                , _lasColor = yellow
-                , _lasColor2 = yellow
-                , _lasCycle = 0
-                , _lasDamage = 11
-                }
+--        & itParams
+--            .~ Refracting
+--                { _phaseV = 1
+--                , _lasColor = yellow
+--                , _lasColor2 = yellow
+--                , _lasCycle = 0
+--                , _lasDamage = 11
+--                }
         & itDimension . dimRad .~ 10
         & itDimension . dimCenter .~ V3 15 0 0
         & itUse . heldAim . aimWeight .~ 6