Flatten values in creature manipulation data types

src/Dodge/Data/Item/Use/Consumption/LoadAction.hs

@@ -19,36 +19,18 @@ data Manipulation -- should be ManipulatedObject?
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ManipulatedObject
-    = InInventory {_inInventory :: InventoryManipulation}
-    | SelNothing
-    | InNearby {_inNearby :: NearbyManipulation}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data NearbyManipulation
-    = SortNearby
-    | SelCloseObject {_ispCloseObject :: Int}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data InventoryManipulation
     = SortInventory
     | SelectedItem 
         { _imSelectedItem :: Int
         , _imRootItem :: Int
         , _imAttachedItems :: IS.IntSet
-        }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data InvSelAction
-    = NoInvSelAction
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+        }    
+    | SelNothing
+    | SortNearby
+    | SelCloseObject {_ispCloseObject :: Int}
+     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ManipulatedObject
 makeLenses ''Manipulation
-makeLenses ''InventoryManipulation
-makeLenses ''NearbyManipulation
-makeLenses ''InvSelAction
-deriveJSON defaultOptions ''InvSelAction
-deriveJSON defaultOptions ''InventoryManipulation
-deriveJSON defaultOptions ''NearbyManipulation
 deriveJSON defaultOptions ''ManipulatedObject
 deriveJSON defaultOptions ''Manipulation