Improve item location code

src/Dodge/Data/Item.hs

@@ -35,8 +35,8 @@ data Item = Item
     , _itType :: ItemType
     , _itID :: Int
     , _itLocation :: ItemLocation
-    , _itIsRoot :: Bool
-    , _itIsSelected :: Bool
+--    , _itIsRoot :: Bool
+--    , _itIsSelected :: Bool
     , _itEffect :: ItEffect
     , _itInvSize :: Float
     , _itDimension :: ItemDimension

src/Dodge/Data/Item/Location.hs

@@ -9,9 +9,9 @@ import Data.Aeson
 import Data.Aeson.TH
 
 data ItemLocation
-    = InInv {_ipCrID :: Int, _ipInvID :: Int}
-    | OnTurret {_ipTuID :: Int}
-    | OnFloor {_ipFlID :: Int}
+    = InInv {_ilCrID :: Int, _ilInvID :: Int, _ilIsRoot :: Bool, _ilIsSelected :: Bool}
+    | OnTurret {_ilTuID :: Int}
+    | OnFloor {_ilFlID :: Int}
     | InVoid
     deriving (Eq, Show, Ord, Read) --Generic, Flat)