Cleanup

src/Dodge/Data/Item/HeldScroll.hs

@@ -1,10 +1,23 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Item.HeldScroll where
-import GHC.Generics
+
+import Control.Lens
 import Data.Aeson
-data HeldScroll = HeldScrollDoNothing | HeldScrollZoom | HeldScrollCharMode
-  deriving (Eq,Ord,Enum,Bounded,Show,Read,Generic)
-instance ToJSON HeldScroll  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON HeldScroll 
+import Data.Aeson.TH
+import qualified Data.Sequence as Seq
+
+data HeldScroll
+    = HeldScrollDoNothing
+    | HeldScrollZoom
+    | HeldScrollCharMode
+        {_hsCharMode :: Seq.Seq Char}
+    | HeldScrollInt
+        { _hsInt :: Int
+        , _hsMaxInt :: Int
+        }
+    deriving (Eq, Ord, Show, Read)
+
+makeLenses ''HeldScroll
+deriveJSON defaultOptions ''HeldScroll