Cleanup constructors FooUse -> UseFoo

src/Dodge/Update/Camera.hs

@@ -6,7 +6,6 @@ module Dodge.Update.Camera (
 ) where
 
 import Bound
---import Control.Applicative
 import Control.Monad
 import Data.Foldable
 import qualified Data.Map.Strict as M
@@ -94,16 +93,16 @@ moveZoomCamera cfig theinput cr w campos =
     offset = fromMaybe noscopeoffset $ do
         guard (SDL.ButtonRight `M.member` _mouseButtons theinput)
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        fmap docamrot (cr ^? crInv . ix i . itUse . scopeScope . opticPos)
+        fmap docamrot (cr ^? crInv . ix i . itUse . uScope . opticPos)
     noscopeoffset = docamrot $
             ((newzoom - newDefaultZoom) / (newDefaultZoom * newzoom)) *.* _mousePos theinput
     newzoom = fromMaybe (newDefaultZoom * newItemZoom) $ do  
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        cr ^? crInv . ix i . itUse . scopeScope . opticZoom
+        cr ^? crInv . ix i . itUse . uScope . opticZoom
     idealDefaultZoom = clipZoom wallZoom
     newDefaultZoom = fromMaybe (changeZoom (campos ^. camDefaultZoom) idealDefaultZoom) $ do
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        cr ^? crInv . ix i . itUse . scopeScope . opticZoom
+        cr ^? crInv . ix i . itUse . uScope . opticZoom
     idealItemZoom = fromMaybe 1 $ do
         guard $ crIsAiming cr
         i <- cr ^? crManipulation . manObject . imSelectedItem
@@ -136,7 +135,7 @@ updateScopeZoom' i w
         w & wppointer %~ doScopeZoom (w ^. input . smoothScrollAmount) (w ^. input . mousePos)
     | otherwise = w & wppointer %~ resetscope
   where
-    wppointer = cWorld . lWorld . creatures . ix 0 . crInv . ix i . itUse . scopeScope
+    wppointer = cWorld . lWorld . creatures . ix 0 . crInv . ix i . itUse . uScope
     resetscope (OpticScope _ _ defz) = OpticScope (V2 0 0) defz defz
     resetscope otherAtt = otherAtt