Cleanup

ghcidOutput

@@ -1 +1 @@
-All good (620 modules, at 14:13:42)
+All good (617 modules, at 21:51:38)

src/Dodge/Creature/Impulse/UseItem.hs

@@ -43,6 +43,7 @@ itemEffect cr it w = case it ^. ldtValue . itUse of
     CraftUse{} -> w
     AttachUse{} -> selectUse it cr  w
     AmmoMagUse{} -> w
+    ScopeUse{} -> w
   where
     itm = it ^. ldtValue
     doequipmentchange = fromMaybe w $ do

src/Dodge/Data/Item.hs

@@ -43,7 +43,7 @@ data Item = Item
     , _itDimension :: ItemDimension
     , _itCurseStatus :: CurseStatus
     , _itTweaks :: ItemTweaks
-    , _itScope :: Scope
+--    , _itScope :: Scope
     , _itParams :: ItemParams
     , _itAttachments :: Set ItemAttachment
     }

src/Dodge/Data/Item/Scope.hs

@@ -20,11 +20,6 @@ data Scope
         , _opticZoom :: Float
         , _opticDefaultZoom :: Float
         }
-    | RemoteScope
-        { -- | a camera offset, note unlike the optic pos this is absolute
-          _remotePos :: Point2
-        , _remoteZoom :: Float
-        }
     deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''Scope

src/Dodge/Data/Item/Use.hs

@@ -12,8 +12,10 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Hammer,
     module Dodge.Data.Item.Targeting,
     module Dodge.Data.GenFloat,
+    module Dodge.Data.Item.Scope
 ) where
 
+import Dodge.Data.Item.Scope
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -67,6 +69,10 @@ data ItemUse
         , _amagParams :: AmmoParams
         , _amagType :: AmmoType
         }
+    | ScopeUse
+        { -- | a camera offset
+          _scopeScope :: Scope
+        }
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data TriggerType
@@ -111,8 +117,7 @@ data AmmoParams
     = BulletParams {_ampBullet :: Bullet}
     | ProjectileParams
         { _ampPayload :: Payload
-        , _ampPjDraw :: ProjectileDraw
+--        , _ampPjDraw :: ProjectileDraw
---        , _ampPjCreation :: ProjectileCreate
         }
     | GasParams {_ampCreateGas :: GasFuel}
     deriving (Eq, Show, Read) --Generic, Flat)

src/Dodge/Data/LWorld.hs

@@ -102,7 +102,7 @@ data LWorld = LWorld
     , _clouds :: [Cloud]
     , _gusts :: IM.IntMap Gust
     , _props :: IM.IntMap Prop
-    , _projectiles :: IM.IntMap Proj
+    , _projectiles :: IM.IntMap Projectile
     , _instantBullets :: [Bullet]
     , _bullets :: [Bullet]
     , _radarSweeps :: [RadarSweep]

src/Dodge/Data/Projectile.hs

@@ -11,7 +11,7 @@ import Data.Aeson.TH
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Geometry.Data
 
-data Proj
+data Projectile
     = Shell
         { _prjPos :: Point2
         , _prjStartPos :: Point2
@@ -29,5 +29,5 @@ data Proj
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-makeLenses ''Proj
+makeLenses ''Projectile
-deriveJSON defaultOptions ''Proj
+deriveJSON defaultOptions ''Projectile

src/Dodge/Default/Item.hs

@@ -31,7 +31,7 @@ defaultHeldItem = Item
         , _itUse = defaultHeldUse
         , _itParams = NoParams
         , _itTweaks = NoTweaks
-        , _itScope = NoScope
+--        , _itScope = NoScope
         , _itAttachments = mempty
         }
 

src/Dodge/Default/Shell.hs

@@ -1,23 +0,0 @@
-module Dodge.Default.Shell where
-
-import Dodge.Data.Item.Use.Consumption.Ammo
-import Dodge.Data.Projectile
-import Geometry.Data
-
-defaultShell :: Proj
-defaultShell =
-    Shell
-        { _prjPos = V2 0 0
-        , _prjZ = 20
-        , _prjStartPos = V2 0 0
-        , _prjVel = V2 0 0
-        , _prjAcc = V2 0 0
-        , _prjDir = 0
-        , _prjSpin = 0
-        , _prjDraw = DrawShell
-        , _prjID = 0
-        , _prjTimer = 0
-        , _prjPayload = ExplosionPayload
-        , _prjUpdates = []
---        , _prjMITID = Nothing
-        }

src/Dodge/HeldUse.hs

@@ -505,7 +505,8 @@ createProjectile magtree muz itm cr = fromMaybe failsound $ do
     ammoitem <- cr ^? crInv . ix magid
     let mscreen = lookup RemoteScreenLink (magtree ^. ldtLeft)
     j <- ammoitem ^? itLocation . ilInvID
-    return $ fireTrackingShell (mscreen ^? _Just . ldtValue) ammoitem muz itm cr 
+    aparams <- ammoitem ^? itUse . amagParams
+    return $ fireTrackingShell (mscreen ^? _Just . ldtValue) aparams muz itm cr 
         . startthesound
         . useammo j
   where

src/Dodge/Item/Ammo.hs

@@ -58,7 +58,7 @@ shellMag =
             .~ AmmoMagUse
                 { _amagParams = ProjectileParams
                     { _ampPayload = ExplosionPayload
-                    , _ampPjDraw = DrawShell
+--                    , _ampPjDraw = DrawShell
                     }
                 , _amagLoadStatus =
                     ReloadStatus

src/Dodge/Item/Display.hs

@@ -117,6 +117,8 @@ itemNumberDisplay cr itm = case iu of
     ConsumeUse {} -> []
     AttachUse {} -> [] --[showReloadProgress cr itm]
     AmmoMagUse {} -> [showLoadedAmount itm]
+    ScopeUse OpticScope {_opticZoom = x} -> [show x]
+    ScopeUse {} -> []
         -- this could be cleaner here...
   where
     iu = itm ^?! itUse

src/Dodge/Item/Scope.hs

@@ -13,7 +13,7 @@ zoomScope =
     defaultHeldItem
         & itType . iyBase .~ ATTACH ZOOMSCOPE
 --        & itUse .~ AttachUse (ScrollAttachParams (ZoomScrollParams{_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}))
-        & itScope .~ OpticScope{_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}
+        & itUse .~ ScopeUse OpticScope{_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}
 
 targetingScope :: TargetType -> Item
 targetingScope tt =

src/Dodge/Item/Weapon/Remote.hs

@@ -1,16 +0,0 @@
-module Dodge.Item.Weapon.Remote (
---    setRemoteScope,
-) where
-
---import Control.Lens
---import Dodge.Data.World
---import Geometry
-
---setRemoteScope :: Int -> Point2 -> World -> World
---setRemoteScope itid pos w = case w ^? cWorld . lWorld . itemLocations . ix itid of
---    Just (InInv cid' invid _ _ _) ->
---        w
---            & cWorld . lWorld . creatures . ix cid' . crInv . ix invid . itScope
---                . remotePos
---            .~ (pos -.- (w ^?! cWorld . lWorld . creatures . ix cid' . crPos))
---    _ -> w

src/Dodge/Item/Weapon/Shell.hs

@@ -1,19 +0,0 @@
-module Dodge.Item.Weapon.Shell (
-    decTimMvVel,
-) where
-
-import Control.Lens
-import Dodge.Data.World
-import Geometry.Vector
-
-decTimMvVel :: Proj -> World -> World
-decTimMvVel pj =
-    cWorld . lWorld . projectiles . ix pjid
-        %~ ( (prjTimer -~ 1)
-                . (prjPos %~ (+.+ vel))
-                . (prjAcc %~ rotateV rot)
-           )
-  where
-    rot = _prjSpin pj
-    vel = _prjVel pj
-    pjid = _prjID pj

src/Dodge/Projectile/Create.hs

@@ -1,5 +1,5 @@
-module Dodge.Projectile.Create 
+module Dodge.Projectile.Create (
-    ( fireTrackingShell
+    fireTrackingShell,
 ) where
 
 import Data.Maybe
@@ -9,16 +9,16 @@ import qualified IntMapHelp as IM
 import LensHelp
 
 -- assumes the mscreen is in your inventory
-fireTrackingShell :: Maybe Item -> Item -> Muzzle -> Item -> Creature -> World -> World
+fireTrackingShell :: Maybe Item -> AmmoParams -> Muzzle -> Item -> Creature -> World -> World
-fireTrackingShell mscreen ammoitem muz it cr w = fromMaybe w $ do
+fireTrackingShell mscreen aparams muz it cr w = w
-    aparams <- ammoitem ^? itUse . amagParams
+    & updatescreen
-    return $ w & cWorld . lWorld . projectiles . at i
+    & cWorld . lWorld . projectiles . at i
         ?~ Shell
             { _prjPos = pos
             , _prjZ = 20
             , _prjStartPos = pos
             , _prjVel = rotateV dir (V2 1 0)
-                , _prjDraw = DrawShell
+            , _prjDraw = maybe DrawShell (const DrawRemoteShell) mscreen
             , _prjID = i
             , _prjAcc = rotateV dir (V2 3 0)
             , _prjDir = dir
@@ -28,69 +28,22 @@ fireTrackingShell mscreen ammoitem muz it cr w = fromMaybe w $ do
             , _prjUpdates =
                 [ PJRemoteShellCollisionCheck (mscreen ^? _Just . itID) --Just screenid)
                 , PJDecTimMvVel
-            , PJSpin 335 (_crID cr) spinamount
+                , PJSpin 335 (_crID cr) (_shellSpinAmount params)
                 , PJRemoteSetDirection (350 - thrustdelay) 0 (mscreen ^? _Just . itID)
                 , PJThrust (350 - thrustdelay) 0
-            , PJReduceSpin (1 - fromIntegral spindrag * 2 / 200)
+                , PJReduceSpin (1 - fromIntegral (_shellSpinDrag params) * 2 / 200)
                 ]
-
---                , _prjMITID = Just $ _itID it
             }
-        & updatescreen
-        
---    makeShell
---            (mscreen ^? _Just . itLocation . ilInvID) -- Just screeninvid)
---            ammoitem
---            muz
---            cr
---            [ PJRemoteShellCollisionCheck (mscreen ^? _Just . itID) --Just screenid)
---            , PJDecTimMvVel
---            , PJSpin 335 (_crID cr) spinamount
---            , PJRemoteSetDirection (350 - thrustdelay) 0 (mscreen ^? _Just . itID)
---            , PJThrust (350 - thrustdelay) 0
---            , PJReduceSpin (1 - fromIntegral spindrag * 2 / 200)
---            ]
   where
-    spinamount = _shellSpinAmount params
     thrustdelay = _shellThrustDelay params
-    spindrag = _shellSpinDrag params
     params = _itParams it
     updatescreen = fromMaybe id $ do
         screeninvid <- mscreen ^? _Just . itLocation . ilInvID
-        return $ cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix screeninvid
+        return $
-            . itUse . atLinkedProjectile ?~ i
+            cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix screeninvid
+                . itUse
+                . atLinkedProjectile
+                ?~ i
     i = IM.newKey $ w ^. cWorld . lWorld . projectiles -- _props (_cWorld w)
     dir = _crDir cr + _mzRot muz
     pos = _crPos cr +.+ rotateV dir (_mzPos muz)
-
----- rather than screen invid why not use an item location?
---makeShell :: Maybe Int -> Item -> Muzzle -> Creature -> [ProjectileUpdate] -> World -> World
---makeShell mscreeninvid ammoitem muz cr theupdate w = fromMaybe w $ do
---    aparams <- ammoitem ^? itUse . amagParams
---    return $
---        w & cWorld . lWorld . projectiles . at i
---            ?~ Shell
---                { _prjPos = pos
---                , _prjZ = 20
---                , _prjStartPos = pos
---                , _prjVel = rotateV dir (V2 1 0)
---                , _prjDraw = DrawShell
---                , _prjID = i
---                , _prjAcc = rotateV dir (V2 3 0)
---                , _prjDir = dir
---                , _prjSpin = 0
---                , _prjPayload = _ampPayload aparams
---                , _prjTimer = 350
---                , _prjUpdates = theupdate
-----                , _prjMITID = Just $ _itID it
---                }
---        & updatescreen
---  where
---    updatescreen = fromMaybe id $ do
---        screeninvid <- mscreeninvid
---        return $ cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix screeninvid
---            . itUse . atLinkedProjectile ?~ i
---    i = IM.newKey $ w ^. cWorld . lWorld . projectiles -- _props (_cWorld w)
---    dir = _crDir cr + _mzRot muz
---    pos = _crPos cr +.+ rotateV dir (_mzPos muz)
-

src/Dodge/Projectile/Draw.hs

@@ -1,4 +1,6 @@
-module Dodge.Projectile.Draw where
+module Dodge.Projectile.Draw 
+    ( drawProjectile
+    ) where
 
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Dodge.Data.Projectile
@@ -7,14 +9,14 @@ import Picture
 import Shape
 import ShapePicture
 
-drawProjectile :: Proj -> SPic
+drawProjectile :: Projectile -> SPic
 drawProjectile prj = case _prjDraw prj of
     DrawShell -> drawShell prj
     DrawRemoteShell -> drawRemoteShell prj
     DrawDrone -> drawShell prj
     DrawBlankProjectile -> mempty
 
-drawShell :: Proj -> SPic
+drawShell :: Projectile -> SPic
 drawShell pj =
     noPic
         . translateSHz 18
@@ -24,7 +26,7 @@ drawShell pj =
 shellShape :: Shape
 shellShape = colorSH black $ upperPrismPoly Small Typical 4 $ map toV2 [(-6, 4), (-6, -4), (6, -4), (8, 0), (6, 4)]
 
-drawRemoteShell :: Proj -> SPic
+drawRemoteShell :: Projectile -> SPic
 drawRemoteShell pj
     | rem (t + 200) 20 < 9 =
         doposition $ noPic shellShape

src/Dodge/Projectile/Update.hs

@@ -1,33 +1,30 @@
-{-# OPTIONS_GHC -Wno-unused-imports #-}
+--{-# OPTIONS_GHC -Wno-unused-imports #-}
-
+module Dodge.Projectile.Update 
-module Dodge.Projectile.Update where
+    ( updateProjectile
+    ) where
 
 import Control.Lens
-import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Base
 import Dodge.Data.World
 import Dodge.EnergyBall
 import Dodge.Item.Location
 import Dodge.Item.Weapon.Launcher
-import Dodge.Item.Weapon.Remote
-import Dodge.Item.Weapon.Shell
-import Dodge.Item.Weapon.TriggerType
-import Dodge.Movement.Turn
-import Dodge.Payload
 import Dodge.SoundLogic
-import Dodge.SoundLogic.LoadSound
 import Dodge.WorldEvent.Cloud
 import Geometry
 import qualified IntMapHelp as IM
 import RandomHelp
-import qualified SDL
 
-updateProjectile :: Proj -> World -> World
+updateProjectile :: Projectile -> World -> World
-updateProjectile pj = case pj of
+updateProjectile pj w' = foldr (`upProjectile` pj) w' (_prjUpdates pj)
-    Shell{} -> upsProjectile pj
+--updateProjectile pj = case pj of
+--    Shell{} -> upsProjectile pj
+--
+--upsProjectile :: Projectile -> World -> World
+--upsProjectile pj w' = foldr (`upProjectile` pj) w' (_prjUpdates pj)
 
-shellCollisionCheck :: (Proj -> World -> World) -> Proj -> World -> World
+shellCollisionCheck :: (Projectile -> World -> World) -> Projectile -> World -> World
 shellCollisionCheck doExplode pj w
     | time > 330 && circOnSomeWall oldPos 4 w = doExplode pj w
     | time <= 330 && anythingHitCirc 2 oldPos newPos w = doExplode pj w
@@ -39,7 +36,7 @@ shellCollisionCheck doExplode pj w
     vel = _prjVel pj
     newPos = oldPos +.+ vel
 
-remoteShellCollisionCheck :: Maybe Int -> Proj -> World -> World
+remoteShellCollisionCheck :: Maybe Int -> Projectile -> World -> World
 remoteShellCollisionCheck mscreenid = shellCollisionCheck 
     $ \pj -> explodeRemoteRocket mscreenid (_prjID pj)
 
@@ -49,10 +46,8 @@ remoteShellCollisionCheck mscreenid = shellCollisionCheck
 --            . stopSoundFrom (ShellSound (_prjID pj))
 --            . (cWorld . lWorld . projectiles %~ IM.delete (_prjID pj))
 
-upsProjectile :: Proj -> World -> World
-upsProjectile pj w' = foldr (`upProjectile` pj) w' (_prjUpdates pj)
 
-upProjectile :: ProjectileUpdate -> Proj -> World -> World
+upProjectile :: ProjectileUpdate -> Projectile -> World -> World
 upProjectile pu pj = case pu of
     PJRemoteShellCollisionCheck mscreenid -> remoteShellCollisionCheck mscreenid pj
 --    PJShellCollisionCheck -> plainShellCollisionCheck pj
@@ -91,7 +86,7 @@ retireRemoteProj mitid pjid w = w & cWorld . lWorld . projectiles %~ IM.delete p
         guard $ itm == pjid
         return $ pointerToItemLocation loc . itUse . atLinkedProjectile .~ Nothing
         
-doThrust :: Proj -> World -> World
+doThrust :: Projectile -> World -> World
 doThrust pj w =
     w
         & randGen .~ g
@@ -117,7 +112,7 @@ trySpinByCID ::
     Int ->
     -- | Spin amount
     Int ->
-    Proj ->
+    Projectile ->
     World ->
     World
 trySpinByCID cid i pj w = w & cWorld . lWorld . projectiles . ix pjid . prjSpin .~ newSpin
@@ -144,7 +139,7 @@ trySpinByCID cid i pj w = w & cWorld . lWorld . projectiles . ix pjid . prjSpin
 --    --itPoint = pointerToItemLocation $ w ^?! cWorld . lWorld . itemLocations . ix itid
 
 -- note this only allows YOU to remotely track projectiles
-pjRemoteSetDirection :: Maybe Int -> Proj -> World -> World
+pjRemoteSetDirection :: Maybe Int -> Projectile -> World -> World
 pjRemoteSetDirection mscreenid pj w = fromMaybe w $ do
     screenid <- mscreenid
     let newdir
@@ -169,5 +164,18 @@ pjRemoteSetDirection mscreenid pj w = fromMaybe w $ do
 --                    (argV $ _prjAcc pj)
 --    --itPoint = pointerToItemLocation $ w ^?! cWorld . lWorld . itemLocations . ix itid
 
-reduceSpinBy :: Float -> Proj -> World -> World
+reduceSpinBy :: Float -> Projectile -> World -> World
 reduceSpinBy x pj = cWorld . lWorld . projectiles . ix (_prjID pj) . prjSpin *~ x
+
+
+decTimMvVel :: Projectile -> World -> World
+decTimMvVel pj =
+    cWorld . lWorld . projectiles . ix pjid
+        %~ ( (prjTimer -~ 1)
+                . (prjPos %~ (+.+ vel))
+                . (prjAcc %~ rotateV rot)
+           )
+  where
+    rot = _prjSpin pj
+    vel = _prjVel pj
+    pjid = _prjID pj

src/Dodge/Update/Camera.hs

@@ -6,7 +6,7 @@ module Dodge.Update.Camera (
 ) where
 
 import Bound
-import Control.Applicative
+--import Control.Applicative
 import Control.Monad
 import Data.Foldable
 import qualified Data.Map.Strict as M
@@ -81,15 +81,11 @@ moveZoomCamera :: Configuration -> Input -> Creature -> World -> Camera -> Camer
 moveZoomCamera cfig theinput cr w campos =
     campos
         & camCenter .~ fromMaybe (_crPos cr +.+ offset ) mremotepos
-        & camViewFrom .~ fromMaybe (_crPos cr +.+ vfoffset) mremotepos
+        & camViewFrom .~ fromMaybe (_crPos cr) mremotepos
         & camZoom .~ newzoom
         & camDefaultZoom .~ newDefaultZoom
         & camItemZoom .~ newItemZoom
   where
-    vfoffset = fromMaybe 0 $ do
-        guard (SDL.ButtonRight `M.member` _mouseButtons theinput)
-        i <- cr ^? crManipulation . manObject . imSelectedItem
-        cr ^? crInv . ix i . itScope . remotePos
     mremotepos = do
         i <- cr ^? crManipulation . manObject . imSelectedItem
         j <- cr ^? crInv . ix i . itUse . atLinkedProjectile . _Just
@@ -98,17 +94,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 . itScope . opticPos)
+        fmap docamrot (cr ^? crInv . ix i . itUse . scopeScope . opticPos)
-            <|> (cr ^? crInv . ix i . itScope . remotePos)
     noscopeoffset = docamrot $
             ((newzoom - newDefaultZoom) / (newDefaultZoom * newzoom)) *.* _mousePos theinput
     newzoom = fromMaybe (newDefaultZoom * newItemZoom) $ do  
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        cr ^? crInv . ix i . itScope . opticZoom
+        cr ^? crInv . ix i . itUse . scopeScope . opticZoom
     idealDefaultZoom = clipZoom wallZoom
     newDefaultZoom = fromMaybe (changeZoom (campos ^. camDefaultZoom) idealDefaultZoom) $ do
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        cr ^? crInv . ix i . itScope . opticZoom
+        cr ^? crInv . ix i . itUse . scopeScope . opticZoom
     idealItemZoom = fromMaybe 1 $ do
         guard $ crIsAiming cr
         i <- cr ^? crManipulation . manObject . imSelectedItem
@@ -141,7 +136,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 . itScope
+    wppointer = cWorld . lWorld . creatures . ix 0 . crInv . ix i . itUse . scopeScope
     resetscope (OpticScope _ _ defz) = OpticScope (V2 0 0) defz defz
     resetscope otherAtt = otherAtt
 

tags

@@ -54,11 +54,11 @@ AddGoal	src/Dodge/Data/ActionPlan.hs	45;"	C
 AddTile	src/Dodge/Room/AddTile.hs	1;"	m
 AesonHelp	src/AesonHelp.hs	1;"	m
 AimAt	src/Dodge/Data/ActionPlan.hs	84;"	C
-AimParams	src/Dodge/Data/Item/Use.hs	125;"	t
+AimParams	src/Dodge/Data/Item/Use.hs	130;"	t
 AimParams	src/Dodge/Default/AimParams.hs	1;"	m
 AimParams	src/Dodge/Default/Item/Held/AimParams.hs	1;"	m
 AimParams	src/Dodge/Default/Item/Use/AimParams.hs	1;"	m
-AimStance	src/Dodge/Data/Item/Use.hs	181;"	t
+AimStance	src/Dodge/Data/Item/Use.hs	186;"	t
 Aiming	src/Dodge/Creature/Stance/Data.hs	42;"	C
 Aiming	src/Dodge/Data/Creature/Stance.hs	39;"	C
 AirFiltrationSS	src/Dodge/Data/Scenario.hs	95;"	C
@@ -76,11 +76,11 @@ AmmoCI	src/Dodge/Data/ComposedItem.hs	37;"	C
 AmmoInLink	src/Dodge/Data/ComposedItem.hs	16;"	C
 AmmoMagSF	src/Dodge/Data/ComposedItem.hs	27;"	C
 AmmoMagType	src/Dodge/Data/Item/Combine.hs	107;"	t
-AmmoMagUse	src/Dodge/Data/Item/Use.hs	65;"	C
+AmmoMagUse	src/Dodge/Data/Item/Use.hs	67;"	C
 AmmoModLink	src/Dodge/Data/ComposedItem.hs	17;"	C
 AmmoModifierCI	src/Dodge/Data/ComposedItem.hs	36;"	C
 AmmoModifierSF	src/Dodge/Data/ComposedItem.hs	30;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	110;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	116;"	t
 AmmoParams	src/Dodge/Item/Weapon/AmmoParams.hs	1;"	m
 AmmoPosition	src/Dodge/Item/AmmoPosition.hs	8;"	t
 AmmoPosition	src/Dodge/Item/AmmoPosition.hs	2;"	m
@@ -130,7 +130,7 @@ AttachMode	src/Dodge/Item/Attachment/Data.hs	13;"	C
 AttachTargetPos	src/Dodge/Data/Item/Attachment.hs	13;"	C
 AttachTargetPos	src/Dodge/Item/Attachment/Data.hs	15;"	C
 AttachType	src/Dodge/Data/Item/Combine.hs	97;"	t
-AttachUse	src/Dodge/Data/Item/Use.hs	62;"	C
+AttachUse	src/Dodge/Data/Item/Use.hs	64;"	C
 Attachment	src/Dodge/Data/Item/Attachment.hs	4;"	m
 Attachment	src/Dodge/Item/Attachment.hs	1;"	m
 Attention	src/Dodge/Creature/Perception/Data.hs	65;"	t
@@ -149,7 +149,7 @@ AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 AutoGun	src/Dodge/Item/Weapon/AutoGun.hs	1;"	m
 AutoRecharging	src/Dodge/Data/Item/Consumption.hs	23;"	C
 AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	28;"	C
-AutoTrigger	src/Dodge/Data/Item/Use.hs	73;"	C
+AutoTrigger	src/Dodge/Data/Item/Use.hs	79;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
 AwakeLevel	src/Dodge/Creature/AlertLevel/Data.hs	14;"	t
 Awareness	src/Dodge/Creature/Perception/Data.hs	72;"	t
@@ -222,7 +222,7 @@ BeamCombine	src/Dodge/Data/Beam.hs	47;"	C
 BeamCombineType	src/Dodge/Data/Beam.hs	38;"	t
 BeamDraw	src/Dodge/Data/Beam.hs	33;"	t
 BeamDrawColor	src/Dodge/Data/Beam.hs	35;"	C
-BeamShooterParams	src/Dodge/Data/Item/Use.hs	91;"	C
+BeamShooterParams	src/Dodge/Data/Item/Use.hs	97;"	C
 BeamSimple	src/Dodge/Data/Beam.hs	50;"	C
 BeamType	src/Dodge/Data/Beam.hs	46;"	t
 BecomePowerful	src/Dodge/Data/Scenario.hs	9;"	C
@@ -304,8 +304,8 @@ BulletClipAttachment	src/Dodge/Data/Item.hs	53;"	C
 BulletEffect	src/Dodge/Data/Bullet.hs	36;"	t
 BulletGun	src/Dodge/Item/Held/BulletGun.hs	1;"	m
 BulletGuns	src/Dodge/Item/Weapon/BulletGuns.hs	1;"	m
-BulletParams	src/Dodge/Data/Item/Use.hs	111;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	117;"	C
-BulletShooterParams	src/Dodge/Data/Item/Use.hs	95;"	C
+BulletShooterParams	src/Dodge/Data/Item/Use.hs	101;"	C
 BulletSpawn	src/Dodge/Data/Bullet.hs	42;"	t
 BulletTrajectory	src/Dodge/Data/Bullet.hs	50;"	t
 BulletTrajectoryType	src/Dodge/Data/Bullet.hs	57;"	t
@@ -469,7 +469,7 @@ ConstantIntensity	src/Dodge/Data/LightSource.hs	17;"	C
 Consumable	src/Dodge/Item/Consumable.hs	1;"	m
 ConsumableFamily	src/Dodge/Item/Family.hs	7;"	C
 ConsumableItemType	src/Dodge/Data/Item/Combine.hs	118;"	t
-ConsumeUse	src/Dodge/Data/Item/Use.hs	52;"	C
+ConsumeUse	src/Dodge/Data/Item/Use.hs	54;"	C
 Consumption	src/Dodge/Data/Item/Consumption.hs	5;"	m
 Consumption	src/Dodge/Data/Item/Use/Consumption.hs	8;"	m
 Consumption	src/Dodge/Default/Item/Held/Consumption.hs	1;"	m
@@ -533,7 +533,7 @@ Cr_status	src/Dodge/Data/Config.hs	71;"	C
 CraftClust	src/Dodge/Combine/Graph.hs	17;"	C
 CraftType	src/Dodge/Combine/Data.hs	26;"	t
 CraftType	src/Dodge/Data/Item/Combine.hs	29;"	t
-CraftUse	src/Dodge/Data/Item/Use.hs	60;"	C
+CraftUse	src/Dodge/Data/Item/Use.hs	62;"	C
 Craftable	src/Dodge/Item/Craftable.hs	1;"	m
 CraftingFamily	src/Dodge/Item/Family.hs	4;"	C
 Create	src/Dodge/Projectile/Create.hs	1;"	m
@@ -672,9 +672,9 @@ DefaultArcStep	src/Dodge/Data/ArcStep.hs	23;"	C
 DefaultCrGroupUpdate	src/Dodge/Data/CrGroupParams.hs	22;"	C
 DefaultDrawButton	src/Dodge/Data/Button.hs	17;"	C
 DefaultDrawSwitch	src/Dodge/Data/Button.hs	18;"	C
-DefaultFlareType	src/Dodge/Data/Item/Use.hs	137;"	C
+DefaultFlareType	src/Dodge/Data/Item/Use.hs	142;"	C
 DefaultForceField	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	48;"	C
-DefaultHeldParams	src/Dodge/Data/Item/Use.hs	78;"	C
+DefaultHeldParams	src/Dodge/Data/Item/Use.hs	84;"	C
 DefaultLightSourceDraw	src/Dodge/Data/LightSource.hs	13;"	C
 DefaultRoomType	src/Dodge/Data/Room.hs	31;"	C
 Delete	src/Dodge/Wall/Delete.hs	1;"	m
@@ -859,7 +859,7 @@ EquipPosition	src/Dodge/Data/Equipment/Misc.hs	20;"	t
 EquipPosition	src/Dodge/Equipment/Data.hs	17;"	t
 EquipSite	src/Dodge/Data/Equipment/Misc.hs	11;"	t
 EquipSite	src/Dodge/Equipment/Data.hs	6;"	t
-EquipUse	src/Dodge/Data/Item/Use.hs	56;"	C
+EquipUse	src/Dodge/Data/Item/Use.hs	58;"	C
 Equipment	src/Dodge/Data/Equipment.hs	12;"	t
 Equipment	src/Dodge/Data/Equipment.hs	3;"	m
 Equipment	src/Dodge/Data/Item/Use/Equipment.hs	5;"	m
@@ -953,7 +953,7 @@ Flank	src/Dodge/Data/ActionPlan.hs	177;"	C
 Flare	src/Dodge/Data/Flare.hs	14;"	t
 Flare	src/Dodge/Data/Flare.hs	6;"	m
 Flare	src/Dodge/Flare.hs	1;"	m
-FlareType	src/Dodge/Data/Item/Use.hs	136;"	t
+FlareType	src/Dodge/Data/Item/Use.hs	141;"	t
 Flash	src/Dodge/WorldEvent/Flash.hs	11;"	m
 FlashBall	src/Dodge/Data/Bullet.hs	33;"	C
 FlatFaces	src/Shape/Data.hs	17;"	C
@@ -1030,8 +1030,8 @@ GasCloud	src/Dodge/Data/Cloud.hs	31;"	C
 GasCreate	src/Dodge/Data/Gas.hs	6;"	t
 GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	54;"	t
 GasFuel	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	51;"	t
-GasParams	src/Dodge/Data/Item/Use.hs	117;"	C
+GasParams	src/Dodge/Data/Item/Use.hs	122;"	C
-GasSprayParams	src/Dodge/Data/Item/Use.hs	79;"	C
+GasSprayParams	src/Dodge/Data/Item/Use.hs	85;"	C
 GenCr	src/Dodge/Creature/State/Data.hs	24;"	C
 GenCr	src/Dodge/Data/Creature/State.hs	31;"	C
 GenFloat	src/Dodge/Data/GenFloat.hs	11;"	t
@@ -1109,13 +1109,13 @@ Hammer	src/Dodge/Hammer.hs	1;"	m
 HammerDown	src/Dodge/Data/Hammer.hs	18;"	C
 HammerPosition	src/Dodge/Data/Hammer.hs	17;"	t
 HammerReleased	src/Dodge/Data/Hammer.hs	19;"	C
-HammerTrigger	src/Dodge/Data/Item/Use.hs	74;"	C
+HammerTrigger	src/Dodge/Data/Item/Use.hs	80;"	C
 HammerType	src/Dodge/Data/Hammer.hs	12;"	t
 HammerUp	src/Dodge/Data/Hammer.hs	20;"	C
 HandPos	src/Dodge/Creature/HandPos.hs	1;"	m
 HardQuit	src/Dodge/Data/Universe.hs	66;"	C
 HasHammer	src/Dodge/Data/Hammer.hs	14;"	C
-HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	140;"	C
+HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	145;"	C
 Held	src/Dodge/Default/Held.hs	1;"	m
 Held	src/Dodge/Default/Item/Held.hs	1;"	m
 Held	src/Dodge/Item/Held.hs	1;"	m
@@ -1129,14 +1129,14 @@ HeldItemType	src/Dodge/Combine/Data.hs	133;"	t
 HeldItemType	src/Dodge/Data/Item/Combine.hs	159;"	t
 HeldMod	src/Dodge/Data/Item/HeldUse.hs	59;"	t
 HeldOffset	src/Dodge/Item/HeldOffset.hs	1;"	m
-HeldParams	src/Dodge/Data/Item/Use.hs	77;"	t
+HeldParams	src/Dodge/Data/Item/Use.hs	83;"	t
 HeldScroll	src/Dodge/Data/Item/HeldScroll.hs	13;"	t
 HeldScroll	src/Dodge/Data/Item/HeldScroll.hs	6;"	m
 HeldScroll	src/Dodge/HeldScroll.hs	1;"	m
 HeldScrollCharMode	src/Dodge/Data/Item/HeldScroll.hs	16;"	C
 HeldScrollDoNothing	src/Dodge/Data/Item/HeldScroll.hs	14;"	C
 HeldScrollZoom	src/Dodge/Data/Item/HeldScroll.hs	15;"	C
-HeldUse	src/Dodge/Data/Item/Use.hs	33;"	C
+HeldUse	src/Dodge/Data/Item/Use.hs	35;"	C
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
 HeldUse	src/Dodge/HeldUse.hs	2;"	m
 HelpNum	src/HelpNum.hs	1;"	m
@@ -1280,7 +1280,7 @@ ItInvEffect	src/Dodge/Data/ItEffect.hs	13;"	C
 ItInvEffectDrop	src/Dodge/Data/ItEffect.hs	29;"	C
 ItInvEffectID	src/Dodge/Data/ItEffect.hs	25;"	C
 ItRewindEffect	src/Dodge/Data/ItEffect.hs	17;"	C
-ItZoom	src/Dodge/Data/Item/Use.hs	190;"	t
+ItZoom	src/Dodge/Data/Item/Use.hs	195;"	t
 Item	src/Dodge/Data/Item.hs	36;"	t
 Item	src/Dodge/Base/Item.hs	1;"	m
 Item	src/Dodge/Data/Item.hs	6;"	m
@@ -1306,7 +1306,7 @@ ItemTweaks	src/Dodge/Data/Item/Tweak.hs	13;"	t
 ItemType	src/Dodge/Combine/Data.hs	12;"	t
 ItemType	src/Dodge/Data/Item/Combine.hs	16;"	t
 ItemUnlocker	src/Dodge/Lock/Data.hs	13;"	C
-ItemUse	src/Dodge/Data/Item/Use.hs	32;"	t
+ItemUse	src/Dodge/Data/Item/Use.hs	34;"	t
 JETPACK	src/Dodge/Combine/Data.hs	116;"	C
 JETPACK	src/Dodge/Data/Item/Combine.hs	138;"	C
 JGK	src/Control/Foldl/JGK.hs	1;"	m
@@ -1383,7 +1383,7 @@ Lampoid	src/Dodge/Data/Creature/Misc.hs	72;"	C
 Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
-LasGunFlare	src/Dodge/Data/Item/Use.hs	141;"	C
+LasGunFlare	src/Dodge/Data/Item/Use.hs	146;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	26;"	C
 LasTurret	src/Dodge/Room/LasTurret.hs	1;"	m
 Laser	src/Dodge/Data/Laser.hs	28;"	t
@@ -1411,7 +1411,7 @@ LeftForward	src/Dodge/Creature/Stance/Data.hs	34;"	C
 LeftForward	src/Dodge/Data/Creature/Stance.hs	32;"	C
 LeftItemType	src/Dodge/Combine/Data.hs	122;"	t
 LeftItemType	src/Dodge/Data/Item/Combine.hs	148;"	t
-LeftUse	src/Dodge/Data/Item/Use.hs	45;"	C
+LeftUse	src/Dodge/Data/Item/Use.hs	47;"	C
 LensHelp	src/LensHelp.hs	1;"	m
 Lethargic	src/Dodge/Creature/AlertLevel/Data.hs	17;"	C
 Lethargic	src/Dodge/Creature/Perception/Data.hs	58;"	C
@@ -1592,7 +1592,7 @@ MidLayer	src/Picture/Data.hs	24;"	C
 Military	src/Dodge/Data/Scenario.hs	45;"	C
 Mine	src/Dodge/Data/Scenario.hs	64;"	C
 MiniGunAI	src/Dodge/Data/Creature/Misc.hs	59;"	C
-MiniGunFlare	src/Dodge/Data/Item/Use.hs	139;"	C
+MiniGunFlare	src/Dodge/Data/Item/Use.hs	144;"	C
 Misc	src/Dodge/Data/Creature/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Equipment/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Item/Misc.hs	6;"	m
@@ -1652,18 +1652,18 @@ Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
 Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
 MuzFlare	src/Dodge/Data/Flare.hs	15;"	C
-Muzzle	src/Dodge/Data/Item/Use.hs	162;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	167;"	t
-MuzzleDetector	src/Dodge/Data/Item/Use.hs	159;"	C
+MuzzleDetector	src/Dodge/Data/Item/Use.hs	164;"	C
-MuzzleEffect	src/Dodge/Data/Item/Use.hs	145;"	t
+MuzzleEffect	src/Dodge/Data/Item/Use.hs	150;"	t
 MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
-MuzzleForceField	src/Dodge/Data/Item/Use.hs	158;"	C
+MuzzleForceField	src/Dodge/Data/Item/Use.hs	163;"	C
-MuzzleLaser	src/Dodge/Data/Item/Use.hs	147;"	C
+MuzzleLaser	src/Dodge/Data/Item/Use.hs	152;"	C
-MuzzleLauncher	src/Dodge/Data/Item/Use.hs	150;"	C
+MuzzleLauncher	src/Dodge/Data/Item/Use.hs	155;"	C
-MuzzleNozzle	src/Dodge/Data/Item/Use.hs	151;"	C
+MuzzleNozzle	src/Dodge/Data/Item/Use.hs	156;"	C
-MuzzleShatter	src/Dodge/Data/Item/Use.hs	157;"	C
+MuzzleShatter	src/Dodge/Data/Item/Use.hs	162;"	C
-MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	146;"	C
+MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	151;"	C
-MuzzleTesla	src/Dodge/Data/Item/Use.hs	148;"	C
+MuzzleTesla	src/Dodge/Data/Item/Use.hs	153;"	C
-MuzzleTractor	src/Dodge/Data/Item/Use.hs	149;"	C
+MuzzleTractor	src/Dodge/Data/Item/Use.hs	154;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvPt	src/Dodge/MvPt.hs	1;"	m
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
@@ -1828,7 +1828,7 @@ OnSpecial	src/Dodge/Equipment/Data.hs	24;"	C
 OnTurret	src/Dodge/Data/Item/Location.hs	33;"	C
 OnceSound	src/Dodge/Data/SoundOrigin.hs	15;"	C
 OneArgument	src/Dodge/Data/Terminal.hs	94;"	C
-OneHand	src/Dodge/Data/Item/Use.hs	185;"	C
+OneHand	src/Dodge/Data/Item/Use.hs	190;"	C
 OnwardCluster	src/Dodge/Data/RoomCluster.hs	14;"	C
 OnwardCluster	src/Dodge/RoomCluster/Data.hs	12;"	C
 OnwardList	src/Dodge/Annotation/Data.hs	15;"	C
@@ -1948,7 +1948,7 @@ Pillar	src/Dodge/Room/Pillar.hs	1;"	m
 Pipe	src/Dodge/Placement/Instance/Pipe.hs	1;"	m
 PistolAI	src/Dodge/Data/Creature/Misc.hs	53;"	C
 PistolCrit	src/Dodge/Creature/PistolCrit.hs	1;"	m
-PistolFlare	src/Dodge/Data/Item/Use.hs	138;"	C
+PistolFlare	src/Dodge/Data/Item/Use.hs	143;"	C
 PistolMod	src/Dodge/Data/Item/HeldUse.hs	60;"	C
 PlaceSpot	src/Dodge/Placement/PlaceSpot.hs	4;"	m
 Placement	src/Dodge/Data/GenWorld.hs	77;"	t
@@ -2016,7 +2016,7 @@ ProjectileCreate	src/Dodge/Data/Ammo.hs	17;"	t
 ProjectileCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	21;"	t
 ProjectileDraw	src/Dodge/Data/Ammo.hs	14;"	t
 ProjectileDraw	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	18;"	t
-ProjectileParams	src/Dodge/Data/Item/Use.hs	112;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	118;"	C
 ProjectileUpdate	src/Dodge/Data/Ammo.hs	20;"	t
 ProjectileUpdate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	24;"	t
 Prop	src/Dodge/Data/Prop.hs	18;"	t
@@ -2147,7 +2147,6 @@ ReloadStatus	src/Dodge/Data/Item/Use/Consumption.hs	20;"	t
 Reloading	src/Dodge/Reloading.hs	1;"	m
 Remote	src/Dodge/Item/Weapon/Remote.hs	1;"	m
 RemoteScope	src/Dodge/Data/Item/Attachment.hs	23;"	C
-RemoteScope	src/Dodge/Data/Item/Scope.hs	23;"	C
 RemoteScope	src/Dodge/Item/Attachment/Data.hs	26;"	C
 RemoteScreenLink	src/Dodge/Data/ComposedItem.hs	20;"	C
 RemoteScreenSF	src/Dodge/Data/ComposedItem.hs	28;"	C
@@ -2276,6 +2275,7 @@ Scope	src/Dodge/Item/Attachment/Data.hs	25;"	t
 Scope	src/Dodge/Data/Item/Scope.hs	6;"	m
 Scope	src/Dodge/Item/Scope.hs	1;"	m
 ScopeAttachment	src/Dodge/Data/Item.hs	52;"	C
+ScopeUse	src/Dodge/Data/Item/Use.hs	72;"	C
 ScreenLayer	src/Dodge/Data/Universe.hs	77;"	t
 ScreenLayer	src/Dodge/Update/Input/ScreenLayer.hs	1;"	m
 ScreenPos	src/Dodge/Data/ScreenPos.hs	9;"	t
@@ -2621,7 +2621,7 @@ TeslaArc	src/Dodge/Data/TeslaArc.hs	6;"	m
 TeslaArc	src/Dodge/Particle/TeslaArc.hs	1;"	m
 TeslaBall	src/Dodge/Data/Bullet.hs	32;"	C
 TeslaBeamCombine	src/Dodge/Data/Beam.hs	41;"	C
-TeslaGunFlare	src/Dodge/Data/Item/Use.hs	142;"	C
+TeslaGunFlare	src/Dodge/Data/Item/Use.hs	147;"	C
 Test	src/Dodge/Creature/Test.hs	8;"	m
 Test	src/Dodge/Event/Test.hs	1;"	m
 Test	src/Picture/Test.hs	1;"	m
@@ -2685,7 +2685,7 @@ Trie	src/SimpleTrie.hs	5;"	t
 Trie	src/Dodge/Combine/Trie.hs	1;"	m
 TriggerDoor	src/Dodge/LevelGen/TriggerDoor.hs	2;"	m
 TriggerDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	1;"	m
-TriggerType	src/Dodge/Data/Item/Use.hs	72;"	t
+TriggerType	src/Dodge/Data/Item/Use.hs	78;"	t
 TriggerType	src/Dodge/Item/Weapon/TriggerType.hs	6;"	m
 Tuple	src/Tuple.hs	1;"	m
 TurbineBaySS	src/Dodge/Data/Scenario.hs	110;"	C
@@ -2712,9 +2712,9 @@ TweakTractionPower	src/Dodge/Data/Item/Tweak.hs	22;"	C
 TweakType	src/Dodge/Data/Item/Tweak.hs	20;"	t
 Tweakable	src/Dodge/Data/Item/Tweak.hs	15;"	C
 TwistGoal	src/Dodge/Data/Scenario.hs	15;"	C
-TwoHandFlat	src/Dodge/Data/Item/Use.hs	184;"	C
+TwoHandFlat	src/Dodge/Data/Item/Use.hs	189;"	C
-TwoHandOver	src/Dodge/Data/Item/Use.hs	183;"	C
+TwoHandOver	src/Dodge/Data/Item/Use.hs	188;"	C
-TwoHandUnder	src/Dodge/Data/Item/Use.hs	182;"	C
+TwoHandUnder	src/Dodge/Data/Item/Use.hs	187;"	C
 Type	src/Dodge/Data/Damage/Type.hs	6;"	m
 Typical	src/Shape/Data.hs	36;"	C
 UPtLayer	src/Dodge/Picture/Layer/Data.hs	16;"	C
@@ -2943,13 +2943,13 @@ _actionSound	src/Dodge/Data/LoadAction.hs	11;"	f
 _actionSound	src/Dodge/Data/LoadAction.hs	14;"	f
 _actionTime	src/Dodge/Data/LoadAction.hs	11;"	f
 _actionTime	src/Dodge/Data/LoadAction.hs	14;"	f
-_aimHandlePos	src/Dodge/Data/Item/Use.hs	131;"	f
+_aimHandlePos	src/Dodge/Data/Item/Use.hs	136;"	f
-_aimMuzzles	src/Dodge/Data/Item/Use.hs	132;"	f
+_aimMuzzles	src/Dodge/Data/Item/Use.hs	137;"	f
-_aimRange	src/Dodge/Data/Item/Use.hs	128;"	f
+_aimRange	src/Dodge/Data/Item/Use.hs	133;"	f
-_aimStance	src/Dodge/Data/Item/Use.hs	130;"	f
+_aimStance	src/Dodge/Data/Item/Use.hs	135;"	f
-_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	127;"	f
+_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	132;"	f
-_aimWeight	src/Dodge/Data/Item/Use.hs	126;"	f
+_aimWeight	src/Dodge/Data/Item/Use.hs	131;"	f
-_aimZoom	src/Dodge/Data/Item/Use.hs	129;"	f
+_aimZoom	src/Dodge/Data/Item/Use.hs	134;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	21;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	24;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	28;"	f
@@ -2970,14 +2970,13 @@ _amPosDirs	src/Dodge/Item/AmmoPosition.hs	10;"	f
 _amString	src/Dodge/Data/Ammo.hs	33;"	f
 _amString	src/Dodge/Data/Ammo.hs	38;"	f
 _amString	src/Dodge/Data/Ammo.hs	42;"	f
-_amagLoadStatus	src/Dodge/Data/Item/Use.hs	66;"	f
+_amagLoadStatus	src/Dodge/Data/Item/Use.hs	68;"	f
-_amagParams	src/Dodge/Data/Item/Use.hs	67;"	f
+_amagParams	src/Dodge/Data/Item/Use.hs	69;"	f
-_amagType	src/Dodge/Data/Item/Use.hs	68;"	f
+_amagType	src/Dodge/Data/Item/Use.hs	70;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	111;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	117;"	f
-_ampCreateGas	src/Dodge/Data/Item/Use.hs	117;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	122;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	113;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	119;"	f
-_ampPjDraw	src/Dodge/Data/Item/Use.hs	114;"	f
 _amposDir	src/Dodge/Item/AmmoPosition.hs	9;"	f
 _amposPos	src/Dodge/Item/AmmoPosition.hs	9;"	f
 _apAction	src/Dodge/Data/ActionPlan.hs	20;"	f
@@ -3009,7 +3008,7 @@ _atFuseTime	src/Dodge/Data/Item/Attachment.hs	12;"	f
 _atFuseTime	src/Dodge/Item/Attachment/Data.hs	12;"	f
 _atInt	src/Dodge/Data/Item/Attachment.hs	14;"	f
 _atInt	src/Dodge/Item/Attachment/Data.hs	16;"	f
-_atLinkedProjectile	src/Dodge/Data/Item/Use.hs	63;"	f
+_atLinkedProjectile	src/Dodge/Data/Item/Use.hs	65;"	f
 _atMInt	src/Dodge/Data/Item/Attachment.hs	15;"	f
 _atMInt	src/Dodge/Item/Attachment/Data.hs	17;"	f
 _atMode	src/Dodge/Item/Attachment/Data.hs	13;"	f
@@ -3083,13 +3082,13 @@ _buTimer	src/Dodge/Data/Bullet.hs	27;"	f
 _buTrajectory	src/Dodge/Data/Bullet.hs	21;"	f
 _buVel	src/Dodge/Data/Bullet.hs	22;"	f
 _buWidth	src/Dodge/Data/Bullet.hs	26;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	85;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	91;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	92;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	98;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	102;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	108;"	f
 _bullets	src/Dodge/Data/LWorld.hs	107;"	f
 _buttons	src/Dodge/Data/LWorld.hs	137;"	f
 _cClock	src/Dodge/Data/CWorld.hs	28;"	f
-_cUse	src/Dodge/Data/Item/Use.hs	53;"	f
+_cUse	src/Dodge/Data/Item/Use.hs	55;"	f
 _cWorld	src/Dodge/Data/World.hs	37;"	f
 _camBoundBox	src/Dodge/Data/CamPos.hs	20;"	f
 _camBoundBox	src/Dodge/Data/Camera.hs	31;"	f
@@ -3348,9 +3347,9 @@ _eqParams	src/Dodge/Data/Equipment.hs	17;"	f
 _eqSite	src/Dodge/Data/Equipment.hs	16;"	f
 _eqUse	src/Dodge/Data/Equipment.hs	13;"	f
 _eqViewDist	src/Dodge/Data/Equipment.hs	18;"	f
-_equipEffect	src/Dodge/Data/Item/Use.hs	49;"	f
+_equipEffect	src/Dodge/Data/Item/Use.hs	51;"	f
-_equipEffect	src/Dodge/Data/Item/Use.hs	57;"	f
+_equipEffect	src/Dodge/Data/Item/Use.hs	59;"	f
-_equipTargeting	src/Dodge/Data/Item/Use.hs	58;"	f
+_equipTargeting	src/Dodge/Data/Item/Use.hs	60;"	f
 _euseAmmoAmount	src/Dodge/Data/Item/HeldUse.hs	41;"	f
 _euseAmmoLink	src/Dodge/Data/Item/HeldUse.hs	44;"	f
 _euseAmmoMax	src/Dodge/Data/Item/HeldUse.hs	42;"	f
@@ -3406,7 +3405,7 @@ _futureWorlds	src/Dodge/Data/World.hs	64;"	f
 _futureWorlds	src/Dodge/Data/World.hs	70;"	f
 _gameplay_rotate_to_wall	src/Dodge/Config/Data.hs	25;"	f
 _gameplay_rotate_to_wall	src/Dodge/Data/Config.hs	55;"	f
-_gasCreation	src/Dodge/Data/Item/Use.hs	80;"	f
+_gasCreation	src/Dodge/Data/Item/Use.hs	86;"	f
 _genPlacements	src/Dodge/Data/GenWorld.hs	26;"	f
 _genRooms	src/Dodge/Data/GenWorld.hs	27;"	f
 _getAttentiveTo	src/Dodge/Creature/AlertLevel/Data.hs	22;"	f
@@ -3449,15 +3448,15 @@ _guVel	src/Dodge/Data/Gust.hs	16;"	f
 _gusts	src/Dodge/Data/LWorld.hs	103;"	f
 _gwWorld	src/Dodge/Data/GenWorld.hs	25;"	f
 _hammerPosition	src/Dodge/Data/Hammer.hs	14;"	f
-_heldAim	src/Dodge/Data/Item/Use.hs	38;"	f
+_heldAim	src/Dodge/Data/Item/Use.hs	40;"	f
-_heldAmmoTypes	src/Dodge/Data/Item/Use.hs	39;"	f
+_heldAmmoTypes	src/Dodge/Data/Item/Use.hs	41;"	f
-_heldDelay	src/Dodge/Data/Item/Use.hs	35;"	f
+_heldDelay	src/Dodge/Data/Item/Use.hs	37;"	f
-_heldHammer	src/Dodge/Data/Item/Use.hs	37;"	f
+_heldHammer	src/Dodge/Data/Item/Use.hs	39;"	f
-_heldMods	src/Dodge/Data/Item/Use.hs	36;"	f
+_heldMods	src/Dodge/Data/Item/Use.hs	38;"	f
-_heldParams	src/Dodge/Data/Item/Use.hs	40;"	f
+_heldParams	src/Dodge/Data/Item/Use.hs	42;"	f
 _heldPos	src/Dodge/Data/Input.hs	27;"	f
-_heldTriggerType	src/Dodge/Data/Item/Use.hs	41;"	f
+_heldTriggerType	src/Dodge/Data/Item/Use.hs	43;"	f
-_heldUsageTime	src/Dodge/Data/Item/Use.hs	42;"	f
+_heldUsageTime	src/Dodge/Data/Item/Use.hs	44;"	f
 _heldWorldPos	src/Dodge/Data/Input.hs	29;"	f
 _hsCharMode	src/Dodge/Data/Item/HeldScroll.hs	17;"	f
 _hud	src/Dodge/Data/World.hs	46;"	f
@@ -3531,7 +3530,6 @@ _itID	src/Dodge/Data/Item.hs	39;"	f
 _itInvSize	src/Dodge/Data/Item.hs	42;"	f
 _itLocation	src/Dodge/Data/Item.hs	40;"	f
 _itParams	src/Dodge/Data/Item.hs	47;"	f
-_itScope	src/Dodge/Data/Item.hs	46;"	f
 _itTweaks	src/Dodge/Data/Item.hs	45;"	f
 _itType	src/Dodge/Data/Item.hs	38;"	f
 _itUse	src/Dodge/Data/Item.hs	37;"	f
@@ -3542,9 +3540,9 @@ _iyBase	src/Dodge/Data/Item/Combine.hs	17;"	f
 _iyModules	src/Dodge/Combine/Data.hs	14;"	f
 _iyModules	src/Dodge/Data/Item/Combine.hs	18;"	f
 _iyStack	src/Dodge/Combine/Data.hs	15;"	f
-_izFac	src/Dodge/Data/Item/Use.hs	193;"	f
+_izFac	src/Dodge/Data/Item/Use.hs	198;"	f
-_izMax	src/Dodge/Data/Item/Use.hs	191;"	f
+_izMax	src/Dodge/Data/Item/Use.hs	196;"	f
-_izMin	src/Dodge/Data/Item/Use.hs	192;"	f
+_izMin	src/Dodge/Data/Item/Use.hs	197;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lClock	src/Dodge/Data/LWorld.hs	146;"	f
 _lTestInt	src/Dodge/Data/LWorld.hs	148;"	f
@@ -3580,10 +3578,10 @@ _ldtLeft	src/Dodge/Data/DoubleTree.hs	39;"	f
 _ldtRight	src/Dodge/Data/DoubleTree.hs	40;"	f
 _ldtValue	src/Dodge/Data/DoubleTree.hs	39;"	f
 _leadTargetBy	src/Dodge/Data/ActionPlan.hs	150;"	f
-_leftConsumption	src/Dodge/Data/Item/Use.hs	50;"	f
+_leftConsumption	src/Dodge/Data/Item/Use.hs	52;"	f
-_leftDelay	src/Dodge/Data/Item/Use.hs	47;"	f
+_leftDelay	src/Dodge/Data/Item/Use.hs	49;"	f
-_leftHammer	src/Dodge/Data/Item/Use.hs	48;"	f
+_leftHammer	src/Dodge/Data/Item/Use.hs	50;"	f
-_leftUse	src/Dodge/Data/Item/Use.hs	46;"	f
+_leftUse	src/Dodge/Data/Item/Use.hs	48;"	f
 _lightBeams	src/Dodge/Data/LWorld.hs	152;"	f
 _lightSources	src/Dodge/Data/LWorld.hs	141;"	f
 _lightingCapShader	src/Data/Preload/Render.hs	16;"	f
@@ -3670,18 +3668,18 @@ _mtBranches	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtLabel	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtTree	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _musicData	src/Data/Preload.hs	13;"	f
-_muzVel	src/Dodge/Data/Item/Use.hs	96;"	f
+_muzVel	src/Dodge/Data/Item/Use.hs	102;"	f
 _mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	44;"	f
 _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	98;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	166;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	171;"	f
-_mzEffect	src/Dodge/Data/Item/Use.hs	168;"	f
+_mzEffect	src/Dodge/Data/Item/Use.hs	173;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	167;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	172;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	165;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	170;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	163;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	168;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	164;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	169;"	f
 _newArcStep	src/Dodge/Data/Item/Params.hs	51;"	f
 _newBeams	src/Dodge/Data/LWorld.hs	115;"	f
 _noClip	src/Dodge/Debug/Flag/Data.hs	7;"	f
@@ -3692,10 +3690,10 @@ _nodesSearched	src/Dodge/Data/Creature/Memory.hs	15;"	f
 _numLinkEW	src/Dodge/Data/Room.hs	33;"	f
 _numLinkNS	src/Dodge/Data/Room.hs	34;"	f
 _numberFloorVerxs	src/Dodge/Data/CWorld.hs	32;"	f
-_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	154;"	f
+_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	159;"	f
-_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	153;"	f
+_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	158;"	f
-_nzPressure	src/Dodge/Data/Item/Use.hs	152;"	f
+_nzPressure	src/Dodge/Data/Item/Use.hs	157;"	f
-_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	155;"	f
+_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	160;"	f
 _offPathFromEdges	src/Dodge/Data/Room.hs	74;"	f
 _onPathFromEdges	src/Dodge/Data/Room.hs	73;"	f
 _opDraw	src/Dodge/Data/Wall.hs	41;"	f
@@ -3853,8 +3851,8 @@ _pyFaces	src/Polyhedra/Data.hs	14;"	f
 _radarBlips	src/Dodge/Data/LWorld.hs	113;"	f
 _radarSweeps	src/Dodge/Data/LWorld.hs	108;"	f
 _randGen	src/Dodge/Data/World.hs	40;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	83;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	89;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	100;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	106;"	f
 _rateMax	src/Dodge/Data/Item/HeldDelay.hs	16;"	f
 _rateMax	src/Dodge/Data/Item/Use/Delay.hs	13;"	f
 _rateMax	src/Dodge/Data/Item/Use/Delay.hs	17;"	f
@@ -3876,16 +3874,14 @@ _rbPos	src/Dodge/Data/RadarBlip.hs	19;"	f
 _rbRad	src/Dodge/Data/RadarBlip.hs	18;"	f
 _rbTime	src/Dodge/Data/RadarBlip.hs	16;"	f
 _rboBaseBloom	src/Data/Preload/Render.hs	38;"	f
-_recoil	src/Dodge/Data/Item/Use.hs	81;"	f
+_recoil	src/Dodge/Data/Item/Use.hs	87;"	f
-_recoil	src/Dodge/Data/Item/Use.hs	98;"	f
+_recoil	src/Dodge/Data/Item/Use.hs	104;"	f
 _reloadAction	src/Dodge/Data/LoadAction.hs	26;"	f
-_remotePos	src/Dodge/Data/Item/Scope.hs	25;"	f
-_remoteZoom	src/Dodge/Data/Item/Scope.hs	26;"	f
 _renderData	src/Data/Preload.hs	11;"	f
 _reverseAmount	src/Dodge/Data/World.hs	63;"	f
 _reverseAmount	src/Dodge/Data/World.hs	69;"	f
 _reverseAmount	src/Dodge/Data/World.hs	73;"	f
-_rifling	src/Dodge/Data/Item/Use.hs	97;"	f
+_rifling	src/Dodge/Data/Item/Use.hs	103;"	f
 _rlDir	src/Dodge/Data/Room.hs	26;"	f
 _rlPos	src/Dodge/Data/Room.hs	25;"	f
 _rlType	src/Dodge/Data/Room.hs	24;"	f
@@ -3965,6 +3961,7 @@ _scopePos	src/Dodge/Data/Item/Attachment.hs	25;"	f
 _scopePos	src/Dodge/Data/Item/Attachment.hs	32;"	f
 _scopePos	src/Dodge/Item/Attachment/Data.hs	27;"	f
 _scopePos	src/Dodge/Item/Attachment/Data.hs	32;"	f
+_scopeScope	src/Dodge/Data/Item/Use.hs	74;"	f
 _scopeZoom	src/Dodge/Data/Item/Attachment.hs	26;"	f
 _scopeZoom	src/Dodge/Data/Item/Attachment.hs	34;"	f
 _scopeZoom	src/Dodge/Item/Attachment/Data.hs	28;"	f
@@ -4028,8 +4025,8 @@ _siPictures	src/Dodge/Data/SelectionList.hs	77;"	f
 _siPictures	src/Dodge/Data/SelectionList.hs	85;"	f
 _sideEffect	src/Loop/Data.hs	13;"	f
 _sideImpulses	src/Dodge/Data/ActionPlan.hs	170;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	84;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	90;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	101;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	107;"	f
 _silhouetteEBO	src/Data/Preload/Render.hs	27;"	f
 _skColor	src/Dodge/Data/Spark.hs	17;"	f
 _skDamageType	src/Dodge/Data/Spark.hs	21;"	f
@@ -4168,8 +4165,8 @@ _toPlaySoundVolume	src/Sound/Data.hs	43;"	f
 _toPlaySoundVolumeFraction	src/Sound/Data.hs	44;"	f
 _toPlaySounds	src/Dodge/Data/World.hs	41;"	f
 _topBoxSize	src/Shape/Data.hs	17;"	f
-_torqueAfter	src/Dodge/Data/Item/Use.hs	82;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	88;"	f
-_torqueAfter	src/Dodge/Data/Item/Use.hs	99;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	105;"	f
 _tractorBeams	src/Dodge/Data/LWorld.hs	122;"	f
 _trieChildren	src/SimpleTrie.hs	7;"	f
 _trieMVal	src/SimpleTrie.hs	6;"	f
@@ -4263,10 +4260,10 @@ _warmSound	src/Dodge/Data/Item/HeldDelay.hs	28;"	f
 _warmTime	src/Dodge/Data/Item/HeldDelay.hs	26;"	f
 _warmTime	src/Dodge/Data/Item/Use/Delay.hs	23;"	f
 _warmTime	src/Dodge/Data/Item/UseDelay.hs	23;"	f
-_weaponInvLock	src/Dodge/Data/Item/Use.hs	88;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	94;"	f
-_weaponInvLock	src/Dodge/Data/Item/Use.hs	105;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	111;"	f
-_weaponRepeat	src/Dodge/Data/Item/Use.hs	89;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	95;"	f
-_weaponRepeat	src/Dodge/Data/Item/Use.hs	106;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	112;"	f
 _windowPosX	src/Dodge/Config/Data.hs	23;"	f
 _windowPosX	src/Dodge/Data/Config.hs	53;"	f
 _windowPosY	src/Dodge/Config/Data.hs	24;"	f
@@ -4744,7 +4741,7 @@ clickDetector	src/Dodge/Item/Held/Utility.hs	53;"	f
 clickGetCreature	src/Dodge/Debug.hs	82;"	f
 clickSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 clipV	src/Geometry/Vector.hs	47;"	f
-clipZoom	src/Dodge/Update/Camera.hs	224;"	f
+clipZoom	src/Dodge/Update/Camera.hs	219;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
 closeObjEq	src/Dodge/Inventory/CloseObject.hs	12;"	f
 closeObjPos	src/Dodge/Inventory/CloseObject.hs	7;"	f
@@ -5232,7 +5229,7 @@ doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
 doRoomShift	src/Dodge/Room/Link.hs	33;"	f
-doScopeZoom	src/Dodge/Update/Camera.hs	148;"	f
+doScopeZoom	src/Dodge/Update/Camera.hs	143;"	f
 doSideEffects	appDodge/Main.hs	117;"	f
 doStep	src/Dodge/ArcStep.hs	9;"	f
 doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	164;"	f
@@ -5247,7 +5244,7 @@ doTimeScroll	src/Dodge/Update.hs	185;"	f
 doTmTm	src/Dodge/TmTm.hs	6;"	f
 doTmWdWd	src/Dodge/WorldEffect.hs	109;"	f
 doTweak	src/Dodge/Tweak.hs	6;"	f
-doWallRotate	src/Dodge/Update/Camera.hs	195;"	f
+doWallRotate	src/Dodge/Update/Camera.hs	190;"	f
 doWdBl	src/Dodge/WorldBool.hs	10;"	f
 doWdCrBl	src/Dodge/CreatureEffect.hs	37;"	f
 doWdCrCr	src/Dodge/CreatureEffect.hs	12;"	f
@@ -5471,12 +5468,12 @@ fadeTLS	src/Dodge/LightSource/Update.hs	14;"	f
 fallSmallBounce	src/Dodge/Prop/Moving.hs	28;"	f
 fallSmallBounce'	src/Dodge/Prop/Moving.hs	33;"	f
 fallSmallBounceDamage	src/Dodge/Prop/Moving.hs	11;"	f
-farWallDistDirection	src/Dodge/Update/Camera.hs	235;"	f
+farWallDistDirection	src/Dodge/Update/Camera.hs	230;"	f
 feet	src/Dodge/Creature/Picture.hs	51;"	f
 ffoldM	src/Framebuffer/Update.hs	79;"	f
 filter3	src/FoldableHelp.hs	76;"	f
 findBlips	src/Dodge/RadarSweep.hs	44;"	f
-findBoundDists	src/Dodge/Update/Camera.hs	244;"	f
+findBoundDists	src/Dodge/Update/Camera.hs	239;"	f
 findClosePoint	src/Dodge/LevelGen/StaticWalls.hs	155;"	f
 findClosePoint	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	74;"	f
 findIndex	src/IntMapHelp.hs	84;"	f
@@ -5488,9 +5485,8 @@ findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 findWithIx	src/ListHelp.hs	123;"	f
 fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
 fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	332;"	f
-fireShell	src/Dodge/Projectile/Create.hs	16;"	f
 fireSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-fireTrackingShell	src/Dodge/Projectile/Create.hs	69;"	f
+fireTrackingShell	src/Dodge/Projectile/Create.hs	12;"	f
 firstBreather	src/Dodge/Room/Breather.hs	9;"	f
 firstWorldLoad	appDodge/Main.hs	77;"	f
 fixedCoordPictures	src/Dodge/Render/Picture.hs	17;"	f
@@ -5746,7 +5742,7 @@ iShape	src/Dodge/Placement/Instance/LightSource.hs	74;"	f
 iShape	src/Dodge/Placements/LightSource.hs	32;"	f
 icosahedronPoints	src/Polyhedra/Geodesic.hs	11;"	f
 icosohedronFaces	src/Polyhedra/Geodesic.hs	18;"	f
-ifConfigWallRotate	src/Dodge/Update/Camera.hs	178;"	f
+ifConfigWallRotate	src/Dodge/Update/Camera.hs	173;"	f
 impulsiveAIBefore	src/Dodge/Creature/Impulse.hs	22;"	f
 impulsiveAIR	src/Dodge/Creature/Rationality.hs	24;"	f
 inCloseRegex	src/Dodge/InputFocus.hs	99;"	f
@@ -6135,7 +6131,6 @@ makeShaderProgram	src/Shader/Compile.hs	287;"	f
 makeShaderUsingVAO	src/Shader/Compile.hs	155;"	f
 makeShaderUsingVBO	src/Shader/Compile.hs	78;"	f
 makeShaderVBO	src/Shader/Compile.hs	38;"	f
-makeShell	src/Dodge/Projectile/Create.hs	36;"	f
 makeShockwaveAt	src/Dodge/WorldEvent/Shockwave.hs	12;"	f
 makeSourcedShader	src/Shader/Compile.hs	203;"	f
 makeStartCloudAt	src/Dodge/WorldEvent/Cloud.hs	60;"	f
@@ -6175,7 +6170,7 @@ maybeOpenTerminal	src/Dodge/Update.hs	113;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/Dodge/RandomHelp.hs	96;"	f
 maybeTakeOne	src/RandomHelp.hs	107;"	f
-maybeWarmupStatus	src/Dodge/Item/Display.hs	178;"	f
+maybeWarmupStatus	src/Dodge/Item/Display.hs	180;"	f
 mcApplyDamage	src/Dodge/Machine/Update.hs	90;"	f
 mcKillBut	src/Dodge/Machine/Destroy.hs	34;"	f
 mcKillTerm	src/Dodge/Machine/Destroy.hs	26;"	f
@@ -6797,7 +6792,7 @@ rectXH	src/Geometry/Polygon.hs	36;"	f
 rectXY	src/Geometry/Polygon.hs	39;"	f
 rectanglePairs	src/Dodge/LevelGen/DoorPane.hs	7;"	f
 red	src/Color.hs	14;"	f
-reduceSpinBy	src/Dodge/Projectile/Update.hs	173;"	f
+reduceSpinBy	src/Dodge/Projectile/Update.hs	172;"	f
 reflDirWall	src/Dodge/Base/Wall.hs	16;"	f
 reflDirWall	src/Dodge/Wall/Reflect.hs	6;"	f
 reflVelWall	src/Dodge/Base/Wall.hs	24;"	f
@@ -6926,8 +6921,8 @@ rotate3x	src/Geometry/Vector3D.hs	60;"	f
 rotate3y	src/Geometry/Vector3D.hs	66;"	f
 rotate3z	src/Geometry/Vector3D.hs	54;"	f
 rotateActionProgress	src/Dodge/Reloading.hs	87;"	f
-rotateCamera	src/Dodge/Update/Camera.hs	209;"	f
+rotateCamera	src/Dodge/Update/Camera.hs	204;"	f
-rotateCameraBy	src/Dodge/Update/Camera.hs	206;"	f
+rotateCameraBy	src/Dodge/Update/Camera.hs	201;"	f
 rotateCameraMinusKey	src/Dodge/Config/KeyConfig.hs	30;"	f
 rotateCameraPlusKey	src/Dodge/Config/KeyConfig.hs	29;"	f
 rotateProp	src/Dodge/LightSources/Lamp.hs	111;"	f
@@ -6937,7 +6932,7 @@ rotateSHq	src/Shape.hs	162;"	f
 rotateSHx	src/Shape.hs	261;"	f
 rotateSP	src/ShapePicture.hs	57;"	f
 rotateTo	src/Polyhedra/Geodesic.hs	63;"	f
-rotateToOverlappingWall	src/Dodge/Update/Camera.hs	184;"	f
+rotateToOverlappingWall	src/Dodge/Update/Camera.hs	179;"	f
 rotateToZ	src/Quaternion.hs	31;"	f
 rotateV	src/Geometry/Vector.hs	105;"	f
 rotateVAround	src/Geometry/Vector.hs	112;"	f
@@ -7072,7 +7067,7 @@ setTile	src/Dodge/Layout.hs	68;"	f
 setTiles	src/Dodge/Layout.hs	65;"	f
 setToggle	src/Dodge/LightSources/Lamp.hs	115;"	f
 setToggle	src/Dodge/Prop/Update.hs	46;"	f
-setViewDistance	src/Dodge/Update/Camera.hs	230;"	f
+setViewDistance	src/Dodge/Update/Camera.hs	225;"	f
 setViewPos	src/Dodge/Creature/ReaderUpdate.hs	61;"	f
 setViewport	src/Dodge/Render.hs	385;"	f
 setVol	src/Dodge/Config/Update.hs	30;"	f
@@ -7175,12 +7170,12 @@ shoulderSP	src/Dodge/Creature/HandPos.hs	196;"	f
 showAttachItem	src/Dodge/Item/Display.hs	74;"	f
 showAutoRechargeProgress	src/Dodge/Item/Display.hs	87;"	f
 showEquipItem	src/Dodge/Item/Display.hs	82;"	f
-showEquipmentNumber	src/Dodge/Item/Display.hs	124;"	f
+showEquipmentNumber	src/Dodge/Item/Display.hs	126;"	f
 showInt	src/Dodge/Item/Info.hs	30;"	f
 showIntKMG	src/Dodge/Item/Info.hs	47;"	f
 showIntKMG'	src/Dodge/Item/Info.hs	54;"	f
 showIntsString	src/Dodge/Tree/Compose.hs	129;"	f
-showLoadedAmount	src/Dodge/Item/Display.hs	147;"	f
+showLoadedAmount	src/Dodge/Item/Display.hs	149;"	f
 showManObj	src/Dodge/TestString.hs	39;"	f
 showPhaseV	src/Dodge/Tweak/Show.hs	16;"	f
 showTerminalError	src/Dodge/Debug/Terminal.hs	75;"	f
@@ -7496,7 +7491,7 @@ toV3	src/Geometry/Data.hs	38;"	f
 toV4	src/Geometry/Data.hs	40;"	f
 toggleCombineInv	src/Dodge/DisplayInventory.hs	32;"	f
 toggleCommand	src/Dodge/Terminal.hs	194;"	f
-toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	53;"	f
+toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	54;"	f
 toggleJust	src/MaybeHelp.hs	41;"	f
 toggleMap	src/Dodge/Update/Input/InGame.hs	237;"	f
 toggleMapKey	src/Dodge/Config/KeyConfig.hs	25;"	f
@@ -7657,7 +7652,7 @@ updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	159;"	f
 updateBarrel	src/Dodge/Barreloid.hs	45;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	13;"	f
 updateBeams	src/Dodge/Update.hs	457;"	f
-updateBounds	src/Dodge/Update/Camera.hs	254;"	f
+updateBounds	src/Dodge/Update/Camera.hs	249;"	f
 updateBulVel	src/Dodge/Bullet.hs	50;"	f
 updateBullet	src/Dodge/Bullet.hs	28;"	f
 updateBullets	src/Dodge/Update.hs	425;"	f
@@ -7731,8 +7726,8 @@ updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	105;"	f
 updateRootItemID	src/Dodge/Inventory/FindRoot.hs	16;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	40;"	f
-updateScopeZoom	src/Dodge/Update/Camera.hs	133;"	f
+updateScopeZoom	src/Dodge/Update/Camera.hs	128;"	f
-updateScopeZoom'	src/Dodge/Update/Camera.hs	138;"	f
+updateScopeZoom'	src/Dodge/Update/Camera.hs	133;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	186;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	165;"	f
@@ -7798,9 +7793,9 @@ useGasParams	src/Dodge/HeldUse.hs	386;"	f
 useHeld	src/Dodge/HeldUse.hs	309;"	f
 useHotKey	src/Dodge/Creature/YourControl.hs	49;"	f
 useItem	src/Dodge/Creature/Action/UseItem.hs	14;"	f
-useItemHotkey	src/Dodge/Creature/Impulse/UseItem.hs	126;"	f
+useItemHotkey	src/Dodge/Creature/Impulse/UseItem.hs	127;"	f
-useItemLeftClick	src/Dodge/Creature/Impulse/UseItem.hs	98;"	f
+useItemLeftClick	src/Dodge/Creature/Impulse/UseItem.hs	99;"	f
-useItemLeftClick'	src/Dodge/Creature/Impulse/UseItem.hs	113;"	f
+useItemLeftClick'	src/Dodge/Creature/Impulse/UseItem.hs	114;"	f
 useL	src/Dodge/Luse.hs	13;"	f
 useLeftItem	src/Dodge/Creature/Action/UseItem.hs	38;"	f
 useLnkRoomPos	src/Dodge/PlacementSpot.hs	244;"	f
@@ -8027,10 +8022,10 @@ zoneps	src/Dodge/LevelGen/MoveDoor.hs	26;"	f
 zonesAroundPoint	src/Dodge/Zoning/Base.hs	89;"	f
 zonesExtract	src/Dodge/Zoning/Base.hs	54;"	f
 zoomFloatingCamera	src/Dodge/Update/Camera.hs	65;"	f
-zoomFromItem	src/Dodge/Update/Camera.hs	218;"	f
+zoomFromItem	src/Dodge/Update/Camera.hs	213;"	f
 zoomInKey	src/Dodge/Config/KeyConfig.hs	31;"	f
-zoomInLongGun	src/Dodge/Update/Camera.hs	162;"	f
+zoomInLongGun	src/Dodge/Update/Camera.hs	157;"	f
 zoomOutKey	src/Dodge/Config/KeyConfig.hs	32;"	f
-zoomOutLongGun	src/Dodge/Update/Camera.hs	170;"	f
+zoomOutLongGun	src/Dodge/Update/Camera.hs	165;"	f
 zoomScope	src/Dodge/Item/Scope.hs	11;"	f
-zoomSpeed	src/Dodge/Update/Camera.hs	159;"	f
+zoomSpeed	src/Dodge/Update/Camera.hs	154;"	f