Remove old layer code

src/Dodge/Item/Weapon/Booster.hs

@@ -81,7 +81,7 @@ updateLinearShockwave pj w
     t = _pjTimer pj
 
 drawBoostShockwave :: Prop -> SPic
-drawBoostShockwave pj = (,) mempty $ setLayer 1 $ onLayer UPtLayer $ pictures $
+drawBoostShockwave pj = (,) mempty $ setLayer 1 $ setDepth 20 $ pictures $
     theArc ++
     [ lineCol $ zip (reverse lps) $ map (`withAlpha` white) [0,0.05..]
     , lineCol $ zip (reverse rps) $ map (`withAlpha` white) [0,0.05..]

src/Dodge/Item/Weapon/Decoration.hs

@@ -5,7 +5,6 @@ module Dodge.Item.Weapon.Decoration
     ( makeLaserScope
     ) where
 import Dodge.Data
-import Dodge.Picture.Layer
 import Geometry.Data
 import Picture
 
@@ -16,7 +15,7 @@ makeLaserScope
     -> Float    -- ^ Fraction of red/green
     -> Particle
 makeLaserScope p ep relFrac = Particle
-    {_ptDraw = const $ setLayer 1 $ onLayer PtLayer $ pictures
+    {_ptDraw = const $ setLayer 1 $ setDepth 20 $ pictures
         [lineAlphaThick 0.5 0.5
         ,lineAlphaThick 0.2 1.5
         ,lineAlphaThick 0.1 2

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -18,7 +18,6 @@ import Dodge.Base
 import Dodge.Item.Weapon.UseEffect
 import Dodge.Item.Weapon.LaserPath
 --import Dodge.Item.Attachment.Data
-import Dodge.Picture.Layer
 import Dodge.Creature.Test
 import Dodge.WorldEvent.HelperParticle
 import Picture
@@ -76,7 +75,7 @@ targetCursor = defaultTargeting
 targetSimpleDraw :: Int -> Item -> Creature -> World -> Picture
 targetSimpleDraw _ it _ w = fromMaybe mempty $ do
     mwp <- it ^? itTargeting . tgPos . _Just
-    return $ setLayer 5 $ color red $ onLayer InvLayer $ uncurryV translate mwp 
+    return $ setLayer 4 $ color red $ setDepth 50 $ uncurryV translate mwp 
         $ rotate (_cameraRot w)
         $ pictures
             [line [V2   x  x, V2 (-x) (-x)]
@@ -88,7 +87,7 @@ targetSimpleDraw _ it _ w = fromMaybe mempty $ do
 targetRBCreatureDraw :: Int -> Item -> Creature -> World -> Picture
 targetRBCreatureDraw _ it _ w = fromMaybe mempty $ do
     mwp <- it ^? itTargeting . tgPos . _Just
-    return $ setLayer 5 $ color thecolor $ onLayer InvLayer $ uncurryV translate mwp 
+    return $ setLayer 5 $ color thecolor $ setDepth 50 $ uncurryV translate mwp 
         $ rotate (_cameraRot w)
         $ pictures
             [line [V2   x  x, V2 (-x) (-x)]

src/Dodge/Item/Weapon/Grenade.hs

@@ -1,6 +1,5 @@
 module Dodge.Item.Weapon.Grenade where
 import Dodge.Data
-import Dodge.Picture.Layer
 import Dodge.WorldEvent.Explosion
 --import Dodge.Item.Weapon.TriggerType
 import Dodge.Item.Weapon.Remote
@@ -193,7 +192,7 @@ moveRemoteBomb itid time pID w
         | otherwise = x - 1
     updatePicture = 
         set (props . ix pID . prDraw)
-            (\_ -> (,) mempty $ onLayer PtLayer $ uncurryV translate newPos $ remoteBombPic time)
+            (\_ -> (,) mempty $ setDepth 20 $ uncurryV translate newPos $ remoteBombPic time)