justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Tweak camera movement

Browse Source
This commit is contained in:
justin
2024-12-31 09:54:57 +00:00
parent e12e4777b2
commit ede08ff1db
6 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Creature/YourControl.hs
-9
View File
@@ -100,7 +100,6 @@ tryAssignHotkey w sc = fromMaybe w $ do
cr <- w ^? cWorld . lWorld . creatures . ix 0
invid <- cr ^? crManipulation . manObject . imSelectedItem
itid <- cr ^? crInv . ix invid . itID
--return $ w & cWorld . lWorld . creatures . ix 0 %~ assignHotkey itid (scancodeToHotkey sc)
return $ w & cWorld . lWorld %~ assignHotkey itid (scancodeToHotkey sc)
{- | The order of these MAY be important, in particular the setting of crMvAim
@@ -180,17 +179,9 @@ pressedMBEffectsTopInventory pkeys w
, Just rtime <- pkeys ^? ix SDL.ButtonRight
, ltime <= rtime && inTopInv
= youhammerdown $ useSelectedItem 0 w
| Just _ <- pkeys ^? ix SDL.ButtonLeft
, Just _ <- pkeys ^? ix SDL.ButtonRight
= w & wCam . camRot -~ rotation
| otherwise = w
where
youhammerdown = set (cWorld . lWorld . creatures . ix 0 . crHammerPosition) HammerDown
inTopInv = case w ^. hud . hudElement of
DisplayInventory{_subInventory = NoSubInventory{}} -> True
_ -> False
rotation =
maybe
0
(angleBetween $ w ^. input . mousePos)
(w ^. input . heldPos . at SDL.ButtonRight)
src/Dodge/DisplayInventory.hs
+13 -7
View File
@@ -180,9 +180,13 @@ updateDisplaySections w cfig =
IM.fromDistinctAscList . zip [0 ..] $
mapMaybe (closeItemToSelectionItem w) (w ^. hud . closeItems)
invitems =
IM.mapWithKey
(\k (indent, x) -> invSelectionItem indent (w ^. cWorld . lWorld)
k (x ^. locLDT . ldtValue))
IM.map
( \(indent, x) ->
invSelectionItem
indent
(w ^. cWorld . lWorld)
(x ^. locLDT . ldtValue)
)
(fmap (first removeindentiffiltering) . allInvLocs $ _crInv cr)
removeindentiffiltering =
if maybe False (not . null) (w ^? hud . hudElement . diInvFilter . _Just)
@@ -309,8 +313,9 @@ updateSection indent mcsel sis availablelines oldoffset =
SelectionSection
{ _ssItems = sis
, _ssOffset = offset
, _ssShownItems = tweakfirst . tweaklast . map snd
$ take availablelines shownstrings
, _ssShownItems =
tweakfirst . tweaklast . map snd $
take availablelines shownstrings
, _ssIndent = indent
}
where
@@ -331,12 +336,13 @@ updateSection indent mcsel sis availablelines oldoffset =
| length allstrings - oldoffset < availablelines ->
length allstrings - availablelines
_ -> oldoffsetbounded
tweakfirst
tweakfirst
| offset > 0 = ix 0 .~ color moreupcolor (text (replicate 15 (toEnum 30)))
| otherwise = id
moreupcolor = fromMaybe white $ allstrings ^? ix offset . _1
tweaklast
| length shownstrings > availablelines = ix (availablelines - 1)
| length shownstrings > availablelines =
ix (availablelines - 1)
.~ color moredowncolor (text . replicate 15 $ toEnum 31)
| otherwise = id
moredowncolor = fromMaybe white $ allstrings ^? ix (offset + availablelines - 1) . _1
src/Dodge/Hotkey.hs
+6 -5
View File
@@ -2,19 +2,20 @@ module Dodge.Hotkey (
assignHotkey,
) where
import NewInt
import Control.Lens
import Data.Maybe
import Dodge.Data.World
import NewInt
-- it is not obvious to me whether hotkeys should belong to LWorld, CWorld or
-- World
assignHotkey :: NewInt ItmInt -> Hotkey -> LWorld -> LWorld
assignHotkey (NInt itid) hk lw = lw
& handleoldposition
& hotkeys . at hk ?~ NInt itid
& imHotkeys . unNIntMap . at itid ?~ hk
assignHotkey (NInt itid) hk lw =
lw
& handleoldposition
& hotkeys . at hk ?~ NInt itid
& imHotkeys . unNIntMap . at itid ?~ hk
where
handleoldposition = fromMaybe id $ do
olditid <- lw ^? hotkeys . ix hk . unNInt
src/Dodge/Inventory/SelectionList.hs
+2 -2
View File
@@ -19,8 +19,8 @@ import NewInt
import Padding
import Picture.Base
invSelectionItem :: Int -> LWorld -> Int -> ComposedItem -> SelectionItem ()
invSelectionItem indent lw i ci =
invSelectionItem :: Int -> LWorld -> ComposedItem -> SelectionItem ()
invSelectionItem indent lw ci =
SelectionItem
{ _siPictures = pics & ix 0 %~ (++ anyequippos ++ anyhotkey)
, _siHeight = itInvHeight $ ci ^. _1
src/Dodge/Update/Camera.hs
+27 -19
View File
@@ -31,7 +31,7 @@ update where your avatar's view is from. -}
updateCamera :: Configuration -> World -> World
updateCamera cfig w = case w ^. wCam . camControl of
CamInGame {} -> updateInGameCamera cfig w
CamFloat -> rotateCamera cfig $ updateFloatingCamera cfig w
CamFloat -> updateFloatingCamera cfig w
updateFloatingCamera :: Configuration -> World -> World
updateFloatingCamera cfig w =
@@ -46,15 +46,20 @@ updateFloatingCamera cfig w =
translateFloatingCamera :: Input -> Camera -> Camera
translateFloatingCamera theinput cam = fromMaybe cam $ do
presstime <- theinput ^. mouseButtons . at ButtonLeft
guard $ presstime > 0
hpos <- theinput ^? heldPos . ix ButtonLeft
let thetran =
screenToWorldPos cam hpos
-.- screenToWorldPos cam (theinput ^. mousePos)
return $
cam & camCenter +~ thetran
& camViewFrom +~ thetran
lpresstime <- theinput ^. mouseButtons . at ButtonLeft
rpresstime <- theinput ^. mouseButtons . at ButtonRight
if lpresstime > rpresstime
then do
hpos <- theinput ^? heldPos . ix ButtonLeft
let thetran =
screenToWorldPos cam hpos
-.- screenToWorldPos cam (theinput ^. mousePos)
return $
cam & camCenter +~ thetran
& camViewFrom +~ thetran
else do
a <- (theinput ^. heldPos . at SDL.ButtonRight)
return $ cam & camRot -~ angleBetween (theinput ^. mousePos) a
translateFloatingCameraKeys :: Input -> Camera -> Camera
translateFloatingCameraKeys theinput = (camCenter -~ thetran) . (camViewFrom -~ thetran)
@@ -157,17 +162,20 @@ doWallRotate wl w = rotateUsing $ (argV . uncurry (-.-) $ _wlLine wl) - (w ^. wC
b = a * (4 / pi)
b' = fromIntegral (round b :: Int)
--rotateCameraBy :: Float -> World -> World
--rotateCameraBy x = wCam . camRot +~ x
rotateCamera :: Configuration -> World -> World
rotateCamera cfig w
-- | keydown SDL.ScancodeQ && keydown SDL.ScancodeE = w
-- | keydown SDL.ScancodeQ = rotateCameraBy 0.025 w
-- | keydown SDL.ScancodeE = rotateCameraBy (-0.025) w
rotateCamera cfig w
| Just ltime <- pkeys ^? ix SDL.ButtonLeft
, Just rtime <- pkeys ^? ix SDL.ButtonRight
, rtime > ltime = w & wCam . camRot -~ rotation
| otherwise = ifConfigWallRotate cfig (w ^. input . mouseButtons) w
-- where
-- keydown scode = scode `M.member` _pressedKeys (_input w) && not (inTextInputFocus w)
where
pkeys = w ^. input . mouseButtons
rotation =
maybe
0
(angleBetween $ w ^. input . mousePos)
(w ^. input . heldPos . at SDL.ButtonRight)
zoomFromItem :: ItZoom -> Float
zoomFromItem ItZoom{_izMax = zMax, _izMin = zMin, _izFac = zFac} =
tags
+31 -37
View File
@@ -3343,7 +3343,7 @@ advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f
advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f
aimDelaySweep src/Dodge/Render/Picture.hs 239;" f
aimStanceInfo src/Dodge/Item/Info.hs 199;" f
aimTurn src/Dodge/Creature/YourControl.hs 154;" f
aimTurn src/Dodge/Creature/YourControl.hs 156;" f
aimingWeaponHandlePos src/Dodge/Item/HeldOffset.hs 69;" f
aimingWeaponZeroPos src/Dodge/Item/HeldOffset.hs 63;" f
airlock src/Dodge/Room/Airlock.hs 19;" f
@@ -3354,7 +3354,7 @@ airlockDoor src/Dodge/Room/Airlock.hs 51;" f
airlockDoubleDoor src/Dodge/Room/Airlock.hs 54;" f
airlockSimple src/Dodge/Room/Airlock.hs 66;" f
airlockZ src/Dodge/Room/Airlock.hs 91;" f
allHotkeys src/Dodge/Creature/YourControl.hs 60;" f
allHotkeys src/Dodge/Creature/YourControl.hs 62;" f
allInvLocs src/Dodge/Item/Grammar.hs 295;" f
allVisibleWalls src/Dodge/Base/Collide.hs 131;" f
alongSegBy src/Geometry.hs 43;" f
@@ -3414,8 +3414,7 @@ armouredCorridor src/Dodge/Room/RoadBlock.hs 20;" f
arms src/Dodge/Creature/Picture.hs 75;" f
arrow src/Picture/Composite.hs 19;" f
arrowPath src/Picture/Composite.hs 8;" f
assignHotkey src/Dodge/Hotkey.hs 25;" f
assignNewHotkey src/Dodge/Hotkey.hs 14;" f
assignHotkey src/Dodge/Hotkey.hs 13;" f
assignPushDoors src/Dodge/LevelGen.hs 42;" f
atFstLnkOut src/Dodge/PlacementSpot.hs 211;" f
atFstLnkOutShiftBy src/Dodge/PlacementSpot.hs 226;" f
@@ -3622,9 +3621,9 @@ clickGetCreature src/Dodge/Debug.hs 107;" f
clipV src/Geometry/Vector.hs 47;" f
clipZoom src/Dodge/Update/Camera.hs 176;" f
clockCycle src/Dodge/Clock.hs 9;" f
closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 71;" f
closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 56;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 85;" f
closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 72;" f
closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 57;" f
closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 86;" f
closeObjectInfo src/Dodge/Render/HUD.hs 211;" f
closestCreatureID src/Dodge/Debug.hs 116;" f
closestPointOnLine src/Geometry/Intersect.hs 251;" f
@@ -3964,7 +3963,7 @@ disconnectTerminal src/Dodge/Terminal.hs 217;" f
displayConfig src/Dodge/Menu.hs 196;" f
displayControls src/Dodge/Menu.hs 206;" f
displayFrameTicks src/Dodge/Render/Picture.hs 39;" f
displayFreeSlots src/Dodge/DisplayInventory.hs 226;" f
displayFreeSlots src/Dodge/DisplayInventory.hs 230;" f
displayIndents src/Dodge/DisplayInventory.hs 123;" f
displayPulse src/Dodge/Item/Display.hs 110;" f
displaySectionsSizes src/Dodge/DisplayInventory.hs 118;" f
@@ -4046,7 +4045,7 @@ 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/Scroll.hs 90;" f
doSectionSize src/Dodge/DisplayInventory.hs 248;" f
doSectionSize src/Dodge/DisplayInventory.hs 252;" f
doSideEffects appDodge/Main.hs 120;" f
doStep src/Dodge/ArcStep.hs 9;" f
doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f
@@ -4234,7 +4233,7 @@ encircleDistP src/Dodge/Creature/Boid.hs 21;" f
encircleP src/Dodge/Creature/Boid.hs 27;" f
endCombineRegex src/Dodge/Update/Input/InGame.hs 246;" f
endRegex src/Dodge/Update/Input/InGame.hs 235;" f
enterCombineInv src/Dodge/DisplayInventory.hs 354;" f
enterCombineInv src/Dodge/DisplayInventory.hs 360;" f
eqConstr src/SameConstr.hs 17;" f
eqPosText src/Dodge/Equipment/Text.hs 5;" f
eqSiteToPositions src/Dodge/Inventory/RBList.hs 76;" f
@@ -4283,7 +4282,7 @@ fdiv src/ShortShow.hs 27;" 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 193;" f
filterSectionsPair src/Dodge/DisplayInventory.hs 197;" f
findBlips src/Dodge/RadarSweep.hs 44;" f
findBoundDists src/Dodge/Update/Camera.hs 196;" f
findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f
@@ -4470,7 +4469,7 @@ halfWidth src/Dodge/Base/Window.hs 48;" f
haltSound src/Dodge/SoundLogic.hs 37;" f
hammerCheck src/Dodge/HeldUse.hs 52;" f
handleEvent src/Dodge/Event.hs 27;" f
handleHotkeys src/Dodge/Creature/YourControl.hs 44;" f
handleHotkeys src/Dodge/Creature/YourControl.hs 45;" f
handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f
handleMouseButtonEvent src/Dodge/Event/Input.hs 63;" f
handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f
@@ -4518,8 +4517,8 @@ holdForm src/Dodge/Creature/Boid.hs 136;" f
holsterWeapon src/Dodge/Creature/Volition.hs 14;" f
homingModule src/Dodge/Item/Scope.hs 40;" f
horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f
hotkeyToScancode src/Dodge/Creature/YourControl.hs 63;" f
hotkeyToString src/Dodge/Inventory/SelectionList.hs 41;" f
hotkeyToScancode src/Dodge/Creature/YourControl.hs 65;" f
hotkeyToString src/Dodge/Inventory/SelectionList.hs 42;" f
humanoidAIList src/Dodge/Humanoid.hs 181;" f
iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f
icosahedronPoints src/Polyhedra/Geodesic.hs 12;" f
@@ -4592,7 +4591,7 @@ intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f
invAdj src/Dodge/Item/Grammar.hs 276;" f
invCursorParams src/Dodge/ListDisplayParams.hs 36;" f
invDP src/Dodge/ListDisplayParams.hs 30;" f
invDimColor src/Dodge/DisplayInventory.hs 220;" f
invDimColor src/Dodge/DisplayInventory.hs 224;" f
invHead src/Dodge/Render/HUD.hs 392;" f
invItemLocUpdate src/Dodge/Creature/State.hs 179;" f
invLDT src/Dodge/Item/Grammar.hs 256;" f
@@ -4753,7 +4752,7 @@ listConfig src/Dodge/Menu.hs 199;" f
listControls src/Dodge/Menu.hs 212;" f
listCursorChooseBorderScale src/Dodge/Render/List.hs 135;" f
listGuard src/Dodge/Creature/ReaderUpdate.hs 188;" f
listSelectionColorPicture src/Dodge/DisplayInventory.hs 346;" f
listSelectionColorPicture src/Dodge/DisplayInventory.hs 352;" f
litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f
llleft src/Dodge/Item/Grammar.hs 182;" f
llright src/Dodge/Item/Grammar.hs 188;" f
@@ -4972,7 +4971,7 @@ mntLSOn src/Dodge/Placement/Instance/LightSource.hs 54;" f
mntLight src/Dodge/Placement/Instance/LightSource.hs 158;" f
mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 163;" f
modTo src/Geometry/Zone.hs 10;" f
mouseActionsCr src/Dodge/Creature/YourControl.hs 164;" f
mouseActionsCr src/Dodge/Creature/YourControl.hs 166;" f
mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 58;" f
mouseCursorType src/Dodge/Render/Picture.hs 80;" f
mouseWorldPos src/Dodge/Base/Coordinate.hs 48;" f
@@ -4981,7 +4980,6 @@ moveCombineSel src/Dodge/Update/Scroll.hs 121;" f
moveHammerUp src/Dodge/Hammer.hs 5;" f
moveInverseShockwave src/Dodge/Shockwave/Update.hs 53;" f
moveLSThen src/Dodge/Placement/Instance/LightSource.hs 30;" f
moveOldHotkey src/Dodge/Hotkey.hs 31;" f
movePenBullet src/Dodge/Bullet.hs 221;" f
moveRoomBy src/Dodge/Room/Link.hs 53;" f
moveShockwave src/Dodge/Shockwave/Update.hs 17;" f
@@ -5026,7 +5024,6 @@ nearRect src/Dodge/Zoning/Common.hs 16;" f
nearSeg src/Dodge/Zoning/Common.hs 12;" f
nearestAngleRep src/Geometry.hs 149;" f
newExtraAwareness src/Dodge/Creature/Perception.hs 137;" f
newHotkey src/Dodge/Hotkey.hs 17;" f
newKey src/IntMapHelp.hs 60;" f
newSounds src/Dodge/Creature/Perception.hs 170;" f
newTextureFramebuffer src/Framebuffer/Setup.hs 16;" f
@@ -5170,7 +5167,7 @@ placeSpotRoomRand src/Dodge/Placement/PlaceSpot.hs 89;" f
placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 70;" f
placeString src/Dodge/Render/MenuScreen.hs 64;" f
placeWallPoly src/Dodge/Placement/PlaceSpot.hs 162;" f
plainRegex src/Dodge/DisplayInventory.hs 223;" f
plainRegex src/Dodge/DisplayInventory.hs 227;" f
playIfFree src/Sound.hs 136;" f
playPositionalSoundQueue src/Sound.hs 144;" f
playSoundAndUpdate src/Sound.hs 54;" f
@@ -5275,7 +5272,7 @@ preCritStart src/Dodge/Room/Start.hs 82;" f
preloadRender src/Preload/Render.hs 30;" f
premapMaybe src/FoldlHelp.hs 24;" f
prependTwo src/Geometry.hs 179;" f
pressedMBEffectsTopInventory src/Dodge/Creature/YourControl.hs 174;" f
pressedMBEffectsTopInventory src/Dodge/Creature/YourControl.hs 176;" f
prettyDT src/Dodge/DoubleTree.hs 179;" f
prettyLDT src/Dodge/DoubleTree.hs 183;" f
prettyShort src/AesonHelp.hs 11;" f
@@ -5407,7 +5404,7 @@ reflectLaserAlong src/Dodge/Item/Weapon/LaserPath.hs 13;" f
refract src/Dodge/Item/Weapon/LaserPath.hs 40;" f
refreshOptionsSelectionList src/Dodge/Menu/Option.hs 39;" f
regexCombs src/Dodge/DisplayInventory.hs 71;" f
regexList src/Dodge/DisplayInventory.hs 390;" f
regexList src/Dodge/DisplayInventory.hs 396;" f
reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 442;" f
reloadLevelStart src/Dodge/Save.hs 71;" f
reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 440;" f
@@ -5416,7 +5413,6 @@ remoteDetonator src/Dodge/Item/Scope.hs 74;" f
remoteScreen src/Dodge/Item/Scope.hs 70;" f
removeAmmoFromMag src/Dodge/HeldUse.hs 398;" f
removeDot src/ShortShow.hs 30;" f
removeHotkey src/Dodge/Hotkey.hs 40;" f
removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f
removeShieldWall src/Dodge/Euse.hs 125;" f
removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f
@@ -5499,7 +5495,6 @@ 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 163;" f
rotateCameraBy src/Dodge/Update/Camera.hs 160;" f
rotateProp src/Dodge/Prop/Update.hs 49;" f
rotateSH src/Shape.hs 256;" f
rotateSHq src/Shape.hs 165;" f
@@ -5548,7 +5543,7 @@ scaleMat src/MatrixHelper.hs 59;" f
scaleMatrix src/MatrixHelper.hs 56;" f
scaleSH src/Shape.hs 268;" f
scalp src/Dodge/Creature/Picture.hs 96;" f
scancodeToHotkey src/Dodge/Creature/YourControl.hs 78;" f
scancodeToHotkey src/Dodge/Creature/YourControl.hs 80;" f
scodeToChar src/Dodge/ScodeToChar.hs 6;" f
scorchSPic src/Dodge/Creature/State.hs 117;" f
screenBox src/Dodge/Base/Window.hs 53;" f
@@ -5576,8 +5571,8 @@ seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 372;" f
seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f
searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 203;" f
secondColumnParams src/Dodge/ListDisplayParams.hs 43;" f
sectionsDesiredLines src/Dodge/DisplayInventory.hs 232;" f
sectionsSizes src/Dodge/DisplayInventory.hs 237;" f
sectionsDesiredLines src/Dodge/DisplayInventory.hs 236;" f
sectionsSizes src/Dodge/DisplayInventory.hs 241;" f
seedStartMenu src/Dodge/Menu.hs 79;" f
seedStartOptions src/Dodge/Menu.hs 82;" f
segOnCirc src/Geometry.hs 116;" f
@@ -5610,7 +5605,6 @@ setDepth src/Picture/Base.hs 128;" f
setDirPS src/Dodge/PlacementSpot.hs 49;" f
setFallback src/Dodge/PlacementSpot.hs 127;" f
setFromToDams src/Dodge/Bullet.hs 183;" f
setHotkey src/Dodge/Hotkey.hs 37;" f
setInLinks src/Dodge/RoomLink.hs 51;" f
setInLinksByType src/Dodge/RoomLink.hs 54;" f
setInLinksPD src/Dodge/RoomLink.hs 74;" f
@@ -6043,7 +6037,7 @@ triggerSwitchSPicLight src/Dodge/Placement/Instance/Button.hs 31;" f
truncFaces src/Polyhedra/Geodesic.hs 53;" f
truncate src/Polyhedra/Geodesic.hs 38;" f
trunkDepth src/TreeHelp.hs 161;" f
tryAssignHotkey src/Dodge/Creature/YourControl.hs 94;" f
tryAssignHotkey src/Dodge/Creature/YourControl.hs 96;" f
tryAttachItems src/Dodge/Item/Grammar.hs 22;" f
tryCombine src/Dodge/Update/Input/InGame.hs 578;" f
tryDropSelected src/Dodge/Update/Input/InGame.hs 115;" f
@@ -6180,8 +6174,8 @@ updateRootItemID src/Dodge/Inventory/Location.hs 35;" f
updateScopeZoom src/Dodge/Update/Scroll.hs 76;" f
updateScopeZoom' src/Dodge/Update/Scroll.hs 81;" f
updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f
updateSection src/Dodge/DisplayInventory.hs 301;" f
updateSectionsPositioning src/Dodge/DisplayInventory.hs 274;" f
updateSection src/Dodge/DisplayInventory.hs 305;" f
updateSectionsPositioning src/Dodge/DisplayInventory.hs 278;" f
updateSeenWalls src/Dodge/Update.hs 684;" f
updateShockwave src/Dodge/Shockwave/Update.hs 12;" f
updateShockwaves src/Dodge/Update.hs 558;" f
@@ -6234,7 +6228,7 @@ useC src/Dodge/Cuse.hs 8;" f
useC' src/Dodge/Cuse.hs 13;" f
useE src/Dodge/Euse.hs 34;" f
useGasParams src/Dodge/HeldUse.hs 507;" f
useHotkey src/Dodge/Creature/YourControl.hs 54;" f
useHotkey src/Dodge/Creature/YourControl.hs 55;" f
useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f
useLoadedAmmo src/Dodge/HeldUse.hs 289;" f
useLocation src/Dodge/Creature/Impulse/UseItem.hs 57;" f
@@ -6295,12 +6289,12 @@ wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f
wallsFromRooms src/Dodge/Layout.hs 146;" f
wallsToDraw src/Dodge/Render/Walls.hs 17;" f
warningRooms src/Dodge/Room/Warning.hs 29;" f
wasdAim src/Dodge/Creature/YourControl.hs 116;" f
wasdAim src/Dodge/Creature/YourControl.hs 118;" f
wasdDir src/Dodge/WASD.hs 17;" f
wasdM src/Dodge/WASD.hs 9;" f
wasdMovement src/Dodge/Creature/YourControl.hs 142;" f
wasdTwist src/Dodge/Creature/YourControl.hs 124;" f
wasdWithAiming src/Dodge/Creature/YourControl.hs 106;" f
wasdMovement src/Dodge/Creature/YourControl.hs 144;" f
wasdTwist src/Dodge/Creature/YourControl.hs 126;" f
wasdWithAiming src/Dodge/Creature/YourControl.hs 108;" f
watchCombinations src/Dodge/Combine/Combinations.hs 15;" f
watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 177;" f
weakenMatS src/Dodge/Material/Sound.hs 18;" f
@@ -6362,7 +6356,7 @@ yellow src/Color.hs 17;" f
you src/Dodge/Base/You.hs 18;" f
youDropItem src/Dodge/Creature/Action.hs 190;" f
yourAugmentedItem src/Dodge/Render/HUD.hs 223;" f
yourControl src/Dodge/Creature/YourControl.hs 25;" f
yourControl src/Dodge/Creature/YourControl.hs 26;" f
yourDefaultSpeed src/Dodge/Default/Creature.hs 129;" f
yourDefaultStrideLength src/Dodge/Default/Creature.hs 132;" f
yourInfo src/Dodge/Creature/Info.hs 8;" f