Cleanup

src/Dodge/Data/Equipment/Misc.hs

@@ -8,16 +8,17 @@ module Dodge.Data.Equipment.Misc where
 import Data.Aeson
 import Data.Aeson.TH
 
-data EquipSite
+data EquipType
     = GoesOnHead
     | GoesOnChest
     | GoesOnBack
     | GoesOnWrist
     | GoesOnLegs
-    deriving (Eq,Ord,Show,Read)
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving (Eq, Ord, Show, Read)
 
-data EquipPosition
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+data EquipSite
     = OnHead
     | OnChest
     | OnBack
@@ -25,9 +26,11 @@ data EquipPosition
     | OnRightWrist
     | OnLegs
     | OnSpecial
-    deriving (Eq, Ord,Show,Read)
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
-data Hotkey = HotkeyQ
+    deriving (Eq, Ord, Show, Read)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
+data Hotkey
+    = HotkeyQ
     | HotkeyE
     | Hotkey1
     | Hotkey2
@@ -39,13 +42,16 @@ data Hotkey = HotkeyQ
     | Hotkey8
     | Hotkey9
     | Hotkey0
-  deriving (Eq, Show, Read, Ord, Bounded, Enum) --Generic, Flat)
-
+    deriving (Eq, Show, Read, Ord, Bounded, Enum) --Generic, Flat)
 
+deriveJSON defaultOptions ''EquipType
 deriveJSON defaultOptions ''EquipSite
-deriveJSON defaultOptions ''EquipPosition
 deriveJSON defaultOptions ''Hotkey
-instance ToJSONKey EquipPosition
-instance FromJSONKey EquipPosition
+
+instance ToJSONKey EquipSite
+
+instance FromJSONKey EquipSite
+
 instance ToJSONKey Hotkey
+
 instance FromJSONKey Hotkey