Simplify right button options

src/Dodge/Data/RightButtonOptions.hs

@@ -15,20 +15,11 @@ data RightButtonOptions
     | EquipOptions
         { _opEquip :: [EquipPosition]
         , _opSel :: Int
-        , _opItemID :: Int
-        , _opAllocateEquipment :: AllocateEquipment
-        , _opActivateEquipment :: ModifyEquipmentActivation
+        , _opAllocateEquipment :: EquipmentAllocation
         }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data ModifyEquipmentActivation
-    = ActivateEquipment {_activateEquipment :: Int}
-    | DeactivateEquipment {_deactivateEquipment :: Int}
-    | ActivateDeactivateEquipment {_activateEquipment :: Int, _deactivateEquipment :: Int}
-    | NoChangeActivateEquipment
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data AllocateEquipment
+data EquipmentAllocation
     = DoNotMoveEquipment
     | PutOnEquipment
         { _allocNewPos :: EquipPosition
@@ -52,8 +43,6 @@ data AllocateEquipment
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''RightButtonOptions
-makeLenses ''AllocateEquipment
-makeLenses ''ModifyEquipmentActivation
-deriveJSON defaultOptions ''ModifyEquipmentActivation
-deriveJSON defaultOptions ''AllocateEquipment
+makeLenses ''EquipmentAllocation
+deriveJSON defaultOptions ''EquipmentAllocation
 deriveJSON defaultOptions ''RightButtonOptions