Cleanup

src/Dodge/Item/Draw/SPic.hs

@@ -35,25 +35,26 @@ equipItemSPic et _ = case et of
         ,color yellow $ thickArc (3*pi/2) (2*pi) 10 5
         ])
     WRISTARMOUR     -> defSPic
-    INVISIBILITYEQUIPMENT _ -> (noPic (colorSH chartreuse $ upperPrismPoly 3 $ rectWH 2 2))
+    INVISIBILITYEQUIPMENT _ -> noPic (colorSH chartreuse $ upperPrismPoly 3 $ rectWH 2 2)
     BRAINHAT  -> noPic (colorSH yellow $ upperPrismPoly 3 $ rectWH 4 4)
+    HAT         -> noPic (colorSH yellow $ upperPrismPoly 3 $ rectWH 4 4)
     HEADLAMP  -> noPic headLampShape
     HEADLAMP1 -> noPic headLampShape
     POWERLEGS -> legsSPic yellow
     SPEEDLEGS -> legsSPic green
     JUMPLEGS  -> legsSPic red
-    FLATSHIELD -> flatShieldEquipSPic
-    JETPACK -> ((,) emptySH $ setDepth 20
+    JETPACK -> (,) emptySH $ setDepth 20
         $ pictures [color yellow $ polygon $ reverse $ rectNSWE 5 (-5) (-11) (-3) ]
-        )
-    AUTODETECTOR dt -> (noPic (colorSH (detectorColor dt) $ upperPrismPoly 3 $ rectWH 2 2))
+    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
+    FLATSHIELD -> flatShieldEquipSPic
     FORCEFIELDGUN   -> defSPic
+    TORCH   -> defSPic
     BANGSTICK i     -> noPic $ baseStickShapeX it i <> stickClip it
     PISTOL          -> noPic $ baseStickShape <> makeTinClipAt pi (V3 5 2 0) it
     REVOLVER        -> noPic $ baseStickShape <> revolverClip it
@@ -314,4 +315,4 @@ latchkeyPic = color yellow $
                        ,thickLine 2 $ map toV2 [(4,0),(4,-4)]
                        ]
 legsSPic :: Color -> SPic
-legsSPic col = (noPic $ translateSH (V3 0 4 0) $ colorSH col $ upperPrismPoly 3 $ rectWH 2 2)
+legsSPic col = noPic $ translateSH (V3 0 4 0) $ colorSH col $ upperPrismPoly 3 $ rectWH 2 2