Cleanup

src/Dodge/Data/Item.hs

@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -16,23 +14,23 @@ module Dodge.Data.Item (
     module Dodge.Data.Item.Location,
 ) where
 
-import NewInt
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Data.Set (Set)
 import Dodge.Data.Item.Combine
-import Dodge.Data.Item.Effect
-import Dodge.Data.Item.Scope
 import Dodge.Data.Item.CurseStatus
+import Dodge.Data.Item.Effect
+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 Dodge.Data.Item.Location
-import Data.Set (Set)
+import NewInt
 
 data ItID = ItID
-    deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
 
 data Item = Item
     { _itUse :: ItemUse
@@ -40,22 +38,21 @@ data Item = Item
     , _itID :: NewInt ItmInt
     , _itLocation :: ItemLocation
     , _itEffect :: ItEffect
-    , _itInvSize :: Float
+    , _itInvSize :: Int
     , _itDimension :: ItemDimension
     , _itCurseStatus :: CurseStatus
     , _itTweaks :: ItemTweaks
---    , _itScope :: Scope
     , _itParams :: ItemParams
     , _itAttachments :: Set ItemAttachment
     }
-    --deriving (Eq, Show, Read) --Generic, Flat)
 
-data ItemAttachment = ScopeAttachment
+data ItemAttachment
+    = ScopeAttachment
     | BulletClipAttachment
     | BulletBeltAttachment
     | StandAttachment
     | PowerSourceAttachment
-    deriving (Eq,Ord)
+    deriving (Eq, Ord)
 
 _itUseAimStance :: Item -> AimStance
 _itUseAimStance = _aimStance . _heldAim . _itUse