Data-ify item drawing

src/Dodge/Item/PassKey.hs

@@ -4,17 +4,19 @@ import Dodge.Default
 import Picture
 import Geometry.Data
 import LensHelp
---import ShapePicture
+import ShapePicture
 import Shape
 keyCard :: Int -> Item
 keyCard n = defaultEquipment
-    { _itEquipPict = \_ _ -> (,) emptySH $ setDepth 0 $ translate (-5) (-5) $ rotate (pi/2.5) keyPic
-    , _itEffect = NoItEffect
+    { _itEffect = NoItEffect
     , _itID = Nothing
 --    , _itZoom = defaultItZoom
     , _itInvColor = aquamarine
     }
     & itType . iyBase .~ KEYCARD n
+    & itDimension . dimPortage .~ WornItem 
+    & itDimension . dimSPic .~  (const . noShape) 
+        (setDepth 0 $ translate (-5) (-5) $ rotate (pi/2.5) keyPic)
 
 keyPic :: Picture
 keyPic = color green $
@@ -25,12 +27,14 @@ keyPic = color green $
 
 latchkey :: Int -> Item
 latchkey _ = defaultEquipment
-    { _itEquipPict = \_ _ -> (,) emptySH $ setDepth 0 $ translate (-5) (-5) $ rotate (pi/2.5) latchkeyPic
-    , _itEffect = NoItEffect
+    { _itEffect = NoItEffect
     , _itID = Nothing
 --    , _itZoom = defaultItZoom
     , _itInvColor = yellow
     }
+    & itDimension . dimPortage .~ WornItem 
+    & itDimension . dimSPic .~ ( \_ -> (,) emptySH $ setDepth 0 $ translate (-5) (-5) $ rotate (pi/2.5) latchkeyPic
+            )
 latchkeyPic :: Picture
 latchkeyPic = color yellow $
               pictures [translate (-4) 0 $ thickCircle 4 2