diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index f8af3dabc..52f74dea6 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -371,7 +371,7 @@ drawTerminalDisplay cfig tm = f = map toselitm . displayTermInput . reverse - . take getMaxLinesTM +-- . take getMaxLinesTM $ _tmDisplayedLines tm displayTermInput = case _tmStatus tm of TerminalOff -> id diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index 514a0311a..cd4e2c18f 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -490,7 +490,6 @@ pbFlicker pt = zoneClouds :: World -> World zoneClouds w = w & clZoning .~ foldl' (flip zoneCloud) mempty (w ^. cWorld . lWorld . clouds) - zoneDusts :: World -> World zoneDusts w = w & dsZoning .~ foldl' (flip zoneDust) mempty (w ^. cWorld . lWorld . dusts) @@ -506,24 +505,16 @@ tmUpdate tm w = fromMaybe w $ do (TLine _ tls g) -> w & pointTermParams %~ ( (tmFutureLines %~ tail) - . (tmDisplayedLines %~ (map displayTerminalLineString tls ++)) + . (tmDisplayedLines %~ take getMaxLinesTM . (map displayTerminalLineString tls ++)) +-- . (tmDisplayedLines %~ (map displayTerminalLineString tls ++)) ) & doTmWdWd g tm where - -- Just (TerminalLineEffect _ eff) -> - -- w - -- & pointTermParams . tmFutureLines %~ tail - -- & doTmWdWd eff tm - pointTermParams = cWorld . lWorld . terminals . ix (_tmID tm) setOldPos :: Creature -> Creature setOldPos cr = cr & crOldPos .~ _crPos cr --- hack ---updateRandGen :: World -> World ---updateRandGen = randGen %~ (snd . (uniform :: StdGen -> (Int,StdGen))) - --doRewind :: World -> World --doRewind w = case w ^. cwTime . maybeWorld of -- Just' cw -> diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 8e1dcbd0a..4662dd5ff 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -107,16 +107,10 @@ updateMouseHeldInGame cfig w = case w ^. input . mouseContext of OverInvDrag k mmouseover ab bn -> doDrag 30 k mmouseover ab bn w _ -> w -doDrag :: - Int -> - Int -> - Maybe (Int, Int) -> - Maybe (Int, Int) -> - Maybe (Int, Int) -> - World -> - World -doDrag 0 _ _ _ _ w = w +doDrag :: Int -> Int -> Maybe (Int, Int) -> Maybe (Int, Int) -> Maybe (Int, Int) -> World -> World +--doDrag 0 _ _ _ _ w = w doDrag n k mmouseover ab bn w = fromMaybe w $ do + guard (n /= 0) -- > 0 ? ss <- w ^? hud . hudElement . diSections . ix k . ssItems x <- mmouseover is <- w ^? hud . hudElement . diSelection . _Just . _3 @@ -255,11 +249,7 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of f (x, y) = (x, y, mempty) selsec = w ^? hud . hudElement . diSelection . _Just . _1 -endRegex :: - Int -> - World -> - Maybe (Int, Int, IS.IntSet) -> - Maybe (Int, Int, IS.IntSet) +endRegex :: Int -> World -> Maybe (Int, Int, IS.IntSet) -> Maybe (Int, Int, IS.IntSet) endRegex i w = fromMaybe id $ do sss <- w ^? hud . hudElement . diSections let j = fromMaybe 0 $ do @@ -268,10 +258,7 @@ endRegex i w = fromMaybe id $ do return k return $ ssSetCursor (ssLookupDown i j) sss -endCombineRegex :: - World -> - Maybe (Int, Int, IS.IntSet) -> - Maybe (Int, Int, IS.IntSet) +endCombineRegex :: World -> Maybe (Int, Int, IS.IntSet) -> Maybe (Int, Int, IS.IntSet) endCombineRegex w = fromMaybe id $ do sss <- w ^? hud . hudElement . subInventory . ciSections let j = fromMaybe 0 $ do @@ -424,13 +411,13 @@ updateKeysTextInputTerminal tmid u = | otherwise = id updateKeyInGame :: Universe -> Scancode -> Int -> Universe -updateKeyInGame uv sc pt = case pt of +updateKeyInGame uv sc = \case 0 -> updateInitialPressInGame uv sc x | x >= 30 -> updateLongPressInGame uv sc _ -> uv updateInitialPressInGame :: Universe -> Scancode -> Universe -updateInitialPressInGame uv sc = case sc of +updateInitialPressInGame uv = \case ScancodeSpace -> over uvWorld spaceAction uv ScancodeP -> pauseGame uv ScancodeF -> over uvWorld youDropItem uv @@ -443,7 +430,7 @@ updateInitialPressInGame uv sc = case sc of _ -> uv updateLongPressInGame :: Universe -> Scancode -> Universe -updateLongPressInGame uv sc = case sc of +updateLongPressInGame uv = \case ScancodeF -> over uvWorld youDropItem uv ScancodeSpace -> over uvWorld spaceAction uv _ -> uv @@ -484,12 +471,10 @@ doRegexInput inp i sss msel filts updateBackspaceRegex :: World -> World updateBackspaceRegex w = case di ^? subInventory of - Just NoSubInventory{} - | secfocus (-1) 0 -> + Just NoSubInventory{} | secfocus (-1) 0 -> w & hud . hudElement %~ trybackspace (-1) diInvFilter diInvFilter diSelection & worldEventFlags . at InventoryChange ?~ () - Just NoSubInventory{} - | secfocus 2 3 -> + Just NoSubInventory{} | secfocus 2 3 -> w & hud . hudElement %~ trybackspace 2 diCloseFilter diCloseFilter diSelection & worldEventFlags . at InventoryChange ?~ () Just CombineInventory{} -> @@ -511,12 +496,10 @@ updateBackspaceRegex w = case di ^? subInventory of updateEnterRegex :: World -> World updateEnterRegex w = case w ^? hud . hudElement . subInventory of - Just NoSubInventory{} - | secfocus [-1, 0, 1] -> + Just NoSubInventory{} | secfocus [-1, 0, 1] -> w & hud . hudElement . diSelection ?~ (-1, 0, mempty) & hud . hudElement . diInvFilter %~ enterregex - Just NoSubInventory{} - | secfocus [2, 3] -> + Just NoSubInventory{} | secfocus [2, 3] -> w & hud . hudElement . diSelection ?~ (2, 0, mempty) & hud . hudElement . diCloseFilter %~ enterregex Just CombineInventory{} -> @@ -524,9 +507,8 @@ updateEnterRegex w = case w ^? hud . hudElement . subInventory of & hud . hudElement . subInventory . ciSelection ?~ (-1, 0, mempty) _ -> w where - di = w ^. hud . hudElement secfocus xs = fromMaybe False $ do - i <- di ^? diSelection . _Just . _1 + i <- w ^? hud . hudElement . diSelection . _Just . _1 return $ i `elem` xs enterregex = (<|> Just "") @@ -545,15 +527,16 @@ spaceAction w = case w ^. hud . hudElement of _ -> w & hud . hudElement . subInventory .~ NoSubInventory getCloseObj :: World -> Maybe (Either FloorItem Button) -getCloseObj w = getSelectedCloseObj w <|> firstcitem <|> firstcbut +getCloseObj w = getSelectedCloseObj w <|> topcitem <|> topcbut where - firstcitem = do - k' <- (w ^? hud . hudElement . diSections . ix 3 . ssItems) >>= (fmap fst . IM.lookupMin) + topcitem = do + k' <- (w ^? hud . hudElement . diSections . ix 3 . ssItems) + >>= (fmap fst . IM.lookupMin) NInt k <- w ^? hud . closeItems . ix k' - fmap Left $ w ^? cWorld . lWorld . floorItems . unNIntMap . ix k - firstcbut = do + Left <$> w ^? cWorld . lWorld . floorItems . unNIntMap . ix k + topcbut = do k <- w ^? hud . closeButtons . ix 0 - fmap Right $ w ^? cWorld . lWorld . buttons . ix k + Right <$> w ^? cWorld . lWorld . buttons . ix k tryCombine :: (Int, Int) -> World -> World tryCombine (i, j) w = fromMaybe w $ do @@ -568,5 +551,4 @@ tryCombine (i, j) w = fromMaybe w $ do maybeExitCombine :: World -> World maybeExitCombine w | ButtonRight `M.member` (w ^. input . mouseButtons) = w - | otherwise = - w & hud . hudElement . subInventory .~ NoSubInventory + | otherwise = w & hud . hudElement . subInventory .~ NoSubInventory diff --git a/tags b/tags index 85d3df6e5..577e36cb6 100644 --- a/tags +++ b/tags @@ -17,7 +17,7 @@ <$> src/Dodge/Data/Camera.hs 39;" o <$> src/Dodge/Data/Creature.hs 80;" o <$> src/Dodge/Data/LWorld.hs 184;" o -<$> src/Dodge/Data/Terminal.hs 110;" o +<$> src/Dodge/Data/Terminal.hs 74;" o ABSOLUTE src/Dodge/Data/Item/Combine.hs 40;" C AIUNIT src/Dodge/Data/Item/Combine.hs 75;" C ALTERIFLE src/Dodge/Data/Item/Combine.hs 155;" C @@ -240,7 +240,7 @@ CombClust src/Dodge/Combine/Graph.hs 19;" t CombEdge src/Dodge/Combine/Graph.hs 32;" t CombNode src/Dodge/Combine/Graph.hs 25;" t CombinableItem src/Dodge/Data/Combine.hs 5;" t -CombineInventory src/Dodge/Data/HUD.hs 36;" C +CombineInventory src/Dodge/Data/HUD.hs 35;" C CombineInventoryChange src/Dodge/Data/World.hs 32;" C ComsSS src/Dodge/Data/Scenario.hs 98;" C ConcurrentEffect src/Loop/Data.hs 6;" t @@ -345,7 +345,7 @@ Detector src/Dodge/Data/Item/Combine.hs 183;" t Dirt src/Dodge/Data/Material.hs 11;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t DisplayInventory src/Dodge/Data/HUD.hs 19;" C -DisplayTerminal src/Dodge/Data/HUD.hs 42;" C +DisplayTerminal src/Dodge/Data/HUD.hs 40;" C Distortion src/Dodge/Data/Distortion.hs 12;" t DivineRetribution src/Dodge/Data/Scenario.hs 35;" C DoActionIf src/Dodge/Data/ActionPlan.hs 116;" C @@ -393,7 +393,6 @@ Ears src/Dodge/Data/Creature/Perception.hs 47;" C East src/Dodge/Data/CardinalPoint.hs 5;" C East8 src/Dodge/Data/CardinalPoint.hs 13;" C EdgeObstacle src/Dodge/Data/PathGraph.hs 48;" t -EffectArguments src/Dodge/Data/Terminal.hs 54;" t EighthRes src/Dodge/Data/Config.hs 97;" C Eldritch src/Dodge/Data/Scenario.hs 34;" C ElectricSensor src/Dodge/Data/Machine/Sensor/Type.hs 13;" C @@ -419,7 +418,7 @@ EquipmentPlatformSF src/Dodge/Data/ComposedItem.hs 17;" C Escape src/Dodge/Data/Scenario.hs 10;" C EscapeMenuOption src/Dodge/Data/Universe.hs 76;" t Essential src/Shape/Data.hs 34;" C -ExamineInventory src/Dodge/Data/HUD.hs 30;" C +ExamineInventory src/Dodge/Data/HUD.hs 29;" C Explore src/Dodge/Data/Scenario.hs 4;" C Explosion src/Dodge/Data/SoundOrigin.hs 38;" C ExplosionPayload src/Dodge/Data/Payload.hs 11;" C @@ -539,7 +538,7 @@ HEATSENSOR src/Dodge/Data/Item/Combine.hs 83;" C HELD src/Dodge/Data/Item/Combine.hs 17;" C HOMINGMODULE src/Dodge/Data/Item/Combine.hs 102;" C HOSE src/Dodge/Data/Item/Combine.hs 55;" C -HUD src/Dodge/Data/HUD.hs 44;" t +HUD src/Dodge/Data/HUD.hs 42;" t HUDElement src/Dodge/Data/HUD.hs 18;" t HalfRes src/Dodge/Data/Config.hs 97;" C HammerTrigger src/Dodge/Data/TriggerType.hs 10;" C @@ -758,7 +757,7 @@ MakeTempLight src/Dodge/Data/WorldEffect.hs 32;" C ManipulatedObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 20;" t Manipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 14;" t Manipulator src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" C -MapperInventory src/Dodge/Data/HUD.hs 31;" C +MapperInventory src/Dodge/Data/HUD.hs 30;" C MapperSF src/Dodge/Data/ComposedItem.hs 39;" C Material src/Dodge/Data/Material.hs 11;" t MaterialSound src/Dodge/Data/SoundOrigin.hs 35;" C @@ -846,7 +845,6 @@ NewIntMap src/NewInt.hs 18;" t NewSideEffect src/Dodge/Data/Universe.hs 65;" C NoAction src/Dodge/Data/ActionPlan.hs 152;" C NoAmmoRequired src/Dodge/Data/Muzzle.hs 25;" C -NoArguments src/Dodge/Data/Terminal.hs 55;" C NoBeamCombine src/Dodge/Data/Beam.hs 43;" C NoConcurrentEffect src/Loop/Data.hs 7;" C NoCrImp src/Dodge/Data/CreatureEffect.hs 24;" C @@ -872,7 +870,7 @@ NoRoomClipBoundaries src/Dodge/Data/Config.hs 107;" C NoSF src/Dodge/Data/ComposedItem.hs 29;" C NoShadowFidelity src/Shape/Data.hs 25;" C NoShadows src/Dodge/Data/Config.hs 103;" C -NoSubInventory src/Dodge/Data/HUD.hs 29;" C +NoSubInventory src/Dodge/Data/HUD.hs 28;" C NoTrigger src/Dodge/Data/TriggerType.hs 11;" C NoWorldEffect src/Dodge/Data/WorldEffect.hs 21;" C Noclip src/Dodge/Data/Config.hs 70;" C @@ -946,7 +944,6 @@ OnRightWrist src/Dodge/Data/Equipment/Misc.hs 26;" C OnSpecial src/Dodge/Data/Equipment/Misc.hs 28;" C OnTurret src/Dodge/Data/Item/Location.hs 37;" C OnceSound src/Dodge/Data/SoundOrigin.hs 16;" C -OneArgument src/Dodge/Data/Terminal.hs 56;" C OneHand src/Dodge/Data/AimStance.hs 9;" C OnwardCluster src/Dodge/Data/RoomCluster.hs 14;" C OnwardList src/Dodge/Annotation/Data.hs 16;" C @@ -1297,7 +1294,7 @@ Stone src/Dodge/Data/Material.hs 11;" C StorageSS src/Dodge/Data/Scenario.hs 94;" C Strategy src/Dodge/Data/ActionPlan.hs 176;" t StrategyActions src/Dodge/Data/ActionPlan.hs 188;" C -SubInventory src/Dodge/Data/HUD.hs 28;" t +SubInventory src/Dodge/Data/HUD.hs 27;" t Superfluous src/Shape/Data.hs 38;" C Surface src/Shape/Data.hs 41;" t Survive src/Dodge/Data/Scenario.hs 5;" C @@ -1309,12 +1306,12 @@ SwarmCrit src/Dodge/Data/Creature/Misc.hs 71;" C SwitchToItem src/Dodge/Data/ActionPlan.hs 38;" C TAPE src/Dodge/Data/Item/Combine.hs 56;" C TARGETING src/Dodge/Data/Item/Combine.hs 22;" C -TCBase src/Dodge/Data/Terminal.hs 80;" C -TCDamageCommand src/Dodge/Data/Terminal.hs 81;" C -TCInfo src/Dodge/Data/Terminal.hs 79;" C -TCSensorInfo src/Dodge/Data/Terminal.hs 82;" C -TCToggles src/Dodge/Data/Terminal.hs 83;" C -TCom src/Dodge/Data/Terminal.hs 79;" t +TCBase src/Dodge/Data/Terminal.hs 52;" C +TCDamageCommand src/Dodge/Data/Terminal.hs 53;" C +TCInfo src/Dodge/Data/Terminal.hs 51;" C +TCSensorInfo src/Dodge/Data/Terminal.hs 54;" C +TCToggles src/Dodge/Data/Terminal.hs 55;" C +TCom src/Dodge/Data/Terminal.hs 50;" t TESLAGUN src/Dodge/Data/Item/Combine.hs 169;" C THERMOMETER src/Dodge/Data/Item/Combine.hs 85;" C THREELINES src/Dodge/Data/GenParams.hs 20;" C @@ -1322,7 +1319,7 @@ TIMESCROLLER src/Dodge/Data/Item/Combine.hs 144;" C TIMESTOPPER src/Dodge/Data/Item/Combine.hs 143;" C TIN src/Dodge/Data/Item/Combine.hs 58;" C TINMAG src/Dodge/Data/Item/Combine.hs 108;" C -TLine src/Dodge/Data/Terminal.hs 43;" C +TLine src/Dodge/Data/Terminal.hs 39;" C TO src/Shader/Data.hs 59;" t TORCH src/Dodge/Data/Item/Combine.hs 176;" C TRACTORGUN src/Dodge/Data/Item/Combine.hs 170;" C @@ -1346,28 +1343,18 @@ TargetingLaser src/Dodge/Data/Laser.hs 18;" C TargetingType src/Dodge/Data/Item/Targeting.hs 11;" t TeleSound src/Dodge/Data/SoundOrigin.hs 36;" C TermSignal src/Dodge/Data/Input.hs 55;" t -Terminal src/Dodge/Data/Terminal.hs 26;" t -TerminalCommandArguments src/Dodge/Data/Terminal.hs 62;" C -TerminalCommandEffect src/Dodge/Data/Terminal.hs 61;" t -TerminalCommandEffectCommands src/Dodge/Data/Terminal.hs 68;" C -TerminalCommandEffectDamageCoding src/Dodge/Data/Terminal.hs 63;" C -TerminalCommandEffectHelp src/Dodge/Data/Terminal.hs 66;" C -TerminalCommandEffectLinkedObject src/Dodge/Data/Terminal.hs 65;" C -TerminalCommandEffectNoArgumentsStr src/Dodge/Data/Terminal.hs 67;" C -TerminalCommandEffectNone src/Dodge/Data/Terminal.hs 70;" C -TerminalCommandEffectSensorParameter src/Dodge/Data/Terminal.hs 64;" C -TerminalCommandEffectSingleCommand src/Dodge/Data/Terminal.hs 69;" C +Terminal src/Dodge/Data/Terminal.hs 22;" t TerminalDeactivated src/Dodge/Data/Terminal/Status.hs 12;" C -TerminalLine src/Dodge/Data/Terminal.hs 43;" t -TerminalLineConst src/Dodge/Data/Terminal.hs 41;" C +TerminalLine src/Dodge/Data/Terminal.hs 39;" t +TerminalLineConst src/Dodge/Data/Terminal.hs 37;" C TerminalLineRead src/Dodge/Data/Terminal/Status.hs 13;" C -TerminalLineString src/Dodge/Data/Terminal.hs 41;" t +TerminalLineString src/Dodge/Data/Terminal.hs 37;" t TerminalOff src/Dodge/Data/Terminal/Status.hs 11;" C TerminalPressTo src/Dodge/Data/Terminal/Status.hs 15;" C TerminalSound src/Dodge/Data/SoundOrigin.hs 24;" C TerminalStatus src/Dodge/Data/Terminal/Status.hs 10;" t TerminalTextInput src/Dodge/Data/Terminal/Status.hs 14;" C -TerminalToggle src/Dodge/Data/Terminal.hs 49;" t +TerminalToggle src/Dodge/Data/Terminal.hs 45;" t Terrestrial src/Dodge/Data/Scenario.hs 72;" C TerrestrialBiome src/Dodge/Data/Scenario.hs 76;" t TeslaArc src/Dodge/Data/TeslaArc.hs 17;" t @@ -1379,17 +1366,17 @@ Tile src/Data/Tile.hs 16;" t Tiled src/Data/Tile.hs 14;" C TimeFlowStatus src/Dodge/Data/World.hs 58;" t Tiny src/Shape/Data.hs 32;" C -TmGetDamageCoding src/Dodge/Data/Terminal.hs 99;" C -TmGetSensor src/Dodge/Data/Terminal.hs 100;" C -TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 97;" C -TmTmSetStatus src/Dodge/Data/Terminal.hs 98;" C -TmWdId src/Dodge/Data/Terminal.hs 91;" C -TmWdWd src/Dodge/Data/Terminal.hs 90;" t -TmWdWdDeactivateTerminal src/Dodge/Data/Terminal.hs 93;" C -TmWdWdDoDeathTriggers src/Dodge/Data/Terminal.hs 96;" C -TmWdWdPowerDownTerminal src/Dodge/Data/Terminal.hs 92;" C -TmWdWdTermSound src/Dodge/Data/Terminal.hs 95;" C -TmWdWdfromWdWd src/Dodge/Data/Terminal.hs 94;" C +TmGetDamageCoding src/Dodge/Data/Terminal.hs 66;" C +TmGetSensor src/Dodge/Data/Terminal.hs 67;" C +TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 64;" C +TmTmSetStatus src/Dodge/Data/Terminal.hs 65;" C +TmWdId src/Dodge/Data/Terminal.hs 58;" C +TmWdWd src/Dodge/Data/Terminal.hs 57;" t +TmWdWdDeactivateTerminal src/Dodge/Data/Terminal.hs 60;" C +TmWdWdDoDeathTriggers src/Dodge/Data/Terminal.hs 63;" C +TmWdWdPowerDownTerminal src/Dodge/Data/Terminal.hs 59;" C +TmWdWdTermSound src/Dodge/Data/Terminal.hs 62;" C +TmWdWdfromWdWd src/Dodge/Data/Terminal.hs 61;" C ToContinueStart src/Sound/Data.hs 27;" C ToPlaySound src/Sound/Data.hs 35;" t ToStart src/Sound/Data.hs 26;" C @@ -1568,8 +1555,6 @@ _apStrategy src/Dodge/Data/ActionPlan.hs 21;" f _aps src/Dodge/Data/Muzzle.hs 22;" f _arbitraryAction src/Dodge/Data/ActionPlan.hs 167;" f _arcNode src/Dodge/Data/LWorld.hs 117;" f -_argList src/Dodge/Data/Terminal.hs 58;" f -_argType src/Dodge/Data/Terminal.hs 57;" f _asDir src/Dodge/Data/ArcStep.hs 16;" f _asObject src/Dodge/Data/ArcStep.hs 17;" f _asPos src/Dodge/Data/ArcStep.hs 15;" f @@ -1653,9 +1638,9 @@ _camViewFrom src/Dodge/Data/Camera.hs 29;" f _camZoom src/Dodge/Data/Camera.hs 26;" f _canID src/Dodge/Data/LWorld.hs 170;" f _carriage src/Dodge/Data/Creature/Stance.hs 14;" f -_carteCenter src/Dodge/Data/HUD.hs 46;" f -_carteRot src/Dodge/Data/HUD.hs 48;" f -_carteZoom src/Dodge/Data/HUD.hs 47;" f +_carteCenter src/Dodge/Data/HUD.hs 44;" f +_carteRot src/Dodge/Data/HUD.hs 46;" f +_carteZoom src/Dodge/Data/HUD.hs 45;" f _cdtCloseLeft src/Dodge/Data/DoubleTree.hs 88;" f _cdtCloseLeft src/Dodge/Data/DoubleTree.hs 96;" f _cdtCloseRight src/Dodge/Data/DoubleTree.hs 90;" f @@ -1671,11 +1656,11 @@ _ceString src/Dodge/Data/Universe.hs 67;" f _chasmShader src/Data/Preload/Render.hs 46;" f _chasmVBO src/Data/Preload/Render.hs 45;" f _chasms src/Dodge/Data/CWorld.hs 30;" f -_ciFilter src/Dodge/Data/HUD.hs 39;" f +_ciFilter src/Dodge/Data/HUD.hs 38;" f _ciInvIDs src/Dodge/Data/Combine.hs 6;" f _ciItem src/Dodge/Data/Combine.hs 7;" f -_ciSections src/Dodge/Data/HUD.hs 37;" f -_ciSelection src/Dodge/Data/HUD.hs 38;" f +_ciSections src/Dodge/Data/HUD.hs 36;" f +_ciSelection src/Dodge/Data/HUD.hs 37;" f _cigType src/Dodge/Data/Camera.hs 19;" f _clPos src/Dodge/Data/Cloud.hs 15;" f _clTimer src/Dodge/Data/Cloud.hs 17;" f @@ -1696,13 +1681,12 @@ _cldtUp src/Dodge/Data/DoubleTree.hs 45;" f _cldtUp src/Dodge/Data/DoubleTree.hs 53;" f _clickPos src/Dodge/Data/Input.hs 46;" f _clickWorldPos src/Dodge/Data/Input.hs 48;" f -_closeButtons src/Dodge/Data/HUD.hs 50;" f -_closeItems src/Dodge/Data/HUD.hs 49;" f +_closeButtons src/Dodge/Data/HUD.hs 48;" f +_closeItems src/Dodge/Data/HUD.hs 47;" f _cloudEBO src/Data/Preload/Render.hs 51;" f _cloudShader src/Data/Preload/Render.hs 50;" f _cloudVBO src/Data/Preload/Render.hs 49;" f _clouds src/Dodge/Data/LWorld.hs 103;" f -_cmdEffect src/Dodge/Data/Terminal.hs 55;" f _colorBlurShader src/Data/Preload/Render.hs 22;" f _coolEnd src/Dodge/Data/TriggerType.hs 17;" f _coolSound src/Dodge/Data/Item/Params.hs 24;" f @@ -1932,7 +1916,7 @@ _heldPos src/Dodge/Data/Input.hs 47;" f _heldWorldPos src/Dodge/Data/Input.hs 49;" f _hotkeys src/Dodge/Data/LWorld.hs 150;" f _hud src/Dodge/Data/World.hs 45;" f -_hudElement src/Dodge/Data/HUD.hs 45;" f +_hudElement src/Dodge/Data/HUD.hs 43;" f _humanoidAI src/Dodge/Data/Creature/Misc.hs 81;" f _ibtAmmoMag src/Dodge/Data/Item/Combine.hs 21;" f _ibtAttach src/Dodge/Data/Item/Combine.hs 20;" f @@ -2038,9 +2022,9 @@ _magBelowID src/Dodge/Data/Muzzle.hs 22;" f _magnets src/Dodge/Data/LWorld.hs 130;" f _mainAction src/Dodge/Data/ActionPlan.hs 171;" f _manObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" f -_mapInvItmID src/Dodge/Data/HUD.hs 34;" f -_mapInvOffset src/Dodge/Data/HUD.hs 32;" f -_mapInvZoom src/Dodge/Data/HUD.hs 33;" f +_mapInvItmID src/Dodge/Data/HUD.hs 33;" f +_mapInvOffset src/Dodge/Data/HUD.hs 31;" f +_mapInvZoom src/Dodge/Data/HUD.hs 32;" f _matUBO src/Data/Preload/Render.hs 39;" f _mbAttach src/Dodge/Data/MetaTree.hs 16;" f _mbTree src/Dodge/Data/MetaTree.hs 16;" f @@ -2420,7 +2404,7 @@ _tbPos src/Dodge/Data/TractorBeam.hs 14;" f _tbStartPos src/Dodge/Data/TractorBeam.hs 15;" f _tbTime src/Dodge/Data/TractorBeam.hs 17;" f _tbVel src/Dodge/Data/TractorBeam.hs 16;" f -_termID src/Dodge/Data/HUD.hs 42;" f +_termID src/Dodge/Data/HUD.hs 40;" f _terminals src/Dodge/Data/LWorld.hs 128;" f _teslaArcs src/Dodge/Data/LWorld.hs 116;" f _testFloat src/Dodge/Data/World.hs 43;" f @@ -2434,21 +2418,21 @@ _tileZero src/Data/Tile.hs 19;" f _tiles src/Data/Tile.hs 14;" f _timeFlow src/Dodge/Data/World.hs 38;" f _timeFlowCharge src/Dodge/Data/World.hs 78;" f -_tlEffect src/Dodge/Data/Terminal.hs 46;" f -_tlPause src/Dodge/Data/Terminal.hs 44;" f -_tlString src/Dodge/Data/Terminal.hs 45;" f -_tmBootLines src/Dodge/Data/Terminal.hs 28;" f -_tmButtonID src/Dodge/Data/Terminal.hs 29;" f -_tmCommandHistory src/Dodge/Data/Terminal.hs 37;" f -_tmCommands src/Dodge/Data/Terminal.hs 34;" f -_tmDeathEffect src/Dodge/Data/Terminal.hs 35;" f -_tmDisplayedLines src/Dodge/Data/Terminal.hs 32;" f -_tmExternalColor src/Dodge/Data/Terminal.hs 31;" f -_tmFutureLines src/Dodge/Data/Terminal.hs 33;" f -_tmID src/Dodge/Data/Terminal.hs 27;" f -_tmMachineID src/Dodge/Data/Terminal.hs 30;" f -_tmStatus src/Dodge/Data/Terminal.hs 36;" f -_tmToggles src/Dodge/Data/Terminal.hs 38;" f +_tlEffect src/Dodge/Data/Terminal.hs 42;" f +_tlPause src/Dodge/Data/Terminal.hs 40;" f +_tlString src/Dodge/Data/Terminal.hs 41;" f +_tmBootLines src/Dodge/Data/Terminal.hs 24;" f +_tmButtonID src/Dodge/Data/Terminal.hs 25;" f +_tmCommandHistory src/Dodge/Data/Terminal.hs 33;" f +_tmCommands src/Dodge/Data/Terminal.hs 30;" f +_tmDeathEffect src/Dodge/Data/Terminal.hs 31;" f +_tmDisplayedLines src/Dodge/Data/Terminal.hs 28;" f +_tmExternalColor src/Dodge/Data/Terminal.hs 27;" f +_tmFutureLines src/Dodge/Data/Terminal.hs 29;" f +_tmID src/Dodge/Data/Terminal.hs 23;" f +_tmMachineID src/Dodge/Data/Terminal.hs 26;" f +_tmStatus src/Dodge/Data/Terminal.hs 32;" f +_tmToggles src/Dodge/Data/Terminal.hs 34;" f _toPlaySoundChunkID src/Sound/Data.hs 41;" f _toPlaySoundPos src/Sound/Data.hs 38;" f _toPlaySoundStatus src/Sound/Data.hs 37;" f @@ -2462,8 +2446,8 @@ _tractorBeams src/Dodge/Data/LWorld.hs 123;" f _trieChildren src/SimpleTrie.hs 12;" f _trieMVal src/SimpleTrie.hs 11;" f _triggers src/Dodge/Data/LWorld.hs 133;" f -_ttDeathEffect src/Dodge/Data/Terminal.hs 51;" f -_ttTriggerID src/Dodge/Data/Terminal.hs 50;" f +_ttDeathEffect src/Dodge/Data/Terminal.hs 47;" f +_ttTriggerID src/Dodge/Data/Terminal.hs 46;" f _tuDir src/Dodge/Data/Machine.hs 61;" f _tuFireTime src/Dodge/Data/Machine.hs 60;" f _tuTurnSpeed src/Dodge/Data/Machine.hs 59;" f @@ -2659,7 +2643,7 @@ anythingHitCirc src/Dodge/Base/Collide.hs 338;" f applyCME src/Dodge/HeldUse.hs 367;" f applyCreatureDamage src/Dodge/Creature/Damage.hs 13;" f applyEventIO src/Loop.hs 89;" f -applyGravityPU src/Dodge/Projectile/Update.hs 43;" f +applyGravityPU src/Dodge/Projectile/Update.hs 42;" f applyIndividualDamage src/Dodge/Creature/Damage.hs 16;" f applyInvLock src/Dodge/HeldUse.hs 426;" f applyMagnetsToBul src/Dodge/Bullet.hs 30;" f @@ -2854,9 +2838,9 @@ centroid src/Geometry/Polygon.hs 136;" f centroidNum src/Geometry/Polygon.hs 139;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainPairs src/Geometry.hs 363;" f -changeSwapOther src/Dodge/Inventory.hs 151;" f -changeSwapSel src/Dodge/Inventory.hs 144;" f -changeSwapWith src/Dodge/Inventory.hs 185;" f +changeSwapOther src/Dodge/Inventory.hs 146;" f +changeSwapSel src/Dodge/Inventory.hs 139;" f +changeSwapWith src/Dodge/Inventory.hs 180;" f charToTuple src/Picture/Base.hs 317;" f charToTupleGrad src/Picture/Text.hs 18;" f chartreuse src/Color.hs 24;" f @@ -2871,7 +2855,7 @@ checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 64;" f checkDeath src/Dodge/Creature/Update.hs 67;" f checkDeath' src/Dodge/Creature/Update.hs 70;" f -checkEndGame src/Dodge/Update.hs 799;" f +checkEndGame src/Dodge/Update.hs 790;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f @@ -2903,7 +2887,7 @@ circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f clAlt src/Dodge/Cloud.hs 5;" f -clClSpringVel src/Dodge/Update.hs 872;" f +clClSpringVel src/Dodge/Update.hs 863;" f clColor src/Shader/Poke/Cloud.hs 35;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f @@ -2927,12 +2911,12 @@ clockCycle src/Dodge/Clock.hs 9;" f closeButtonToSelectionItem src/Dodge/Inventory/SelectionList.hs 220;" f closeItemToSelectionItem src/Dodge/Inventory/SelectionList.hs 205;" f closeItemToTextPictures src/Dodge/Inventory/SelectionList.hs 240;" f -closeObjectInfo src/Dodge/Render/HUD.hs 219;" f +closeObjectInfo src/Dodge/Render/HUD.hs 220;" f closestCreatureID src/Dodge/Debug.hs 116;" f closestPointOnLine src/Geometry/Intersect.hs 281;" f closestPointOnLineParam src/Geometry/Intersect.hs 297;" f closestPointOnSeg src/Geometry/Intersect.hs 312;" f -cloudEffect src/Dodge/Update.hs 824;" f +cloudEffect src/Dodge/Update.hs 815;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 10;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -2944,7 +2928,7 @@ cogRaised src/Dodge/Creature/Perception.hs 102;" f colCrWall src/Dodge/WallCreatureCollisions.hs 28;" f colCrsWalls src/Dodge/WallCreatureCollisions.hs 18;" f collectDamageTypes src/Dodge/Damage.hs 53;" f -collectInvItems src/Dodge/Update/Input/InGame.hs 300;" f +collectInvItems src/Dodge/Update/Input/InGame.hs 302;" f collide3 src/Dodge/Base/Collide.hs 119;" f collide3Chasm src/Dodge/Base/Collide.hs 103;" f collide3Chasms src/Dodge/Base/Collide.hs 96;" f @@ -2967,7 +2951,7 @@ combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 42;" f combineAwareness src/Dodge/Creature/Perception.hs 110;" f combineFloors src/Dodge/Room/Procedural.hs 172;" f -combineInventoryExtra src/Dodge/Render/HUD.hs 334;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 335;" f combineItemListYouX src/Dodge/Combine.hs 34;" f combineList src/Dodge/Combine.hs 20;" f combineRooms src/Dodge/Room/Procedural.hs 152;" f @@ -2985,14 +2969,14 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f conEffects src/Dodge/Concurrent.hs 12;" f conLDTToConDT src/Dodge/DoubleTree.hs 22;" f -concurrentIS src/Dodge/Update/Input/InGame.hs 292;" f +concurrentIS src/Dodge/Update/Input/InGame.hs 294;" f connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f -connectionBlurb src/Dodge/Terminal.hs 49;" f -connectionBlurbLines src/Dodge/Terminal.hs 41;" f +connectionBlurb src/Dodge/Terminal.hs 46;" f +connectionBlurbLines src/Dodge/Terminal.hs 38;" f constructEdges src/Polyhedra.hs 34;" f constructEdgesList src/Polyhedra.hs 43;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 57;" f -continueTerminal src/Dodge/Update/Input/InGame.hs 399;" f +continueTerminal src/Dodge/Update/Input/InGame.hs 405;" f convexHull src/Geometry/Polygon.hs 110;" f convexHullSafe src/Geometry/Polygon.hs 117;" f convexPolysOverlap src/Geometry/ConvexPoly.hs 50;" f @@ -3014,7 +2998,7 @@ crAwayFromPost src/Dodge/Creature/Test.hs 82;" f crBlips src/Dodge/RadarSweep.hs 87;" f crCamouflage src/Dodge/Creature/Picture.hs 31;" f crCanSeeCr src/Dodge/Creature/Test.hs 51;" f -crCrSpring src/Dodge/Update.hs 901;" f +crCrSpring src/Dodge/Update.hs 892;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 57;" f crDexterity src/Dodge/Creature/Statistics.hs 14;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f @@ -3042,7 +3026,7 @@ crRad src/Dodge/Creature/Radius.hs 7;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 72;" f crSetRoots src/Dodge/Inventory/Location.hs 48;" f crShape src/Dodge/Creature/Shape.hs 8;" f -crSpring src/Dodge/Update.hs 896;" f +crSpring src/Dodge/Update.hs 887;" f crStratConMatches src/Dodge/Creature/Test.hs 77;" f crStrength src/Dodge/Creature/Statistics.hs 24;" f crUpdate' src/Dodge/Creature/Update.hs 56;" f @@ -3114,7 +3098,7 @@ dShadCol src/Dodge/Render/List.hs 215;" f damMatSideEffect src/Dodge/Material/Damage.hs 13;" f damThingHitWith src/Dodge/Damage.hs 72;" f damToExpBarrel src/Dodge/Barreloid.hs 49;" f -damageCodeCommand src/Dodge/Terminal.hs 69;" f +damageCodeCommand src/Dodge/Terminal.hs 66;" f damageCrWl src/Dodge/Damage.hs 29;" f damageCrWlID src/Dodge/Damage.hs 23;" f damageDirection src/Dodge/Damage.hs 35;" f @@ -3136,7 +3120,7 @@ dbArgChain src/Dodge/Base.hs 170;" f dbwMuzzles src/Dodge/HeldUse.hs 314;" f deZoneIX src/Dodge/Zoning/Base.hs 89;" f deZoneWall src/Dodge/Zoning/Wall.hs 70;" f -deactivateTerminal src/Dodge/WorldEffect.hs 138;" f +deactivateTerminal src/Dodge/WorldEffect.hs 139;" f deadEndRoom src/Dodge/Room/Room.hs 235;" f deadFeet src/Dodge/Creature/Picture.hs 66;" f deadRot src/Dodge/Creature/Picture.hs 82;" f @@ -3156,7 +3140,7 @@ debugMenuOptions src/Dodge/Menu.hs 122;" f debugOn src/Dodge/Data/Config.hs 151;" f debugSelectCreatureList src/Dodge/Debug.hs 86;" f debugSelectCreatureMessage src/Dodge/Debug.hs 77;" f -decodeSensorType src/Dodge/WorldEffect.hs 151;" f +decodeSensorType src/Dodge/WorldEffect.hs 152;" f decomposeSelfTree src/Dodge/Tree/Compose.hs 60;" f decomposeTree src/Dodge/Tree/Compose.hs 57;" f decoratedBlock src/Dodge/Placement/Instance/Block.hs 10;" f @@ -3227,11 +3211,11 @@ deleteWallFromZones src/Dodge/Wall/Zone.hs 23;" f deleteWallID src/Dodge/Wall/Delete.hs 13;" f deleteWallIDs src/Dodge/Wall/Delete.hs 28;" f denormalEdges src/Polyhedra.hs 136;" f -destroyAllInvItems src/Dodge/Inventory.hs 60;" f +destroyAllInvItems src/Dodge/Inventory.hs 57;" f destroyBlock src/Dodge/Block.hs 52;" f destroyCreature src/Dodge/Creature/Update.hs 93;" f destroyDoor src/Dodge/Block.hs 80;" f -destroyInvItem src/Dodge/Inventory.hs 45;" f +destroyInvItem src/Dodge/Inventory.hs 42;" f destroyItem src/Dodge/Inventory.hs 64;" f destroyLS src/Dodge/LightSource.hs 32;" f destroyLSFlashAt src/Dodge/LightSource.hs 42;" f @@ -3240,7 +3224,7 @@ destroyMatS src/Dodge/Material/Sound.hs 7;" f destroyMcType src/Dodge/Machine/Destroy.hs 22;" f destroyMount src/Dodge/Block.hs 100;" f destroyMounts src/Dodge/Block.hs 97;" f -destroyProjectile src/Dodge/Projectile/Update.hs 161;" f +destroyProjectile src/Dodge/Projectile/Update.hs 160;" f detV src/Geometry/Vector.hs 93;" f detector src/Dodge/Item/Held/Utility.hs 27;" f detectorColor src/Dodge/Item/Draw/SPic.hs 465;" f @@ -3262,7 +3246,7 @@ displayFrameTicks src/Dodge/Render/Picture.hs 46;" f displayFreeSlots src/Dodge/DisplayInventory.hs 199;" f displayIndents src/Dodge/DisplayInventory.hs 110;" f displayPulse src/Dodge/Inventory/SelectionList.hs 176;" f -displayTerminalLineString src/Dodge/Update.hs 497;" f +displayTerminalLineString src/Dodge/Update.hs 496;" f dist src/Geometry/Vector.hs 190;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f @@ -3277,7 +3261,7 @@ doAfterPlacements src/Dodge/Layout.hs 83;" f doAimTwist src/Dodge/Creature/YourControl.hs 140;" f doAnyEquipmentEffect src/Dodge/Creature/State.hs 139;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f -doBarrelSpin src/Dodge/Projectile/Update.hs 215;" f +doBarrelSpin src/Dodge/Projectile/Update.hs 214;" f doBlBl src/Dodge/BlBl.hs 5;" f doBlSh src/Dodge/Block/Draw.hs 14;" f doBounce src/Dodge/Base/Collide.hs 66;" f @@ -3292,7 +3276,7 @@ doCrWdAc src/Dodge/CreatureEffect.hs 77;" f doCrWdImp src/Dodge/CreatureEffect.hs 16;" f doCrWdWd src/Dodge/CreatureEffect.hs 20;" f doDamage src/Dodge/Creature/State.hs 41;" f -doDeathToggle src/Dodge/WorldEffect.hs 95;" f +doDeathToggle src/Dodge/WorldEffect.hs 96;" f doDeathTriggers src/Dodge/WorldEffect.hs 90;" f doDebugTest src/Dodge/Update/Input/DebugTest.hs 22;" f doDebugTest2 src/Dodge/Update/Input/DebugTest.hs 37;" f @@ -3303,12 +3287,12 @@ doDebugTestF6 src/Dodge/Update/Input/DebugTest.hs 40;" f doDebugTestF7 src/Dodge/Update/Input/DebugTest.hs 48;" f doDebugTestF8 src/Dodge/Update/Input/DebugTest.hs 56;" f doDrWdWd src/Dodge/DrWdWd.hs 16;" f -doDrag src/Dodge/Update/Input/InGame.hs 108;" f +doDrag src/Dodge/Update/Input/InGame.hs 110;" f doDrawing src/Dodge/Render.hs 34;" f doDrawing' src/Dodge/Render.hs 45;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f doGenFloat src/Dodge/HeldUse.hs 1198;" f -doGravityPU src/Dodge/Projectile/Update.hs 37;" f +doGravityPU src/Dodge/Projectile/Update.hs 36;" f doHeldUseEffect src/Dodge/HeldUse.hs 343;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f @@ -3330,7 +3314,7 @@ doPropUpdates src/Dodge/Prop/Update.hs 34;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 445;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 451;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f @@ -3342,9 +3326,9 @@ doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 166;" f doTestDrawing src/Dodge/Render.hs 41;" 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 183;" f +doThrust src/Dodge/Projectile/Update.hs 182;" f doTimeScroll src/Dodge/Update.hs 208;" f -doTmWdWd src/Dodge/WorldEffect.hs 98;" f +doTmWdWd src/Dodge/WorldEffect.hs 99;" f doWallRotate src/Dodge/Update/Camera.hs 213;" f doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 37;" f @@ -3386,7 +3370,7 @@ drawCircCollisionTest src/Dodge/Debug/Picture.hs 116;" f drawCliff src/Dodge/Render/ShapePicture.hs 47;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f drawCombFilter src/Dodge/Render/Picture.hs 268;" f -drawCombineInventory src/Dodge/Render/HUD.hs 175;" f +drawCombineInventory src/Dodge/Render/HUD.hs 176;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 69;" f drawCoord src/Dodge/Debug/Picture.hs 364;" f drawCorpse src/Dodge/Corpse/Draw.hs 6;" f @@ -3409,7 +3393,7 @@ drawDragSelecting src/Dodge/Render/HUD.hs 146;" f drawEmptySet src/Dodge/Render/Picture.hs 140;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 7;" f drawEquipment src/Dodge/Creature/Picture.hs 133;" f -drawExamineInventory src/Dodge/Render/HUD.hs 191;" f +drawExamineInventory src/Dodge/Render/HUD.hs 192;" f drawExplosiveBall src/Dodge/EnergyBall/Draw.hs 15;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 269;" f drawFlame src/Dodge/Flame/Draw.hs 8;" f @@ -3423,8 +3407,8 @@ drawInputMenu src/Dodge/Render/MenuScreen.hs 22;" f drawInspectWall src/Dodge/Debug/Picture.hs 244;" f drawInspectWalls src/Dodge/Debug/Picture.hs 232;" f drawInventory src/Dodge/Render/HUD.hs 54;" f -drawItemChildrenConnect src/Dodge/Render/HUD.hs 321;" f -drawItemConnections src/Dodge/Render/HUD.hs 311;" f +drawItemChildrenConnect src/Dodge/Render/HUD.hs 322;" f +drawItemConnections src/Dodge/Render/HUD.hs 312;" f drawJumpDown src/Dodge/Render/Picture.hs 191;" f drawLabCrossCol src/Dodge/Render/Label.hs 8;" f drawLampCover src/Dodge/Prop/Draw.hs 55;" f @@ -3437,7 +3421,7 @@ drawListYgapScaleYoff src/Dodge/Render/List.hs 95;" f drawListYoff src/Dodge/Render/List.hs 92;" f drawMachine src/Dodge/Machine/Draw.hs 17;" f drawMapperAR src/Dodge/Targeting/Draw.hs 12;" f -drawMapperInventory src/Dodge/Render/HUD.hs 166;" f +drawMapperInventory src/Dodge/Render/HUD.hs 167;" f drawMenuClick src/Dodge/Render/Picture.hs 163;" f drawMenuCursor src/Dodge/Render/Picture.hs 177;" f drawMenuOrHUD src/Dodge/Render/Picture.hs 64;" f @@ -3457,7 +3441,7 @@ drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 26;" f drawPulseBall src/Dodge/Render/ShapePicture.hs 53;" f drawQuitTerminal src/Dodge/Render/Picture.hs 133;" f -drawRBOptions src/Dodge/Render/HUD.hs 244;" f +drawRBOptions src/Dodge/Render/HUD.hs 245;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 14;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 38;" f drawReturn src/Dodge/Render/Picture.hs 147;" f @@ -3480,7 +3464,7 @@ drawSubInventory src/Dodge/Render/HUD.hs 157;" f drawSwitch src/Dodge/Button/Draw.hs 16;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 24;" f drawTargetingAR src/Dodge/Targeting/Draw.hs 20;" f -drawTerminalDisplay src/Dodge/Render/HUD.hs 357;" f +drawTerminalDisplay src/Dodge/Render/HUD.hs 358;" f drawTeslaArc src/Dodge/Tesla/Draw.hs 9;" f drawText src/Picture/Base.hs 220;" f drawTitle src/Dodge/Render/MenuScreen.hs 55;" f @@ -3523,7 +3507,7 @@ dtToRootIntMap' src/Dodge/DoubleTree.hs 153;" f dtToUpDownAdj src/Dodge/DoubleTree.hs 158;" f dummyMenuOption src/Dodge/Menu/Option.hs 74;" f dustColor src/Shader/Poke/Cloud.hs 71;" f -dustSpringVel src/Dodge/Update.hs 883;" f +dustSpringVel src/Dodge/Update.hs 874;" f ebColor src/Dodge/EnergyBall.hs 77;" f ebDamage src/Dodge/EnergyBall.hs 85;" f ebEffect src/Dodge/EnergyBall.hs 45;" f @@ -3544,15 +3528,15 @@ encircleCloseP src/Dodge/Creature/Boid.hs 36;" f encircleDistP src/Dodge/Creature/Boid.hs 22;" f encircleP src/Dodge/Creature/Boid.hs 28;" f endArcPos src/Dodge/Tesla.hs 87;" f -endCombineRegex src/Dodge/Update/Input/InGame.hs 269;" f -endRegex src/Dodge/Update/Input/InGame.hs 256;" f +endCombineRegex src/Dodge/Update/Input/InGame.hs 271;" f +endRegex src/Dodge/Update/Input/InGame.hs 258;" f energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f enterCombineInv src/Dodge/DisplayInventory.hs 324;" f epText src/Dodge/Inventory/SelectionList.hs 76;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 5;" f eqSiteToPositions src/Dodge/Inventory/RBList.hs 77;" f -equipAllocString src/Dodge/Render/HUD.hs 302;" f +equipAllocString src/Dodge/Render/HUD.hs 303;" f equipAttachPos src/Dodge/Item/Draw.hs 32;" f equipBackgroundEffect src/Dodge/Euse.hs 15;" f equipInfo src/Dodge/Item/Info.hs 141;" f @@ -3570,14 +3554,14 @@ errorNormalizeV src/Geometry.hs 55;" f errorPointInPolygon src/Geometry.hs 47;" f evaluateRandPS src/Dodge/Placement/PlaceSpot.hs 150;" f evenOddSplit src/Dodge/Base.hs 160;" f -exitTerminalSubInv src/Dodge/WorldEffect.hs 144;" f +exitTerminalSubInv src/Dodge/WorldEffect.hs 145;" f expandLine src/Dodge/Picture.hs 30;" f expandPolyBy src/Dodge/LevelGen/StaticWalls.hs 91;" f expandPolyByFixed src/Dodge/LevelGen/StaticWalls.hs 97;" f expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 184;" f -explodeShell src/Dodge/Projectile/Update.hs 285;" f +explodeShell src/Dodge/Projectile/Update.hs 284;" f explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f @@ -3641,7 +3625,7 @@ flockPointTarget src/Dodge/Creature/Boid.hs 200;" f flockPointTargetR src/Dodge/Creature/Boid.hs 267;" f flockToPointUsing src/Dodge/Creature/Boid.hs 215;" f flockToPointUsing' src/Dodge/Creature/Boid.hs 228;" f -floorItemPickupInfo src/Dodge/Render/HUD.hs 224;" f +floorItemPickupInfo src/Dodge/Render/HUD.hs 225;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 121;" f floorWire src/Dodge/Wire.hs 13;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f @@ -3706,9 +3690,9 @@ getAutoSpringLinks src/Dodge/Item/Grammar.hs 84;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 169;" f getBulletType src/Dodge/HeldUse.hs 943;" f -getCloseObj src/Dodge/Update/Input/InGame.hs 541;" f -getCommand src/Dodge/Terminal.hs 61;" f -getCommands src/Dodge/Terminal.hs 58;" f +getCloseObj src/Dodge/Update/Input/InGame.hs 547;" f +getCommand src/Dodge/Terminal.hs 58;" f +getCommands src/Dodge/Terminal.hs 55;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 45;" f getDistortions src/Dodge/Render.hs 435;" f getEquipmentAllocation src/Dodge/Inventory/RBList.hs 47;" f @@ -3727,7 +3711,7 @@ getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 6;" f getRootItemBounds src/Dodge/Render/HUD.hs 93;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f -getSensorInfo src/Dodge/WorldEffect.hs 157;" f +getSensorInfo src/Dodge/WorldEffect.hs 158;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f getSplitString src/Dodge/Debug/Terminal.hs 126;" f getTiles src/Dodge/Layout.hs 208;" f @@ -3827,9 +3811,9 @@ heldItemWeight src/Dodge/Creature/Statistics.hs 72;" f heldPositionInfo src/Dodge/Item/Info.hs 241;" f heldTorqueAmount src/Dodge/HeldUse.hs 584;" f heldTriggerType src/Dodge/BaseTriggerType.hs 27;" f -helpCommand src/Dodge/Terminal.hs 104;" f +helpCommand src/Dodge/Terminal.hs 101;" f helpPoly3D src/Polyhedra.hs 125;" f -helpStrings src/Dodge/Terminal.hs 107;" f +helpStrings src/Dodge/Terminal.hs 104;" f heron src/Geometry.hs 221;" f hiToFloat src/Dodge/Room/Modify/Girder.hs 171;" f highBar src/Dodge/Room/Foreground.hs 89;" f @@ -3950,7 +3934,7 @@ isAnimate src/Dodge/Creature/Test.hs 144;" f isCognizant src/Dodge/Creature/Perception.hs 106;" f isConnected src/Dodge/Inventory/Swap.hs 74;" f isElectrical src/Dodge/Machine/Update.hs 80;" f -isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 192;" f +isGroupSelectableSection src/Dodge/Update/Input/InGame.hs 194;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f isLHS src/Geometry/LHS.hs 8;" f @@ -4215,7 +4199,7 @@ makeSourcedShader src/Shader/Compile.hs 167;" f makeSpark src/Dodge/Spark.hs 45;" f makeSubmenuOption src/Dodge/Menu/OptionType.hs 19;" f makeSwitch src/Dodge/LevelGen/Switch.hs 38;" f -makeTermLine src/Dodge/Terminal.hs 116;" f +makeTermLine src/Dodge/Terminal.hs 113;" f makeTermPara src/Dodge/Terminal.hs 122;" f makeTeslaArc src/Dodge/Tesla.hs 29;" f makeTeslaExplosionAt src/Dodge/WorldEvent/Explosion.hs 40;" f @@ -4236,7 +4220,7 @@ maybeClearPath src/Dodge/Block.hs 72;" f maybeClearPaths src/Dodge/Block.hs 69;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 32;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 37;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 562;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 568;" f maybeOpenConsole src/Dodge/Update.hs 131;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 116;" f @@ -4325,10 +4309,10 @@ moveCombineSel src/Dodge/Update/Scroll.hs 118;" f moveInverseShockwave src/Dodge/Shockwave/Update.hs 44;" f moveLSThen src/Dodge/Placement/Instance/LightSource.hs 30;" f movePenBullet src/Dodge/Bullet.hs 199;" f -moveProjectile src/Dodge/Projectile/Update.hs 263;" f +moveProjectile src/Dodge/Projectile/Update.hs 262;" f moveRoomBy src/Dodge/Room/Link.hs 53;" f moveShockwave src/Dodge/Shockwave/Update.hs 13;" f -moveStuckGrenade src/Dodge/Projectile/Update.hs 249;" f +moveStuckGrenade src/Dodge/Projectile/Update.hs 248;" f moveToSideFirstOutLink src/Dodge/Room/Warning.hs 55;" f moveWall src/Dodge/Wall/Move.hs 29;" f moveWallID src/Dodge/Wall/Move.hs 24;" f @@ -4348,7 +4332,7 @@ muzFlareAt src/Dodge/HeldUse.hs 676;" f mvButton src/Dodge/Placement/PlaceSpot.hs 177;" f mvCr src/Dodge/Placement/PlaceSpot.hs 187;" f mvFS src/Dodge/Placement/PlaceSpot.hs 190;" f -mvGust src/Dodge/Update.hs 815;" f +mvGust src/Dodge/Update.hs 806;" f mvLS src/Dodge/Placement/PlaceSpot.hs 218;" f mvP src/Dodge/Wall/Move.hs 54;" f mvPP src/Dodge/Placement/PlaceSpot.hs 184;" f @@ -4455,7 +4439,7 @@ parseNum src/Dodge/Debug/Terminal.hs 75;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 527;" f +pauseGame src/Dodge/Update/Input/InGame.hs 533;" f pauseMenu src/Dodge/Menu.hs 56;" f pauseMenuOptions src/Dodge/Menu.hs 61;" f pauseSound src/Dodge/SoundLogic.hs 42;" f @@ -4491,7 +4475,7 @@ pipe src/Dodge/Item/Craftable.hs 32;" f pistol src/Dodge/Item/Held/Stick.hs 40;" f pistolCrit src/Dodge/Creature/PistolCrit.hs 12;" f pistolerRoom src/Dodge/Room/Room.hs 321;" f -pjRemoteSetDirection src/Dodge/Projectile/Update.hs 228;" f +pjRemoteSetDirection src/Dodge/Projectile/Update.hs 227;" f plBlock src/Dodge/Placement/PlaceSpot/Block.hs 18;" f plDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 22;" f plLineBlock src/Dodge/Placement/PlaceSpot/Block.hs 50;" f @@ -4609,7 +4593,7 @@ positionRoomsFromTree src/Dodge/Tree/Shift.hs 35;" f postGenerationProcessing src/Dodge/LevelGen.hs 33;" f postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f postWorldLoad src/Dodge/WorldLoad.hs 15;" f -powerDownTerminal src/Dodge/WorldEffect.hs 132;" f +powerDownTerminal src/Dodge/WorldEffect.hs 133;" f powerFakeout src/Dodge/Room/Start.hs 27;" f powerFakeout' src/Dodge/Room/Start.hs 24;" f powerLegs src/Dodge/Item/Equipment.hs 85;" f @@ -4618,7 +4602,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 118;" f -ppEvents src/Dodge/Update.hs 778;" f +ppEvents src/Dodge/Update.hs 769;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 82;" f prePos src/Quaternion.hs 68;" f @@ -4697,7 +4681,7 @@ qToV2 src/Quaternion.hs 56;" f qToV3 src/Quaternion.hs 53;" f quarterRoomSquare src/Dodge/Room/Procedural.hs 213;" f quarterRoomTri src/Dodge/Room/Procedural.hs 177;" f -quitCommand src/Dodge/Terminal.hs 113;" f +quitCommand src/Dodge/Terminal.hs 110;" f qz src/Quaternion.hs 71;" f rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f rLauncherX src/Dodge/Item/Held/Launcher.hs 30;" f @@ -4725,7 +4709,7 @@ randPeakedParam src/RandomHelp.hs 130;" f randProb src/RandomHelp.hs 68;" f randSpark src/Dodge/Spark.hs 69;" f randSparkExtraVel src/Dodge/Spark.hs 92;" f -randWallReflect src/Dodge/Update.hs 671;" f +randWallReflect src/Dodge/Update.hs 662;" f randomChallenges src/Dodge/Room/Start.hs 62;" f randomCompass src/Dodge/Layout.hs 59;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 266;" f @@ -4827,7 +4811,7 @@ rightPadNoSquash src/Padding.hs 23;" f rlPosDir src/Dodge/RoomLink.hs 94;" f rlauncherPic src/Dodge/Item/Draw/SPic.hs 409;" f rmInLinks src/Dodge/RoomLink.hs 138;" f -rmInvItem src/Dodge/Inventory.hs 75;" f +rmInvItem src/Dodge/Inventory.hs 76;" f rmLinksOfType src/Dodge/RoomLink.hs 135;" f rmOutLinks src/Dodge/RoomLink.hs 138;" f roomC src/Dodge/Room/Room.hs 38;" f @@ -4954,7 +4938,7 @@ selectedItemScroll src/Dodge/Update/Scroll.hs 50;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 63;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 69;" f senseDamage src/Dodge/Machine/Update.hs 160;" f -sensorCommand src/Dodge/Terminal.hs 82;" f +sensorCommand src/Dodge/Terminal.hs 79;" f sensorRoom src/Dodge/Room/SensorDoor.hs 27;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 48;" f sensorSPic src/Dodge/Machine/Draw.hs 70;" f @@ -4978,12 +4962,12 @@ setLinkType src/Dodge/RoomLink.hs 60;" f setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMusicVolume src/Sound.hs 162;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 53;" f -setOldPos src/Dodge/Update.hs 520;" f +setOldPos src/Dodge/Update.hs 515;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f -setSelWhileDragging src/Dodge/Update/Input/InGame.hs 336;" f +setSelWhileDragging src/Dodge/Update/Input/InGame.hs 338;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5024,10 +5008,10 @@ shapeVerxSize src/Shape/Parameters.hs 10;" f shatterGun src/Dodge/Item/Held/Weapons.hs 8;" f shatterGunSPic src/Dodge/Item/Draw/SPic.hs 324;" f shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f -shellExplosionCheck src/Dodge/Projectile/Update.hs 57;" f -shellHitCreature src/Dodge/Projectile/Update.hs 85;" f -shellHitFloor src/Dodge/Projectile/Update.hs 101;" f -shellHitWall src/Dodge/Projectile/Update.hs 68;" f +shellExplosionCheck src/Dodge/Projectile/Update.hs 56;" f +shellHitCreature src/Dodge/Projectile/Update.hs 84;" f +shellHitFloor src/Dodge/Projectile/Update.hs 100;" f +shellHitWall src/Dodge/Projectile/Update.hs 67;" f shellMag src/Dodge/Item/Ammo.hs 49;" f shellModule src/Dodge/Item/Scope.hs 123;" f shellShape src/Dodge/Projectile/Draw.hs 35;" f @@ -5037,9 +5021,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 78;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 84;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 310;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 349;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 343;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 312;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 351;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 345;" f shiftLinkBy src/Dodge/Room/Link.hs 87;" f shiftPSBy src/Dodge/Placement/Shift.hs 12;" f shiftPathBy src/Dodge/Room/Link.hs 92;" f @@ -5089,7 +5073,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 151;" f -simpleCrSprings src/Dodge/Update.hs 892;" f +simpleCrSprings src/Dodge/Update.hs 883;" f simpleTermMessage src/Dodge/Terminal.hs 176;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f @@ -5140,7 +5124,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 86;" f -spaceAction src/Dodge/Update/Input/InGame.hs 531;" f +spaceAction src/Dodge/Update/Input/InGame.hs 537;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 190;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 183;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 175;" f @@ -5196,7 +5180,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 311;" f startCr src/Dodge/Creature.hs 93;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 281;" f +startDrag src/Dodge/Update/Input/InGame.hs 283;" f startInvList src/Dodge/Creature.hs 108;" f startInventory src/Dodge/Creature.hs 111;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -5229,7 +5213,7 @@ swapAnyExtraSelection src/Dodge/Inventory/Swap.hs 55;" f swapInOutLinks src/Dodge/RoomLink.hs 80;" f swapIndices src/ListHelp.hs 50;" f swapInvItems src/Dodge/Inventory/Swap.hs 20;" f -swapItemWith src/Dodge/Inventory.hs 174;" f +swapItemWith src/Dodge/Inventory.hs 169;" f swarmCrit src/Dodge/Creature/SwarmCrit.hs 10;" f swarmUsingCenter src/Dodge/Creature/Boid.hs 172;" f switchDoor src/Dodge/Placement/Instance/Door.hs 96;" f @@ -5266,8 +5250,8 @@ targetingScope src/Dodge/Item/Scope.hs 38;" f telRoomLev src/Dodge/Room/Teleport.hs 14;" f teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f termScreenColor src/Dodge/Terminal/Color.hs 10;" f -termSoundLine src/Dodge/Terminal.hs 52;" f -termTextColor src/Dodge/Terminal.hs 55;" f +termSoundLine src/Dodge/Terminal.hs 49;" f +termTextColor src/Dodge/Terminal.hs 52;" f terminalColor src/Dodge/Placement/Instance/Terminal.hs 51;" f terminalReturnEffect src/Dodge/Terminal.hs 179;" f terminalSPic src/Dodge/Machine/Draw.hs 29;" f @@ -5288,7 +5272,7 @@ textJustifyCenter src/Picture/Base.hs 212;" f textJustifyLeft src/Picture/Base.hs 208;" f textJustifyRight src/Picture/Base.hs 198;" f textRight src/Picture/Base.hs 203;" f -textTerminal src/Dodge/Terminal.hs 38;" f +textTerminal src/Dodge/Terminal.hs 35;" f textVMirror src/Picture/Base.hs 216;" f tflat2 src/Picture/Data.hs 60;" f tflat3 src/Picture/Data.hs 64;" f @@ -5323,8 +5307,9 @@ tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f titleOptionsMenu src/Dodge/Menu.hs 102;" f titleOptionsNoWrite src/Dodge/Menu.hs 105;" f -tlSetStatus src/Dodge/Terminal.hs 119;" f -tmUpdate src/Dodge/Update.hs 500;" f +tlDoEffect src/Dodge/Terminal.hs 119;" f +tlSetStatus src/Dodge/Terminal.hs 116;" f +tmUpdate src/Dodge/Update.hs 499;" f toBinary src/Dodge/Inventory/SelectionList.hs 138;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f @@ -5338,7 +5323,7 @@ toV2 src/Geometry/Data.hs 54;" f toV3 src/Geometry/Data.hs 57;" f toV4 src/Geometry/Data.hs 60;" f toggleCombineInv src/Dodge/DisplayInventory.hs 318;" f -toggleCommand src/Dodge/Terminal.hs 91;" f +toggleCommand src/Dodge/Terminal.hs 88;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 65;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 103;" f toggleJust src/MaybeHelp.hs 41;" f @@ -5410,22 +5395,22 @@ truncate src/Polyhedra/Geodesic.hs 38;" f trunkDepth src/TreeHelp.hs 161;" f tryAttachItems src/Dodge/Item/Grammar.hs 33;" f tryClickUse src/Dodge/Creature/YourControl.hs 221;" f -tryCombine src/Dodge/Update/Input/InGame.hs 552;" f +tryCombine src/Dodge/Update/Input/InGame.hs 558;" f tryDrawToCapacitor src/Dodge/Creature/State.hs 149;" f -tryDropSelected src/Dodge/Update/Input/InGame.hs 126;" f +tryDropSelected src/Dodge/Update/Input/InGame.hs 128;" f tryGetChannel src/Sound.hs 97;" f tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f tryGetRootItemInvID src/Dodge/Inventory/Location.hs 29;" f tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 38;" f -tryPickupSelected src/Dodge/Update/Input/InGame.hs 133;" f +tryPickupSelected src/Dodge/Update/Input/InGame.hs 135;" f tryPlay src/Sound.hs 84;" f tryPutFloorItemIDInInv src/Dodge/Inventory/Add.hs 26;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 42;" f tryPutItemInInvAt src/Dodge/Inventory/Add.hs 32;" f trySeedFromClipboard src/Dodge/Menu.hs 91;" f -trySpin src/Dodge/Projectile/Update.hs 171;" f +trySpin src/Dodge/Projectile/Update.hs 170;" f trySynthBullet src/Dodge/Creature/State.hs 165;" f -tryThrust src/Dodge/Projectile/Update.hs 177;" f +tryThrust src/Dodge/Projectile/Update.hs 176;" f tryUseParent src/Dodge/Creature/State.hs 143;" f turnTo src/Dodge/Movement/Turn.hs 8;" f turret src/Dodge/Placement/Instance/Turret.hs 35;" f @@ -5464,87 +5449,87 @@ unusedSpotNearInLink src/Dodge/PlacementSpot.hs 191;" f updateAimPos src/Dodge/Update.hs 321;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla.hs 44;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 479;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 485;" f updateBarrel src/Dodge/Barreloid.hs 41;" f updateBarreloid src/Dodge/Barreloid.hs 15;" f updateBaseWheelEvent src/Dodge/Update/Scroll.hs 33;" f updateBounds src/Dodge/Update/Camera.hs 251;" f updateBulVel src/Dodge/Bullet.hs 55;" f updateBullet src/Dodge/Bullet.hs 20;" f -updateBullets src/Dodge/Update.hs 591;" f +updateBullets src/Dodge/Update.hs 582;" f updateCamera src/Dodge/Update/Camera.hs 30;" f updateCloseObjects src/Dodge/Inventory.hs 120;" f -updateCloud src/Dodge/Update.hs 829;" f -updateClouds src/Dodge/Update.hs 697;" f +updateCloud src/Dodge/Update.hs 820;" f +updateClouds src/Dodge/Update.hs 688;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f updateCombineSections src/Dodge/DisplayInventory.hs 44;" f updateCreature src/Dodge/Creature/Update.hs 30;" f updateCreature' src/Dodge/Creature/Update.hs 38;" f -updateCreatureGroups src/Dodge/Update.hs 563;" f -updateCreatureSoundPositions src/Dodge/Update.hs 539;" f -updateDebris src/Dodge/Update.hs 598;" f +updateCreatureGroups src/Dodge/Update.hs 554;" f +updateCreatureSoundPositions src/Dodge/Update.hs 530;" f +updateDebris src/Dodge/Update.hs 589;" f updateDebrisChunk src/Dodge/Prop/Moving.hs 16;" f updateDebugMessageOffset src/Dodge/Update.hs 100;" f -updateDelayedEvents src/Dodge/Update.hs 921;" f +updateDelayedEvents src/Dodge/Update.hs 912;" f updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 584;" f +updateDistortions src/Dodge/Update.hs 575;" f updateDoor src/Dodge/Update.hs 326;" f -updateDust src/Dodge/Update.hs 853;" f -updateDusts src/Dodge/Update.hs 700;" f +updateDust src/Dodge/Update.hs 844;" f +updateDusts src/Dodge/Update.hs 691;" f updateEnergyBall src/Dodge/EnergyBall.hs 31;" f -updateEnergyBalls src/Dodge/Update.hs 688;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 506;" f +updateEnergyBalls src/Dodge/Update.hs 679;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 512;" f updateExpBarrel src/Dodge/Barreloid.hs 20;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 19;" f -updateFlames src/Dodge/Update.hs 685;" f +updateFlames src/Dodge/Update.hs 676;" f updateFloatingCamera src/Dodge/Update/Camera.hs 35;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 366;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 359;" f -updateGusts src/Dodge/Update.hs 812;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 368;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 361;" f +updateGusts src/Dodge/Update.hs 803;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f -updateIMl src/Dodge/Update.hs 553;" f -updateIMl' src/Dodge/Update.hs 558;" f +updateIMl src/Dodge/Update.hs 544;" f +updateIMl' src/Dodge/Update.hs 549;" f updateInGameCamera src/Dodge/Update/Camera.hs 79;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 426;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 432;" f updateInt2Map src/Dodge/Zoning/Base.hs 92;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 86;" f updateItemTargeting src/Dodge/Creature/State.hs 259;" f -updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 393;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 420;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 384;" f -updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 402;" f +updateKeyContinueTerminal src/Dodge/Update/Input/InGame.hs 399;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 426;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 386;" f +updateKeysTextInputTerminal src/Dodge/Update/Input/InGame.hs 408;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 11;" f updateLasers src/Dodge/Update.hs 450;" f updateLeftParentSF src/Dodge/Item/Grammar.hs 169;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 439;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 445;" f updateMachine src/Dodge/Machine/Update.hs 20;" f updateMagnets src/Dodge/Update.hs 329;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 198;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 200;" f updateMouseContext src/Dodge/Update.hs 342;" f updateMouseContextGame src/Dodge/Update.hs 347;" f -updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 96;" f -updateMouseInGame src/Dodge/Update/Input/InGame.hs 86;" f -updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 159;" f -updateObjCatMaybes src/Dodge/Update.hs 575;" f -updateObjMapMaybe src/Dodge/Update.hs 568;" f +updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 98;" f +updateMouseInGame src/Dodge/Update/Input/InGame.hs 88;" f +updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 161;" f +updateObjCatMaybes src/Dodge/Update.hs 566;" f +updateObjMapMaybe src/Dodge/Update.hs 559;" f updatePastWorlds src/Dodge/Update.hs 438;" f updatePreload src/Preload/Update.hs 20;" f -updateProjectile src/Dodge/Projectile/Update.hs 28;" f +updateProjectile src/Dodge/Projectile/Update.hs 27;" f updateProp src/Dodge/Prop/Update.hs 11;" f updatePulse src/Dodge/Creature/Update.hs 135;" f updatePulseBall src/Dodge/Update.hs 464;" f -updatePulseLaser src/Dodge/Update.hs 638;" f +updatePulseLaser src/Dodge/Update.hs 629;" f updatePulseLasers src/Dodge/Update.hs 459;" f updateRBList src/Dodge/Inventory/RBList.hs 18;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f -updateRadarBlips src/Dodge/Update.hs 587;" f +updateRadarBlips src/Dodge/Update.hs 578;" f updateRadarSweep src/Dodge/RadarSweep.hs 39;" f -updateRadarSweeps src/Dodge/Update.hs 691;" f +updateRadarSweeps src/Dodge/Update.hs 682;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 108;" f updateRightParentSF src/Dodge/Item/Grammar.hs 180;" f @@ -5554,22 +5539,22 @@ updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 265;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 244;" f updateShockwave src/Dodge/Shockwave/Update.hs 8;" f -updateShockwaves src/Dodge/Update.hs 682;" f +updateShockwaves src/Dodge/Update.hs 673;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 72;" f updateSounds src/Sound.hs 67;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 694;" f -updateTeslaArc src/Dodge/Update.hs 608;" f -updateTeslaArcs src/Dodge/Update.hs 605;" f +updateSparks src/Dodge/Update.hs 685;" f +updateTeslaArc src/Dodge/Update.hs 599;" f +updateTeslaArcs src/Dodge/Update.hs 596;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 679;" f +updateTractorBeams src/Dodge/Update.hs 670;" f updateTurret src/Dodge/Machine/Update.hs 50;" f updateUniverse src/Dodge/Update.hs 79;" f updateUniverseFirst src/Dodge/Update.hs 90;" f updateUniverseLast src/Dodge/Update.hs 141;" f updateUniverseMid src/Dodge/Update.hs 161;" f -updateUseInputInGame src/Dodge/Update/Input/InGame.hs 43;" f +updateUseInputInGame src/Dodge/Update/Input/InGame.hs 45;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 23;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 10;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f @@ -5732,7 +5717,7 @@ yV2 src/Geometry/Vector.hs 210;" f yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 12;" f youDropItem src/Dodge/Creature/Action.hs 190;" f -yourAugmentedItem src/Dodge/Render/HUD.hs 231;" f +yourAugmentedItem src/Dodge/Render/HUD.hs 232;" f yourControl src/Dodge/Creature/YourControl.hs 28;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 110;" f yourInfo src/Dodge/Creature/Info.hs 10;" f @@ -5750,9 +5735,9 @@ zipCountDown src/Dodge/Room/Procedural.hs 118;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f zoneClouds src/Dodge/Update.hs 491;" f zoneCreature src/Dodge/Zoning/Creature.hs 54;" f -zoneCreatures src/Dodge/Update.hs 534;" f +zoneCreatures src/Dodge/Update.hs 525;" f zoneDust src/Dodge/Zoning/Cloud.hs 48;" f -zoneDusts src/Dodge/Update.hs 494;" f +zoneDusts src/Dodge/Update.hs 493;" f zoneExtract src/Dodge/Zoning/Base.hs 52;" f zoneMonoid src/Dodge/Zoning/Base.hs 83;" f zoneOfCirc src/Dodge/Zoning/Base.hs 24;" f