Make optical scope relative to camera rotation

src/Dodge/Data/Item/HeldUse.hs

@@ -104,7 +104,7 @@ data HeldMod
     | ExplodeRemoteShellMod
     | DoNothingMod
 --    | ForceFieldMod
-    | DetectorMod Detector
+--    | DetectorMod Detector
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Euse

src/Dodge/Data/Item/Scope.hs

@@ -12,8 +12,16 @@ import Geometry.Data
 
 data Scope
     = NoScope
-    | RemoteScope
+    | OpticScope
         { -- | a camera offset
+          _opticPos :: Point2  -- this should be relative to the camera rotation
+                                -- this means that when the camera rotates when firing etc,
+                                -- this doesn't need to be changed
+        , _opticZoom :: Float
+        , _opticDefaultZoom :: Float
+        }
+    | RemoteScope
+        { -- | a camera offset, note unlike the optic pos this is absolute
           _remotePos :: Point2
         , _remoteZoom :: Float
         }

src/Dodge/Data/Item/Use.hs

@@ -121,15 +121,15 @@ data AmmoParams = BulletParams {_ampBullet :: Bullet}
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data ScrollAttachParams
-    = ZoomScrollParams
-        { -- | a camera offset
-          _opticPos :: Point2  -- this should be relative to the camera rotation
-                                -- then when the camera rotates when firing etc,
-                                -- this doesn't need to be changed
-        , _opticZoom :: Float
-        , _opticDefaultZoom :: Float
-        }
-    | CharScrollParams
+    = -- ZoomScrollParams
+--        { -- | a camera offset
+--          _opticPos :: Point2  -- this should be relative to the camera rotation
+--                                -- then when the camera rotates when firing etc,
+--                                -- this doesn't need to be changed
+--        , _opticZoom :: Float
+--        , _opticDefaultZoom :: Float
+--        }
+     CharScrollParams
         { _scrollChar :: Seq.Seq Char}
     deriving (Eq, Show, Read) --Generic, Flat)