Cleanup and reorganise

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -3,13 +3,18 @@
 Extra weapon effects, supplementing explicit use effects.
  -}
 module Dodge.Item.Weapon.ExtraEffect
-    where
+    ( wpRecock
+    , itemLaserScopeEffect
+    , autoSonarEffect
+    , autoRadarEffect
+    , rbSetTarget
+    ) where
 import Dodge.Data
 import Dodge.Base
 import Dodge.Item.Data
 import Dodge.Item.Weapon.Decoration
 import Dodge.Item.Weapon.UseEffect
-import Dodge.Item.Attachment.Data
+--import Dodge.Item.Attachment.Data
 import Dodge.WorldEvent.ThingsHit
 import Dodge.Picture.Layer
 import Dodge.Creature.Test
@@ -36,19 +41,19 @@ wpRecock = ItInvEffect
     moveHammerUp HammerUp       = HammerUp
     moveHammerUp NoHammer       = NoHammer
     fOnIt it = it & itHammer %~ moveHammerUp
-{- |
-Special recock for the bezier gun.
-Not sure of its purpose at this time...  -}
-bezierRecock :: ItEffect
-bezierRecock = ItInvEffect 
-    {_itInvEffect = f
-    ,_itEffectCounter = 0
-    }
-  where 
-    f _ cr i = creatures . ix (_crID cr) . crInv %~ IM.adjust fOnIt i
-    fOnIt it = case _itHammer it of
-                  HammerDown -> it & itHammer .~ HammerUp
-                  _          -> it & itAttachment .~ NoItAttachment
+--{- |
+--Special recock for the bezier gun.
+--Not sure of its purpose at this time...  -}
+--bezierRecock :: ItEffect
+--bezierRecock = ItInvEffect 
+--    {_itInvEffect = f
+--    ,_itEffectCounter = 0
+--    }
+--  where 
+--    f _ cr i = creatures . ix (_crID cr) . crInv %~ IM.adjust fOnIt i
+--    fOnIt it = case _itHammer it of
+--                  HammerDown -> it & itHammer .~ HammerUp
+--                  _          -> it & itAttachment .~ NoItAttachment
 {- |
 Creates a laser scope and recocks the weapon.
 TODO add the laser scope!