From f91a5cebb5f9e8d13a81591fb6d1e8f5a782d62f Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 25 Nov 2024 23:13:54 +0000 Subject: [PATCH] Cleanup --- src/Dodge/Creature/YourControl.hs | 2 +- src/Dodge/InputFocus.hs | 73 ++-------- src/Dodge/Update/Camera.hs | 2 +- src/Dodge/Update/Input/InGame.hs | 12 +- tags | 227 +++++++++++------------------- 5 files changed, 98 insertions(+), 218 deletions(-) diff --git a/src/Dodge/Creature/YourControl.hs b/src/Dodge/Creature/YourControl.hs index 0c9b6bb4f..d0f3b0b34 100644 --- a/src/Dodge/Creature/YourControl.hs +++ b/src/Dodge/Creature/YourControl.hs @@ -21,7 +21,7 @@ import qualified SDL -- | The AI equivalent for your control. yourControl :: Creature -> World -> World yourControl _ w - | inInputFocus w = w + | inTextInputFocus w = w | not intopinv = w & cWorld . lWorld . creatures . ix 0 %~ wasdWithAiming w | otherwise = diff --git a/src/Dodge/InputFocus.hs b/src/Dodge/InputFocus.hs index ec3fdd3c1..26f7be957 100644 --- a/src/Dodge/InputFocus.hs +++ b/src/Dodge/InputFocus.hs @@ -1,11 +1,7 @@ module Dodge.InputFocus ( - inInvRegex, - inCloseRegex, - inSubInvRegex, - inputFocus, - inInputFocus, --- regexScope, --- regexFocus, +-- inInvRegex, +-- inCloseRegex, + inTextInputFocus, ) where import Control.Monad @@ -13,52 +9,17 @@ import Data.Maybe import Dodge.Data.World import LensHelp ---regexScope :: --- (Applicative f) => --- World -> --- Maybe ((SSSExtra -> f SSSExtra) -> HUDElement -> f HUDElement, Int) ---regexScope w = case w ^? hud . hudElement . subInventory of --- Just NoSubInventory{} -> case he ^? diSelection . _Just of --- Just (-1, _) -> di (-1) --- Just (0, _) -> di (-1) --- Just (2, _) -> di 2 --- Just (3, _) -> di 2 --- _ -> Nothing --- Just CombineInventory{} -> --- Just (subInventory . ciSections . sssExtra, -1) --- _ -> Nothing --- where --- di x = Just (diSections . sssExtra, x) --- he = w ^. hud . hudElement - ---regexFocus :: --- (Applicative f) => --- World -> --- Maybe --- ((SSSExtra -> f SSSExtra) -> HUDElement -> f HUDElement, Int) ---regexFocus w = case w ^? hud . hudElement . subInventory of --- Just NoSubInventory{} -> case he ^? diSelection . _Just of --- Just (-1, _) -> di (-1) --- Just (2, _) -> di 2 --- _ -> Nothing --- Just CombineInventory{} -> --- Just (subInventory . ciSections . sssExtra, -1) --- _ -> Nothing --- where --- di x = Just (diSections . sssExtra, x) --- he = w ^. hud . hudElement - -inInputFocus :: World -> Bool -inInputFocus = isJust . inputFocusI +inTextInputFocus :: World -> Bool +inTextInputFocus = isJust . inputFocusI inputFocusI :: World -> Maybe ((String -> Identity String) -> World -> Identity World) -inputFocusI = inputFocus +inputFocusI = textInputFocus -inputFocus :: +textInputFocus :: Applicative f => World -> Maybe ((String -> f String) -> World -> f World) -inputFocus w = case w ^? hud . hudElement . subInventory of +textInputFocus w = case w ^? hud . hudElement . subInventory of Just NoSubInventory{} -> case he ^? diSelection . _Just . _1 of Just (-1) -> Just $ hud . hudElement . diInvFilter . _Just Just 2 -> Just $ hud . hudElement . diCloseFilter . _Just @@ -74,21 +35,3 @@ inputFocus w = case w ^? hud . hudElement . subInventory of where he = w ^. hud . hudElement -inTopRegex :: Int -> World -> Bool -inTopRegex x w = fromMaybe False $ do - i <- w ^? hud . hudElement . diSelection . _Just . _1 - return $ i == x - -inInvRegex :: World -> Bool -inInvRegex = inTopRegex (-1) - -inCloseRegex :: World -> Bool -inCloseRegex = inTopRegex 2 - -inSubInvRegex :: World -> Bool -inSubInvRegex w = fromMaybe False $ do - i <- w ^? hud . hudElement . subInventory . ciSelection . _Just . _1 - return $ i == (-1) - ---inputFocus :: World -> Bool ---inputFocus w = inTermFocus w || inSubInvRegex w || inInvRegex w || inCloseRegex w diff --git a/src/Dodge/Update/Camera.hs b/src/Dodge/Update/Camera.hs index a26b1cd90..f0e6bc639 100644 --- a/src/Dodge/Update/Camera.hs +++ b/src/Dodge/Update/Camera.hs @@ -206,7 +206,7 @@ rotateCamera cfig w | keydown SDL.ScancodeE = rotateCameraBy (-0.025) w | otherwise = ifConfigWallRotate cfig (w ^. input . mouseButtons) w where - keydown scode = scode `M.member` _pressedKeys (_input w) && not (inInputFocus w) + keydown scode = scode `M.member` _pressedKeys (_input w) && not (inTextInputFocus w) zoomFromItem :: ItZoom -> Float zoomFromItem ItZoom{_izMax = zMax, _izMin = zMin, _izFac = zFac} = diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 0f6e62450..413c1b1e0 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -21,7 +21,6 @@ import Dodge.Data.Combine import Dodge.Data.Universe import Dodge.DisplayInventory import Dodge.Event.Test -import Dodge.InputFocus import Dodge.Inventory import Dodge.Inventory.Add import Dodge.ListDisplayParams @@ -39,22 +38,19 @@ import SDL updateUseInputInGame :: Universe -> Universe updateUseInputInGame u = updateFunctionKeys $ case u ^. uvWorld . hud . hudElement of DisplayCarte -> over uvWorld updatePressedButtonsCarte u - DisplayInventory{_subInventory = si} -> case si of + DisplayInventory{_subInventory = si, _diSelection = disel} -> case si of DisplayTerminal tmid -> updateKeysInTerminal tmid u - CombineInventory{_ciSections = sss, _ciSelection = msel} - | inSubInvRegex (u ^. uvWorld) -> + CombineInventory{_ciSections = sss, _ciSelection = msel@(Just ((-1),_,_))} -> u & uvWorld . hud . hudElement . subInventory %~ docombineregexinput sss msel & uvWorld . worldEventFlags . at CombineInventoryChange ?~ () - _ - | inInvRegex (u ^. uvWorld) -> + _ | disel ^? _Just . _1 == Just (-1) -> u & uvWorld . hud . hudElement %~ dodisplayregexinput diInvFilter diInvFilter (-1) & uvWorld . worldEventFlags . at InventoryChange ?~ () & uvWorld %~ setInvPosFromSS - _ - | inCloseRegex (u ^. uvWorld) -> + _ | disel ^? _Just . _1 == Just 2 -> u & uvWorld . hud . hudElement %~ dodisplayregexinput diCloseFilter diCloseFilter 2 & uvWorld . worldEventFlags . at InventoryChange ?~ () diff --git a/tags b/tags index 62d9e1265..f7d0c2286 100644 --- a/tags +++ b/tags @@ -281,7 +281,6 @@ CardinalPoint src/Dodge/Data/CardinalPoint.hs 1;" m Carriage src/Dodge/Data/Creature/Stance.hs 20;" t Carte src/Dodge/Render/HUD/Carte.hs 1;" m ChainEffect src/Dodge/Item/Weapon/TriggerType.hs 43;" t -ChainEffect src/Dodge/ChainEffect.hs 1;" m ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C ChangeStrategy src/Dodge/Data/ActionPlan.hs 44;" C @@ -299,11 +298,9 @@ ChemFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 51;" C ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 62;" C ChooseMovementSpreadGun src/Dodge/Data/CreatureEffect.hs 61;" C ChooseTarget src/Dodge/Creature/ChooseTarget.hs 1;" m -CircFlare src/Dodge/Data/Flare.hs 21;" C Cleat src/Dodge/Cleat.hs 2;" m Climate src/Dodge/Data/Scenario.hs 32;" C Clock src/Dodge/Clock.hs 1;" m -CloseObject src/Dodge/Inventory/CloseObject.hs 1;" m CloseToMelee src/Dodge/Data/ActionPlan.hs 187;" C CloseToggle src/Dodge/Data/Machine/Sensor.hs 39;" t Close_shape_culling src/Dodge/Data/Config.hs 79;" C @@ -436,8 +433,6 @@ CryostatisSS src/Dodge/Data/Scenario.hs 91;" C Crystal src/Dodge/Data/Material.hs 11;" C Cull_more_lights src/Dodge/Data/Config.hs 78;" C CumulativeMuzzleEffect src/Dodge/Data/MuzzleEffect.hs 11;" t -CurseStatus src/Dodge/Data/Item/CurseStatus.hs 11;" t -CurseStatus src/Dodge/Data/Item/CurseStatus.hs 6;" m CursorDisplay src/Dodge/Data/SelectionList.hs 20;" t Cuse src/Dodge/Data/Item/HeldUse.hs 15;" t Cuse src/Dodge/Cuse.hs 1;" m @@ -573,7 +568,6 @@ Draw src/Dodge/Laser/Draw.hs 1;" m Draw src/Dodge/LightSource/Draw.hs 1;" m Draw src/Dodge/LinearShockwave/Draw.hs 1;" m Draw src/Dodge/Machine/Draw.hs 1;" m -Draw src/Dodge/Particle/Draw.hs 1;" m Draw src/Dodge/Projectile/Draw.hs 1;" m Draw src/Dodge/Prop/Draw.hs 1;" m Draw src/Dodge/RadarSweep/Draw.hs 1;" m @@ -621,7 +615,6 @@ East src/Dodge/Data/CardinalPoint.hs 5;" C East8 src/Dodge/Data/CardinalPoint.hs 13;" C EdgeObstacle src/Dodge/Data/PathGraph.hs 48;" t Effect src/Dodge/Data/Item/Effect.hs 6;" m -Effect src/Dodge/Default/Item/Effect.hs 1;" m EffectArguments src/Dodge/Data/Terminal.hs 94;" t EffectRootNotroot src/Dodge/Data/Item/Effect.hs 24;" C EffectWhileAttached src/Dodge/Data/Item/Effect.hs 28;" C @@ -704,11 +697,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 -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 130;" t -Flash src/Dodge/WorldEvent/Flash.hs 11;" m FlashBall src/Dodge/Data/Bullet.hs 33;" C FlatFaces src/Shape/Data.hs 17;" C FlatShieldParams src/Dodge/Data/Item/Params.hs 19;" C @@ -1029,7 +1018,6 @@ Layer src/Picture/Data.hs 22;" t Layout src/Dodge/Layout.hs 2;" m LeadTarget src/Dodge/Data/ActionPlan.hs 149;" C Left src/Dodge/Item/Left.hs 1;" m -LeftButton src/Dodge/Terminal/LeftButton.hs 1;" m LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 26;" t LeftForward src/Dodge/Data/Creature/Stance.hs 32;" C LeftItemType src/Dodge/Data/Item/Combine.hs 119;" t @@ -1052,11 +1040,9 @@ Lights src/Dodge/Render/Lights.hs 1;" m LimitedBreathableAtmosphere src/Dodge/Data/Scenario.hs 38;" C LimitedFood src/Dodge/Data/Scenario.hs 39;" C LimitedWater src/Dodge/Data/Scenario.hs 40;" C -Line src/Dodge/Terminal/Line.hs 1;" m LinearShockwave src/Dodge/Data/LinearShockwave.hs 13;" t LinearShockwave src/Dodge/Data/LinearShockwave.hs 6;" m Link src/Dodge/Room/Link.hs 6;" m -LinkDecoration src/Dodge/Debug/LinkDecoration.hs 1;" m LinkTest src/Dodge/Data/ComposedItem.hs 57;" t LinkUpdate src/Dodge/Data/ComposedItem.hs 62;" t List src/Dodge/Combine/List.hs 1;" m @@ -1209,7 +1195,6 @@ 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 -MuzFlare src/Dodge/Data/Flare.hs 15;" C Muzzle src/Dodge/Data/Item/Use.hs 155;" t MuzzleDetector src/Dodge/Data/Item/Use.hs 152;" C MuzzleEffect src/Dodge/Data/Item/Use.hs 139;" t @@ -1577,7 +1562,6 @@ ReaderUpdate src/Dodge/Creature/ReaderUpdate.hs 1;" m RecRoomSS src/Dodge/Data/Scenario.hs 103;" C RectRoomType src/Dodge/Data/Room.hs 32;" C ReduceSpinPU src/Dodge/Data/Item/Use/Consumption/Ammo.hs 33;" C -Regex src/Regex.hs 1;" m ReigonalGovernment src/Dodge/Data/Scenario.hs 50;" C Religion src/Dodge/Data/Scenario.hs 47;" C Reload src/Dodge/Data/ActionPlan.hs 190;" C @@ -1601,7 +1585,6 @@ ResFactor src/Dodge/Data/Config.hs 95;" t ResearchFacility src/Dodge/Data/Scenario.hs 62;" C ResourceFailure src/Dodge/Data/Scenario.hs 29;" C RetailFacility src/Dodge/Data/Scenario.hs 67;" C -ReturnEffect src/Dodge/Terminal/ReturnEffect.hs 1;" m Revenge src/Dodge/Data/Scenario.hs 6;" C RewindLeftClick src/Dodge/Data/World.hs 73;" C RezBaySS src/Dodge/Data/Scenario.hs 105;" C @@ -1689,7 +1672,6 @@ SelectedItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 22;" C SelectionInfo src/Dodge/Data/SelectionList.hs 53;" C SelectionItem src/Dodge/Data/SelectionList.hs 44;" t SelectionList src/Dodge/Data/SelectionList.hs 4;" m -SelectionList src/Dodge/Default/SelectionList.hs 1;" m SelectionList src/Dodge/Inventory/SelectionList.hs 3;" m SelectionList src/Dodge/SelectionList.hs 1;" m SelectionSection src/Dodge/Data/SelectionList.hs 30;" t @@ -1716,7 +1698,6 @@ ShadowFidelity src/Shape/Data.hs 24;" t ShadowRendering src/Dodge/Data/Config.hs 98;" t Shadows src/Dodge/Shadows.hs 1;" m Shape src/Shape/Data.hs 53;" t -Shape src/Dodge/Data/Creature/Shape.hs 1;" m Shape src/Shape.hs 3;" m ShapePicture src/Dodge/Render/ShapePicture.hs 1;" m ShapePicture src/ShapePicture.hs 1;" m @@ -1965,7 +1946,6 @@ Toggle2 src/Dodge/Data/Universe.hs 104;" C TopDecoration src/Dodge/Placement/TopDecoration.hs 1;" m TopEscapeMenuOption src/Dodge/Data/Universe.hs 74;" C TopLDT src/Dodge/Data/DoubleTree.hs 44;" C -Torch src/Dodge/LightSource/Torch.hs 1;" m TorpedoBaySS src/Dodge/Data/Scenario.hs 99;" C TorqueCr src/Dodge/Data/WorldEffect.hs 32;" C TorqueDamage src/Dodge/Data/Damage.hs 27;" C @@ -2000,12 +1980,9 @@ Type src/Dodge/Data/Damage/Type.hs 6;" m Type src/Dodge/Terminal/Type.hs 1;" m Typical src/Shape/Data.hs 36;" C UncomposableIsolateSF src/Dodge/Data/ComposedItem.hs 37;" C -Uncursed src/Dodge/Data/Item/CurseStatus.hs 12;" C UnderGround src/Dodge/Data/Scenario.hs 78;" C UnderRoof src/Dodge/Data/Scenario.hs 79;" C UnderSea src/Dodge/Data/Scenario.hs 77;" C -UndroppableIdentified src/Dodge/Data/Item/CurseStatus.hs 13;" C -UndroppableUnidentified src/Dodge/Data/Item/CurseStatus.hs 14;" C UniRandFloat src/Dodge/Data/GenFloat.hs 12;" C Unimportant src/Shape/Data.hs 37;" C Universe src/Dodge/Data/Universe.hs 30;" t @@ -2545,14 +2522,6 @@ _flWidth src/Dodge/Data/Flame.hs 18;" f _flZ src/Dodge/Data/Flame.hs 20;" f _flames src/Dodge/Data/LWorld.hs 109;" f _flankTarget src/Dodge/Data/ActionPlan.hs 177;" f -_flareAlpha src/Dodge/Data/Flare.hs 23;" f -_flareColor src/Dodge/Data/Flare.hs 17;" f -_flareColor src/Dodge/Data/Flare.hs 22;" f -_flarePoly src/Dodge/Data/Flare.hs 16;" f -_flareTime src/Dodge/Data/Flare.hs 19;" f -_flareTime src/Dodge/Data/Flare.hs 25;" f -_flareTran3 src/Dodge/Data/Flare.hs 18;" f -_flareTran3 src/Dodge/Data/Flare.hs 24;" f _flares src/Dodge/Data/LWorld.hs 112;" f _flatShieldWlMIX src/Dodge/Data/Item/Params.hs 20;" f _floorItems src/Dodge/Data/LWorld.hs 128;" f @@ -3338,8 +3307,6 @@ addPolyWall src/Dodge/LevelGen/StaticWalls.hs 141;" f addPolyWalls src/Dodge/LevelGen/StaticWalls.hs 129;" f addRandomGirderEW src/Dodge/Room/Girder.hs 9;" f addRandomGirderFrom src/Dodge/Room/Girder.hs 16;" f -addRoomLinkDecorations src/Dodge/Debug/LinkDecoration.hs 19;" f -addRoomPolyDecorations src/Dodge/Debug/LinkDecoration.hs 14;" f addSideEffect src/Dodge/Concurrent.hs 30;" f addSouthPillars src/Dodge/Room/LongDoor.hs 88;" f addTermSignal src/Dodge/Event/Input.hs 34;" f @@ -3347,7 +3314,7 @@ addToTrunk src/TreeHelp.hs 156;" f addWarningTerminal src/Dodge/Room/Warning.hs 37;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 77;" f -advanceScrollAmount src/Dodge/Update.hs 408;" f +advanceScrollAmount src/Dodge/Update.hs 409;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/Picture.hs 235;" f @@ -3591,13 +3558,13 @@ chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 46;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 101;" f checkConnection src/Dodge/Inventory/Swap.hs 80;" f checkDeath src/Dodge/Creature/State.hs 75;" f -checkEndGame src/Dodge/Update.hs 695;" f +checkEndGame src/Dodge/Update.hs 696;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 16;" f checkInventorySelectionExists src/Dodge/DisplayInventory.hs 94;" f -checkTermDist src/Dodge/Update.hs 301;" f +checkTermDist src/Dodge/Update.hs 302;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f @@ -3618,7 +3585,7 @@ circle src/Picture/Base.hs 180;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f -clClSpringVel src/Dodge/Update.hs 748;" f +clClSpringVel src/Dodge/Update.hs 749;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f @@ -3639,14 +3606,12 @@ clockCycle src/Dodge/Clock.hs 9;" f closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 66;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 52;" f closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 79;" f -closeObjEq src/Dodge/Inventory/CloseObject.hs 15;" f -closeObjPos src/Dodge/Inventory/CloseObject.hs 10;" f -closeObjectInfo src/Dodge/Render/HUD.hs 212;" f +closeObjectInfo src/Dodge/Render/HUD.hs 214;" f closestCreatureID src/Dodge/Debug.hs 92;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f closestPointOnLineParam src/Geometry/Intersect.hs 267;" f closestPointOnSeg src/Geometry/Intersect.hs 282;" f -cloudEffect src/Dodge/Update.hs 718;" f +cloudEffect src/Dodge/Update.hs 719;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 9;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -3675,7 +3640,7 @@ combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 41;" f combineAwareness src/Dodge/Creature/Perception.hs 109;" f combineFloors src/Dodge/Room/Procedural.hs 172;" f -combineInventoryExtra src/Dodge/Render/HUD.hs 330;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 332;" f combineItemListYouX src/Dodge/Combine.hs 33;" f combineList src/Dodge/Combine.hs 20;" f combineRooms src/Dodge/Room/Procedural.hs 152;" f @@ -3718,7 +3683,7 @@ crAdd src/Dodge/Room/RezBox.hs 104;" f crAwayFromPost src/Dodge/Creature/Test.hs 77;" f crBlips src/Dodge/RadarSweep.hs 69;" f crCanSeeCr src/Dodge/Creature/Test.hs 48;" f -crCrSpring src/Dodge/Update.hs 766;" f +crCrSpring src/Dodge/Update.hs 767;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 28;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 37;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 51;" f @@ -3739,7 +3704,7 @@ crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 24;" f crOnWall src/Dodge/WallCreatureCollisions.hs 84;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 67;" f crSetRoots src/Dodge/Inventory/Location.hs 48;" f -crSpring src/Dodge/Update.hs 761;" f +crSpring src/Dodge/Update.hs 762;" f crStratConMatches src/Dodge/Creature/Test.hs 72;" f crUpdate src/Dodge/Creature/State.hs 62;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 61;" f @@ -3760,7 +3725,6 @@ createPathGrid src/Dodge/Room/Path.hs 21;" f createProjectile src/Dodge/HeldUse.hs 496;" f createShell src/Dodge/Projectile/Create.hs 19;" f createShieldWall src/Dodge/Euse.hs 134;" f -createTorchLightOffset src/Dodge/LightSource/Torch.hs 11;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f createWall src/Dodge/Wall/Create.hs 8;" f creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 10;" f @@ -3915,7 +3879,6 @@ defaultInput src/Dodge/Default/World.hs 14;" f defaultIntention src/Dodge/Default/Creature.hs 105;" f defaultInvSize src/Dodge/Default/Creature.hs 79;" f defaultItEffect src/Dodge/Default/Item.hs 55;" f -defaultItEffect src/Dodge/Default/Item/Effect.hs 5;" f defaultItZoom src/Dodge/Default/Item/Use/AimParams.hs 30;" f defaultItemDimension src/Dodge/Default/Item.hs 17;" f defaultLS src/Dodge/Default/LightSource.hs 6;" f @@ -3931,7 +3894,6 @@ defaultPerceptionState src/Dodge/Default/Creature.hs 82;" f defaultProp src/Dodge/Default/Prop.hs 6;" f defaultProximitySensor src/Dodge/Default.hs 80;" f defaultRoom src/Dodge/Default/Room.hs 9;" f -defaultSelectionList src/Dodge/Default/SelectionList.hs 5;" f defaultSensorWall src/Dodge/Default/Wall.hs 58;" f defaultState src/Dodge/Default/Creature.hs 140;" f defaultSwitchWall src/Dodge/Default/Door.hs 22;" f @@ -3942,7 +3904,6 @@ defaultVision src/Dodge/Default/Creature.hs 92;" f defaultWall src/Dodge/Default/Wall.hs 10;" f defaultWindow src/Dodge/Default/Wall.hs 74;" f defaultWorld src/Dodge/Default/World.hs 34;" f -defocusTerminalInput src/Dodge/Terminal/LeftButton.hs 21;" f degToRad src/Geometry/Vector.hs 117;" f deleteIMInZone src/Dodge/Base.hs 70;" f deleteWall src/Dodge/Wall/Delete.hs 21;" f @@ -3986,7 +3947,7 @@ displayFrameTicks src/Dodge/Render/Picture.hs 39;" f displayFreeSlots src/Dodge/DisplayInventory.hs 211;" f displayIndents src/Dodge/DisplayInventory.hs 119;" f displaySectionsSizes src/Dodge/DisplayInventory.hs 114;" f -displayTerminalLineString src/Dodge/Update.hs 437;" f +displayTerminalLineString src/Dodge/Update.hs 438;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f @@ -4026,7 +3987,7 @@ doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 26;" f doIntImp src/Dodge/CreatureEffect.hs 24;" f doInvEffect src/Dodge/ItEffect.hs 10;" f doItCrWdWd src/Dodge/WorldEffect.hs 49;" f -doItemTimeScroll src/Dodge/Update.hs 198;" f +doItemTimeScroll src/Dodge/Update.hs 199;" f doLoop src/Loop.hs 60;" f doMCrAc src/Dodge/CreatureEffect.hs 57;" f doMP2Ac src/Dodge/CreatureEffect.hs 73;" f @@ -4055,12 +4016,11 @@ doStep src/Dodge/ArcStep.hs 9;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f doTerminalBootProgram src/Dodge/WorldEffect.hs 102;" f doTerminalCommandEffect src/Dodge/Terminal.hs 135;" f -doTerminalEffectLB src/Dodge/Terminal/LeftButton.hs 13;" f doTestDrawing src/Dodge/Render.hs 42;" f doTextInputOver src/Dodge/Update/Input/Text.hs 15;" f doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f doThrust src/Dodge/Projectile/Update.hs 74;" f -doTimeScroll src/Dodge/Update.hs 203;" f +doTimeScroll src/Dodge/Update.hs 204;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 107;" f doWallRotate src/Dodge/Update/Camera.hs 188;" f @@ -4070,7 +4030,7 @@ doWdCrCr src/Dodge/CreatureEffect.hs 12;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 26;" f doWeaponRepetitions src/Dodge/HeldUse.hs 56;" f -doWorldEvents src/Dodge/Update.hs 419;" f +doWorldEvents src/Dodge/Update.hs 420;" f doWorldPos src/Dodge/WorldPos.hs 7;" f door src/Dodge/Room/Door.hs 13;" f doorBetween src/Dodge/Placement/Instance/Door.hs 39;" f @@ -4095,11 +4055,10 @@ drawBul src/Dodge/Bullet/Draw.hs 9;" f drawButton src/Dodge/Button/Draw.hs 9;" f drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f drawCarte src/Dodge/Render/HUD/Carte.hs 14;" f -drawCircFlare src/Dodge/Flare.hs 25;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f drawCombFilter src/Dodge/Render/Picture.hs 216;" f drawCombFilterJump src/Dodge/Render/Picture.hs 159;" f -drawCombineInventory src/Dodge/Render/HUD.hs 170;" f +drawCombineInventory src/Dodge/Render/HUD.hs 171;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 62;" f drawCorpse src/Dodge/Corpse/Draw.hs 6;" f drawCrInfo src/Dodge/Debug/Picture.hs 342;" f @@ -4116,15 +4075,14 @@ drawDragDrop src/Dodge/Render/Picture.hs 177;" f drawDragPickup src/Dodge/Render/Picture.hs 186;" f drawDragSelect src/Dodge/Render/Picture.hs 163;" f drawDragSelected src/Dodge/Render/HUD.hs 133;" f -drawDragSelecting src/Dodge/Render/HUD.hs 150;" f +drawDragSelecting src/Dodge/Render/HUD.hs 151;" f drawEmptySet src/Dodge/Render/Picture.hs 114;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 8;" f drawEquipment src/Dodge/Creature/Picture.hs 140;" f -drawExamineInventory src/Dodge/Render/HUD.hs 185;" f +drawExamineInventory src/Dodge/Render/HUD.hs 187;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 234;" f drawFlame src/Dodge/Flame/Draw.hs 7;" f drawFlamelet src/Dodge/EnergyBall/Draw.hs 23;" f -drawFlare src/Dodge/Flare.hs 12;" f drawFooterText src/Dodge/Render/MenuScreen.hs 74;" f drawForceField src/Dodge/Wall/Draw.hs 11;" f drawGapPlus src/Dodge/Render/Picture.hs 226;" f @@ -4154,7 +4112,6 @@ drawMouseOver src/Dodge/Render/HUD.hs 103;" f drawMousePosition src/Dodge/Debug/Picture.hs 319;" f drawMovingShape src/Dodge/Prop/Draw.hs 67;" f drawMovingShapeCol src/Dodge/Prop/Draw.hs 73;" f -drawMuzFlare src/Dodge/Flare.hs 17;" f drawOptions src/Dodge/Render/MenuScreen.hs 35;" f drawPathBetween src/Dodge/Debug/Picture.hs 168;" f drawPathEdge src/Dodge/Debug/Picture.hs 222;" f @@ -4164,7 +4121,7 @@ drawPointLabel src/Dodge/Render/Label.hs 13;" f drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 15;" f drawProp' src/Dodge/Prop/Draw.hs 12;" f -drawRBOptions src/Dodge/Render/HUD.hs 238;" f +drawRBOptions src/Dodge/Render/HUD.hs 240;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 7;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 30;" f drawReturn src/Dodge/Render/Picture.hs 120;" f @@ -4183,13 +4140,12 @@ drawShell src/Dodge/Projectile/Draw.hs 20;" f drawShockwave src/Dodge/Shockwave/Draw.hs 7;" f drawSpark src/Dodge/Spark/Draw.hs 6;" f drawStaticBall src/Dodge/EnergyBall/Draw.hs 14;" f -drawSubInventory src/Dodge/Render/HUD.hs 162;" f +drawSubInventory src/Dodge/Render/HUD.hs 163;" f drawSweep src/Dodge/Render/Picture.hs 242;" f drawSwitch src/Dodge/Button/Draw.hs 15;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 28;" f -drawTargetLaser src/Dodge/Particle/Draw.hs 6;" f drawTargeting src/Dodge/Targeting/Draw.hs 13;" f -drawTerminalDisplay src/Dodge/Render/HUD.hs 356;" f +drawTerminalDisplay src/Dodge/Render/HUD.hs 358;" f drawTeslaArc src/Dodge/Tesla/Arc/Draw.hs 7;" f drawText src/Picture/Base.hs 220;" f drawTitle src/Dodge/Render/MenuScreen.hs 57;" f @@ -4237,7 +4193,7 @@ encircleP src/Dodge/Creature/Boid.hs 27;" f enterCombineInv src/Dodge/DisplayInventory.hs 343;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f -equipAllocString src/Dodge/Render/HUD.hs 296;" f +equipAllocString src/Dodge/Render/HUD.hs 298;" f equipInfo src/Dodge/Item/Info.hs 103;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 65;" f equipPosition src/Dodge/Item/Draw.hs 30;" f @@ -4264,7 +4220,6 @@ expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 183;" f expireAndDamageFL src/Dodge/Flame.hs 48;" f explodeShell src/Dodge/Projectile/Update.hs 154;" f -explosionFlashAt src/Dodge/WorldEvent/Flash.hs 56;" f explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 410;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 29;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f @@ -4309,7 +4264,6 @@ flameTorrent src/Dodge/Item/Held/SprayGuns.hs 40;" f flameWall src/Dodge/Item/Held/SprayGuns.hs 56;" f flamerPic src/Dodge/Item/Draw/SPic.hs 328;" f flareCircleAt src/Dodge/HeldUse.hs 181;" f -flareCircleAt src/Dodge/WorldEvent/Flash.hs 46;" f flatItemCombinations src/Dodge/Combine/Combinations.hs 49;" f flatLookupItems src/Dodge/Combine.hs 36;" f flatShield src/Dodge/Item/Held/Utility.hs 9;" f @@ -4329,7 +4283,7 @@ flockPointTarget src/Dodge/Creature/Boid.hs 199;" f flockPointTargetR src/Dodge/Creature/Boid.hs 266;" f flockToPointUsing src/Dodge/Creature/Boid.hs 214;" f flockToPointUsing' src/Dodge/Creature/Boid.hs 227;" f -floorItemPickupInfo src/Dodge/Render/HUD.hs 217;" f +floorItemPickupInfo src/Dodge/Render/HUD.hs 219;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 119;" f floorWire src/Dodge/Wire.hs 13;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 412;" f @@ -4362,7 +4316,7 @@ fromV3 src/Geometry/Data.hs 43;" f frontArmour src/Dodge/Item/Equipment.hs 41;" f fstV2 src/Geometry/Data.hs 50;" f fuelPack src/Dodge/Item/Equipment.hs 64;" f -functionalUpdate src/Dodge/Update.hs 249;" f +functionalUpdate src/Dodge/Update.hs 250;" f fuseFunc src/Dodge/Path.hs 150;" f fusePairs src/Dodge/Path.hs 153;" f fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f @@ -4408,7 +4362,7 @@ getLaserDamage src/Dodge/HeldUse.hs 193;" f getLaserPhaseV src/Dodge/HeldUse.hs 190;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f -getMenuMouseContext src/Dodge/Update.hs 365;" f +getMenuMouseContext src/Dodge/Update.hs 367;" f getNodePos src/Dodge/Path.hs 31;" f getPretty src/AesonHelp.hs 7;" f getPrettyShort src/AesonHelp.hs 10;" f @@ -4439,7 +4393,7 @@ glassWallDamage src/Dodge/Wall/DamageEffect.hs 48;" f glushortSize src/Shader/Parameters.hs 25;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f goToTarget src/Dodge/Creature/ReaderUpdate.hs 136;" f -gotoTerminal src/Dodge/Update.hs 128;" f +gotoTerminal src/Dodge/Update.hs 129;" f grahamEliminate src/Geometry/Polygon.hs 125;" f grahamScan src/Geometry/Polygon.hs 116;" f grapeCannon src/Dodge/Item/Held/Cone.hs 38;" f @@ -4598,7 +4552,7 @@ invAdj src/Dodge/Item/Grammar.hs 188;" f invCursorParams src/Dodge/ListDisplayParams.hs 38;" f invDimColor src/Dodge/DisplayInventory.hs 205;" f invDisplayParams src/Dodge/ListDisplayParams.hs 32;" f -invHead src/Dodge/Render/HUD.hs 394;" f +invHead src/Dodge/Render/HUD.hs 396;" f invLDT src/Dodge/Item/Grammar.hs 171;" f invRootMap src/Dodge/Item/Grammar.hs 180;" f invRootTrees src/Dodge/Item/Grammar.hs 210;" f @@ -4608,8 +4562,8 @@ invSideEff src/Dodge/Creature/State.hs 162;" f invSize src/Dodge/Inventory/CheckSlots.hs 30;" f invTrees src/Dodge/Item/Grammar.hs 198;" f invTrees' src/Dodge/Item/Grammar.hs 202;" f -inventoryExtra src/Dodge/Render/HUD.hs 305;" f -inventoryExtraH src/Dodge/Render/HUD.hs 316;" f +inventoryExtra src/Dodge/Render/HUD.hs 307;" f +inventoryExtraH src/Dodge/Render/HUD.hs 318;" f inventoryX src/Dodge/Creature.hs 115;" f inverseSelNumPos src/Dodge/SelectionSections.hs 228;" f inverseSelSecYint src/Dodge/SelectionSections.hs 201;" f @@ -4637,7 +4591,7 @@ isLeftOfA src/Geometry.hs 181;" f isNothing' src/MaybeHelp.hs 33;" f isOnSeg src/Geometry.hs 240;" f isOutLnk src/Dodge/PlacementSpot.hs 164;" f -isOverTerminalScreen src/Dodge/Update.hs 386;" f +isOverTerminalScreen src/Dodge/Update.hs 388;" f isPutID src/Dodge/Placement/Instance/Wall.hs 129;" f isRHS src/Geometry/LHS.hs 24;" f isUnusedLnk src/Dodge/PlacementSpot.hs 61;" f @@ -4760,7 +4714,6 @@ lineOutputTerminal src/Dodge/WorldEffect.hs 76;" f lineSplit src/Justify.hs 26;" f lineThick src/Picture/Base.hs 234;" f lineUp src/Dodge/Creature/Boid.hs 147;" f -linkDecoration src/Dodge/Debug/LinkDecoration.hs 27;" f linksAndPath src/Dodge/Room/Path.hs 39;" f linksAndPath' src/Dodge/Room/Path.hs 44;" f linksOnPath src/Dodge/Room/CheckConsistency.hs 7;" f @@ -4774,7 +4727,7 @@ llleft src/Dodge/Item/Grammar.hs 107;" f llright src/Dodge/Item/Grammar.hs 114;" f lmt src/MatrixHelper.hs 43;" f lnkBothAnd src/Dodge/Room/Procedural.hs 121;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 383;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 385;" f lnkPosDir src/Dodge/RoomLink.hs 97;" f loadDodgeConfig src/Dodge/Config/Load.hs 9;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 21;" f @@ -4839,9 +4792,7 @@ makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f makeColorTermLine src/Dodge/Terminal.hs 129;" f -makeColorTermLine src/Dodge/Terminal/Line.hs 19;" f makeColorTermPara src/Dodge/Terminal.hs 126;" f -makeColorTermPara src/Dodge/Terminal/Line.hs 16;" f makeCorpse src/Dodge/Corpse/Make.hs 10;" f makeDebris src/Dodge/Block/Debris.hs 42;" f makeDebrisDirected src/Dodge/Block/Debris.hs 79;" f @@ -4883,7 +4834,6 @@ makeSwitch src/Dodge/LevelGen/Switch.hs 52;" f makeSwitchSPic src/Dodge/LevelGen/Switch.hs 40;" f makeTermLine src/Dodge/Terminal.hs 120;" f makeTermPara src/Dodge/Terminal.hs 123;" f -makeTermPara src/Dodge/Terminal/Line.hs 13;" f makeTeslaArc src/Dodge/Tesla/Arc.hs 57;" f makeTeslaBallAt src/Dodge/Tesla/Ball.hs 6;" f makeTeslaExplosionAt src/Dodge/WorldEvent/Explosion.hs 41;" f @@ -4894,7 +4844,7 @@ makeTlsTimeRadColPos src/Dodge/LightSource.hs 88;" f makeTypeCraft src/Dodge/Item/Craftable.hs 13;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 7;" f mapOverlay src/Dodge/Render/HUD/Carte.hs 24;" f -markWallSeen src/Dodge/Update.hs 680;" f +markWallSeen src/Dodge/Update.hs 681;" f maxDamageType src/Dodge/Damage.hs 37;" f maxShowX src/Dodge/Combine/Graph.hs 49;" f maxViewDistance src/Dodge/Viewpoints.hs 26;" f @@ -4906,7 +4856,7 @@ maybeClearPaths src/Dodge/Block.hs 74;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f maybeExitCombine src/Dodge/Update/Input/InGame.hs 560;" f -maybeOpenTerminal src/Dodge/Update.hs 123;" f +maybeOpenTerminal src/Dodge/Update.hs 124;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 111;" f maybeWarmupStatus src/Dodge/Item/Display.hs 119;" f @@ -5016,12 +4966,11 @@ multiLookupTrie src/SimpleTrie.hs 34;" f multiLookupTrieI src/SimpleTrie.hs 43;" f muout src/Dodge/RoomLink.hs 129;" f muzFlareAt src/Dodge/HeldUse.hs 167;" f -muzFlareAt src/Dodge/WorldEvent/Flash.hs 26;" f mvBullet src/Dodge/Bullet.hs 33;" f mvButton src/Dodge/Placement/PlaceSpot.hs 176;" f mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f mvFS src/Dodge/Placement/PlaceSpot.hs 189;" f -mvGust src/Dodge/Update.hs 709;" f +mvGust src/Dodge/Update.hs 710;" f mvLS src/Dodge/Placement/PlaceSpot.hs 217;" f mvP src/Dodge/Wall/Move.hs 54;" f mvPP src/Dodge/Placement/PlaceSpot.hs 183;" f @@ -5134,7 +5083,7 @@ pauseGame src/Dodge/Update/Input/InGame.hs 480;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f -pauseTime src/Dodge/Update.hs 189;" f +pauseTime src/Dodge/Update.hs 190;" f pciToCI src/Dodge/Item/Grammar.hs 96;" f peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f pedestalRoom src/Dodge/Room/Containing.hs 50;" f @@ -5269,7 +5218,6 @@ polyToPics src/Polyhedra.hs 122;" f polyToTris src/Geometry/Triangulate.hs 7;" f polyToTris' src/Geometry.hs 160;" f polyToTris'' src/Geometry/Triangulate.hs 15;" f -polyWireFrame src/Dodge/Debug/LinkDecoration.hs 33;" f polygon src/Picture/Base.hs 72;" f polygonCol src/Picture/Base.hs 78;" f polygonWire src/Picture/Base.hs 63;" f @@ -5290,7 +5238,7 @@ powlistUpToN src/Multiset.hs 23;" f powlistUpToN' src/Multiset.hs 12;" f powlistUpToN'' src/Multiset.hs 31;" f ppDraw src/Dodge/Render/ShapePicture.hs 116;" f -ppEvents src/Dodge/Update.hs 672;" f +ppEvents src/Dodge/Update.hs 673;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 82;" f preloadRender src/Preload/Render.hs 30;" f @@ -5417,9 +5365,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 69;" f -regexIn src/Regex.hs 4;" f regexList src/Dodge/DisplayInventory.hs 376;" f -regexList src/Regex.hs 7;" f reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 442;" f reloadLevelStart src/Dodge/Save.hs 71;" f reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 440;" f @@ -5484,7 +5430,6 @@ roomCenterPillar src/Dodge/Room/Room.hs 119;" f roomCritLS src/Dodge/Room/RunPast.hs 24;" f roomCross src/Dodge/Room/Boss.hs 83;" f roomGlassOctogon src/Dodge/Room/Boss.hs 21;" f -roomLinkDecorations src/Dodge/Debug/LinkDecoration.hs 24;" f roomMiniIntro src/Dodge/Room/Room.hs 114;" f roomNgon src/Dodge/Room/Ngon.hs 14;" f roomPadCut src/Dodge/Room/Room.hs 59;" f @@ -5492,7 +5437,6 @@ roomPillars src/Dodge/Room/Pillar.hs 100;" f roomPillarsContaining src/Dodge/Room/Containing.hs 39;" f roomPillarsPassage src/Dodge/Room/Pillar.hs 87;" f roomPillarsSquare src/Dodge/Room/Pillar.hs 44;" f -roomPolyDecorations src/Dodge/Debug/LinkDecoration.hs 30;" f roomRect src/Dodge/Room/Procedural.hs 38;" f roomRectAutoLinks src/Dodge/Room/Procedural.hs 138;" f roomShuriken src/Dodge/Room/Boss.hs 121;" f @@ -5575,8 +5519,8 @@ scrollCommands src/Dodge/Update/Scroll.hs 132;" f scrollDebugInfoInt src/Dodge/Debug.hs 47;" f scrollRBOption src/Dodge/Update/Scroll.hs 109;" f scrollSelectionSections src/Dodge/SelectionSections.hs 26;" f -scrollTimeBack src/Dodge/Update.hs 213;" f -scrollTimeForward src/Dodge/Update.hs 233;" f +scrollTimeBack src/Dodge/Update.hs 214;" f +scrollTimeForward src/Dodge/Update.hs 234;" f scrollWatch src/Dodge/Item/Weapon/Utility.hs 30;" f seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 486;" f @@ -5595,11 +5539,11 @@ seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f selCloseObj src/Dodge/Update/Input/InGame.hs 503;" f -selNumPos src/Dodge/Render/HUD.hs 443;" f -selNumPosCardinal src/Dodge/Render/HUD.hs 466;" f +selNumPos src/Dodge/Render/HUD.hs 445;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 468;" f selSecDrawCursor src/Dodge/Render/List.hs 130;" f selSecDrawCursorAt src/Dodge/Render/List.hs 108;" f -selSecSelCol src/Dodge/Render/HUD.hs 491;" f +selSecSelCol src/Dodge/Render/HUD.hs 493;" f selSecSelSize src/Dodge/SelectionSections.hs 180;" f selSecYint src/Dodge/SelectionSections.hs 189;" f selectCreatureDebugItem src/Dodge/Debug.hs 39;" f @@ -5616,7 +5560,7 @@ sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f setChannelPos src/Sound.hs 149;" f -setClickWorldPos src/Dodge/Update.hs 98;" f +setClickWorldPos src/Dodge/Update.hs 99;" f setClusterID src/Dodge/Combine/Graph.hs 115;" f setDepth src/Picture/Base.hs 128;" f setDirPS src/Dodge/PlacementSpot.hs 49;" f @@ -5634,7 +5578,7 @@ setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMinInvSize src/Dodge/Creature/Action.hs 149;" f setMusicVolume src/Sound.hs 161;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 51;" f -setOldPos src/Dodge/Update.hs 461;" f +setOldPos src/Dodge/Update.hs 462;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f @@ -5742,7 +5686,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 129;" f -simpleCrSprings src/Dodge/Update.hs 757;" f +simpleCrSprings src/Dodge/Update.hs 758;" f simpleDamFL src/Dodge/Flame.hs 41;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f @@ -5920,9 +5864,7 @@ teleportModule src/Dodge/Item/Craftable.hs 30;" f termButton src/Dodge/Placement/Instance/Terminal.hs 51;" f termScreenColor src/Dodge/Terminal/Color.hs 9;" f termSoundLine src/Dodge/Terminal.hs 111;" f -termSoundLine src/Dodge/Terminal/Line.hs 10;" f termTextColor src/Dodge/Terminal.hs 114;" f -termTextColor src/Dodge/Terminal/Line.hs 22;" f terminalColor src/Dodge/Placement/Instance/Terminal.hs 66;" f terminalReturnEffect src/Dodge/Terminal.hs 276;" f terminalSPic src/Dodge/Machine/Draw.hs 29;" f @@ -5962,7 +5904,7 @@ threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f 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 176;" f +timeFlowUpdate src/Dodge/Update.hs 177;" f timeModule src/Dodge/Item/Craftable.hs 33;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f tinMag src/Dodge/Item/Ammo.hs 27;" f @@ -5971,7 +5913,7 @@ titleOptionsMenu src/Dodge/Menu.hs 99;" f titleOptionsNoWrite src/Dodge/Menu.hs 102;" f tlsTimeRadColPos src/Dodge/LightSource.hs 69;" f tlsTimeRadFunPos src/Dodge/LightSource.hs 26;" f -tmUpdate src/Dodge/Update.hs 441;" f +tmUpdate src/Dodge/Update.hs 442;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 148;" f @@ -6115,41 +6057,40 @@ updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBounds src/Dodge/Update/Camera.hs 245;" f updateBulVel src/Dodge/Bullet.hs 50;" f updateBullet src/Dodge/Bullet.hs 28;" f -updateBullets src/Dodge/Update.hs 538;" f +updateBullets src/Dodge/Update.hs 539;" f updateCamera src/Dodge/Update/Camera.hs 31;" f updateCloseObjects src/Dodge/Inventory.hs 113;" f -updateCloud src/Dodge/Update.hs 723;" f -updateClouds src/Dodge/Update.hs 567;" f +updateCloud src/Dodge/Update.hs 724;" f +updateClouds src/Dodge/Update.hs 568;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 40;" f updateCombineSections src/Dodge/DisplayInventory.hs 46;" f updateCreature src/Dodge/Creature/Update.hs 10;" f -updateCreatureGroups src/Dodge/Update.hs 507;" f -updateCreatureSoundPositions src/Dodge/Update.hs 483;" f -updateDebugMessageOffset src/Dodge/Update.hs 92;" f -updateDelayedEvents src/Dodge/Update.hs 786;" f +updateCreatureGroups src/Dodge/Update.hs 508;" f +updateCreatureSoundPositions src/Dodge/Update.hs 484;" f +updateDebugMessageOffset src/Dodge/Update.hs 93;" f +updateDelayedEvents src/Dodge/Update.hs 787;" f updateDisplaySections src/Dodge/DisplayInventory.hs 126;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 528;" f +updateDistortions src/Dodge/Update.hs 529;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f -updateEnergyBalls src/Dodge/Update.hs 555;" f +updateEnergyBalls src/Dodge/Update.hs 556;" f updateEnterRegex src/Dodge/Update/Input/InGame.hs 459;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 71;" f -updateFlames src/Dodge/Update.hs 552;" f -updateFlare src/Dodge/Flare.hs 7;" f +updateFlames src/Dodge/Update.hs 553;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f updateFunctionKey src/Dodge/Update/Input/InGame.hs 310;" f updateFunctionKeys src/Dodge/Update/Input/InGame.hs 303;" f -updateGusts src/Dodge/Update.hs 706;" f +updateGusts src/Dodge/Update.hs 707;" f updateHeldRootItem src/Dodge/Creature/State.hs 167;" f updateHumanoid src/Dodge/Humanoid.hs 12;" f -updateIMl src/Dodge/Update.hs 497;" f -updateIMl' src/Dodge/Update.hs 502;" f +updateIMl src/Dodge/Update.hs 498;" f +updateIMl' src/Dodge/Update.hs 503;" f updateInGameCamera src/Dodge/Update/Camera.hs 70;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 363;" f -updateInstantBullets src/Dodge/Update.hs 644;" f +updateInstantBullets src/Dodge/Update.hs 645;" f updateInv src/Dodge/Creature/State.hs 152;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f updateItemTargeting src/Dodge/Creature/State.hs 268;" f @@ -6158,24 +6099,24 @@ updateKeyInGame src/Dodge/Update/Input/InGame.hs 357;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 345;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f -updateLasers src/Dodge/Update.hs 426;" f -updateLightSources src/Dodge/Update.hs 531;" f +updateLasers src/Dodge/Update.hs 427;" f +updateLightSources src/Dodge/Update.hs 532;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 378;" f -updateMIM src/Dodge/Update.hs 657;" f +updateMIM src/Dodge/Update.hs 658;" f updateMachine src/Dodge/Machine/Update.hs 19;" f updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 169;" f -updateMouseContext src/Dodge/Update.hs 309;" f -updateMouseContextGame src/Dodge/Update.hs 314;" f +updateMouseContext src/Dodge/Update.hs 310;" f +updateMouseContextGame src/Dodge/Update.hs 315;" f updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 90;" f updateMouseInGame src/Dodge/Update/Input/InGame.hs 82;" f updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 136;" f updateMovement src/Dodge/Creature/State.hs 331;" f -updateObjCatMaybes src/Dodge/Update.hs 519;" f -updateObjMapMaybe src/Dodge/Update.hs 512;" f -updatePastWorlds src/Dodge/Update.hs 414;" f +updateObjCatMaybes src/Dodge/Update.hs 520;" f +updateObjMapMaybe src/Dodge/Update.hs 513;" f +updatePastWorlds src/Dodge/Update.hs 415;" f updatePosEvent src/Dodge/PosEvent.hs 11;" f -updatePosEvents src/Dodge/Update.hs 564;" f +updatePosEvents src/Dodge/Update.hs 565;" f updatePreload src/Preload/Update.hs 20;" f updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 320;" f updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 323;" f @@ -6183,9 +6124,9 @@ updateProjectile src/Dodge/Projectile/Update.hs 23;" f updateProp src/Dodge/Prop/Update.hs 11;" f updateRBList src/Dodge/Inventory/RBList.hs 16;" f updateRadarBlip src/Dodge/RadarBlip.hs 8;" f -updateRadarBlips src/Dodge/Update.hs 534;" f +updateRadarBlips src/Dodge/Update.hs 535;" f updateRadarSweep src/Dodge/RadarSweep.hs 25;" f -updateRadarSweeps src/Dodge/Update.hs 558;" f +updateRadarSweeps src/Dodge/Update.hs 559;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 106;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f @@ -6194,32 +6135,32 @@ updateScopeZoom' src/Dodge/Update/Camera.hs 132;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 286;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 259;" f -updateSeenWalls src/Dodge/Update.hs 675;" f +updateSeenWalls src/Dodge/Update.hs 676;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f -updateShockwaves src/Dodge/Update.hs 549;" f +updateShockwaves src/Dodge/Update.hs 550;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 71;" f updateSounds src/Sound.hs 66;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 561;" f +updateSparks src/Dodge/Update.hs 562;" f updateTempLightSource src/Dodge/LightSource/Update.hs 7;" f updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f -updateTeslaArcs src/Dodge/Update.hs 543;" f +updateTeslaArcs src/Dodge/Update.hs 544;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 546;" f +updateTractorBeams src/Dodge/Update.hs 547;" f updateTurret src/Dodge/Machine/Update.hs 47;" f -updateUniverse src/Dodge/Update.hs 71;" f -updateUniverseFirst src/Dodge/Update.hs 83;" f -updateUniverseLast src/Dodge/Update.hs 133;" f -updateUniverseMid src/Dodge/Update.hs 155;" f +updateUniverse src/Dodge/Update.hs 72;" f +updateUniverseFirst src/Dodge/Update.hs 84;" f +updateUniverseLast src/Dodge/Update.hs 134;" f +updateUniverseMid src/Dodge/Update.hs 156;" f updateUseInputInGame src/Dodge/Update/Input/InGame.hs 39;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 21;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f updateWheelEvent src/Dodge/Update/Scroll.hs 19;" f -updateWheelEvents src/Dodge/Update.hs 401;" f -updateWorldEventFlag src/Dodge/Update.hs 117;" f -updateWorldEventFlags src/Dodge/Update.hs 105;" f +updateWheelEvents src/Dodge/Update.hs 402;" f +updateWorldEventFlag src/Dodge/Update.hs 118;" f +updateWorldEventFlags src/Dodge/Update.hs 106;" f upperBody src/Dodge/Creature/Picture.hs 133;" f upperBox src/Shape.hs 154;" f upperBoxHalf src/Shape.hs 220;" f @@ -6371,7 +6312,7 @@ yV2 src/Geometry/Vector.hs 203;" f 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 224;" f +yourAugmentedItem src/Dodge/Render/HUD.hs 226;" f yourControl src/Dodge/Creature/YourControl.hs 22;" f yourDefaultSpeed src/Dodge/Default/Creature.hs 134;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 137;" f @@ -6389,9 +6330,9 @@ zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f zipWithDefaults src/Dodge/Item/Display.hs 21;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f -zoneClouds src/Dodge/Update.hs 434;" f +zoneClouds src/Dodge/Update.hs 435;" f zoneCreature src/Dodge/Zoning/Creature.hs 52;" f -zoneCreatures src/Dodge/Update.hs 478;" f +zoneCreatures src/Dodge/Update.hs 479;" f zoneExtract src/Dodge/Zoning/Base.hs 50;" f zoneMonoid src/Dodge/Zoning/Base.hs 80;" f zoneOfCirc src/Dodge/Zoning/Base.hs 22;" f