Cleanup

src/Dodge/Data/Item.hs

@@ -5,7 +5,6 @@ module Dodge.Data.Item (
     module Dodge.Data.Item,
     module Dodge.Data.Item.Effect,
     module Dodge.Data.Item.Misc,
-    module Dodge.Data.Item.Tweak,
     module Dodge.Data.Item.Params,
     module Dodge.Data.Item.Use,
     module Dodge.Data.Item.CurseStatus,
@@ -17,7 +16,6 @@ module Dodge.Data.Item (
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import Data.Set (Set)
 import Dodge.Data.Item.Combine
 import Dodge.Data.Item.CurseStatus
 import Dodge.Data.Item.Effect
@@ -25,12 +23,10 @@ import Dodge.Data.Item.Location
 import Dodge.Data.Item.Misc
 import Dodge.Data.Item.Params
 import Dodge.Data.Item.Scope
-import Dodge.Data.Item.Tweak
 import Dodge.Data.Item.Use
 import NewInt
 
-data ItID = ItID
-    deriving (Eq, Ord, Show, Read)
+data ItID = ItID deriving (Eq, Ord, Show, Read)
 
 data Item = Item
     { _itUse :: ItemUse
@@ -41,23 +37,9 @@ data Item = Item
     , _itInvSize :: Int
     , _itDimension :: ItemDimension
     , _itCurseStatus :: CurseStatus
---    , _itTweaks :: ItemTweaks
     , _itParams :: ItemParams
-    , _itAttachments :: Set ItemAttachment
     }
 
-data ItemAttachment
-    = ScopeAttachment
-    | BulletClipAttachment
-    | BulletBeltAttachment
-    | StandAttachment
-    | PowerSourceAttachment
-    deriving (Eq, Ord)
-
-_itUseAimStance :: Item -> AimStance
-_itUseAimStance = _aimStance . _heldAim . _itUse
-
 makeLenses ''Item
 deriveJSON defaultOptions ''ItID
-deriveJSON defaultOptions ''ItemAttachment
 deriveJSON defaultOptions ''Item