Cleanup

src/Dodge/Data.hs

@@ -340,7 +340,7 @@ data Item
         , _itFloorPict  :: Item -> SPic
         , _itEquipPict :: Creature -> Int -> SPic
         , _itScroll     :: Float -> Creature -> Item -> Item
-        , _itCombineType :: CombineType
+        , _itType       :: CombineType
         , _itAttachment :: ItAttachment
         , _itID         :: Maybe Int
         , _itEffect     :: ItEffect
@@ -353,36 +353,6 @@ data Item
         , _itParams     :: ItemParams
         , _itTweaks     :: ItemTweaks
         }
---    | Consumable
---        { _itName :: String
---        , _itMaxStack :: Int
---        , _itAmount :: Int
---        , _cnEffect :: Int -> World -> Maybe World
---        , _itFloorPict :: Item -> SPic
---        , _itEquipPict :: Creature -> Int -> SPic
---        , _itIdentity :: ItemIdentity
---        , _itID :: Maybe Int
---        , _itInvSize    :: Int
---        , _itInvDisplay :: Item -> [String]
---        , _itInvColor :: Color
---        , _itEffect :: ItEffect
---        , _itCurseStatus :: CurseStatus
---        , _itDimension  :: ItemDimension
---        }
---    | Craftable
---        { _itName :: String
---        , _itMaxStack :: Int
---        , _itAmount :: Int
---        , _itFloorPict :: Item -> SPic
---        , _itEquipPict :: Creature -> Int -> SPic
---        , _itIdentity :: ItemIdentity
---        , _itID :: Maybe Int
---        , _itInvSize    :: Int
---        , _itInvDisplay :: Item -> [String]
---        , _itInvColor :: Color
---        , _itCurseStatus :: CurseStatus
---        , _itDimension  :: ItemDimension
---        }
      | Equipment
         { _itName :: String
         , _itFloorPict :: Item -> SPic
@@ -390,7 +360,7 @@ data Item
 --        , _itIdentity :: ItemIdentity
         , _itEffect :: ItEffect
         , _itID :: Maybe Int
-        , _itCombineType :: CombineType
+        , _itType :: CombineType
         , _itZoom :: ItZoom
         , _itInvSize    :: Float
         , _itInvDisplay :: Item -> [String]
@@ -411,7 +381,7 @@ data Item
         --, _itIdentity   :: ItemIdentity
         , _itID         :: Maybe Int
         , _itAttachment :: ItAttachment
-        , _itCombineType :: CombineType
+        , _itType :: CombineType
         , _itInvSize    :: Float
         , _itInvDisplay :: Item -> [String]
         , _itInvColor   :: Color