Remove some deriving clauses

src/Dodge/Data/Equipment/Misc.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
+--{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -15,7 +15,8 @@ data EquipSite
     | GoesOnWrist
     | GoesOnLegs
     | GoesOnSpecial
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipPosition
     = OnHead
@@ -25,7 +26,8 @@ data EquipPosition
     | OnRightWrist
     | OnLegs
     | OnSpecial
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 instance ToJSONKey EquipPosition
 

src/Dodge/Data/Item/Combine.hs

@@ -17,10 +17,12 @@ data ItemType = ItemType
     , _iyModules :: M.Map ModuleSlot ItemModuleType
     , _iyStack :: Stack
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Stack = NoStack | Stack ItAmount
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CraftType
     = PIPE
@@ -69,7 +71,8 @@ data CraftType
     | TIMEMODULE
     | SIZEMODULE
     | GRAVITYMODULE
-    deriving (Eq, Ord, Show, Enum, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Enum, Read) --Generic, Flat)
 
 data ItemBaseType
     = NoItemType
@@ -78,12 +81,14 @@ data ItemBaseType
     | EQUIP {_ibtEquip :: EquipItemType}
     | Consumable {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ConsumableItemType
     = MEDKIT Int
     | EXPLOSIVES
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipItemType
     = MAGSHIELD
@@ -99,7 +104,8 @@ data EquipItemType
     | JUMPLEGS
     | JETPACK
     | AUTODETECTOR Detector
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq,Ord,Show,Read)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data LeftItemType
     = BOOSTER

src/Dodge/Data/Item/Use.hs

@@ -49,7 +49,7 @@ data ItemUse
         }
     | CraftUse
         {_useAmount :: ItAmount}
-    deriving (Eq, Show, Read) --Generic, Flat)
+    --deriving (Eq, Show, Read) --Generic, Flat)
 
 data AimParams = AimParams
     { _aimWeight :: Int
@@ -59,21 +59,22 @@ data AimParams = AimParams
     , _aimHandlePos :: Float
     , _aimMuzPos :: Float
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data AimStance
     = TwoHandTwist
     | TwoHandFlat
     | OneHand
     | LeaveHolstered
-    deriving (Eq, Show, Ord, Enum, Read) --Generic, Flat)
+    deriving (Eq)
+    --deriving (Eq, Show, Ord, Enum, Read) --Generic, Flat)
 
 data ItZoom = ItZoom
     { _itZoomMax :: Float
     , _itZoomMin :: Float
     , _itZoomFac :: Float
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemUse
 makeLenses ''AimParams

src/Dodge/Data/Item/Use/Equipment.hs

@@ -22,13 +22,13 @@ data EquipEffect = EquipEffect
     , _eeParams :: EquipParams
     , _eeViewDist :: Maybe Float
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EquipParams
     = NoEquipParams
     | EquipID {_eparamID :: Int}
     | EquipCounter {_eparamInt :: Int}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''EquipEffect
 makeLenses ''EquipParams

src/Dodge/Data/Machine/Sensor.hs

@@ -27,16 +27,18 @@ data Sensor
         , _proxRequirement :: ProximityRequirement
         , _sensToggle :: Bool
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ProximityRequirement
     = RequireHealth {_proxReqMinHealth :: Int}
     | RequireEquipment {_proxReqEquipment :: ItemBaseType}
     | RequireImpossible
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Show)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CloseToggle = NotClose | IsClose
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Show)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Sensor
 makeLenses ''ProximityRequirement

src/Dodge/Data/RightButtonOptions.hs

@@ -19,14 +19,14 @@ data RightButtonOptions
         , _opAllocateEquipment :: AllocateEquipment
         , _opActivateEquipment :: ActivateEquipment
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ActivateEquipment
     = ActivateEquipment {_activateEquipment :: Int}
     | DeactivateEquipment {_deactivateEquipment :: Int}
     | ActivateDeactivateEquipment {_activateEquipment :: Int, _deactivateEquipment :: Int}
     | NoChangeActivateEquipment
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data AllocateEquipment
     = DoNotMoveEquipment
@@ -49,7 +49,7 @@ data AllocateEquipment
     | RemoveEquipment
         { _allocOldPos :: EquipPosition
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''RightButtonOptions
 makeLenses ''AllocateEquipment