Continue reorganising records into functions

src/Dodge/Creature/Test.hs

@@ -24,6 +24,7 @@ module Dodge.Creature.Test (
     crSafeDistFromTarg,
 ) where
 
+import Dodge.Data.AimStance
 import Dodge.Item.AimStance
 import Control.Lens
 import Data.List (find)

src/Dodge/Creature/YourControl.hs

@@ -2,6 +2,7 @@ module Dodge.Creature.YourControl (
     yourControl,
 ) where
 
+import Dodge.Data.AimStance
 import Dodge.Item.AimStance
 import Control.Monad
 import qualified Data.Map.Strict as M

src/Dodge/Data.hs

@@ -19,8 +19,10 @@ module Dodge.Data (
     module Dodge.Data.CrWlID,
     module Dodge.Data.CreatureEffect,
     module Dodge.Data.MountedObject,
+    module Dodge.Data.AimStance,
 ) where
 
+import Dodge.Data.AimStance
 import Dodge.Data.Config
 import Dodge.Data.Scenario
 import Dodge.Data.WorldEffect

src/Dodge/Data/Item/Use.hs

@@ -114,9 +114,6 @@ data AmmoParams
 data AimParams = AimParams
     { _aimWeight :: Int
     , _aimTurnSpeed :: Float
-    , _aimRange :: Float
-    , _aimZoom :: ItZoom
---    , _aimHandlePos :: V2 Float
     , _aimMuzzles :: [Muzzle]
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
@@ -179,23 +176,8 @@ data Muzzle = Muzzle
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data AimStance
-    = TwoHandUnder
-    | TwoHandOver
-    | TwoHandFlat
-    | OneHand
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data ItZoom = ItZoom
-    { _izMax :: Float
-    , _izMin :: Float
-    , _izFac :: Float
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 makeLenses ''ItemUse
 makeLenses ''AimParams
-makeLenses ''ItZoom
 makeLenses ''Muzzle
 makeLenses ''HeldParams
 makeLenses ''AttachParams
@@ -215,8 +197,6 @@ deriveJSON defaultOptions ''AmmoParams
 deriveJSON defaultOptions ''HeldParams
 deriveJSON defaultOptions ''AmmoPerShot
 deriveJSON defaultOptions ''Muzzle
-deriveJSON defaultOptions ''AimStance
 deriveJSON defaultOptions ''AttachParams
-deriveJSON defaultOptions ''ItZoom
 deriveJSON defaultOptions ''AimParams
 deriveJSON defaultOptions ''ItemUse

src/Dodge/Default/Item/Use/AimParams.hs

@@ -1,6 +1,6 @@
 module Dodge.Default.Item.Use.AimParams (
     defaultAimParams,
-    defaultItZoom,
+--    defaultItZoom,
 ) where
 
 import Dodge.Data.Item.Use
@@ -11,8 +11,7 @@ defaultAimParams =
     AimParams
         { _aimWeight = 0
         , _aimTurnSpeed = 1
-        , _aimRange = 0
+--        , _aimZoom = defaultItZoom
-        , _aimZoom = defaultItZoom
         --, _aimHandlePos = V2 3 0
         , _aimMuzzles =
             [ Muzzle
@@ -28,10 +27,10 @@ defaultAimParams =
             ]
         }
 
-defaultItZoom :: ItZoom
+--defaultItZoom :: ItZoom
-defaultItZoom =
+--defaultItZoom =
-    ItZoom
+--    ItZoom
-        { _izMax = 20
+--        { _izMax = 20
-        , _izMin = 0.2
+--        , _izMin = 0.2
-        , _izFac = 1
+--        , _izFac = 1
-        }
+--        }

src/Dodge/Item/Grammar.hs

@@ -7,6 +7,7 @@ module Dodge.Item.Grammar (
     allInvLocs,
 ) where
 
+import Dodge.Data.AimStance
 import Dodge.Item.AimStance
 import Control.Applicative
 import qualified Data.IntMap.Strict as IM

src/Dodge/Item/Held/BatteryGuns.hs

@@ -59,7 +59,6 @@ laser =
                 , _itTgActive = False
                 }
         & itUse . heldAim . aimWeight .~ 6
-        & itUse . heldAim . aimRange .~ 1
         & itType .~ HELD LASER
 
 -- previous attractionPower values: 1, -1, -10, 0
@@ -72,7 +71,6 @@ tractorGun =
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimWeight .~ 6
-        & itUse . heldAim . aimRange .~ 1
         & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ NoFlare
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTractor
         & itType .~ HELD TRACTORGUN

src/Dodge/Item/Held/Cane.hs

@@ -31,8 +31,7 @@ volleyGun :: Int -> Item
 volleyGun i =
     defaultBangCane
         & itUse . heldAim . aimWeight .~ 6
-        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itUse . heldAim . aimMuzzles .~ getZipList 
             (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
             <*> ZipList [0..i-1] 
@@ -54,8 +53,7 @@ rifle =
     defaultBangCane
         & itType .~ HELD RIFLE
         & itUse . heldAim . aimWeight .~ 6
-        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item
@@ -94,8 +92,7 @@ miniGunX i =
     autoRifle
         & itUse . heldDelay .~ WarmUpNoDelay{_warmTime = 0, _warmMax = 100, _warmSound = crankSlowS}
         & itUse . heldAim . aimWeight .~ 6
-        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itAmmoSlots .~ singleAmmo BeltBulletAmmo
 --        & itUse . heldParams . bulGunSound ?~ (mini1S,2)
         & itUse . heldAim . aimTurnSpeed .~ 0.5

src/Dodge/Item/Held/Launcher.hs

@@ -16,7 +16,6 @@ rLauncher =
     defaultHeldItem
         & itUse . heldDelay . rateMax .~ 20
         & itUse . heldAim . aimWeight .~ 8
-        & itUse . heldAim . aimRange .~ 0.5
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleRLauncher
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 20 0

src/Dodge/Item/Held/Rod.hs

@@ -25,8 +25,7 @@ bangRod =
         & itUse . heldDelay . rateMax .~ 12
         & itType .~ HELD BANGROD
         & itUse . heldAim . aimWeight .~ 8
-        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         -- & itUse . heldAim . aimHandlePos .~ 5
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
         & itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ HeavySmokeFlare
@@ -54,7 +53,7 @@ sniperRifle =
     elephantGun
         & itType .~ HELD SNIPERRIFLE
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5,_izFac = 1}
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5,_izFac = 1}
 
 --machineGun :: Item
 --machineGun =

src/Dodge/Item/Held/SprayGuns.hs

@@ -40,7 +40,7 @@ flameTorrent :: Item
 flameTorrent =
     flameThrower
         & itType .~ HELD FLAMETORRENT
-        & itUse . heldAim . aimZoom .~ defaultItZoom
+--        & itUse . heldAim . aimZoom .~ defaultItZoom
 --        & itParams . sprayNozzles . ix 0
 --            %~ ( (nzPressure .~ 10)
 --                    . (nzMaxWalkAngle .~ 1.5)
@@ -74,7 +74,7 @@ flameThrower =
         & itParams .~ NoParams
         & itUse . heldDelay .~ NoDelay
         & itUse . heldAim . aimWeight .~ 5
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0 0 NoFlare 
             MuzzleNozzle
                         { _nzPressure = ConstFloat 4

src/Dodge/Item/Held/Utility.hs

@@ -41,8 +41,7 @@ detector dt =
     defaultHeldItem
         & itUseCondition .~ UseableAnytime
         & itUse . heldDelay . rateMax .~ 20
-        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
         & itUse . heldParams .~ DefaultHeldParams
         & itType .~ DETECTOR dt
@@ -54,8 +53,7 @@ blinker =
     defaultHeldItem
         & itUseCondition .~ UseableAnytime
         & itUse . heldDelay . rateMax .~ 20
-        & itUse . heldAim . aimRange .~ 1
+--        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
-        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
         & itUse . heldParams .~ DefaultHeldParams
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleBlink

src/Dodge/Item/HeldOffset.hs

@@ -7,6 +7,7 @@ module Dodge.Item.HeldOffset (
     heldItemOrient2D,
 ) where
 
+import Dodge.Data.AimStance
 import Dodge.Item.AimStance
 import qualified Quaternion as Q
 import Dodge.Data.Creature

src/Dodge/Item/Info.hs

@@ -4,6 +4,7 @@ module Dodge.Item.Info (
     itemInfo,
 ) where
 
+import Dodge.Data.AimStance
 import Data.Char
 --import qualified Data.Map.Strict as M
 import Dodge.Data.Item

src/Dodge/Update/Camera.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE LambdaCase #-}
 {- Functions controlling the movement of the screen camera:
 '_cameraCenter', '_cameraZoom', _cameraRot';
 and the position that the character sees from: '_cameraViewFrom'.  -}
@@ -113,7 +114,7 @@ moveZoomCamera cfig theinput cr w campos =
     idealItemZoom = fromMaybe 1 $ do
         guard $ crIsAiming cr
         i <- cr ^? crManipulation . manObject . imSelectedItem
-        zoomFromItem <$> (cr ^? crInv . ix i . itUse . heldAim . aimZoom)
+        getAimZoom <$> (cr ^? crInv . ix i)
     newItemZoom = changeZoom (campos ^. camItemZoom) idealItemZoom
     changeZoom curZoom idealZoom
         | curZoom > idealZoom + 0.01 = ((zoomOutSpeed -1) * curZoom + idealZoom) / zoomOutSpeed
@@ -130,6 +131,55 @@ moveZoomCamera cfig theinput cr w campos =
     zoomInSpeed = 25
     zoomOutSpeed = 15
 
+getAimZoom :: Item -> Float
+getAimZoom itm = case itm ^. itType of
+    HELD hit -> heldAimZoom hit
+    _ -> 1
+
+heldAimZoom :: HeldItemType -> Float
+heldAimZoom = \case
+    BANGSTICK{} -> 1
+    REWINDER -> 1
+    TIMESTOPPER -> 1
+    TIMESCROLLER -> 1
+    PISTOL -> 1
+    MACHINEPISTOL -> 1
+    AUTOPISTOL -> 1
+    SMG -> 1
+    BANGCONE -> 1
+    BLUNDERBUSS -> 1.5
+    GRAPECANNON{} ->  1.5
+    MINIGUNX{} ->  1.5
+    VOLLEYGUN{} ->  1.5
+    RIFLE ->  1.5
+    ALTERIFLE ->  1.5
+    AUTORIFLE ->  1.5
+    BURSTRIFLE ->  1.5
+    BANGROD ->  1.5
+    ELEPHANTGUN ->  1.5
+    AMR ->  1.5
+    AUTOAMR ->  1.5
+    SNIPERRIFLE ->  0.5
+    FLAMESPITTER -> 1
+    FLAMETHROWER ->  1.5
+    FLAMETORRENT -> 1
+    FLAMEWALL -> 1
+    BLOWTORCH -> 1
+    SPARKGUN -> 1
+    TESLAGUN ->  1.5
+    LASER ->  1.5
+    TRACTORGUN ->  1.5
+    RLAUNCHER ->  1.5
+    RLAUNCHERX{} ->  1.5
+    GLAUNCHER ->  1.5
+    POISONSPRAYER -> 1
+    SHATTERGUN -> 1
+    TORCH -> 1
+    FLATSHIELD -> 1
+    KEYCARD {} -> 1
+    BLINKER -> 1
+    BLINKERUNSAFE -> 1
+
 -- for example, this should be 400 or so when you have an unsafe blink gun
 -- capable of firing, should be expanded when you have a radar of some sort, etc
 viewDistanceFromItems :: Creature -> Float
@@ -168,10 +218,6 @@ doWallRotate wl w
     b = a * (4 / pi) -- for 8 way cardinal orientation wrt wall
     b' = fromIntegral (round b :: Int)
 
-zoomFromItem :: ItZoom -> Float
-zoomFromItem ItZoom{_izMax = zMax, _izMin = zMin, _izFac = zFac} =
-    min zMax $ max zMin zFac
-
 clipZoom ::
     -- | Furthest viewable distance
     Float ->

tags

@@ -48,7 +48,8 @@ AesonHelp	src/AesonHelp.hs	1;"	m
 AimAt	src/Dodge/Data/ActionPlan.hs	84;"	C
 AimParams	src/Dodge/Data/Item/Use.hs	114;"	t
 AimParams	src/Dodge/Default/Item/Use/AimParams.hs	1;"	m
-AimStance	src/Dodge/Data/Item/Use.hs	182;"	t
+AimStance	src/Dodge/Data/AimStance.hs	9;"	t
+AimStance	src/Dodge/Data/AimStance.hs	3;"	m
 AimStance	src/Dodge/Item/AimStance.hs	2;"	m
 Aiming	src/Dodge/Data/Creature/Stance.hs	39;"	C
 AirFiltrationSS	src/Dodge/Data/Scenario.hs	95;"	C
@@ -69,7 +70,7 @@ AmmoModifierSF	src/Dodge/Data/ComposedItem.hs	57;"	C
 AmmoParams	src/Dodge/Data/Item/Use.hs	107;"	t
 AmmoPayloadLink	src/Dodge/Data/ComposedItem.hs	21;"	C
 AmmoPayloadSF	src/Dodge/Data/ComposedItem.hs	59;"	C
-AmmoPerShot	src/Dodge/Data/Item/Use.hs	156;"	t
+AmmoPerShot	src/Dodge/Data/Item/Use.hs	153;"	t
 AmmoTargetingLink	src/Dodge/Data/ComposedItem.hs	20;"	C
 AmmoTargetingSF	src/Dodge/Data/ComposedItem.hs	58;"	C
 AmmoType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	24;"	t
@@ -148,7 +149,7 @@ Base	src/Picture/Base.hs	4;"	m
 BasicBeamDraw	src/Dodge/Data/Beam.hs	34;"	C
 BasicBulletTrajectory	src/Dodge/Data/Bullet.hs	50;"	C
 BasicBulletTrajectoryType	src/Dodge/Data/Bullet.hs	57;"	C
-BasicFlare	src/Dodge/Data/Item/Use.hs	126;"	C
+BasicFlare	src/Dodge/Data/Item/Use.hs	123;"	C
 BatteryGuns	src/Dodge/Item/Held/BatteryGuns.hs	1;"	m
 BatteryGuns	src/Dodge/Item/Weapon/BatteryGuns.hs	1;"	m
 Beam	src/Dodge/Data/Beam.hs	18;"	t
@@ -275,7 +276,7 @@ CamRemoteScope	src/Dodge/Data/Camera.hs	15;"	C
 Camera	src/Dodge/Data/Camera.hs	23;"	t
 Camera	src/Dodge/Camera.hs	1;"	m
 Camera	src/Dodge/Data/Camera.hs	5;"	m
-Camera	src/Dodge/Update/Camera.hs	4;"	m
+Camera	src/Dodge/Update/Camera.hs	5;"	m
 CameraScrollTimeFlow	src/Dodge/Data/World.hs	67;"	C
 CamouflageStatus	src/Dodge/Data/CamouflageStatus.hs	11;"	t
 CamouflageStatus	src/Dodge/Data/CamouflageStatus.hs	6;"	m
@@ -687,7 +688,7 @@ FlameBeamCombine	src/Dodge/Data/Beam.hs	39;"	C
 FlameSound	src/Dodge/Data/SoundOrigin.hs	27;"	C
 Flamer	src/Dodge/Data/SoundOrigin.hs	25;"	C
 Flank	src/Dodge/Data/ActionPlan.hs	177;"	C
-FlareType	src/Dodge/Data/Item/Use.hs	124;"	t
+FlareType	src/Dodge/Data/Item/Use.hs	121;"	t
 FlashBall	src/Dodge/Data/Bullet.hs	32;"	C
 FlatFaces	src/Shape/Data.hs	17;"	C
 FlatShieldParams	src/Dodge/Data/Item/Params.hs	15;"	C
@@ -826,7 +827,7 @@ HammerUp	src/Dodge/Data/Hammer.hs	20;"	C
 HandPos	src/Dodge/Creature/HandPos.hs	1;"	m
 HardQuit	src/Dodge/Data/Universe.hs	70;"	C
 HasHammer	src/Dodge/Data/Hammer.hs	14;"	C
-HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	129;"	C
+HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	126;"	C
 Held	src/Dodge/Item/Held.hs	1;"	m
 HeldDelay	src/Dodge/Data/Item/HeldDelay.hs	6;"	m
 HeldItemType	src/Dodge/Data/Item/Combine.hs	137;"	t
@@ -946,7 +947,6 @@ ItEffect	src/Dodge/ItEffect.hs	3;"	m
 ItID	src/Dodge/Data/Item.hs	29;"	t
 ItInvEffect	src/Dodge/Data/Item/Effect.hs	23;"	t
 ItTargeting	src/Dodge/Data/Item.hs	61;"	C
-ItZoom	src/Dodge/Data/Item/Use.hs	189;"	t
 Item	src/Dodge/Data/Item.hs	41;"	t
 Item	src/Dodge/Data/Item.hs	4;"	m
 Item	src/Dodge/Default/Item.hs	1;"	m
@@ -1016,7 +1016,7 @@ Lampoid	src/Dodge/Data/Creature/Misc.hs	83;"	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	130;"	C
+LasGunFlare	src/Dodge/Data/Item/Use.hs	127;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	28;"	C
 LasTurret	src/Dodge/Room/LasTurret.hs	1;"	m
 Laser	src/Dodge/Data/Laser.hs	21;"	t
@@ -1187,7 +1187,7 @@ Metapysics	src/Dodge/Data/Scenario.hs	17;"	t
 Military	src/Dodge/Data/Scenario.hs	45;"	C
 Mine	src/Dodge/Data/Scenario.hs	64;"	C
 MiniGunAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
-MiniGunFlare	src/Dodge/Data/Item/Use.hs	128;"	C
+MiniGunFlare	src/Dodge/Data/Item/Use.hs	125;"	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
@@ -1221,23 +1221,23 @@ Multiset	src/Multiset.hs	4;"	m
 Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
 Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
-Muzzle	src/Dodge/Data/Item/Use.hs	161;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	158;"	t
-MuzzleBlink	src/Dodge/Data/Item/Use.hs	149;"	C
+MuzzleBlink	src/Dodge/Data/Item/Use.hs	146;"	C
-MuzzleDetector	src/Dodge/Data/Item/Use.hs	148;"	C
+MuzzleDetector	src/Dodge/Data/Item/Use.hs	145;"	C
-MuzzleEffect	src/Dodge/Data/Item/Use.hs	134;"	t
+MuzzleEffect	src/Dodge/Data/Item/Use.hs	131;"	t
 MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
-MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	140;"	C
+MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	137;"	C
-MuzzleLaser	src/Dodge/Data/Item/Use.hs	136;"	C
+MuzzleLaser	src/Dodge/Data/Item/Use.hs	133;"	C
-MuzzleNozzle	src/Dodge/Data/Item/Use.hs	141;"	C
+MuzzleNozzle	src/Dodge/Data/Item/Use.hs	138;"	C
-MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	139;"	C
+MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	136;"	C
-MuzzleRewind	src/Dodge/Data/Item/Use.hs	151;"	C
+MuzzleRewind	src/Dodge/Data/Item/Use.hs	148;"	C
-MuzzleScroller	src/Dodge/Data/Item/Use.hs	153;"	C
+MuzzleScroller	src/Dodge/Data/Item/Use.hs	150;"	C
-MuzzleShatter	src/Dodge/Data/Item/Use.hs	147;"	C
+MuzzleShatter	src/Dodge/Data/Item/Use.hs	144;"	C
-MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	135;"	C
+MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	132;"	C
-MuzzleStopper	src/Dodge/Data/Item/Use.hs	152;"	C
+MuzzleStopper	src/Dodge/Data/Item/Use.hs	149;"	C
-MuzzleTesla	src/Dodge/Data/Item/Use.hs	137;"	C
+MuzzleTesla	src/Dodge/Data/Item/Use.hs	134;"	C
-MuzzleTractor	src/Dodge/Data/Item/Use.hs	138;"	C
+MuzzleTractor	src/Dodge/Data/Item/Use.hs	135;"	C
-MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	150;"	C
+MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	147;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
 MvWalking	src/Dodge/Data/Creature/Misc.hs	39;"	C
@@ -1275,7 +1275,7 @@ NoDropEffect	src/Dodge/Data/Item/Effect.hs	37;"	C
 NoEquipParams	src/Dodge/Data/Item/Use/Equipment.hs	36;"	C
 NoEscapeMenuOption	src/Dodge/Data/Universe.hs	79;"	C
 NoFaction	src/Dodge/Data/Creature/State.hs	40;"	C
-NoFlare	src/Dodge/Data/Item/Use.hs	125;"	C
+NoFlare	src/Dodge/Data/Item/Use.hs	122;"	C
 NoHammer	src/Dodge/Data/Hammer.hs	13;"	C
 NoHeldUseEffect	src/Dodge/Data/Item/Use.hs	57;"	C
 NoHoming	src/Dodge/Data/Projectile.hs	48;"	C
@@ -1283,7 +1283,7 @@ NoIntImp	src/Dodge/Data/CreatureEffect.hs	20;"	C
 NoInvEffect	src/Dodge/Data/Item/Effect.hs	24;"	C
 NoItTargeting	src/Dodge/Data/Item.hs	60;"	C
 NoItemScroll	src/Dodge/Data/Item.hs	56;"	C
-NoLightFlare	src/Dodge/Data/Item/Use.hs	127;"	C
+NoLightFlare	src/Dodge/Data/Item/Use.hs	124;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
 NoMvType	src/Dodge/Data/Creature/Misc.hs	38;"	C
@@ -1363,7 +1363,7 @@ OnSpecial	src/Dodge/Data/Equipment/Misc.hs	28;"	C
 OnTurret	src/Dodge/Data/Item/Location.hs	37;"	C
 OnceSound	src/Dodge/Data/SoundOrigin.hs	16;"	C
 OneArgument	src/Dodge/Data/Terminal.hs	92;"	C
-OneHand	src/Dodge/Data/Item/Use.hs	186;"	C
+OneHand	src/Dodge/Data/AimStance.hs	13;"	C
 OnwardCluster	src/Dodge/Data/RoomCluster.hs	14;"	C
 OnwardList	src/Dodge/Annotation/Data.hs	16;"	C
 Opacity	src/Dodge/Data/Wall.hs	40;"	t
@@ -1958,7 +1958,7 @@ TeslaArc	src/Dodge/Data/TeslaArc.hs	17;"	t
 TeslaArc	src/Dodge/Data/TeslaArc.hs	6;"	m
 TeslaBall	src/Dodge/Data/Bullet.hs	31;"	C
 TeslaBeamCombine	src/Dodge/Data/Beam.hs	41;"	C
-TeslaGunFlare	src/Dodge/Data/Item/Use.hs	131;"	C
+TeslaGunFlare	src/Dodge/Data/Item/Use.hs	128;"	C
 Test	src/Dodge/Creature/Test.hs	8;"	m
 Test	src/Dodge/Event/Test.hs	1;"	m
 Test	src/Picture/Test.hs	1;"	m
@@ -2031,9 +2031,9 @@ Turret	src/Dodge/Data/Machine.hs	57;"	t
 Turret	src/Dodge/Placement/Instance/Turret.hs	1;"	m
 TurretInt	src/Dodge/Data/Item/Location.hs	21;"	t
 TwistGoal	src/Dodge/Data/Scenario.hs	15;"	C
-TwoHandFlat	src/Dodge/Data/Item/Use.hs	185;"	C
+TwoHandFlat	src/Dodge/Data/AimStance.hs	12;"	C
-TwoHandOver	src/Dodge/Data/Item/Use.hs	184;"	C
+TwoHandOver	src/Dodge/Data/AimStance.hs	11;"	C
-TwoHandUnder	src/Dodge/Data/Item/Use.hs	183;"	C
+TwoHandUnder	src/Dodge/Data/AimStance.hs	10;"	C
 Type	src/Dodge/Data/Damage/Type.hs	6;"	m
 Type	src/Dodge/Terminal/Type.hs	1;"	m
 Typical	src/Shape/Data.hs	36;"	C
@@ -2075,7 +2075,7 @@ UseBulletMod	src/Dodge/Data/Item/Use.hs	48;"	C
 UseCondition	src/Dodge/Data/Item/Use.hs	67;"	t
 UseDelay	src/Dodge/Data/Item/HeldDelay.hs	13;"	t
 UseEquip	src/Dodge/Data/Item/Use.hs	42;"	C
-UseExactly	src/Dodge/Data/Item/Use.hs	157;"	C
+UseExactly	src/Dodge/Data/Item/Use.hs	154;"	C
 UseFocus	src/Dodge/Data/Item/Use.hs	62;"	t
 UseFromLocation	src/Dodge/Data/Item/Use.hs	64;"	C
 UseFromRoot	src/Dodge/Data/Item/Use.hs	63;"	C
@@ -2092,7 +2092,7 @@ UseScope	src/Dodge/Data/Item/Use.hs	47;"	C
 UseSelf	src/Dodge/Data/ActionPlan.hs	157;"	C
 UseTarget	src/Dodge/Data/ActionPlan.hs	154;"	C
 UseToggle	src/Dodge/Data/Item/Use.hs	49;"	C
-UseUpTo	src/Dodge/Data/Item/Use.hs	158;"	C
+UseUpTo	src/Dodge/Data/Item/Use.hs	155;"	C
 UseValue	src/Dodge/Data/Item/Use.hs	46;"	C
 UseableAnytime	src/Dodge/Data/Item/Use.hs	69;"	C
 UseableWhenAimed	src/Dodge/Data/Item/Use.hs	68;"	C
@@ -2217,11 +2217,9 @@ Zoning	src/Dodge/Zoning.hs	1;"	m
 __Just'	src/MaybeHelp.hs	13;"	f
 _actAction	src/Dodge/Data/ActionPlan.hs	81;"	f
 _actLabel	src/Dodge/Data/ActionPlan.hs	80;"	f
-_aimMuzzles	src/Dodge/Data/Item/Use.hs	120;"	f
+_aimMuzzles	src/Dodge/Data/Item/Use.hs	117;"	f
-_aimRange	src/Dodge/Data/Item/Use.hs	117;"	f
 _aimTurnSpeed	src/Dodge/Data/Item/Use.hs	116;"	f
 _aimWeight	src/Dodge/Data/Item/Use.hs	115;"	f
-_aimZoom	src/Dodge/Data/Item/Use.hs	118;"	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
@@ -2681,9 +2679,6 @@ _itemLocations	src/Dodge/Data/LWorld.hs	101;"	f
 _itsInt	src/Dodge/Data/Item.hs	57;"	f
 _itsMax	src/Dodge/Data/Item.hs	58;"	f
 _itsRangeInt	src/Dodge/Data/Item.hs	58;"	f
-_izFac	src/Dodge/Data/Item/Use.hs	192;"	f
-_izMax	src/Dodge/Data/Item/Use.hs	190;"	f
-_izMin	src/Dodge/Data/Item/Use.hs	191;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lAimPos	src/Dodge/Data/LWorld.hs	150;"	f
 _lClock	src/Dodge/Data/LWorld.hs	145;"	f
@@ -2813,14 +2808,14 @@ _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	78;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	168;"	f
+_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	165;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	165;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	162;"	f
-_mzEffect	src/Dodge/Data/Item/Use.hs	167;"	f
+_mzEffect	src/Dodge/Data/Item/Use.hs	164;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	166;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	163;"	f
-_mzFrame	src/Dodge/Data/Item/Use.hs	169;"	f
+_mzFrame	src/Dodge/Data/Item/Use.hs	166;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	164;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	161;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	162;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	159;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	163;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	160;"	f
 _nodeMetaTree	src/Dodge/Data/MetaTree.hs	14;"	f
 _nodeMetaTree	src/Dodge/Tree/Compose/Data.hs	9;"	f
 _nodeTree	src/Dodge/Data/MetaTree.hs	13;"	f
@@ -2829,10 +2824,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	29;"	f
-_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	144;"	f
+_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	141;"	f
-_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	143;"	f
+_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	140;"	f
-_nzPressure	src/Dodge/Data/Item/Use.hs	142;"	f
+_nzPressure	src/Dodge/Data/Item/Use.hs	139;"	f
-_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	145;"	f
+_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	142;"	f
 _offPathFromEdges	src/Dodge/Data/Room.hs	74;"	f
 _oldMagnets	src/Dodge/Data/LWorld.hs	127;"	f
 _onPathFromEdges	src/Dodge/Data/Room.hs	73;"	f
@@ -3233,14 +3228,14 @@ _unTO	src/Shader/Data.hs	59;"	f
 _unpauseClock	src/Dodge/Data/World.hs	54;"	f
 _unputTerminal	src/Dodge/Data/GenWorld.hs	36;"	f
 _useAheadPos	src/Dodge/Data/ActionPlan.hs	161;"	f
-_useExactly	src/Dodge/Data/Item/Use.hs	157;"	f
+_useExactly	src/Dodge/Data/Item/Use.hs	154;"	f
 _useMapperLines	src/Dodge/Data/Item/Use.hs	51;"	f
 _useMapperPoints	src/Dodge/Data/Item/Use.hs	52;"	f
 _useMvTargetPos	src/Dodge/Data/ActionPlan.hs	164;"	f
 _useSelf	src/Dodge/Data/ActionPlan.hs	158;"	f
 _useTarget	src/Dodge/Data/ActionPlan.hs	155;"	f
 _useToggle	src/Dodge/Data/Item/Use.hs	49;"	f
-_useUpTo	src/Dodge/Data/Item/Use.hs	158;"	f
+_useUpTo	src/Dodge/Data/Item/Use.hs	155;"	f
 _uvCanContinue	src/Dodge/Data/Universe.hs	39;"	f
 _uvConfig	src/Dodge/Data/Universe.hs	37;"	f
 _uvDebug	src/Dodge/Data/Universe.hs	44;"	f
@@ -3340,7 +3335,7 @@ aGib	src/Dodge/Prop/Gib.hs	17;"	f
 aRadarPulse	src/Dodge/RadarSweep.hs	19;"	f
 aShape	src/Dodge/Placement/Instance/LightSource.hs	107;"	f
 aSound	src/Dodge/SoundLogic.hs	74;"	f
-aStance	src/Dodge/Item/AimStance.hs	11;"	f
+aStance	src/Dodge/Item/AimStance.hs	12;"	f
 aStaticBall	src/Dodge/WorldEvent/SpawnParticle.hs	41;"	f
 aTreeStrut	src/Dodge/Tree/GenerateStructure.hs	42;"	f
 accessTerminal	src/Dodge/WorldEffect.hs	52;"	f
@@ -3387,10 +3382,10 @@ advanceScrollAmount	src/Dodge/Update.hs	415;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	33;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	44;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	264;"	f
-aimStanceHandlePos	src/Dodge/Item/HeldOffset.hs	65;"	f
+aimStanceHandlePos	src/Dodge/Item/HeldOffset.hs	63;"	f
 aimStanceInfo	src/Dodge/Item/Info.hs	239;"	f
 aimTurn	src/Dodge/Creature/YourControl.hs	160;"	f
-aimingWeaponZeroPos	src/Dodge/Item/HeldOffset.hs	61;"	f
+aimingWeaponZeroPos	src/Dodge/Item/HeldOffset.hs	59;"	f
 airlock	src/Dodge/Room/Airlock.hs	19;"	f
 airlock0	src/Dodge/Room/Airlock.hs	25;"	f
 airlock90	src/Dodge/Room/Airlock.hs	122;"	f
@@ -3402,10 +3397,10 @@ airlockZ	src/Dodge/Room/Airlock.hs	91;"	f
 allInvLocs	src/Dodge/Item/Grammar.hs	310;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	40;"	f
-alteRifle	src/Dodge/Item/Held/Cane.hs	61;"	f
+alteRifle	src/Dodge/Item/Held/Cane.hs	59;"	f
 ammoMagInfo	src/Dodge/Item/Info.hs	45;"	f
 ammoMagSPic	src/Dodge/Item/Draw/SPic.hs	124;"	f
-amr	src/Dodge/Item/Held/Rod.hs	42;"	f
+amr	src/Dodge/Item/Held/Rod.hs	41;"	f
 analyser	src/Dodge/Placement/Instance/Analyser.hs	12;"	f
 analyserByDoor	src/Dodge/Room/LasTurret.hs	77;"	f
 andOrRegex	src/Dodge/DisplayInventory.hs	78;"	f
@@ -3475,14 +3470,14 @@ attachOnward'	src/Dodge/Tree/Compose.hs	98;"	f
 attachTree	src/Dodge/Tree/Compose.hs	38;"	f
 attentionViewPoint	src/Dodge/Creature/ReaderUpdate.hs	66;"	f
 attribSize	src/Shader/Compile.hs	306;"	f
-autoAmr	src/Dodge/Item/Held/Rod.hs	47;"	f
+autoAmr	src/Dodge/Item/Held/Rod.hs	46;"	f
 autoBS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	374;"	f
 autoCrit	src/Dodge/Creature/AutoCrit.hs	12;"	f
 autoDetector	src/Dodge/Item/Weapon/Radar.hs	11;"	f
 autoEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	18;"	f
 autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	532;"	f
 autoPistol	src/Dodge/Item/Held/Stick.hs	58;"	f
-autoRifle	src/Dodge/Item/Held/Cane.hs	73;"	f
+autoRifle	src/Dodge/Item/Held/Cane.hs	71;"	f
 awakeLevelPerception	src/Dodge/Creature/Perception.hs	162;"	f
 axisInt	src/Geometry/Intersect.hs	227;"	f
 azure	src/Color.hs	22;"	f
@@ -3540,7 +3535,7 @@ blinkActionFail	src/Dodge/Creature/Action/Blink.hs	88;"	f
 blinkActionMousePos	src/Dodge/Creature/Action/Blink.hs	22;"	f
 blinkDistortions	src/Dodge/Creature/Action/Blink.hs	43;"	f
 blinkShockwave	src/Dodge/Creature/Action/Blink.hs	79;"	f
-blinker	src/Dodge/Item/Held/Utility.hs	52;"	f
+blinker	src/Dodge/Item/Held/Utility.hs	51;"	f
 blinker	src/Dodge/Item/Weapon/Utility.hs	14;"	f
 blipAt	src/Dodge/RadarSweep.hs	77;"	f
 blockLine	src/Dodge/Placement/Instance/Wall.hs	41;"	f
@@ -3587,7 +3582,7 @@ bulletModule	src/Dodge/Item/Scope.hs	118;"	f
 bulletPayloadModule	src/Dodge/Item/Scope.hs	132;"	f
 bulletSynthesizer	src/Dodge/Item/Ammo.hs	117;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
-burstRifle	src/Dodge/Item/Held/Cane.hs	79;"	f
+burstRifle	src/Dodge/Item/Held/Cane.hs	77;"	f
 buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	538;"	f
 cFilledRect	src/Dodge/CharacterEnums.hs	6;"	f
 cWireRect	src/Dodge/CharacterEnums.hs	10;"	f
@@ -3669,7 +3664,7 @@ click1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	440;"	f
 clickGetCreature	src/Dodge/Debug.hs	107;"	f
 clicker	src/Dodge/Item/Scope.hs	82;"	f
 clipV	src/Geometry/Vector.hs	47;"	f
-clipZoom	src/Dodge/Update/Camera.hs	175;"	f
+clipZoom	src/Dodge/Update/Camera.hs	221;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
 closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	217;"	f
 closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	202;"	f
@@ -3948,7 +3943,6 @@ defaultInput	src/Dodge/Default/World.hs	14;"	f
 defaultIntention	src/Dodge/Default/Creature.hs	100;"	f
 defaultInvSize	src/Dodge/Default/Creature.hs	74;"	f
 defaultItEffect	src/Dodge/Default/Item.hs	48;"	f
-defaultItZoom	src/Dodge/Default/Item/Use/AimParams.hs	31;"	f
 defaultLS	src/Dodge/Default/LightSource.hs	8;"	f
 defaultLWorld	src/Dodge/Default/World.hs	95;"	f
 defaultLeftLoadable	src/Dodge/Default/Item/Use/Consumption.hs	8;"	f
@@ -4104,7 +4098,7 @@ doThrust	src/Dodge/Projectile/Update.hs	149;"	f
 doTimeScroll	src/Dodge/Update.hs	200;"	f
 doTmTm	src/Dodge/TmTm.hs	6;"	f
 doTmWdWd	src/Dodge/WorldEffect.hs	99;"	f
-doWallRotate	src/Dodge/Update/Camera.hs	161;"	f
+doWallRotate	src/Dodge/Update/Camera.hs	211;"	f
 doWdBl	src/Dodge/WorldBool.hs	10;"	f
 doWdCrBl	src/Dodge/CreatureEffect.hs	37;"	f
 doWdCrCr	src/Dodge/CreatureEffect.hs	12;"	f
@@ -4273,7 +4267,7 @@ edgeToPic	src/Dodge/Debug/Picture.hs	431;"	f
 effectWhileAttached	src/Dodge/ItEffect.hs	56;"	f
 ejectS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 elecCrackleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	386;"	f
-elephantGun	src/Dodge/Item/Held/Rod.hs	35;"	f
+elephantGun	src/Dodge/Item/Held/Rod.hs	34;"	f
 emptyCorridor	src/Dodge/Room/BlinkAcross.hs	22;"	f
 emptyTrie	src/SimpleTrie.hs	16;"	f
 encircle	src/Dodge/Creature/Boid.hs	115;"	f
@@ -4327,14 +4321,14 @@ 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	186;"	f
+farWallDistDirection	src/Dodge/Update/Camera.hs	232;"	f
 fdiv	src/ShortShow.hs	26;"	f
 feet	src/Dodge/Creature/Picture.hs	53;"	f
 ffoldM	src/Framebuffer/Update.hs	79;"	f
 filter3	src/FoldableHelp.hs	76;"	f
 filterSectionsPair	src/Dodge/DisplayInventory.hs	167;"	f
 findBlips	src/Dodge/RadarSweep.hs	62;"	f
-findBoundDists	src/Dodge/Update/Camera.hs	193;"	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	85;"	f
@@ -4417,7 +4411,7 @@ fusePoint	src/Dodge/LevelGen/StaticWalls.hs	158;"	f
 fuseWall	src/Dodge/LevelGen/StaticWalls.hs	165;"	f
 fuseWallsWith	src/Dodge/LevelGen/StaticWalls.hs	172;"	f
 g	src/ShortShow.hs	33;"	f
-gLauncher	src/Dodge/Item/Held/Launcher.hs	32;"	f
+gLauncher	src/Dodge/Item/Held/Launcher.hs	31;"	f
 gRandify	src/Dodge/Randify.hs	11;"	f
 gadgetEffect	src/Dodge/HeldUse.hs	41;"	f
 gameOverMenu	src/Dodge/Menu.hs	187;"	f
@@ -4437,6 +4431,7 @@ geometryQuickCheckTests	test/Spec.hs	55;"	f
 geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
+getAimZoom	src/Dodge/Update/Camera.hs	134;"	f
 getAmmoLinks	src/Dodge/Item/Grammar.hs	134;"	f
 getArguments	src/Dodge/Update/Scroll.hs	176;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	164;"	f
@@ -4529,7 +4524,7 @@ handleKeyboardEvent	src/Dodge/Event/Input.hs	22;"	f
 handleMouseButtonEvent	src/Dodge/Event/Input.hs	63;"	f
 handleMouseMotionEvent	src/Dodge/Event/Input.hs	47;"	f
 handleMouseWheelEvent	src/Dodge/Event/Input.hs	58;"	f
-handlePos	src/Dodge/Item/HeldOffset.hs	90;"	f
+handlePos	src/Dodge/Item/HeldOffset.hs	88;"	f
 handleResizeEvent	src/Dodge/Event.hs	53;"	f
 handleTextInput	src/Dodge/Event/Input.hs	18;"	f
 handleWindowMoveEvent	src/Dodge/Event.hs	44;"	f
@@ -4550,13 +4545,14 @@ healS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	378;"	f
 healthAnalyserByDoor	src/Dodge/Room/LasTurret.hs	74;"	f
 healthTest	src/Dodge/Room/LasTurret.hs	95;"	f
 heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
-heldAimStance	src/Dodge/Item/AimStance.hs	16;"	f
+heldAimStance	src/Dodge/Item/AimStance.hs	17;"	f
+heldAimZoom	src/Dodge/Update/Camera.hs	139;"	f
 heldEffect	src/Dodge/HeldUse.hs	61;"	f
 heldEffectMuzzles	src/Dodge/HeldUse.hs	119;"	f
 heldEffectNoHammerCheck	src/Dodge/HeldUse.hs	69;"	f
-heldHandlePos	src/Dodge/Item/HeldOffset.hs	95;"	f
+heldHandlePos	src/Dodge/Item/HeldOffset.hs	93;"	f
 heldInfo	src/Dodge/Item/Info.hs	87;"	f
-heldItemOffset	src/Dodge/Item/HeldOffset.hs	72;"	f
+heldItemOffset	src/Dodge/Item/HeldOffset.hs	70;"	f
 heldItemOrient2D	src/Dodge/Item/HeldOffset.hs	27;"	f
 heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	32;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	220;"	f
@@ -5010,7 +5006,7 @@ minCrIXOn	src/Dodge/Zoning/Creature.hs	46;"	f
 minOn	src/FoldableHelp.hs	35;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	346;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
-miniGunX	src/Dodge/Item/Held/Cane.hs	92;"	f
+miniGunX	src/Dodge/Item/Held/Cane.hs	90;"	f
 miniGunXPict	src/Dodge/Item/Draw/SPic.hs	357;"	f
 miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	352;"	f
 miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	548;"	f
@@ -5052,7 +5048,7 @@ moveWall	src/Dodge/Wall/Move.hs	29;"	f
 moveWallID	src/Dodge/Wall/Move.hs	24;"	f
 moveWallIDToward	src/Dodge/Wall/Move.hs	47;"	f
 moveWallIDUnsafe	src/Dodge/Wall/Move.hs	19;"	f
-moveZoomCamera	src/Dodge/Update/Camera.hs	84;"	f
+moveZoomCamera	src/Dodge/Update/Camera.hs	85;"	f
 mtTopLabels	src/Dodge/Tree/Compose.hs	49;"	f
 mtUnderLabels	src/Dodge/Tree/Compose.hs	52;"	f
 muchWlDustAt	src/Dodge/Wall/Dust.hs	15;"	f
@@ -5408,7 +5404,7 @@ quarterRoomSquare	src/Dodge/Room/Procedural.hs	213;"	f
 quarterRoomTri	src/Dodge/Room/Procedural.hs	177;"	f
 quitCommand	src/Dodge/Terminal.hs	57;"	f
 rLauncher	src/Dodge/Item/Held/Launcher.hs	14;"	f
-rLauncherX	src/Dodge/Item/Held/Launcher.hs	38;"	f
+rLauncherX	src/Dodge/Item/Held/Launcher.hs	37;"	f
 rToOnward	src/Dodge/Cleat.hs	21;"	f
 radBounds	src/Dodge/Room/Foreground.hs	154;"	f
 radToDeg	src/Geometry/Vector.hs	122;"	f
@@ -5507,7 +5503,7 @@ retreatActionsPistol	src/Dodge/Humanoid.hs	248;"	f
 retreatFireLauncher	src/Dodge/Humanoid.hs	269;"	f
 retreatPointForFrom	src/Dodge/Creature/Impulse/Flee.hs	7;"	f
 reversePair	src/Dodge/LevelGen.hs	82;"	f
-rewinder	src/Dodge/Item/Held/Utility.hs	73;"	f
+rewinder	src/Dodge/Item/Held/Utility.hs	71;"	f
 rewinder	src/Dodge/Item/Weapon/Utility.hs	34;"	f
 rezBox	src/Dodge/Room/RezBox.hs	23;"	f
 rezBox'	src/Dodge/Room/RezBox.hs	31;"	f
@@ -5520,7 +5516,7 @@ rezInvBox	src/Dodge/Room/RezBox.hs	134;"	f
 rezText	src/Dodge/Story.hs	4;"	f
 rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	72;"	f
-rifle	src/Dodge/Item/Held/Cane.hs	52;"	f
+rifle	src/Dodge/Item/Held/Cane.hs	51;"	f
 right	src/DoubleStack.hs	16;"	f
 rightIsParentCombine	src/Dodge/Item/Grammar.hs	240;"	f
 rightPad	src/Padding.hs	19;"	f
@@ -5560,7 +5556,7 @@ rotate3	src/Geometry/Vector3D.hs	48;"	f
 rotate3x	src/Geometry/Vector3D.hs	60;"	f
 rotate3y	src/Geometry/Vector3D.hs	66;"	f
 rotate3z	src/Geometry/Vector3D.hs	54;"	f
-rotateCamera	src/Dodge/Update/Camera.hs	138;"	f
+rotateCamera	src/Dodge/Update/Camera.hs	188;"	f
 rotateList	src/Padding.hs	49;"	f
 rotateProp	src/Dodge/Prop/Update.hs	49;"	f
 rotateSH	src/Shape.hs	256;"	f
@@ -5568,7 +5564,7 @@ rotateSHq	src/Shape.hs	165;"	f
 rotateSHx	src/Shape.hs	264;"	f
 rotateSP	src/ShapePicture.hs	57;"	f
 rotateTo	src/Polyhedra/Geodesic.hs	64;"	f
-rotateToOverlappingWall	src/Dodge/Update/Camera.hs	150;"	f
+rotateToOverlappingWall	src/Dodge/Update/Camera.hs	200;"	f
 rotateToZ	src/Quaternion.hs	34;"	f
 rotateV	src/Geometry/Vector.hs	105;"	f
 rotateVAround	src/Geometry/Vector.hs	112;"	f
@@ -5698,7 +5694,7 @@ setTargetMv	src/Dodge/Creature/ReaderUpdate.hs	74;"	f
 setTile	src/Dodge/Layout.hs	68;"	f
 setTiles	src/Dodge/Layout.hs	65;"	f
 setToggle	src/Dodge/Prop/Update.hs	46;"	f
-setViewDistance	src/Dodge/Update/Camera.hs	181;"	f
+setViewDistance	src/Dodge/Update/Camera.hs	227;"	f
 setViewPos	src/Dodge/Creature/ReaderUpdate.hs	61;"	f
 setViewport	src/Dodge/Render.hs	388;"	f
 setVol	src/Dodge/Config/Update.hs	30;"	f
@@ -5772,7 +5768,7 @@ shootingRange	src/Dodge/Room/Room.hs	332;"	f
 shortPoint2	src/Dodge/ShortShow.hs	4;"	f
 shortShow	src/ShortShow.hs	9;"	f
 shotgunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	544;"	f
-shoulderHeight	src/Dodge/Item/HeldOffset.hs	75;"	f
+shoulderHeight	src/Dodge/Item/HeldOffset.hs	73;"	f
 shoulderSH	src/Dodge/Creature/Picture.hs	139;"	f
 shoulderSP	src/Dodge/Creature/HandPos.hs	170;"	f
 showAttachItem	src/Dodge/Item/Display.hs	88;"	f
@@ -5824,7 +5820,7 @@ smg	src/Dodge/Item/Held/Stick.hs	72;"	f
 smokeCloudAt	src/Dodge/WorldEvent/Cloud.hs	41;"	f
 smokeReducer	src/Dodge/Item/Scope.hs	163;"	f
 sndV2	src/Geometry/Data.hs	52;"	f
-sniperRifle	src/Dodge/Item/Held/Rod.hs	52;"	f
+sniperRifle	src/Dodge/Item/Held/Rod.hs	51;"	f
 someCrits	src/Dodge/LockAndKey.hs	120;"	f
 soundAngle	src/Dodge/SoundLogic.hs	163;"	f
 soundContinue	src/Dodge/SoundLogic.hs	131;"	f
@@ -5924,7 +5920,7 @@ strFromEquipment	src/Dodge/Creature/Statistics.hs	17;"	f
 strFromHeldItem	src/Dodge/Creature/Statistics.hs	29;"	f
 strengthFactor	src/Dodge/Creature/Impulse/Movement.hs	35;"	f
 strictify	src/MaybeHelp.hs	37;"	f
-strideRot	src/Dodge/Item/HeldOffset.hs	78;"	f
+strideRot	src/Dodge/Item/HeldOffset.hs	76;"	f
 stringToList	src/Picture/Base.hs	313;"	f
 stringToListGrad	src/Picture/Text.hs	12;"	f
 stripZ	src/Geometry/Vector3D.hs	97;"	f
@@ -6019,9 +6015,9 @@ tileTexCoords	src/Tile.hs	11;"	f
 tilesFromRooms	src/Dodge/Layout.hs	205;"	f
 tilesToLine	src/Shader/AuxAddition.hs	66;"	f
 timeFlowUpdate	src/Dodge/Update.hs	170;"	f
-timeScroller	src/Dodge/Item/Held/Utility.hs	86;"	f
+timeScroller	src/Dodge/Item/Held/Utility.hs	84;"	f
 timeScroller	src/Dodge/Item/Weapon/Utility.hs	47;"	f
-timeStopper	src/Dodge/Item/Held/Utility.hs	80;"	f
+timeStopper	src/Dodge/Item/Held/Utility.hs	78;"	f
 timeStopper	src/Dodge/Item/Weapon/Utility.hs	41;"	f
 timerTLS	src/Dodge/LightSource/Update.hs	22;"	f
 tinMag	src/Dodge/Item/Ammo.hs	27;"	f
@@ -6065,7 +6061,7 @@ torso	src/Dodge/Creature/Picture.hs	105;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
 tractorBeamAt	src/Dodge/HeldUse.hs	515;"	f
-tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	66;"	f
+tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	65;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	429;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
 tractorSPic	src/Dodge/TractorBeam/Draw.hs	10;"	f
@@ -6074,8 +6070,8 @@ transMat	src/MatrixHelper.hs	73;"	f
 transToHandle	src/Dodge/Item/HeldOffset.hs	22;"	f
 translate	src/Picture/Base.hs	116;"	f
 translate3	src/Picture/Base.hs	120;"	f
-translateFloatingCamera	src/Dodge/Update/Camera.hs	43;"	f
+translateFloatingCamera	src/Dodge/Update/Camera.hs	44;"	f
-translateFloatingCameraKeys	src/Dodge/Update/Camera.hs	60;"	f
+translateFloatingCameraKeys	src/Dodge/Update/Camera.hs	61;"	f
 translateH	src/Picture/Base.hs	112;"	f
 translatePointToHead	src/Dodge/Creature/HandPos.hs	147;"	f
 translatePointToLeftHand	src/Dodge/Creature/HandPos.hs	75;"	f
@@ -6143,7 +6139,7 @@ twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	79;"	f
 twinSlowDoorRoom	src/Dodge/Room/LongDoor.hs	28;"	f
 twists	src/Dodge/Creature/Test.hs	104;"	f
 twoFlat	src/Dodge/Creature/Test.hs	101;"	f
-twoFlatHRot	src/Dodge/Item/HeldOffset.hs	87;"	f
+twoFlatHRot	src/Dodge/Item/HeldOffset.hs	85;"	f
 twoHandTwistAmount	src/Dodge/Creature/YourControl.hs	145;"	f
 twoRoomPoss	src/Dodge/PlacementSpot.hs	147;"	f
 twoStep1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
@@ -6159,7 +6155,7 @@ unitVectorAtAngle	src/Geometry/Vector.hs	100;"	f
 unlockInv	src/Dodge/Inventory/Lock.hs	12;"	f
 unpause	src/Dodge/Menu.hs	195;"	f
 unsafeBlinkAction	src/Dodge/Creature/Action/Blink.hs	55;"	f
-unsafeBlinker	src/Dodge/Item/Held/Utility.hs	65;"	f
+unsafeBlinker	src/Dodge/Item/Held/Utility.hs	63;"	f
 unsafeBlinker	src/Dodge/Item/Weapon/Utility.hs	27;"	f
 unsafeSwapKeys	src/IntMapHelp.hs	74;"	f
 unshadowBlock	src/Dodge/Block.hs	43;"	f
@@ -6179,11 +6175,11 @@ updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	453;"	f
 updateBarrel	src/Dodge/Barreloid.hs	45;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	13;"	f
 updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	28;"	f
-updateBounds	src/Dodge/Update/Camera.hs	203;"	f
+updateBounds	src/Dodge/Update/Camera.hs	249;"	f
 updateBulVel	src/Dodge/Bullet.hs	53;"	f
 updateBullet	src/Dodge/Bullet.hs	21;"	f
 updateBullets	src/Dodge/Update.hs	539;"	f
-updateCamera	src/Dodge/Update/Camera.hs	27;"	f
+updateCamera	src/Dodge/Update/Camera.hs	28;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	111;"	f
 updateCloud	src/Dodge/Update.hs	738;"	f
 updateClouds	src/Dodge/Update.hs	613;"	f
@@ -6205,7 +6201,7 @@ updateFBOTO	src/Framebuffer/Update.hs	97;"	f
 updateFBOTO3	src/Framebuffer/Update.hs	131;"	f
 updateFlame	src/Dodge/Flame.hs	70;"	f
 updateFlames	src/Dodge/Update.hs	598;"	f
-updateFloatingCamera	src/Dodge/Update/Camera.hs	32;"	f
+updateFloatingCamera	src/Dodge/Update/Camera.hs	33;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	364;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	357;"	f
 updateGusts	src/Dodge/Update.hs	721;"	f
@@ -6213,7 +6209,7 @@ updateHeldRootItem	src/Dodge/Creature/State.hs	259;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
 updateIMl	src/Dodge/Update.hs	501;"	f
 updateIMl'	src/Dodge/Update.hs	506;"	f
-updateInGameCamera	src/Dodge/Update/Camera.hs	76;"	f
+updateInGameCamera	src/Dodge/Update/Camera.hs	77;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	400;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	86;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	377;"	f
@@ -6350,7 +6346,7 @@ verticalPipe	src/Dodge/Placement/Instance/Pipe.hs	6;"	f
 verticalWire	src/Dodge/Wire.hs	24;"	f
 viewBoundaries	src/Dodge/Debug/Picture.hs	304;"	f
 viewClipBounds	src/Dodge/Debug/Picture.hs	313;"	f
-viewDistanceFromItems	src/Dodge/Update/Camera.hs	135;"	f
+viewDistanceFromItems	src/Dodge/Update/Camera.hs	185;"	f
 viewTarget	src/Dodge/Creature/ReaderUpdate.hs	144;"	f
 violet	src/Color.hs	21;"	f
 visibleWalls	src/Dodge/Base/Collide.hs	123;"	f
@@ -6471,8 +6467,7 @@ zonePn	src/Dodge/Zoning/Pathing.hs	30;"	f
 zoneWall	src/Dodge/Zoning/Wall.hs	65;"	f
 zonesAroundPoint	src/Dodge/Zoning/Base.hs	90;"	f
 zonesExtract	src/Dodge/Zoning/Base.hs	55;"	f
-zoomFloatingCamera	src/Dodge/Update/Camera.hs	68;"	f
+zoomFloatingCamera	src/Dodge/Update/Camera.hs	69;"	f
-zoomFromItem	src/Dodge/Update/Camera.hs	171;"	f
 zoomInLongGun	src/Dodge/Update/Scroll.hs	96;"	f
 zoomOutLongGun	src/Dodge/Update/Scroll.hs	104;"	f
 zoomScope	src/Dodge/Item/Scope.hs	33;"	f