Data-ify item drawing

src/Dodge/Default/Item.hs

@@ -3,13 +3,13 @@ module Dodge.Default.Item
     ) where
 import Dodge.Data
 import Picture
-import Shape
+--import Shape
 
 defaultItem :: Item
 defaultItem = Item
     { _itCurseStatus = Uncursed
     , _itType = defaultItemType
-    , _itEquipPict = \_ _ -> (,) emptySH blank
+--    , _itEquipPict = \_ _ -> (,) emptySH blank
     , _itEffect = NoItEffect
     , _itID = Nothing
     , _itIsHeld = False

src/Dodge/Default/Weapon.hs

@@ -5,7 +5,7 @@ import Dodge.Item.Weapon.AmmoParams
 import Dodge.Reloading.Action
 import Dodge.Item.Weapon.Bullet
 import Dodge.Default.Item
-import Dodge.Item.Draw
+--import Dodge.Item.Draw
 import Picture
 import ShapePicture
 import Shape
@@ -110,7 +110,6 @@ defaultWeapon = defaultItem
     & itConsumption .~ defaultLoadable
     & itUse .~ defaultrUse
     & itDimension .~ defItDimCol white
-    & itEquipPict .~ pictureWeaponOnAim
     & itInvColor .~ white
     & itType . iyModules .~ M.fromList 
         [(ModBullet, EMPTYMODULE)
@@ -128,8 +127,7 @@ defaultItemValue :: ItemValue
 defaultItemValue = ItemValue 10 MundaneItem
 defaultCraftable :: Item
 defaultCraftable = defaultItem 
-    { _itEquipPict = pictureWeaponOnAim
-    , _itInvColor = green
+    { _itInvColor = green
     , _itDimension = defItDimCol green
     }
 defItDim :: ItemDimension