diff --git a/src/Dodge/Base/Collide.hs b/src/Dodge/Base/Collide.hs index 7e09f9808..8bec336d6 100644 --- a/src/Dodge/Base/Collide.hs +++ b/src/Dodge/Base/Collide.hs @@ -186,7 +186,7 @@ crHeight cr = case cr ^. crHP of Avatar {} -> 25 CrabCrit {} -> 25 SlinkCrit {} -> 25 - SlimeCrit {_slimeSlime = r} -> min 15 $ slimeToRad r + SlimeCrit {_slimeSlime = r} -> min 25 $ 2 * slimeToRad r BeeCrit {} -> 10 HiveCrit {} -> 25 BarrelCrit{} -> 20 diff --git a/src/Dodge/Inventory.hs b/src/Dodge/Inventory.hs index 7bfe01295..db33d84ae 100644 --- a/src/Dodge/Inventory.hs +++ b/src/Dodge/Inventory.hs @@ -213,7 +213,6 @@ multiSelScroll' f w = fromMaybe w $ do | otherwise = IS.insert i . IS.insert k return $ w --- & hud . diSelection . _Just . slSet %~ insertordelete & hud . diSections . ix j . ssSet %~ insertordelete & hud . diSelection . _Just . slInt .~ k diff --git a/src/Dodge/Projectile/Update.hs b/src/Dodge/Projectile/Update.hs index e06573eac..56db46f6d 100644 --- a/src/Dodge/Projectile/Update.hs +++ b/src/Dodge/Projectile/Update.hs @@ -1,6 +1,6 @@ -- {-# LANGUAGE LambdaCase #-} -- {-# OPTIONS_GHC -Wno-unused-imports #-} -module Dodge.Projectile.Update (updateProjectile) where +module Dodge.Projectile.Update (updateProjectile,slimeEatSound) where import Control.Monad import Data.List (delete) @@ -81,8 +81,18 @@ stickHitSound pj = [slapS, slap1S, slap2S, slap3S, slap4S, slap5S, slap6S, slap7S] (pj ^. pjPos . _xy) +slimeEatSound :: Int -> Point2 -> World -> World +slimeEatSound i p w = w & soundStart (CrSound i) p s Nothing + & randGen .~ g + where + (s,g) = runState (takeOne [slurp1S,slurp2S,slurp3S,slurp4S,slurp5S]) (w ^. randGen) + shellHitCreature :: Point3 -> Creature -> Projectile -> World -> World shellHitCreature p cr pj + | SlimeCrit{} <- cr ^. crType = (cWorld . lWorld . projectiles . at (pj ^. pjID) .~ Nothing) + . (cWorld . lWorld . creatures . ix (cr ^. crID) . crType . slimeSlime +~ 100) + . (cWorld . lWorld . creatures . ix (cr ^. crID) . crType . slimeSlimeChange +~ 100) + . slimeEatSound (cr ^. crID) (cr ^. crPos . _xy) | Just GStick <- pj ^? pjType . gnHitEffect = (pjlens . pjType .~ Grenade gren) . stickHitSound pj @@ -249,15 +259,9 @@ moveProjectile pj w (_, Just (_, OChasmWall)) -> w & pjlens . pjTimer .~ 0 -- no stick or bounce for now _ -> w - & pjlens - . pjSpin - *~ 0.99 - & pjlens - . pjPos - +~ _pjVel pj - & pjlens - . pjDir - +~ _pjSpin pj + & pjlens . pjSpin *~ 0.99 + & pjlens . pjPos +~ _pjVel pj + & pjlens . pjDir +~ _pjSpin pj where pjlens = cWorld . lWorld . projectiles . ix (pj ^. pjID) sp = _pjPos pj diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index c89a7e523..d96ec5a0b 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -120,21 +120,18 @@ drawMouseOver u = w ^? input . mouseContext . mcoInvSelect <|> w ^? input . mouseContext . mcoInvFilt sss <- w ^? hud . diSections - return - . translateScreenPos cfig (invDP ^. ldpPos) - . color (0.3 *^ white) - $ selSecDrawCursor invDP curs sss (Sel j i) - curs = BackdropCurs + drawcursor invDP sss j i combinvsel = do (j, i) <- (w ^? input . mouseContext . mcoCombSelect) <|> (w ^? input . mouseContext . mcoCombCombine) sss <- w ^? hud . subInventory . ciSections - let idp = secondColumnLDP + drawcursor secondColumnLDP sss j i + drawcursor idp sss j i = return . translateScreenPos cfig (idp ^. ldpPos) . color (0.3 * white) - $ selSecDrawCursor idp curs sss (Sel j i) + $ selSecDrawCursor idp BackdropCurs sss (Sel j i) drawDragSelected :: Config -> World -> Maybe Picture drawDragSelected cfig w = do diff --git a/src/Dodge/TestString.hs b/src/Dodge/TestString.hs index 187bda29b..574ce4083 100644 --- a/src/Dodge/TestString.hs +++ b/src/Dodge/TestString.hs @@ -58,14 +58,15 @@ crs :: Universe -> [Creature] crs u = u ^.. uvWorld . cWorld . lWorld . creatures . each testStringInit :: Universe -> [String] -testStringInit u = - [ u ^. uvWorld . testString - , u ^. uvWorld . input . mouseContext . to show - , u ^. uvWorld . hud . diSelection . to show - , u ^. uvWorld . cWorld . lWorld . lInvLock . to show - ] - <> u ^. uvWorld . hud . manObject . to prettyShort - <> u ^.. uvWorld . hud . diSections . each . ssSet . to show +testStringInit u = [ u ^. uvWorld . testString ] + <> u ^.. uvWorld . cWorld . lWorld . projectiles . each . pjPos . _z . to show + <> u ^.. uvWorld . cWorld . lWorld . creatures . each . crType . slimeSlime . to (show . slimeToRad) +-- , u ^. uvWorld . input . mouseContext . to show +-- , u ^. uvWorld . hud . diSelection . to show +-- , u ^. uvWorld . cWorld . lWorld . lInvLock . to show +-- ] +-- <> u ^. uvWorld . hud . manObject . to prettyShort +-- <> u ^.. uvWorld . hud . diSections . each . ssSet . to show --testStringInit u = u ^. uvWorld . cWorld . lWorld . creatures . ix 5 . crActionPlan . to prettyShort --[show . getSum $ foldMap (Sum . crslime) (crs u)] -- u ^.. tocrs . each . crType . slimeSplitTimer . to show diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index 23672cbf3..e87f13aee 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -1106,12 +1106,6 @@ fuseSlimes c1 c2 = (cWorld . lWorld . creatures . ix mini .~ c) & crID .~ mini eslime = min (c1 ^?! crType . slimeSlime) (c2 ^?! crType . slimeSlime) -slimeEatSound :: Int -> Point2 -> World -> World -slimeEatSound i p w = w & soundStart (CrSound i) p s Nothing - & randGen .~ g - where - (s,g) = runState (takeOne [slurp1S,slurp2S,slurp3S,slurp4S,slurp5S]) (w ^. randGen) - updateDelayedEvents :: World -> World updateDelayedEvents w = diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 9ad821c58..9d3214e5b 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -279,7 +279,7 @@ updateMouseClickInGame u = case w ^. input . mouseContext of selsec = w ^? hud . diSelection . _Just . slSec maybeselectselected (i,_) = fromMaybe id $ do Sel i' j <- w ^. hud . diSelection - guard $ i' == i && w ^? hud . diSections . ix i . ssSet == Just (IS.empty) + guard $ i' == i && w ^? hud . diSections . ix i . ssSet == Just IS.empty return $ uvWorld . hud . diSections . ix i . ssSet .~ IS.singleton j endRegex :: Int -> World -> Maybe Selection -> Maybe Selection @@ -509,7 +509,6 @@ updateBackspaceRegex w = case di ^? subInventory of he & filtset . _Just %~ init & selset ?~ Sel x 0 - -- & selset ?~ Sel x 0 mempty [] -> he & filtset .~ Nothing di = w ^. hud @@ -531,9 +530,7 @@ updateEnterRegex w = case w ^? hud . subInventory of & hud . subInventory . ciSelection ?~ Sel (-1) 0 _ -> w where - secfocus xs = fromMaybe False $ do - i <- w ^? hud . diSelection . _Just . slSec - return $ i `elem` xs + secfocus xs = maybe False (`elem` xs) $ w ^? hud . diSelection . _Just . slSec enterregex = (<|> Just "") pauseGame :: Universe -> Universe diff --git a/tags b/tags index 8d596805e..7ee2c995b 100644 --- a/tags +++ b/tags @@ -2877,10 +2877,10 @@ centerVaultRoom src/Dodge/Room/Procedural.hs 271;" f centroid src/Geometry/Polygon.hs 192;" f centroidNum src/Geometry/Polygon.hs 195;" f chainPairs src/Geometry.hs 360;" f -changeSwapOther src/Dodge/Inventory.hs 220;" f +changeSwapOther src/Dodge/Inventory.hs 219;" f changeSwapSel src/Dodge/Inventory.hs 190;" f changeSwapSelSet src/Dodge/Inventory.hs 125;" f -changeSwapWith src/Dodge/Inventory.hs 251;" f +changeSwapWith src/Dodge/Inventory.hs 250;" f charToTuple src/Picture/Base.hs 312;" f charToTupleGrad src/Picture/Text.hs 18;" f chartreuse src/Color.hs 51;" f @@ -2948,7 +2948,7 @@ clockCycle src/Dodge/Clock.hs 7;" f closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 241;" f closeItemDist src/Dodge/Inventory.hs 122;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 220;" f -closeObjectInfo src/Dodge/Render/HUD.hs 230;" f +closeObjectInfo src/Dodge/Render/HUD.hs 227;" f closestCrToMouse src/Dodge/Debug.hs 308;" f closestPointOnLine src/Geometry/Intersect.hs 286;" f closestPointOnLineParam src/Geometry/Intersect.hs 302;" f @@ -2983,7 +2983,7 @@ combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 44;" f combineAwareness src/Dodge/Creature/Perception.hs 119;" f combineFloors src/Dodge/Room/Procedural.hs 154;" f -combineInventoryExtra src/Dodge/Render/HUD.hs 344;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 341;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 134;" f @@ -3010,7 +3010,7 @@ connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 802;" f constructEdges src/Polyhedra.hs 31;" f constructEdgesList src/Polyhedra.hs 40;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f -continueTerminal src/Dodge/Update/Input/InGame.hs 397;" f +continueTerminal src/Dodge/Update/Input/InGame.hs 402;" f convexHull src/Geometry/Polygon.hs 150;" f convexHullSafe src/Geometry/Polygon.hs 172;" f convexPolysOverlap src/Geometry/ConvexPoly.hs 48;" f @@ -3371,7 +3371,7 @@ doPreload appDodge/Main.hs 133;" f doQuickload src/Dodge/Save.hs 83;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 8;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 450;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 455;" f doRoomPlacements src/Dodge/Layout.hs 121;" f doRoomShift src/Dodge/Room/Link.hs 34;" f doScopeZoom src/Dodge/Update/Scroll.hs 90;" f @@ -3422,7 +3422,7 @@ drawCircCollisionTest src/Dodge/Debug/Picture.hs 118;" f drawCliff src/Dodge/Render/ShapePicture.hs 87;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f drawCombFilter src/Dodge/Render/Picture.hs 278;" f -drawCombineInventory src/Dodge/Render/HUD.hs 192;" f +drawCombineInventory src/Dodge/Render/HUD.hs 189;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 76;" f drawCoord src/Dodge/Debug/Picture.hs 396;" f drawCountMod src/Render.hs 231;" f @@ -3443,13 +3443,13 @@ drawDrag src/Dodge/Render/Picture.hs 209;" f drawDragDrop src/Dodge/Render/Picture.hs 238;" f drawDragPickup src/Dodge/Render/Picture.hs 247;" f drawDragSelect src/Dodge/Render/Picture.hs 202;" f -drawDragSelected src/Dodge/Render/HUD.hs 139;" f -drawDragSelecting src/Dodge/Render/HUD.hs 156;" f +drawDragSelected src/Dodge/Render/HUD.hs 136;" f +drawDragSelecting src/Dodge/Render/HUD.hs 153;" f drawDumbSwitch src/Dodge/Button/Draw.hs 31;" f drawEmptySet src/Dodge/Render/Picture.hs 158;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f drawEquipment src/Dodge/Creature/Picture.hs 426;" f -drawExamineInventory src/Dodge/Render/HUD.hs 201;" f +drawExamineInventory src/Dodge/Render/HUD.hs 198;" f drawExplosiveBall src/Dodge/EnergyBall/Draw.hs 15;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 271;" f drawFlame src/Dodge/Flame/Draw.hs 8;" f @@ -3464,8 +3464,8 @@ drawInputMenu src/Dodge/Render/MenuScreen.hs 33;" f drawInspectWall src/Dodge/Debug/Picture.hs 256;" f drawInspectWalls src/Dodge/Debug/Picture.hs 244;" f drawInventory src/Dodge/Render/HUD.hs 62;" f -drawItemChildrenConnect src/Dodge/Render/HUD.hs 337;" f -drawItemConnections src/Dodge/Render/HUD.hs 330;" f +drawItemChildrenConnect src/Dodge/Render/HUD.hs 334;" f +drawItemConnections src/Dodge/Render/HUD.hs 327;" f drawJumpDown src/Dodge/Render/Picture.hs 197;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f drawLabelledList src/Dodge/Render/List.hs 219;" f @@ -3479,7 +3479,7 @@ drawListYoff src/Dodge/Render/List.hs 90;" f drawLoadingScreen src/Dodge/Render/MenuScreen.hs 24;" f drawMachine src/Dodge/Machine/Draw.hs 18;" f drawMapperAR src/Dodge/Targeting/Draw.hs 12;" f -drawMapperInventory src/Dodge/Render/HUD.hs 183;" f +drawMapperInventory src/Dodge/Render/HUD.hs 180;" f drawMenuClick src/Dodge/Render/Picture.hs 173;" f drawMenuCursor src/Dodge/Render/Picture.hs 185;" f drawMenuOrHUD src/Dodge/Render/Picture.hs 71;" f @@ -3498,7 +3498,7 @@ drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawPulseBall src/Dodge/Render/ShapePicture.hs 95;" f drawPulseLaser src/Dodge/Laser/Update.hs 42;" f drawQuitTerminal src/Dodge/Render/Picture.hs 152;" f -drawRBOptions src/Dodge/Render/HUD.hs 266;" f +drawRBOptions src/Dodge/Render/HUD.hs 263;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 14;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 38;" f drawReturn src/Dodge/Render/Picture.hs 161;" f @@ -3516,12 +3516,12 @@ drawSlimeCrit src/Dodge/Creature/Picture.hs 57;" f drawSlinkCrit src/Dodge/Creature/Picture.hs 86;" f drawSpark src/Dodge/Spark/Draw.hs 7;" f drawStaticBall src/Dodge/EnergyBall/Draw.hs 28;" f -drawSubInventory src/Dodge/Render/HUD.hs 175;" f +drawSubInventory src/Dodge/Render/HUD.hs 172;" f drawSwitch src/Dodge/Button/Draw.hs 18;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 24;" f drawTargetingAR src/Dodge/Targeting/Draw.hs 20;" f -drawTerminalCursorLink src/Dodge/Render/HUD.hs 400;" f -drawTerminalDisplay src/Dodge/Render/HUD.hs 361;" f +drawTerminalCursorLink src/Dodge/Render/HUD.hs 397;" f +drawTerminalDisplay src/Dodge/Render/HUD.hs 358;" f drawTeslaArc src/Dodge/Tesla/Draw.hs 9;" f drawText src/Picture/Base.hs 224;" f drawTitle src/Dodge/Render/MenuScreen.hs 49;" f @@ -3583,8 +3583,8 @@ encircleCloseP src/Dodge/Creature/Boid.hs 38;" f encircleDistP src/Dodge/Creature/Boid.hs 24;" f encircleP src/Dodge/Creature/Boid.hs 30;" f endArcPos src/Dodge/Tesla.hs 87;" f -endCombineRegex src/Dodge/Update/Input/InGame.hs 286;" f -endRegex src/Dodge/Update/Input/InGame.hs 280;" f +endCombineRegex src/Dodge/Update/Input/InGame.hs 291;" f +endRegex src/Dodge/Update/Input/InGame.hs 285;" f energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f enterCombineInv src/Dodge/DisplayInventory.hs 322;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f @@ -3592,7 +3592,7 @@ epText src/Dodge/Inventory/SelectionList.hs 73;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f eqTypeToSites src/Dodge/Inventory/RBList.hs 78;" f -equipAllocString src/Dodge/Render/HUD.hs 321;" f +equipAllocString src/Dodge/Render/HUD.hs 318;" f equipAttachPos src/Dodge/Item/Draw.hs 30;" f equipBackgroundEffect src/Dodge/Euse.hs 22;" f equipInfo src/Dodge/Item/Info.hs 140;" f @@ -3675,7 +3675,7 @@ flockACC src/Dodge/Creature/ReaderUpdate.hs 97;" f flockArmourChaseCrit src/Dodge/Creature/ArmourChase.hs 14;" f flockChaseTarget src/Dodge/Creature/Boid.hs 188;" f flockPointTarget src/Dodge/Creature/Boid.hs 204;" f -floorItemPickupInfo src/Dodge/Render/HUD.hs 235;" f +floorItemPickupInfo src/Dodge/Render/HUD.hs 232;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 143;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f @@ -3743,7 +3743,7 @@ getAutoSpringLinks src/Dodge/Item/Grammar.hs 90;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 175;" f getBulletType src/Dodge/HeldUse.hs 945;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 546;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 547;" f getCommand src/Dodge/Terminal.hs 61;" f getCommands src/Dodge/Terminal.hs 58;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 56;" f @@ -3963,15 +3963,15 @@ invDP src/Dodge/ListDisplayParams.hs 32;" f invDT src/Dodge/Item/Grammar.hs 227;" f invDT' src/Dodge/Item/Grammar.hs 232;" f invDimColor src/Dodge/DisplayInventory.hs 191;" f -invHead src/Dodge/Render/HUD.hs 430;" f +invHead src/Dodge/Render/HUD.hs 427;" f invIMDT src/Dodge/Item/Grammar.hs 256;" f invIndents src/Dodge/Item/Grammar.hs 263;" f invItemEffs src/Dodge/Creature/State.hs 92;" f invItemLocUpdate src/Dodge/Creature/State.hs 100;" f invRootMap src/Dodge/Item/Grammar.hs 237;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 33;" f -invSetSelection src/Dodge/Inventory.hs 256;" f -invSetSelectionPos src/Dodge/Inventory.hs 265;" f +invSetSelection src/Dodge/Inventory.hs 255;" f +invSetSelectionPos src/Dodge/Inventory.hs 264;" f invShiftPointBy src/Dodge/ShiftPoint.hs 17;" f invSize src/Dodge/Inventory/CheckSlots.hs 33;" f inventoryX src/Dodge/Creature.hs 103;" f @@ -4156,7 +4156,7 @@ listGuard src/Dodge/Creature/ReaderUpdate.hs 287;" f listSelectionColorPicture src/Dodge/DisplayInventory.hs 300;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f lmt src/MatrixHelper.hs 53;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 419;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 416;" f loadAmmoTut src/Dodge/Room/Tutorial.hs 475;" f loadDodgeConfig src/Dodge/Config.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f @@ -4283,7 +4283,7 @@ maybeBlockedPassage src/Dodge/Room/RezBox.hs 80;" f maybeClearLoadingScreen src/Dodge/StartNewGame.hs 58;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 136;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 141;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 568;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 569;" f maybeOpenConsole src/Dodge/Update.hs 136;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 135;" f @@ -4528,7 +4528,7 @@ passthroughLockKeyLists src/Dodge/Room/Tutorial.hs 693;" f pathConnected src/Dodge/Room/CheckConsistency.hs 13;" f pathEdgeObstructed src/Dodge/Path.hs 87;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 534;" f +pauseGame src/Dodge/Update/Input/InGame.hs 539;" f pauseMenu src/Dodge/Menu.hs 57;" f pauseMenuOptions src/Dodge/Menu.hs 64;" f pauseSound src/Dodge/SoundLogic.hs 42;" f @@ -4976,8 +4976,8 @@ screenPolygon src/Dodge/Base/Window.hs 18;" f screenPolygonBord src/Dodge/Base/Window.hs 28;" f screenPosAbs src/Dodge/ScreenPos.hs 16;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 45;" f -scrollAugInvSel src/Dodge/Inventory.hs 268;" f -scrollAugNextInSection src/Dodge/Inventory.hs 283;" f +scrollAugInvSel src/Dodge/Inventory.hs 267;" f +scrollAugNextInSection src/Dodge/Inventory.hs 282;" f scrollRBOption src/Dodge/Update/Scroll.hs 140;" f scrollSelectionSections src/Dodge/SelectionSections.hs 31;" f scrollTimeBack src/Dodge/Update.hs 244;" f @@ -4999,11 +4999,11 @@ seedStartMenu src/Dodge/Menu.hs 85;" f seedStartOptions src/Dodge/Menu.hs 88;" f segOnCirc src/Geometry.hs 113;" f segmentArea src/Dodge/Creature/Update.hs 355;" f -selNumPos src/Dodge/Render/HUD.hs 479;" f -selNumPosCardinal src/Dodge/Render/HUD.hs 496;" f +selNumPos src/Dodge/Render/HUD.hs 476;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 493;" f selSecDrawCursor src/Dodge/Render/List.hs 102;" f selSecDrawCursorFixWidth src/Dodge/Render/List.hs 120;" f -selSecSelCol src/Dodge/Render/HUD.hs 516;" f +selSecSelCol src/Dodge/Render/HUD.hs 513;" f selSecSelSize src/Dodge/SelectionSections.hs 154;" f selSecYint src/Dodge/SelectionSections.hs 163;" f selectedItemScroll src/Dodge/Update/Scroll.hs 50;" f @@ -5042,7 +5042,7 @@ setOutLinksByType src/Dodge/RoomLink.hs 76;" f setOutLinksPD src/Dodge/RoomLink.hs 96;" f setPixelOffsetBounded src/Dodge/Update/Input/InGame.hs 106;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 326;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 340;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 345;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 93;" f setShaderSource src/Shader/Compile.hs 121;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5085,7 +5085,7 @@ shiftByV2 src/Dodge/PlacementSpot.hs 257;" f shiftChildren src/Dodge/Tree/Compose.hs 45;" f shiftDraw src/Dodge/Render/ShapePicture.hs 111;" f shiftInBy src/Dodge/PlacementSpot.hs 254;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 307;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 312;" f shiftInvItemsDown src/Dodge/Inventory.hs 155;" f shiftInvItemsUp src/Dodge/Inventory.hs 165;" f shiftLinkBy src/Dodge/Room/Link.hs 89;" f @@ -5219,7 +5219,7 @@ soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 89;" f spPos src/ShapePicture/Data.hs 11;" f -spaceAction src/Dodge/Update/Input/InGame.hs 537;" f +spaceAction src/Dodge/Update/Input/InGame.hs 542;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 162;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 155;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 147;" f @@ -5283,7 +5283,7 @@ stackedInventory src/Dodge/Creature.hs 318;" f startCr src/Dodge/Creature.hs 83;" f startCrafts src/Dodge/Room/Start.hs 94;" f startDeathTimer src/Dodge/Creature/Update.hs 495;" f -startDrag src/Dodge/Update/Input/InGame.hs 295;" f +startDrag src/Dodge/Update/Input/InGame.hs 300;" f startInvList src/Dodge/Creature.hs 97;" f startInventory src/Dodge/Creature.hs 100;" f startNewGameInSlot src/Dodge/StartNewGame.hs 16;" f @@ -5323,7 +5323,7 @@ swapInIntSet src/Dodge/Inventory/Swap.hs 57;" f swapInOutLinks src/Dodge/RoomLink.hs 99;" f swapIndices src/ListHelp.hs 50;" f swapInvItems src/Dodge/Inventory/Swap.hs 23;" f -swapItemWith src/Dodge/Inventory.hs 240;" f +swapItemWith src/Dodge/Inventory.hs 239;" f swapSelSet src/Dodge/Inventory.hs 130;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 174;" f @@ -5513,7 +5513,7 @@ truncate src/Polyhedra/Geodesic.hs 39;" f trunkDepth src/TreeHelp.hs 164;" f tryAttachItems src/Dodge/Item/Grammar.hs 35;" f tryClickUse src/Dodge/Creature/YourControl.hs 205;" f -tryCombine src/Dodge/Update/Input/InGame.hs 558;" f +tryCombine src/Dodge/Update/Input/InGame.hs 559;" f tryDrawToCapacitor src/Dodge/Creature/State.hs 184;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 132;" f tryEvadeSideways src/Dodge/Creature/Action.hs 104;" f @@ -5573,7 +5573,7 @@ updateAggroBee src/Dodge/Creature/Update.hs 129;" f updateAimPos src/Dodge/Update.hs 399;" f updateAllNodes src/TreeHelp.hs 88;" f updateArc src/Dodge/Tesla.hs 44;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 479;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 484;" f updateBarrel src/Dodge/Barreloid.hs 43;" f updateBarreloid src/Dodge/Barreloid.hs 16;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 30;" f @@ -5617,14 +5617,14 @@ updateEdgesWall src/Dodge/Update/WallDamage.hs 23;" f updateEdgesWall' src/Dodge/Update/WallDamage.hs 36;" f updateEnergyBall src/Dodge/EnergyBall.hs 32;" f updateEnergyBalls src/Dodge/Update.hs 774;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 511;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 516;" f updateExpBarrel src/Dodge/Barreloid.hs 21;" f updateFlame src/Dodge/Flame.hs 19;" f updateFlames src/Dodge/Update.hs 771;" f updateFloatingCamera src/Dodge/Update/Camera.hs 39;" f updateFoodSearchChaseCrit src/Dodge/Creature/Update.hs 381;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 358;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 354;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 363;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 359;" f updateGas src/Dodge/Update.hs 941;" f updateGusts src/Dodge/Update.hs 903;" f updateHiveCrit src/Dodge/Creature/Update.hs 82;" f @@ -5632,22 +5632,22 @@ updateHoverCrit src/Dodge/Humanoid.hs 25;" f updateIMl src/Dodge/Update.hs 638;" f updateIMl' src/Dodge/Update.hs 641;" f updateInGameCamera src/Dodge/Update/Camera.hs 87;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 431;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 436;" f updateInt2Map src/Dodge/Zoning/Base.hs 94;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 88;" f updateItemTargeting src/Dodge/Creature/State.hs 293;" f -updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 391;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 425;" f +updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 396;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 430;" f updateKeysInGame src/Dodge/Update/Input/InGame.hs 80;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 377;" f -updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 400;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f +updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 405;" f updateLampoid src/Dodge/Lampoid.hs 13;" f updateLaser src/Dodge/Laser/Update.hs 12;" f updateLasers src/Dodge/Update.hs 516;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 179;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLivingCreature src/Dodge/Creature/Update.hs 61;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 444;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 449;" f updateMachine src/Dodge/Machine/Update.hs 24;" f updateMagnets src/Dodge/Update.hs 407;" f updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 217;" f @@ -5868,7 +5868,7 @@ yV2 src/Geometry/Vector.hs 213;" f yellow src/Color.hs 44;" f you src/Dodge/Base/You.hs 17;" f youDropItem src/Dodge/Creature/Action.hs 192;" f -yourAugmentedItem src/Dodge/Render/HUD.hs 242;" f +yourAugmentedItem src/Dodge/Render/HUD.hs 239;" f yourControl src/Dodge/Creature/YourControl.hs 26;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 108;" f yourInfo src/Dodge/Creature/Info.hs 10;" f