Cleanup. Start tweaking flares, glares and flashes

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -10,7 +10,6 @@ import Dodge.Item.Data
 import Dodge.Item.Weapon.Decoration
 import Dodge.Item.Weapon.UseEffect
 import Dodge.Item.Attachment.Data
-import Dodge.WorldEvent.Flash
 import Dodge.WorldEvent.ThingsHit
 import Dodge.Picture.Layer
 import Dodge.Creature.Test
@@ -52,6 +51,7 @@ bezierRecock = ItInvEffect
                   _          -> it & itAttachment .~ NoItAttachment
 {- |
 Creates a laser scope and recocks the weapon.
+TODO add the laser scope!
  -}
 itemLaserScopeEffect :: ItEffect
 itemLaserScopeEffect 
@@ -63,7 +63,6 @@ itemLaserScopeEffect
         | invid == _crInvSel cr && crIsAiming' cr = w 
             & particles %~ (:) (makeLaserScope sp ep reloadFrac)
             & creatures . ix (_crID cr) . crInv . ix invid . itHammer %~ moveHammerUp
-            & laserScopeTargetGlow col glowPoint 
         | otherwise = w
       where
         p = _crPos cr
@@ -74,14 +73,14 @@ itemLaserScopeEffect
         ep = case listToMaybe $ thingsHitLongLine sp xp w of
                 Just (pos,_) -> pos
                 Nothing -> xp
-        glowPoint = case listToMaybe $ thingsHitLongLine sp xp w of
-                Just (pos,E3x2 wl) -> pos +.+ 2 *.* wallNormal wl
-                _ -> ep -.- 2 *.* unitVectorAtAngle d
+        --glowPoint = case listToMaybe $ thingsHitLongLine sp xp w of
+        --        Just (pos,E3x2 wl) -> pos +.+ 2 *.* wallNormal wl
+        --        _ -> ep -.- 2 *.* unitVectorAtAngle d
         it = (cr ^. crInv) IM.! invid
         reloadFrac 
             | _wpLoadedAmmo it == 0 = 1
             | otherwise = fromIntegral (_wpReloadState it) / fromIntegral (_wpReloadTime it)
-        col = mixColors reloadFrac (1-reloadFrac) red green
+        --col = mixColors reloadFrac (1-reloadFrac) red green
 {- | Automatically send out radar pulses that detect walls.  -}
 autoRadarEffect :: ItEffect
 autoRadarEffect = ItInvEffect {_itInvEffect = f 50 ,_itEffectCounter = 0 }