Destroying mounted lights flashes, move equipment datatype

src/Dodge/Item/Draw/SPic.hs

@@ -13,19 +13,21 @@ import Data.Maybe
 itemSPic :: Item -> SPic
 itemSPic it = modulesSPic it <> case it ^. itType . iyBase of
     HELD ht -> heldItemSPic ht it
+    LEFT lt -> leftItemSPic lt it
+    EQUIP et -> equipItemSPic et it
     NOTDEFINED      -> defSPic
     EFFGUN _        -> defSPic
     AUTOEFFGUN _    -> defSPic
 
-    BOOSTER         -> defSPic
-    REWINDER        -> defSPic
-    BLINKER         -> defSPic
-    BLINKERUNSAFE   -> defSPic
-    SHRINKER        -> defSPic
-    SPAWNER         -> defSPic
 --
-    CLICKDETECTOR dt -> (noPic (colorSH (detectorColor dt) $ upperPrismPoly 3 $ rectWH 2 2))
-    AUTODETECTOR dt -> (noPic (colorSH (detectorColor dt) $ upperPrismPoly 3 $ rectWH 2 2))
+--
+    KEYCARD _ -> noShape (setDepth 0 $ translate (-5) (-5) $ rotate (pi/2.5) keyPic)
+--    
+    MEDKIT _  -> defSPic
+    CRAFT _ -> defSPic
+
+equipItemSPic :: EquipItemType -> Item -> SPic
+equipItemSPic et _ = case et of
     MAGSHIELD       -> defSPic
     FLAMESHIELD     -> defSPic
     FRONTARMOUR -> (emptySH , setDepth 20 $ pictures
@@ -44,12 +46,11 @@ itemSPic it = modulesSPic it <> case it ^. itType . iyBase of
     JETPACK -> ((,) emptySH $ setDepth 20
         $ pictures [color yellow $ polygon $ reverse $ rectNSWE 5 (-5) (-11) (-3) ]
         )
---
-    KEYCARD _ -> noShape (setDepth 0 $ translate (-5) (-5) $ rotate (pi/2.5) keyPic)
---    
-    MEDKIT _  -> defSPic
-    CRAFT _ -> defSPic
-
+    AUTODETECTOR dt -> (noPic (colorSH (detectorColor dt) $ upperPrismPoly 3 $ rectWH 2 2))
+leftItemSPic :: LeftItemType -> Item -> SPic
+leftItemSPic lt _ = case lt of
+    BLINKER -> defSPic
+    _       -> defSPic
 heldItemSPic :: HeldItemType -> Item -> SPic
 heldItemSPic ht it = case ht of
     FORCEFIELDGUN   -> defSPic
@@ -98,6 +99,7 @@ heldItemSPic ht it = case ht of
     POISONSPRAYER   -> flamerPic it
     DRONELAUNCHER   -> defSPic
     SHATTERGUN      -> shatterGunSPic
+    HELDDETECTOR dt -> noPic (colorSH (detectorColor dt) $ upperPrismPoly 3 $ rectWH 2 2)
 
 modulesSPic :: Item -> SPic
 modulesSPic _ = mempty