Cleanup

src/Dodge/Data/Item.hs

@@ -7,10 +7,14 @@ module Dodge.Data.Item
     , module Dodge.Data.Item.Tweak
     , module Dodge.Data.Item.Params
     , module Dodge.Data.Item.Use
+    , module Dodge.Data.Item.Consumption
+    , module Dodge.Data.Item.CurseStatus
+    , module Dodge.Data.Item.Attachment
     ) where
 import GHC.Generics
 import Data.Aeson
 import Control.Lens
+import Dodge.Data.Item.CurseStatus
 import Dodge.Data.Item.Misc
 import Dodge.Data.Item.Tweak
 import Dodge.Data.Item.Consumption
@@ -18,12 +22,9 @@ import Dodge.Data.Item.Use
 import Dodge.Data.Item.Params
 import Dodge.Data.ItEffect
 import Dodge.Data.Targeting
-import Dodge.Item.Data
 import Dodge.Combine.Data
-import Dodge.Item.Attachment.Data
+import Dodge.Data.Item.Attachment
 import Color
-
-import qualified IntMapHelp as IM
 data Item = Item
     { _itConsumption    :: ItemConsumption
     , _itUse        :: ItemUse
@@ -47,15 +48,4 @@ data Item = Item
 instance ToJSON Item  where
     toEncoding = genericToEncoding defaultOptions
 instance FromJSON Item 
-data ItemTweaks
-    = NoTweaks
-    | Tweakable
-        { _tweakParams :: IM.IntMap TweakParam
-        , _tweakSel    :: Int
-        }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON ItemTweaks where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON ItemTweaks
 makeLenses ''Item
-makeLenses ''ItemTweaks