Start implementing attachable scroll items

src/Dodge/Data/Item/HeldScroll.hs

@@ -1,21 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Item.HeldScroll where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import qualified Data.Sequence as Seq
-
-data HeldScroll
-    = HeldScrollDoNothing
-    | HeldScrollZoom
-    | HeldScrollCharMode
-        {_hsCharMode :: Seq.Seq Char}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''HeldScroll
-deriveJSON defaultOptions ''HeldScroll

src/Dodge/Data/Item/Scope.hs

@@ -14,18 +14,16 @@ data Scope
     = NoScope
     | RemoteScope
         { -- | a camera offset
-          _scopePos :: Point2
-        , _scopeZoom :: Float
-        , -- | if the camera offset is also the center of vision
-          _scopeIsCamera :: Bool
-        }
-    | ZoomScope
-        { -- | a camera offset
-          _scopePos :: Point2
---        , _scopeZoomChange :: Int
-        , _scopeZoom :: Float
-        , _scopeDefaultZoom :: Float
+          _remotePos :: Point2
+        , _remoteZoom :: Float
         }
+--    | ZoomScope
+--        { -- | a camera offset
+--          _scopePos :: Point2
+----        , _scopeZoomChange :: Int
+--        , _scopeZoom :: Float
+--        , _scopeDefaultZoom :: Float
+--        }
     deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''Scope

src/Dodge/Data/Item/Use.hs

@@ -7,19 +7,18 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Item.Use,
     module Dodge.Data.Item.Use.Equipment,
     module Dodge.Data.Item.HeldUse,
-    module Dodge.Data.Item.HeldScroll,
     module Dodge.Data.Item.HeldDelay,
     module Dodge.Data.Item.Use.Consumption,
     module Dodge.Data.Hammer,
     module Dodge.Data.Item.Targeting,
 ) where
 
-import Linear
+import Geometry.Data
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import qualified Data.Sequence as Seq
 import Dodge.Data.Hammer
-import Dodge.Data.Item.HeldScroll
 import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Use.Consumption
 import Dodge.Data.Item.Use.Equipment
@@ -33,7 +32,6 @@ data ItemUse
         , _heldMods :: HeldMod
         , _heldHammer :: HammerPosition
         , _heldAim :: AimParams
-        , _heldScroll :: HeldScroll
         , _heldConsumption :: HeldConsumption
 --        , _useTargeting :: Maybe TargetType
         }
@@ -59,9 +57,20 @@ data ItemUse
     --deriving (Eq, Show, Read) --Generic, Flat)
 
 data AttachParams
-    = ZoomScopeParams
+    = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams}
     | AmmoAttachParams
 
+data ScrollAttachParams
+    = ZoomScrollParams
+        { -- | a camera offset
+          _opticPos :: Point2
+--        , _scopeZoomChange :: Int
+        , _opticZoom :: Float
+        , _opticDefaultZoom :: Float
+        }
+    | CharScrollParams
+        { _scrollChar :: Seq.Seq Char}
+
 data ItemUse' 
     = ItemHeld HeldUse'
     | ItemEquip EquipUse'
@@ -110,8 +119,11 @@ makeLenses ''ItemUse
 makeLenses ''AimParams
 makeLenses ''ItZoom
 makeLenses ''Muzzle
+makeLenses ''AttachParams
+makeLenses ''ScrollAttachParams
 deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AimStance
+deriveJSON defaultOptions ''ScrollAttachParams
 deriveJSON defaultOptions ''AttachParams
 deriveJSON defaultOptions ''ItZoom
 deriveJSON defaultOptions ''AimParams

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

@@ -29,6 +29,8 @@ data HeldConsumption
 data AmmoSource
     = InternalSource InternalAmmo
     | AboveSource
+    | BelowSource
+    | EitherSource
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data ExternalSourceType = BulletClip