Rename fadeCircle shaders to lightmapCircle

src/Dodge/Critters.hs

@@ -277,8 +277,6 @@ drawEquipment cr = pictures $ map f $ IM.toList (_crInv cr)
 
 frontArmouredPict = const $ pictures [ color (greyN 0.8) $ circleSolid 20
                              , color red $ circLine 20
---                             ,color (greyN 0.1) $ thickArc 0 90 20 5
---                             ,color (greyN 0.1) $ thickArc 270 360 20 5
                              ]
 
 --packCrits :: (Int -> World -> World) -> [Int] -> [Creature]

src/Dodge/Weapons.hs

@@ -564,7 +564,7 @@ startZoomOutLongGun  _ w = w & creatures . ix 0 . crInv . ix (_crInvSel (_creatu
 
 
 poisonSprayer = defaultAutoGun 
-    { _itName = "POISONSPRAYER"
+    { _itName = "POISONSPRAY"
     , _itIdentity = PoisonSprayer
     , _wpMaxAmmo = 500
     , _wpLoadedAmmo = 500
@@ -586,7 +586,7 @@ poisonSprayer = defaultAutoGun
     }
 
 flamer = defaultAutoGun 
-    { _itName = "FLAMETHROWER"
+    { _itName = "FLAMER"
     , _itIdentity = Flamethrower
     , _wpMaxAmmo = 250
     , _wpLoadedAmmo = 250
@@ -1058,8 +1058,8 @@ moveFlame rotd w pt =
                 rfl wl p = Just $ pt {_btTimer' = time -1, _btPos' = pOut p
                                    , _btVel' = reflV wl, _ptPict' = thepic $ pOut p
                                    }
-                glow p' = onLayerL [levLayer UPtLayer,0] $ uncurry translate p'
-                            $ color (withAlpha 0.02 orange)
+                glow p' = setLayer 2 $ onLayerL [levLayer UPtLayer,0] $ uncurry translate p'
+                            $ color (withAlpha 0.01 orange)
                             $ circleSolid 50
                 pOut p = p +.+ safeNormalizeV (sp -.- p)
                 --reflV wall = (0.6 *.* reflectIn (_wlLine wall !! 1 -.- _wlLine wall !! 0)

src/Dodge/WorldActions.hs

@@ -475,7 +475,6 @@ crGlareWidth :: Float -> Color -> Float -> Point2 -> Creature -> Particle'
 crGlareWidth wdth col alphay p cr =
     Particle'
         { _ptPict' = onLayerL [levLayer GloomLayer + 2] $ l cp
-        --{ _ptPict' = [(blank, [levLayer WlLayer + 2])]
         , _ptUpdate' = \w pt -> (w, Just $ pt {_ptPict' = onLayerL [levLayer GloomLayer + 2] $ upp cid w
                                               ,_ptUpdate' = ptTimer' 0
                                               }
@@ -489,7 +488,6 @@ crGlareWidth wdth col alphay p cr =
           cid = _crID cr
           upp cid' w' = case w' ^? creatures . ix cid . crPos of
                             Just y -> l y 
-                            --Just p -> uncurry translate p $ circleSolid 5
                             _      -> blank
 
 muzFlareAt :: Point2 -> World -> World