Start work on crafting/combinations

src/Dodge/Data.hs

@@ -9,6 +9,7 @@ circular imports are probably not a good idea.
 {-# LANGUAGE DeriveGeneric #-}
 module Dodge.Data 
     ( module Dodge.Data
+    , module Dodge.Combine.Data
     , module Dodge.Distortion.Data
     , module Dodge.Data.DamageType
     , module Dodge.Data.SoundOrigin
@@ -27,6 +28,7 @@ import Dodge.Creature.Memory.Data
 import Dodge.Distortion.Data
 import Dodge.Data.SoundOrigin
 import Dodge.Data.DamageType
+import Dodge.Combine.Data
 import Dodge.Config.Data
 import Dodge.Config.KeyConfig
 import Dodge.Item.Attachment.Data
@@ -337,6 +339,7 @@ data Item
         , _itEquipPict :: Creature -> Int -> SPic
         , _itScroll     :: Float -> Creature -> Item -> Item
         , _itIdentity   :: ItemIdentity
+        , _itCombineType :: ItemCombineType
         , _itAttachment :: ItAttachment
         , _itID         :: Maybe Int
         , _itEffect     :: ItEffect