Commit before attempting to add concurrency to loop

src/Dodge/Data/Item.hs

@@ -12,6 +12,7 @@ module Dodge.Data.Item (
     module Dodge.Data.Item.Scope,
     module Dodge.Data.Item.Combine,
     module Dodge.Data.Item.Targeting,
+    module Dodge.Data.Item.Location,
 ) where
 
 import Color
@@ -27,6 +28,7 @@ import Dodge.Data.Item.Params
 import Dodge.Data.Item.Tweak
 import Dodge.Data.Item.Use
 import Dodge.Data.Item.Targeting
+import Dodge.Data.Item.Location
 
 data Item = Item
     { _itUse :: ItemUse

src/Dodge/Data/Item/Location.hs

@@ -0,0 +1,17 @@
+{-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+module Dodge.Data.Item.Location where
+
+import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+
+data ItemLocation
+    = InInv {_ipCrID :: Int, _ipInvID :: Int}
+    | OnTurret {_ipTuID :: Int}
+    | OnFloor {_ipFlID :: Int}
+    | InVoid
+    deriving (Eq, Show, Read, Ord)
+
+makeLenses ''ItemLocation
+deriveJSON defaultOptions ''ItemLocation

src/Dodge/Data/Item/Misc.hs

@@ -33,19 +33,10 @@ data ItemValue = ItemValue
 data ItemValueType = MundaneItem | ArtefactItem
     deriving (Eq, Show, Read)
 
-data ItemLocation
-    = InInv {_ipCrID :: Int, _ipInvID :: Int}
-    | OnTurret {_ipTuID :: Int}
-    | OnFloor {_ipFlID :: Int}
-    | InVoid
-    deriving (Eq, Show, Read)
-
 makeLenses ''ItemDimension
 makeLenses ''ItemPortage
 makeLenses ''ItemValue
-makeLenses ''ItemLocation
 deriveJSON defaultOptions ''ItemDimension
 deriveJSON defaultOptions ''ItemPortage
 deriveJSON defaultOptions ''ItemValue
 deriveJSON defaultOptions ''ItemValueType
-deriveJSON defaultOptions ''ItemLocation