diff --git a/data/sound/reloadFail.TNKTONK.300.wav b/data/sound/reloadFail.TNKTONK.300.wav new file mode 100644 index 000000000..6f7c2ab60 Binary files /dev/null and b/data/sound/reloadFail.TNKTONK.300.wav differ diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs index a77dc69b4..f2f238299 100644 --- a/src/Dodge/Data/Terminal.hs +++ b/src/Dodge/Data/Terminal.hs @@ -28,6 +28,7 @@ data Terminal = Terminal , _tmStatus :: TerminalStatus , _tmCommandHistory :: [String] , _tmToggles :: M.Map String TerminalToggle + , _tmRebootOnAccess :: Bool } data TerminalLineString = TerminalLineConst String Color diff --git a/src/Dodge/Default/Terminal.hs b/src/Dodge/Default/Terminal.hs index 84fd603e2..c544139ca 100644 --- a/src/Dodge/Default/Terminal.hs +++ b/src/Dodge/Default/Terminal.hs @@ -19,6 +19,7 @@ defaultTerminal = , _tmStatus = TerminalOff , _tmCommandHistory = [] , _tmToggles = mempty + , _tmRebootOnAccess = False -- , _tmExternalColor = dark magenta } diff --git a/src/Dodge/Room/Room.hs b/src/Dodge/Room/Room.hs index 7ff4175ce..e1a75d03c 100644 --- a/src/Dodge/Room/Room.hs +++ b/src/Dodge/Room/Room.hs @@ -428,7 +428,9 @@ distributerRoom atype aamount = do store = sps (unusedOffPathAwayFromLink 50) (PutMachine (reverse $ polyCirc 4 20) mcstore Nothing) & plExternalID ?~ i dst gw = let mj = gw ^? genPmnt . ix i . plMID . _Just - in putTerminal (mcdist mj) (defaultTerminal & tmBootLines .~ tmDistributeLines) + in putTerminal (mcdist mj) (defaultTerminal & tmBootLines .~ tmDistributeLines + & tmRebootOnAccess .~ True + ) & plSpot .~ unusedOffPathAwayFromLink 50 & plExternalID ?~ i1 thepipe gw = diff --git a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs index 7c649d8bc..e763b6bbf 100644 --- a/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs +++ b/src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs @@ -1,4 +1,4 @@ --- generated at 2025-12-31 13:02:57.083459577 UTC +-- generated at 2025-12-31 13:24:22.332967514 UTC module Dodge.SoundLogic.ExternallyGeneratedSounds where import Sound.Data soundToVol :: SoundID -> Float @@ -143,32 +143,33 @@ soundToVol v = case _getSoundID v of 137 -> 300 138 -> 100 139 -> 300 - 140 -> 100 + 140 -> 300 141 -> 100 - 142 -> 500 - 143 -> 100 + 142 -> 100 + 143 -> 500 144 -> 100 - 145 -> 500 - 146 -> 100 + 145 -> 100 + 146 -> 500 147 -> 100 - 148 -> 500 - 149 -> 40 - 150 -> 200 - 151 -> 50 - 152 -> 500 - 153 -> 2000 + 148 -> 100 + 149 -> 500 + 150 -> 40 + 151 -> 200 + 152 -> 50 + 153 -> 500 154 -> 2000 - 155 -> 40 - 156 -> 100 + 155 -> 2000 + 156 -> 40 157 -> 100 - 158 -> 500 - 159 -> 100 - 160 -> 1000 - 161 -> 100 - 162 -> 500 - 163 -> 8000 - 164 -> 200 - 165 -> 300 + 158 -> 100 + 159 -> 500 + 160 -> 100 + 161 -> 1000 + 162 -> 100 + 163 -> 500 + 164 -> 8000 + 165 -> 200 + 166 -> 300 _ -> 50 soundToOnomato :: SoundID -> String soundToOnomato v = case _getSoundID v of @@ -312,32 +313,33 @@ soundToOnomato v = case _getSoundID v of 137 -> "BWAAH" 138 -> "SLP" 139 -> "DWAAH" - 140 -> "VFVFVF" - 141 -> "SLP" - 142 -> "CRTINK" - 143 -> "VHHP" - 144 -> "SPRT" - 145 -> "PRUM" - 146 -> "SLPP" - 147 -> "FWUMP" - 148 -> "CLANG" - 149 -> "TIP" - 150 -> "CRAKLE" - 151 -> "HSSS" - 152 -> "TRINKL" - 153 -> "BANG" - 154 -> "CHUGUGUG" - 155 -> "TAPP" - 156 -> "KKSQWL" - 157 -> "SKWLL" - 158 -> "DUDURAH" - 159 -> "SKWLL" - 160 -> "TRNKL" - 161 -> "SLP" - 162 -> "WHUAWUH" - 163 -> "RINGGG" - 164 -> "QWLPH" - 165 -> "WRRR" + 140 -> "TNKTONK" + 141 -> "VFVFVF" + 142 -> "SLP" + 143 -> "CRTINK" + 144 -> "VHHP" + 145 -> "SPRT" + 146 -> "PRUM" + 147 -> "SLPP" + 148 -> "FWUMP" + 149 -> "CLANG" + 150 -> "TIP" + 151 -> "CRAKLE" + 152 -> "HSSS" + 153 -> "TRINKL" + 154 -> "BANG" + 155 -> "CHUGUGUG" + 156 -> "TAPP" + 157 -> "KKSQWL" + 158 -> "SKWLL" + 159 -> "DUDURAH" + 160 -> "SKWLL" + 161 -> "TRNKL" + 162 -> "SLP" + 163 -> "WHUAWUH" + 164 -> "RINGGG" + 165 -> "QWLPH" + 166 -> "WRRR" _ -> error "unitialised sound" soundPathList :: [String] soundPathList = @@ -481,6 +483,7 @@ soundPathList = , "sineRaisePitchTwoSec.BWAAH.300.wav" , "slap4.SLP.100.wav" , "skwareFadeTwoSec.DWAAH.300.wav" + , "reloadFail.TNKTONK.300.wav" , "throb1.VFVFVF.100.wav" , "slap5.SLP.100.wav" , "smallGlass3.CRTINK.500.wav" @@ -788,55 +791,57 @@ slap4S :: SoundID slap4S = SoundID 138 skwareFadeTwoSecS :: SoundID skwareFadeTwoSecS = SoundID 139 +reloadFailS :: SoundID +reloadFailS = SoundID 140 throb1S :: SoundID -throb1S = SoundID 140 +throb1S = SoundID 141 slap5S :: SoundID -slap5S = SoundID 141 +slap5S = SoundID 142 smallGlass3S :: SoundID -smallGlass3S = SoundID 142 +smallGlass3S = SoundID 143 reverseCymbal1S :: SoundID -reverseCymbal1S = SoundID 143 +reverseCymbal1S = SoundID 144 blood2S :: SoundID -blood2S = SoundID 144 +blood2S = SoundID 145 insertOneS :: SoundID -insertOneS = SoundID 145 +insertOneS = SoundID 146 slap1S :: SoundID -slap1S = SoundID 146 +slap1S = SoundID 147 tap4S :: SoundID -tap4S = SoundID 147 +tap4S = SoundID 148 clang1S :: SoundID -clang1S = SoundID 148 +clang1S = SoundID 149 foot1S :: SoundID -foot1S = SoundID 149 +foot1S = SoundID 150 elecCrackleS :: SoundID -elecCrackleS = SoundID 150 +elecCrackleS = SoundID 151 foamSprayLoopS :: SoundID -foamSprayLoopS = SoundID 151 +foamSprayLoopS = SoundID 152 smallGlass1S :: SoundID -smallGlass1S = SoundID 152 +smallGlass1S = SoundID 153 bangS :: SoundID -bangS = SoundID 153 +bangS = SoundID 154 seagullChatterS :: SoundID -seagullChatterS = SoundID 154 +seagullChatterS = SoundID 155 foot3S :: SoundID -foot3S = SoundID 155 +foot3S = SoundID 156 bloodShort3S :: SoundID -bloodShort3S = SoundID 156 +bloodShort3S = SoundID 157 blood4S :: SoundID -blood4S = SoundID 157 +blood4S = SoundID 158 ejectS :: SoundID -ejectS = SoundID 158 +ejectS = SoundID 159 bloodShort4S :: SoundID -bloodShort4S = SoundID 159 +bloodShort4S = SoundID 160 metal1S :: SoundID -metal1S = SoundID 160 +metal1S = SoundID 161 slapClean5S :: SoundID -slapClean5S = SoundID 161 +slapClean5S = SoundID 162 warp1S :: SoundID -warp1S = SoundID 162 +warp1S = SoundID 163 tinitusS :: SoundID -tinitusS = SoundID 163 +tinitusS = SoundID 164 gut1S :: SoundID -gut1S = SoundID 164 +gut1S = SoundID 165 fireFadeS :: SoundID -fireFadeS = SoundID 165 +fireFadeS = SoundID 166 diff --git a/src/Dodge/WorldEffect.hs b/src/Dodge/WorldEffect.hs index 923998570..d1db6674a 100644 --- a/src/Dodge/WorldEffect.hs +++ b/src/Dodge/WorldEffect.hs @@ -72,6 +72,9 @@ accessTerminal tid w = fromMaybe w $ do & cWorld . lWorld . terminals . ix tid %~ tryToBoot where tryToBoot tm = case _tmStatus tm of + _ | tm ^. tmRebootOnAccess -> tm + & tmFutureLines .~ _tmBootLines tm + & tmStatus .~ TerminalLineRead TerminalTextInput{} -> tm TerminalLineRead -> tm TerminalPressTo{} -> tm @@ -127,12 +130,12 @@ tmDistributeAmmo tm w = fromMaybe w $ do [TLine 1 [TerminalLineConst (g (aamount - newaamount)) white] TmWdId ,TLine 1 [TerminalLineConst (shortShow newaamount <>" "<>show atype<>" AVAILABLE") white] TmWdId ,TLine 1 [] (TmWdWdTermSound (getsid (aamount - newaamount))) - ,TLine 1 [TerminalLineConst "" yellow] (TmTmSetStatus (TerminalPressTo "")) - ,TLine 1 [TerminalLineConst "" white] TmWdWdPowerDownTerminal +-- ,TLine 1 [TerminalLineConst "" yellow] (TmTmSetStatus (TerminalPressTo "")) +-- ,TLine 1 [TerminalLineConst "" white] (TmWdWdLeaveTerminal "") ] where getsid x | x > 0 = reloadS - | otherwise = dedumS + | otherwise = reloadFailS g 0 = "NO SUITABLE RECIPIENTS" g _ = "SUCCESFUL" diff --git a/tags b/tags index 1f903142f..d0623a6c2 100644 --- a/tags +++ b/tags @@ -17,7 +17,7 @@ <$> src/Dodge/Data/Camera.hs 38;" o <$> src/Dodge/Data/Creature.hs 89;" o <$> src/Dodge/Data/LWorld.hs 176;" o -<$> src/Dodge/Data/Terminal.hs 68;" o +<$> src/Dodge/Data/Terminal.hs 69;" o ABSOLUTE src/Dodge/Data/Item/Combine.hs 39;" C AIUNIT src/Dodge/Data/Item/Combine.hs 74;" C ALTERIFLE src/Dodge/Data/Item/Combine.hs 153;" C @@ -1062,7 +1062,7 @@ QFloat src/Geometry/Data.hs 50;" t QuarterRes src/Dodge/Data/Config.hs 111;" C QuicksaveSlot src/Dodge/Data/SaveSlot.hs 8;" C RAM src/Dodge/Data/Item/Combine.hs 73;" C -RCommands src/Dodge/Terminal.hs 166;" C +RCommands src/Dodge/Terminal.hs 165;" C RED src/Color/Data.hs 12;" C RELCURS src/Dodge/Data/Item/Combine.hs 40;" C RELITEM src/Dodge/Data/Item/Combine.hs 41;" C @@ -1086,7 +1086,7 @@ RandPS src/Dodge/Data/GenWorld.hs 55;" C RandomImpulse src/Dodge/Data/ActionPlan.hs 31;" C RandomTurn src/Dodge/Data/ActionPlan.hs 30;" C ReactorSS src/Dodge/Data/Scenario.hs 111;" C -RecCommands src/Dodge/Terminal.hs 165;" t +RecCommands src/Dodge/Terminal.hs 164;" t RecRoomSS src/Dodge/Data/Scenario.hs 103;" C RectRoomType src/Dodge/Data/Room.hs 33;" C ReducedRocketSmoke src/Dodge/Data/Projectile.hs 52;" C @@ -1277,11 +1277,11 @@ SwarmCrit src/Dodge/Data/Creature/Misc.hs 69;" C SwitchToItem src/Dodge/Data/ActionPlan.hs 37;" C TAPE src/Dodge/Data/Item/Combine.hs 55;" C TARGETING src/Dodge/Data/Item/Combine.hs 21;" C -TCBase src/Dodge/Data/Terminal.hs 48;" C -TCDamageCommand src/Dodge/Data/Terminal.hs 49;" C -TCInfo src/Dodge/Data/Terminal.hs 47;" C -TCom src/Dodge/Data/Terminal.hs 46;" t -TCommands src/Dodge/Terminal.hs 57;" t +TCBase src/Dodge/Data/Terminal.hs 49;" C +TCDamageCommand src/Dodge/Data/Terminal.hs 50;" C +TCInfo src/Dodge/Data/Terminal.hs 48;" C +TCom src/Dodge/Data/Terminal.hs 47;" t +TCommands src/Dodge/Terminal.hs 56;" t TESLAGUN src/Dodge/Data/Item/Combine.hs 167;" C THERMOMETER src/Dodge/Data/Item/Combine.hs 83;" C THREELINES src/Dodge/Data/GenParams.hs 18;" C @@ -1289,7 +1289,7 @@ TIMESCROLLER src/Dodge/Data/Item/Combine.hs 142;" C TIMESTOPPER src/Dodge/Data/Item/Combine.hs 141;" C TIN src/Dodge/Data/Item/Combine.hs 57;" C TINMAG src/Dodge/Data/Item/Combine.hs 106;" C -TLine src/Dodge/Data/Terminal.hs 35;" C +TLine src/Dodge/Data/Terminal.hs 36;" C TO src/Shader/Data.hs 59;" t TRACTORGUN src/Dodge/Data/Item/Combine.hs 168;" C TRANSFORMER src/Dodge/Data/Item/Combine.hs 64;" C @@ -1304,11 +1304,11 @@ TSright src/Dodge/Data/Input.hs 58;" C TStab src/Dodge/Data/Input.hs 56;" C TSup src/Dodge/Data/Input.hs 59;" C TUBE src/Dodge/Data/Item/Combine.hs 51;" C -TabComplete src/Dodge/Terminal.hs 161;" C -TabCompletion src/Dodge/Terminal.hs 159;" t -TabFail src/Dodge/Terminal.hs 163;" C -TabMatch src/Dodge/Terminal.hs 160;" C -TabMultiComplete src/Dodge/Terminal.hs 162;" C +TabComplete src/Dodge/Terminal.hs 160;" C +TabCompletion src/Dodge/Terminal.hs 158;" t +TabFail src/Dodge/Terminal.hs 162;" C +TabMatch src/Dodge/Terminal.hs 159;" C +TabMultiComplete src/Dodge/Terminal.hs 161;" C Tap src/Dodge/Data/SoundOrigin.hs 39;" C TargetCursor src/Dodge/Data/Item/Targeting.hs 12;" C TargetRBCreature src/Dodge/Data/Item/Targeting.hs 11;" C @@ -1319,16 +1319,16 @@ TeleSound src/Dodge/Data/SoundOrigin.hs 36;" C TermSignal src/Dodge/Data/Input.hs 51;" t Terminal src/Dodge/Data/Terminal.hs 19;" t TerminalDeactivated src/Dodge/Data/Terminal/Status.hs 12;" C -TerminalLine src/Dodge/Data/Terminal.hs 35;" t -TerminalLineConst src/Dodge/Data/Terminal.hs 33;" C +TerminalLine src/Dodge/Data/Terminal.hs 36;" t +TerminalLineConst src/Dodge/Data/Terminal.hs 34;" C TerminalLineRead src/Dodge/Data/Terminal/Status.hs 13;" C -TerminalLineString src/Dodge/Data/Terminal.hs 33;" t +TerminalLineString src/Dodge/Data/Terminal.hs 34;" 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 41;" t +TerminalToggle src/Dodge/Data/Terminal.hs 42;" t Terrestrial src/Dodge/Data/Scenario.hs 72;" C TerrestrialBiome src/Dodge/Data/Scenario.hs 76;" t TeslaArc src/Dodge/Data/TeslaArc.hs 15;" t @@ -1340,17 +1340,17 @@ Tile src/Data/Tile.hs 16;" t Tiled src/Data/Tile.hs 14;" C TimeFlowStatus src/Dodge/Data/World.hs 63;" t Tiny src/Shape/Data.hs 27;" C -TmDistributeAmmo src/Dodge/Data/Terminal.hs 61;" C -TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 59;" C -TmTmSetStatus src/Dodge/Data/Terminal.hs 60;" C -TmWdId src/Dodge/Data/Terminal.hs 52;" C -TmWdWd src/Dodge/Data/Terminal.hs 51;" t -TmWdWdDeactivateTerminal src/Dodge/Data/Terminal.hs 55;" C -TmWdWdDoDeathTriggers src/Dodge/Data/Terminal.hs 58;" C -TmWdWdLeaveTerminal src/Dodge/Data/Terminal.hs 54;" C -TmWdWdPowerDownTerminal src/Dodge/Data/Terminal.hs 53;" C -TmWdWdTermSound src/Dodge/Data/Terminal.hs 57;" C -TmWdWdfromWdWd src/Dodge/Data/Terminal.hs 56;" C +TmDistributeAmmo src/Dodge/Data/Terminal.hs 62;" C +TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 60;" C +TmTmSetStatus src/Dodge/Data/Terminal.hs 61;" C +TmWdId src/Dodge/Data/Terminal.hs 53;" C +TmWdWd src/Dodge/Data/Terminal.hs 52;" t +TmWdWdDeactivateTerminal src/Dodge/Data/Terminal.hs 56;" C +TmWdWdDoDeathTriggers src/Dodge/Data/Terminal.hs 59;" C +TmWdWdLeaveTerminal src/Dodge/Data/Terminal.hs 55;" C +TmWdWdPowerDownTerminal src/Dodge/Data/Terminal.hs 54;" C +TmWdWdTermSound src/Dodge/Data/Terminal.hs 58;" C +TmWdWdfromWdWd src/Dodge/Data/Terminal.hs 57;" C ToContinueStart src/Sound/Data.hs 25;" C ToPlaySound src/Sound/Data.hs 33;" t ToStart src/Sound/Data.hs 24;" C @@ -2168,7 +2168,7 @@ _pzDir src/Dodge/Data/PulseLaser.hs 14;" f _pzPhaseV src/Dodge/Data/PulseLaser.hs 12;" f _pzPos src/Dodge/Data/PulseLaser.hs 13;" f _pzTimer src/Dodge/Data/PulseLaser.hs 16;" f -_rCommands src/Dodge/Terminal.hs 166;" f +_rCommands src/Dodge/Terminal.hs 165;" f _radarBlips src/Dodge/Data/LWorld.hs 108;" f _radarSweeps src/Dodge/Data/LWorld.hs 104;" f _randGen src/Dodge/Data/World.hs 39;" f @@ -2370,9 +2370,9 @@ _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 83;" f -_tlEffect src/Dodge/Data/Terminal.hs 38;" f -_tlPause src/Dodge/Data/Terminal.hs 36;" f -_tlString src/Dodge/Data/Terminal.hs 37;" f +_tlEffect src/Dodge/Data/Terminal.hs 39;" f +_tlPause src/Dodge/Data/Terminal.hs 37;" f +_tlString src/Dodge/Data/Terminal.hs 38;" f _tmBootLines src/Dodge/Data/Terminal.hs 21;" f _tmButtonID src/Dodge/Data/Terminal.hs 22;" f _tmCommandHistory src/Dodge/Data/Terminal.hs 29;" f @@ -2382,6 +2382,7 @@ _tmDisplayedLines src/Dodge/Data/Terminal.hs 24;" f _tmFutureLines src/Dodge/Data/Terminal.hs 25;" f _tmID src/Dodge/Data/Terminal.hs 20;" f _tmMachineID src/Dodge/Data/Terminal.hs 23;" f +_tmRebootOnAccess src/Dodge/Data/Terminal.hs 31;" f _tmStatus src/Dodge/Data/Terminal.hs 28;" f _tmToggles src/Dodge/Data/Terminal.hs 30;" f _toPlaySoundChunkID src/Sound/Data.hs 39;" f @@ -2397,8 +2398,8 @@ _tractorBeams src/Dodge/Data/LWorld.hs 118;" f _trieChildren src/SimpleTrie.hs 12;" f _trieMVal src/SimpleTrie.hs 11;" f _triggers src/Dodge/Data/LWorld.hs 127;" f -_ttDeathEffect src/Dodge/Data/Terminal.hs 43;" f -_ttTriggerID src/Dodge/Data/Terminal.hs 42;" f +_ttDeathEffect src/Dodge/Data/Terminal.hs 44;" f +_ttTriggerID src/Dodge/Data/Terminal.hs 43;" f _tuDir src/Dodge/Data/Machine.hs 68;" f _tuFireTime src/Dodge/Data/Machine.hs 67;" f _tuTurnSpeed src/Dodge/Data/Machine.hs 66;" f @@ -2529,7 +2530,7 @@ addButtonSlowDoor src/Dodge/Room/LongDoor.hs 96;" f addCrGibs src/Dodge/Prop/Gib.hs 17;" f addDepth src/Picture/Base.hs 136;" f addDoorAtNthLinkToggleInterrupt src/Dodge/Room/Warning.hs 41;" f -addDoorAtNthLinkToggleTerminal src/Dodge/Room/Warning.hs 66;" f +addDoorAtNthLinkToggleTerminal src/Dodge/Room/Warning.hs 60;" f addDoorToggleTerminal src/Dodge/Room/Warning.hs 38;" f addGib4 src/Dodge/Prop/Gib.hs 52;" f addGibAt src/Dodge/Prop/Gib.hs 63;" f @@ -2556,7 +2557,7 @@ addSideEffect src/Dodge/Concurrent.hs 29;" f addSouthPillars src/Dodge/Room/LongDoor.hs 88;" f addTermSignal src/Dodge/Event/Input.hs 31;" f addToTrunk src/TreeHelp.hs 157;" f -addWarningTerminal src/Dodge/Room/Warning.hs 88;" f +addWarningTerminal src/Dodge/Room/Warning.hs 81;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 81;" f advanceScrollAmount src/Dodge/Update.hs 422;" f @@ -2646,9 +2647,9 @@ attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 75;" f attribSize src/Shader/Compile.hs 139;" f autoAmr src/Dodge/Item/Held/Rod.hs 39;" f -autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 700;" f +autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 731;" f autoCrit src/Dodge/Creature/AutoCrit.hs 10;" f -autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 522;" f +autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 545;" f autoPistol src/Dodge/Item/Held/Stick.hs 49;" f autoRifle src/Dodge/Item/Held/Cane.hs 27;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 161;" f @@ -2657,15 +2658,15 @@ azure src/Color.hs 49;" f bQuadToF src/Geometry/Bezier.hs 37;" f bQuadToLine src/Geometry/Bezier.hs 30;" f backPQ src/Dodge/Creature/HandPos.hs 128;" f -backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 690;" f +backgroundSpaceS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 721;" f backpackCombinations src/Dodge/Combine/Combinations.hs 27;" f backpackShape src/Dodge/Item/Draw/SPic.hs 187;" f backspaceInputted src/Dodge/Update/Input/Text.hs 25;" f bangCone src/Dodge/Item/Held/Cone.hs 11;" f bangConeShape src/Dodge/Item/Draw/SPic.hs 304;" f -bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 610;" f +bangEchoS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 639;" f bangRod src/Dodge/Item/Held/Rod.hs 18;" f -bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 784;" f +bangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 817;" f bangStick src/Dodge/Item/Held/Stick.hs 15;" f barPP src/Dodge/Room/Foreground.hs 231;" f barrel src/Dodge/Creature/Inanimate.hs 17;" f @@ -2713,22 +2714,22 @@ blockPillar src/Dodge/Room/Pillar.hs 22;" f blockedCorridor src/Dodge/Room/RoadBlock.hs 71;" f blockedCorridorCloseBlocks src/Dodge/Room/RoadBlock.hs 78;" f blockingLoad src/Dodge/Concurrent.hs 35;" f -blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f -blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 766;" f -blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 606;" f -blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 792;" f -blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 528;" f -blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 728;" f -blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f -blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 520;" f -bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f -bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 734;" f -bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 790;" f -bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 796;" f -bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 632;" f -bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 710;" f -bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 562;" f -bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f +blood1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 707;" f +blood2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 799;" f +blood3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 635;" f +blood4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 825;" f +blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 553;" f +blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 761;" f +blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 557;" f +blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 543;" f +bloodShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 585;" f +bloodShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 767;" f +bloodShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 823;" f +bloodShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 829;" f +bloodShort5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 661;" f +bloodShort6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 743;" f +bloodShort7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 589;" f +bloodShort8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 533;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f blue src/Color.hs 43;" f blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f @@ -2765,8 +2766,8 @@ bulletSynthesizer src/Dodge/Item/Ammo.hs 82;" f bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f burstRifle src/Dodge/Item/Held/Cane.hs 30;" f buttonFlip src/Dodge/Button/Event.hs 17;" f -buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f -cChasm src/Dodge/Room/Tutorial.hs 129;" f +buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 587;" f +cChasm src/Dodge/Room/Tutorial.hs 131;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f @@ -2801,7 +2802,7 @@ chaseCritInternal src/Dodge/Humanoid.hs 8;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 121;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 36;" f -chasmSimpleMaze src/Dodge/Room/Tutorial.hs 198;" f +chasmSimpleMaze src/Dodge/Room/Tutorial.hs 200;" f chasmTest src/Dodge/Creature/Update.hs 109;" f chasmWallToSurface src/Dodge/Base/Collide.hs 118;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f @@ -2840,9 +2841,9 @@ clAlt src/Dodge/Cloud.hs 5;" f clColor src/Shader/Poke/Cloud.hs 39;" f clZoneSize src/Dodge/Zoning/Cloud.hs 24;" f clampPath src/Dodge/Room/Procedural.hs 146;" f -clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 774;" f -clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 694;" f -clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 546;" f +clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 807;" f +clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 725;" f +clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f cldtPropagateFold src/Dodge/DoubleTree.hs 358;" f cleanUpPreload src/Preload.hs 10;" f cleanUpSoundPreload src/Preload.hs 15;" f @@ -2850,7 +2851,7 @@ cleanupHalted src/Sound.hs 118;" f cleatLabel src/Dodge/Cleat.hs 30;" f cleatOnward src/Dodge/Cleat.hs 24;" f cleatSide src/Dodge/Cleat.hs 27;" f -click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 742;" f +click1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 775;" f clicker src/Dodge/Item/Scope.hs 82;" f clipV src/Geometry/Vector.hs 48;" f clipZoom src/Dodge/Update/Camera.hs 237;" f @@ -2899,9 +2900,9 @@ combineInventoryExtra src/Dodge/Render/HUD.hs 334;" f combineItemListYouX src/Dodge/Combine.hs 36;" f combineList src/Dodge/Combine.hs 21;" f combineRooms src/Dodge/Room/Procedural.hs 132;" f -combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 704;" f +combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 735;" f combineTree src/Dodge/Tree/Compose.hs 67;" f -commandColor src/Dodge/Terminal.hs 128;" f +commandColor src/Dodge/Terminal.hs 127;" f commonPrefix src/Dodge/Debug/Terminal.hs 149;" f comp src/Quaternion.hs 61;" f compP2A src/Dodge/ShiftPoint.hs 11;" f @@ -2911,11 +2912,11 @@ compactDrawTree src/Dodge/LevelGen.hs 88;" f compileAndCheckShader src/Shader/Compile.hs 108;" f composeNode src/Dodge/Tree/Compose.hs 76;" f composeTree src/Dodge/Tree/Compose.hs 47;" f -computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 628;" f +computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 657;" f conEffects src/Dodge/Concurrent.hs 12;" f conLDTToConDT src/Dodge/DoubleTree.hs 22;" f concurrentIS src/Dodge/Update/Input/InGame.hs 292;" f -connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 706;" f +connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 737;" f constructEdges src/Polyhedra.hs 34;" f constructEdgesList src/Polyhedra.hs 43;" f contToIDCont src/Dodge/LevelGen/PlacementHelper.hs 58;" f @@ -2983,7 +2984,7 @@ crWlPbHit src/Dodge/WorldEvent/ThingsHit.hs 59;" f crZoneSize src/Dodge/Zoning/Creature.hs 43;" f craftInfo src/Dodge/Item/Info.hs 169;" f craftItemSPic src/Dodge/Item/Draw/SPic.hs 40;" f -crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 564;" f +crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 591;" f createForceField src/Dodge/ForceField.hs 7;" f createGas src/Dodge/Gas.hs 10;" f createHeadLamp src/Dodge/Euse.hs 58;" f @@ -3043,7 +3044,7 @@ damMatSideEffect src/Dodge/Material/Damage.hs 20;" f damThingHitWith src/Dodge/Damage.hs 72;" f damToExpBarrel src/Dodge/Barreloid.hs 53;" f damageBlock src/Dodge/Wall/Damage.hs 44;" f -damageCodeCommand src/Dodge/Terminal.hs 68;" f +damageCodeCommand src/Dodge/Terminal.hs 67;" f damageCrWl src/Dodge/Damage.hs 29;" f damageCrWlID src/Dodge/Damage.hs 23;" f damageCrystal src/Dodge/Material/Damage.hs 222;" f @@ -3055,7 +3056,7 @@ damageGlassBlock src/Dodge/Wall/Damage.hs 49;" f damageHP src/Dodge/Creature/Damage.hs 37;" f damageInCircle src/Dodge/Damage.hs 61;" f damageMetal src/Dodge/Material/Damage.hs 65;" f -damageSensor src/Dodge/Placement/Instance/Sensor.hs 15;" f +damageSensor src/Dodge/Placement/Instance/Sensor.hs 13;" f damageStone src/Dodge/Material/Damage.hs 33;" f damageThingHit src/Dodge/Bullet.hs 180;" f damageTypeThreshold src/Dodge/Machine/Update.hs 132;" f @@ -3073,7 +3074,7 @@ deadFeet src/Dodge/Creature/Picture.hs 68;" f deadRot src/Dodge/Creature/Picture.hs 84;" f deadScalp src/Dodge/Creature/Picture.hs 81;" f deadUpperBody src/Dodge/Creature/Picture.hs 114;" f -debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 686;" f +debrisS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 717;" f debrisSPic src/Dodge/Prop/Draw.hs 16;" f debrisSize src/Dodge/Block/Debris.hs 83;" f debugEvent src/Dodge/Debug.hs 37;" f @@ -3089,7 +3090,7 @@ debugPutItems src/Dodge/Debug.hs 78;" f debugPutN src/Dodge/Debug.hs 84;" f debugShowPath src/Dodge/Debug.hs 105;" f debugWritableValues src/Dodge/Debug.hs 118;" f -decodeSensorType src/Dodge/Terminal.hs 82;" f +decodeSensorType src/Dodge/Terminal.hs 81;" f decomposeSelfTree src/Dodge/Tree/Compose.hs 61;" f decomposeTree src/Dodge/Tree/Compose.hs 58;" f decontamRoom src/Dodge/Room/Airlock.hs 38;" f @@ -3097,10 +3098,10 @@ decoratedBlock src/Dodge/Placement/Instance/Block.hs 14;" f decorationToShape src/Dodge/Placement/TopDecoration.hs 16;" f decreaseAwareness src/Dodge/Creature/Perception.hs 118;" f decrementTimer src/Sound.hs 103;" f -dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f -dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 640;" f -dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 718;" f -dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 748;" f +dedaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 551;" f +dededaS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 669;" f +dededumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 751;" f +dedumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 781;" f defDamageMaterial src/Dodge/Material/Damage.hs 30;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 310;" f @@ -3179,7 +3180,7 @@ digitalLine src/Geometry.hs 285;" f digitalRect src/Geometry.hs 302;" f dim src/Color.hs 139;" f dirtPoly src/Dodge/Room/RoadBlock.hs 74;" f -disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 746;" f +disconnectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 779;" f displayConfig src/Dodge/Menu.hs 225;" f displayControls src/Dodge/Menu.hs 241;" f displayFrameTicks src/Dodge/Render/Picture.hs 50;" f @@ -3189,8 +3190,8 @@ displayPulse src/Dodge/Inventory/SelectionList.hs 182;" f displayTerminalLineString src/Dodge/Update.hs 487;" f dist src/Geometry/Vector.hs 185;" f dist3 src/Geometry/Vector3D.hs 101;" f -distributeAmmoToItem src/Dodge/WorldEffect.hs 151;" f -distributeAmmoToYou src/Dodge/WorldEffect.hs 139;" f +distributeAmmoToItem src/Dodge/WorldEffect.hs 154;" f +distributeAmmoToYou src/Dodge/WorldEffect.hs 142;" f distributerRoom src/Dodge/Room/Room.hs 415;" f divTo src/Geometry/Zone.hs 8;" f divideCircle src/Geometry.hs 321;" f @@ -3214,8 +3215,8 @@ doCrGroupUpdate src/Dodge/CrGroupUpdate.hs 5;" f doCrImp src/Dodge/CreatureEffect.hs 13;" f doCrWdAc src/Dodge/CreatureEffect.hs 47;" f doDamage src/Dodge/Creature/State.hs 43;" f -doDeathToggle src/Dodge/WorldEffect.hs 98;" f -doDeathTriggers src/Dodge/WorldEffect.hs 91;" f +doDeathToggle src/Dodge/WorldEffect.hs 101;" f +doDeathTriggers src/Dodge/WorldEffect.hs 94;" f doDebugGet src/Dodge/Debug.hs 98;" f doDebugPut src/Dodge/Debug.hs 87;" f doDebugTest src/Dodge/Update/Input/DebugTest.hs 23;" f @@ -3249,17 +3250,17 @@ doRandImpulse src/Dodge/RandImpulse.hs 7;" f doRegexInput src/Dodge/Update/Input/InGame.hs 453;" f doRoomPlacements src/Dodge/Layout.hs 104;" f doRoomShift src/Dodge/Room/Link.hs 33;" f -doScopeZoom src/Dodge/Update/Scroll.hs 89;" f +doScopeZoom src/Dodge/Update/Scroll.hs 87;" f doSectionSize src/Dodge/DisplayInventory.hs 215;" f doSideEffects appDodge/Main.hs 117;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 172;" f -doTabComplete src/Dodge/Terminal.hs 226;" f +doTabComplete src/Dodge/Terminal.hs 241;" f doTestDrawing src/Dodge/Render.hs 40;" 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 132;" f doTimeScroll src/Dodge/Update.hs 205;" f -doTmWdWd src/Dodge/WorldEffect.hs 101;" f +doTmWdWd src/Dodge/WorldEffect.hs 104;" f doWallRotate src/Dodge/Update/Camera.hs 227;" f doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 18;" f @@ -3437,8 +3438,8 @@ edgeToPic src/Dodge/Debug/Picture.hs 416;" f effectOnEquip src/Dodge/Equipment.hs 32;" f effectOnRemove src/Dodge/Equipment.hs 19;" f eitType src/Dodge/Data/EquipType.hs 15;" f -ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 794;" f -elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 778;" f +ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 827;" f +elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 811;" f elephantGun src/Dodge/Item/Held/Rod.hs 27;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 22;" f emptyTrie src/SimpleTrie.hs 17;" f @@ -3449,7 +3450,7 @@ encircleP src/Dodge/Creature/Boid.hs 30;" f endArcPos src/Dodge/Tesla.hs 87;" f endCombineRegex src/Dodge/Update/Input/InGame.hs 276;" f endRegex src/Dodge/Update/Input/InGame.hs 270;" f -energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 652;" f +energyReleaseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 681;" f enterCombineInv src/Dodge/DisplayInventory.hs 321;" f enumOption src/Dodge/Menu/OptionType.hs 17;" f epText src/Dodge/Inventory/SelectionList.hs 79;" f @@ -3475,7 +3476,7 @@ errorIsLHS src/Geometry.hs 65;" f errorNormalizeV src/Geometry.hs 54;" f errorPointInPolygon src/Geometry.hs 46;" f evenOddSplit src/Dodge/Base.hs 160;" f -exitTerminalSubInv src/Dodge/WorldEffect.hs 171;" f +exitTerminalSubInv src/Dodge/WorldEffect.hs 174;" f expandLine src/Dodge/Picture.hs 30;" f expandPolyBy src/Dodge/LevelGen/StaticWalls.hs 91;" f expandPolyByFixed src/Dodge/LevelGen/StaticWalls.hs 97;" f @@ -3483,7 +3484,7 @@ expandPolyCorners src/Dodge/LevelGen/StaticWalls.hs 103;" f expandToSquare src/Dodge/LevelGen/StaticWalls/Deprecated.hs 83;" f expireAndDamage src/Dodge/Bullet.hs 188;" f explodeShell src/Dodge/Projectile/Update.hs 274;" f -explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 656;" f +explosionS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 685;" f explosiveBarrel src/Dodge/Creature/Inanimate.hs 25;" f extTrigLitPos src/Dodge/Placement/Instance/Button.hs 80;" f extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f @@ -3508,9 +3509,9 @@ findReverseEdgeList src/Polyhedra.hs 57;" f findWallFreeDropPoint src/Dodge/FloorItem.hs 27;" f findWallsInPolygon src/Dodge/LevelGen/StaticWalls/Deprecated.hs 78;" f findWithIx src/ListHelp.hs 124;" f -fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 806;" f -fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 624;" f -fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 670;" f +fireFadeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 841;" f +fireLoudS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 653;" f +fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 701;" f firstBreather src/Dodge/Room/Breather.hs 9;" f firstTrie src/SimpleTrie.hs 51;" f firstWorldLoad appDodge/Main.hs 68;" f @@ -3542,15 +3543,15 @@ floorItemPickupInfo src/Dodge/Render/HUD.hs 229;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 124;" f floorTo src/Geometry/Zone.hs 12;" f floorWire src/Dodge/Wire.hs 13;" f -foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 736;" f -foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 780;" f -foldMTRS src/Dodge/Room/Tutorial.hs 75;" f +foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 769;" f +foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 813;" f +foldMTRS src/Dodge/Room/Tutorial.hs 77;" f foldPairs src/ListHelp.hs 37;" f foldrWhileArb src/ListHelp.hs 111;" f followImpulse src/Dodge/Creature/Impulse.hs 24;" f -foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 776;" f -foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 666;" f -foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 788;" f +foot1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 809;" f +foot2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 697;" f +foot3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 821;" f forbidFlee src/Dodge/Creature/Boid.hs 45;" f forceElements src/StrictHelp.hs 10;" f forceField src/Dodge/Wall/ForceField.hs 6;" f @@ -3560,7 +3561,7 @@ fourEmbossDecoration src/Dodge/Placement/TopDecoration.hs 37;" f fpsText src/Dodge/Render/Picture.hs 57;" f fractionLoadedAmmo src/Dodge/Item/Draw/SPic.hs 146;" f frag src/Shader/Data.hs 110;" f -fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 516;" f +fridgeHumS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 539;" f fromJust' src/MaybeHelp.hs 22;" f fromListL src/DoubleStack.hs 7;" f fromTopLeft src/Dodge/ScreenPos.hs 9;" f @@ -3603,11 +3604,11 @@ getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 173;" f getBulletType src/Dodge/HeldUse.hs 906;" f getCloseObj src/Dodge/Update/Input/InGame.hs 539;" f -getCommand src/Dodge/Terminal.hs 62;" f -getCommands src/Dodge/Terminal.hs 59;" f +getCommand src/Dodge/Terminal.hs 61;" f +getCommands src/Dodge/Terminal.hs 58;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f -getCrsFromRooms src/Dodge/Room/Tutorial.hs 349;" f -getCrsFromRooms' src/Dodge/Room/Tutorial.hs 336;" f +getCrsFromRooms src/Dodge/Room/Tutorial.hs 351;" f +getCrsFromRooms' src/Dodge/Room/Tutorial.hs 338;" f getDebugMouseOver src/Dodge/Update.hs 392;" f getDistortions src/Dodge/Render.hs 441;" f getEdgesCrossing src/Dodge/Path.hs 37;" f @@ -3624,7 +3625,7 @@ getNodePos src/Dodge/Path.hs 34;" f getPJStabiliser src/Dodge/HeldUse.hs 1243;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 3;" f -getRoomsFromInts src/Dodge/Room/Tutorial.hs 332;" f +getRoomsFromInts src/Dodge/Room/Tutorial.hs 334;" f getRootItemBounds src/Dodge/Render/HUD.hs 102;" f getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f @@ -3644,10 +3645,10 @@ girderZ src/Dodge/Room/Foreground.hs 108;" f glCreate src/GLHelp.hs 11;" f glassLesson src/Dodge/Room/GlassLesson.hs 23;" f glassLessonRunPast src/Dodge/Room/GlassLesson.hs 68;" f -glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 660;" f -glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 668;" f -glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 672;" f -glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 650;" f +glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 689;" f +glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 699;" f +glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 703;" f +glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 679;" f glassSwitchBack src/Dodge/Room/Room.hs 80;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 114;" f glauncherPic src/Dodge/Item/Draw/SPic.hs 401;" f @@ -3668,13 +3669,13 @@ gridPoints' src/Grid.hs 37;" f gridPointsOff src/Grid.hs 32;" f gridRoomPos src/Dodge/Room/Procedural.hs 90;" f groupSplitItemAmounts src/Dodge/Combine.hs 52;" f -gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 494;" f -gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 804;" f -gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f -gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f -gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 658;" f -gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 636;" f -gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 682;" f +gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 515;" f +gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 839;" f +gut2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 581;" f +gut3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 675;" f +gut4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 687;" f +gut5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 665;" f +gut6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 713;" f gyroscope src/Dodge/Item/Scope.hs 156;" f hackBoldText src/Picture/Base.hs 204;" f hackDropShadow src/Picture/Base.hs 207;" f @@ -3708,7 +3709,7 @@ headLamp src/Dodge/Item/Equipment.hs 79;" f headLampShape src/Dodge/Item/Draw/SPic.hs 422;" f headMap src/Dodge/DoubleTree.hs 249;" f headPQ src/Dodge/Creature/HandPos.hs 116;" f -healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 592;" f +healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 621;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 90;" f healthTest src/Dodge/Room/LasTurret.hs 111;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 24;" f @@ -3729,16 +3730,15 @@ heldItemWeight src/Dodge/Creature/Statistics.hs 80;" f heldPositionInfo src/Dodge/Item/Info.hs 240;" f heldTorqueAmount src/Dodge/HeldUse.hs 586;" f heldTriggerType src/Dodge/BaseTriggerType.hs 27;" f -helpPara src/Dodge/Terminal.hs 104;" f helpPoly3D src/Polyhedra.hs 125;" f heron src/Geometry.hs 218;" f hiToFloat src/Dodge/Room/Modify/Girder.hs 171;" f highBar src/Dodge/Room/Foreground.hs 89;" f highDiagonalMesh src/Dodge/Room/Foreground.hs 35;" f highMesh src/Dodge/Room/Foreground.hs 25;" f -hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 580;" f +hit1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 607;" f hitEffFromBul src/Dodge/Bullet.hs 156;" f -hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f +hitS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 745;" f holdForm src/Dodge/Creature/Boid.hs 139;" f holsterWeapon src/Dodge/Creature/Volition.hs 15;" f homingModule src/Dodge/Item/Scope.hs 48;" f @@ -3773,9 +3773,9 @@ insertAt src/Padding.hs 63;" f insertIMInZone src/Dodge/Base.hs 54;" f insertInTrie src/SimpleTrie.hs 24;" f insertNewKey src/IntMapHelp.hs 65;" f -insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 768;" f +insertOneS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 801;" f insertOver src/ListHelp.hs 47;" f -insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 674;" f +insertS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 705;" f insertStructureWalls src/Dodge/Placement/PlaceSpot/Block.hs 41;" f insertWall src/Dodge/Placement/PlaceSpot/Block.hs 134;" f insertWallInZones src/Dodge/Wall/Zone.hs 20;" f @@ -3902,7 +3902,7 @@ itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPicTree.hs 16;" f itemSPic src/Dodge/Item/Draw/SPic.hs 17;" f itemScan src/Dodge/Item/Scope.hs 63;" f -itemScroll src/Dodge/Update/Scroll.hs 55;" f +itemScroll src/Dodge/Update/Scroll.hs 53;" f itemScrollDisplay src/Dodge/Inventory/SelectionList.hs 127;" f itemScrollValue src/Dodge/Inventory/SelectionList.hs 154;" f itemShapeMax src/Dodge/Item/Orientation.hs 56;" f @@ -3941,8 +3941,8 @@ keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 75;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f keyPic src/Dodge/Item/Draw/SPic.hs 438;" f keyholeCorridor src/Dodge/Room/Corridor.hs 40;" f -knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f -lChasm src/Dodge/Room/Tutorial.hs 138;" f +knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 733;" f +lChasm src/Dodge/Room/Tutorial.hs 140;" f lConnect src/Dodge/Render/Connectors.hs 43;" f lConnectCol src/Dodge/Render/Connectors.hs 46;" f lConnectMulti src/Dodge/Render/Connectors.hs 51;" f @@ -3951,7 +3951,7 @@ lamp src/Dodge/Creature/Lamp.hs 18;" f lampCrSPic src/Dodge/Render/ShapePicture.hs 87;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 130;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 413;" f -lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 692;" f +lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 723;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 123;" f lasTunnel src/Dodge/Room/LasTurret.hs 142;" f lasTunnelRunPast src/Dodge/Room/LasTurret.hs 183;" f @@ -3974,7 +3974,7 @@ ldtToDT src/Dodge/DoubleTree.hs 16;" f ldtToIM src/Dodge/DoubleTree.hs 219;" f ldtToIndentList src/Dodge/DoubleTree.hs 222;" f ldtToLoc src/Dodge/DoubleTree.hs 268;" f -leaveResetQuitTerminal src/Dodge/WorldEffect.hs 165;" f +leaveResetQuitTerminal src/Dodge/WorldEffect.hs 168;" f led src/Dodge/Item/Held/Utility.hs 23;" f left src/DoubleStack.hs 16;" f leftChildList src/Dodge/Item/Grammar.hs 185;" f @@ -3990,7 +3990,7 @@ liShape src/Dodge/Placement/Instance/LightSource.hs 79;" f light src/Color.hs 131;" f lightSensByDoor src/Dodge/Room/LasTurret.hs 60;" f lightSensInsideDoor src/Dodge/Room/LasTurret.hs 48;" f -lightSensor src/Dodge/Placement/Instance/Sensor.hs 28;" f +lightSensor src/Dodge/Placement/Instance/Sensor.hs 26;" f lightsToRender src/Dodge/Render/Lights.hs 14;" f lightx4 src/Color.hs 155;" f linGrad src/Geometry/Intersect.hs 241;" f @@ -3999,7 +3999,7 @@ lineCol src/Picture/Base.hs 245;" f lineGeom src/Dodge/Base.hs 32;" f lineOnScreenCone src/Dodge/Debug/Picture.hs 60;" f lineOrth src/Dodge/Creature/Boid.hs 128;" f -lineOutputTerminal src/Dodge/Room/Warning.hs 93;" f +lineOutputTerminal src/Dodge/Room/Warning.hs 86;" f lineSplit src/Justify.hs 26;" f lineThick src/Picture/Base.hs 249;" f lineUp src/Dodge/Creature/Boid.hs 150;" f @@ -4055,6 +4055,7 @@ loopPairs src/ListHelp.hs 30;" f lootRoom src/Dodge/Room/Treasure.hs 58;" f lorem src/Lorem.hs 3;" f lowBlock src/Dodge/Placement/Instance/Block.hs 28;" f +lowWhirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 535;" f lsColPos src/Dodge/LightSource.hs 24;" f lsColPosID src/Dodge/LightSource.hs 21;" f lsColPosRad src/Dodge/LightSource.hs 30;" f @@ -4082,8 +4083,8 @@ makeBlockDebris src/Dodge/Block/Debris.hs 36;" f makeBullet src/Dodge/HeldUse.hs 971;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 7;" f -makeColorTermLine src/Dodge/Terminal.hs 125;" f -makeColorTermPara src/Dodge/Terminal.hs 122;" f +makeColorTermLine src/Dodge/Terminal.hs 124;" f +makeColorTermPara src/Dodge/Terminal.hs 121;" f makeCorpse src/Dodge/Corpse/Make.hs 13;" f makeDebris src/Dodge/Block/Debris.hs 48;" f makeDebrisDirected src/Dodge/Block/Debris.hs 51;" f @@ -4113,18 +4114,18 @@ makeSourcedShader src/Shader/Compile.hs 54;" f makeSpark src/Dodge/Spark.hs 45;" f makeSubmenuOption src/Dodge/Menu/OptionType.hs 23;" f makeSwitch src/Dodge/LevelGen/Switch.hs 38;" f -makeTermLine src/Dodge/Terminal.hs 110;" f -makeTermPara src/Dodge/Terminal.hs 119;" f +makeTermLine src/Dodge/Terminal.hs 109;" f +makeTermPara src/Dodge/Terminal.hs 118;" f makeTeslaArc src/Dodge/Tesla.hs 29;" f makeTeslaExplosionAt src/Dodge/WorldEvent/Explosion.hs 39;" f makeTileFromPoly src/Tile.hs 34;" f makeTypeCraft src/Dodge/Item/Craftable.hs 18;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 12;" f mapper src/Dodge/Item/Scope.hs 70;" f -marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 582;" f -marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 552;" f -marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 590;" f -marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 578;" f +marimbaB6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 609;" f +marimbaC5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 579;" f +marimbaE5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 617;" f +marimbaG5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 605;" f materialColor src/Dodge/Material/Color.hs 8;" f materialPenetrable src/Dodge/Bullet.hs 211;" f maxAmmo src/Dodge/Item/MaxAmmo.hs 6;" f @@ -4176,19 +4177,19 @@ merge src/ListHelp.hs 84;" f mergeBy src/ListHelp.hs 87;" f mergeOn src/ListHelp.hs 94;" f mergeSound src/Sound.hs 59;" f -metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 798;" f -metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 696;" f -metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f -metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 496;" f -metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f -metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 738;" f -metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f +metal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 831;" f +metal2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 727;" f +metal3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f +metal4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 517;" f +metal5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 647;" f +metal6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 771;" f +metal7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f metalPlate src/Dodge/Item/Craftable.hs 35;" f mglCreate src/GLHelp.hs 8;" f mglDelete src/GLHelp.hs 14;" f midBarDecoration src/Dodge/Placement/TopDecoration.hs 23;" f midBounds src/Dodge/Room/Foreground.hs 150;" f -midChasm src/Dodge/Room/Tutorial.hs 161;" f +midChasm src/Dodge/Room/Tutorial.hs 163;" f midPad src/Padding.hs 27;" f midPadL src/Padding.hs 33;" f midPoint src/Geometry.hs 83;" f @@ -4196,18 +4197,18 @@ midWall src/Dodge/Placement/Instance/Wall.hs 38;" f minAndMax src/FoldableHelp.hs 109;" f minCrIXOn src/Dodge/Zoning/Creature.hs 49;" f minOn src/FoldableHelp.hs 35;" f -mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 550;" f +mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 577;" f miniGunCrit src/Dodge/Creature.hs 61;" f miniGunX src/Dodge/Item/Held/Cane.hs 33;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 373;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 370;" f -miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 616;" f +miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 645;" f miniTree2 src/Dodge/Room/Room.hs 121;" f minimumOn src/FoldlHelp.hs 14;" f mirrorXAxis src/Geometry/Polygon.hs 68;" f mirrorxz src/Picture/Base.hs 350;" f mirroryz src/Picture/Base.hs 355;" f -missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 586;" f +missileLaunchS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 613;" f mixColors src/Color.hs 113;" f mixColorsFrac src/Color.hs 109;" f mixColorsLinear src/Color.hs 122;" f @@ -4227,14 +4228,14 @@ mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 70;" f mouseCursorType src/Dodge/Render/Picture.hs 90;" f mouseWorldPos src/Dodge/Base/Coordinate.hs 37;" f moveBullet src/Dodge/Bullet.hs 197;" f -moveCombineSel src/Dodge/Update/Scroll.hs 119;" f +moveCombineSel src/Dodge/Update/Scroll.hs 117;" f moveInverseShockwave src/Dodge/Shockwave/Update.hs 31;" f movePenBullet src/Dodge/Bullet.hs 203;" f moveProjectile src/Dodge/Projectile/Update.hs 249;" f moveRoomBy src/Dodge/Room/Link.hs 53;" f moveShockwave src/Dodge/Shockwave/Update.hs 13;" f moveStuckGrenade src/Dodge/Projectile/Update.hs 228;" f -moveToSideNthOutLink src/Dodge/Room/Warning.hs 96;" f +moveToSideNthOutLink src/Dodge/Room/Warning.hs 89;" f moveWall src/Dodge/Wall/Move.hs 23;" f moveWallID src/Dodge/Wall/Move.hs 18;" f moveWallIDUnsafe src/Dodge/Wall/Move.hs 13;" f @@ -4307,7 +4308,7 @@ numSubElements src/Shader/Parameters.hs 39;" f numTraversable src/TreeHelp.hs 184;" f obstacleColor src/Dodge/Debug/Picture.hs 263;" f obstructPathsCrossing src/Dodge/Path.hs 120;" f -oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 598;" f +oldMachineBootS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 627;" f onEquipWristShield src/Dodge/Equipment.hs 37;" f onRemoveWristShield src/Dodge/Equipment.hs 24;" f onXY src/Geometry/Vector3D.hs 130;" f @@ -4385,7 +4386,7 @@ picFormat src/Polyhedra.hs 23;" f picMap src/Picture/Base.hs 70;" f pickUpItem src/Dodge/Inventory/Add.hs 70;" f pickUpItemAt src/Dodge/Inventory/Add.hs 75;" f -pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 730;" f +pickUpS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 763;" f pincerP src/Dodge/Creature/Boid.hs 63;" f pincerP' src/Dodge/Creature/Boid.hs 96;" f pincerP'' src/Dodge/Creature/Boid.hs 106;" f @@ -4466,8 +4467,8 @@ pokeWall src/Shader/Poke.hs 80;" f pokeWallsWindows src/Shader/Poke.hs 52;" f poly3 src/Picture/Base.hs 87;" f poly3Col src/Picture/Base.hs 91;" f -polyChasm src/Dodge/Room/Tutorial.hs 182;" f -polyChasmC src/Dodge/Room/Tutorial.hs 191;" f +polyChasm src/Dodge/Room/Tutorial.hs 184;" f +polyChasmC src/Dodge/Room/Tutorial.hs 193;" f polyCirc src/Shape.hs 47;" f polyCircx src/Shape.hs 52;" f polyCornerDist src/Geometry/Polygon.hs 61;" f @@ -4506,7 +4507,7 @@ prependTwo src/Geometry.hs 177;" f prettyDT src/Dodge/DoubleTree.hs 258;" f prettyLDT src/Dodge/DoubleTree.hs 263;" f prettyShort src/AesonHelp.hs 11;" f -primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 608;" f +primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 637;" f printColumnTitles src/Dodge/Tree/Shift.hs 149;" f printColumns src/Dodge/Tree/Shift.hs 139;" f printInfo src/Dodge/Tree/Shift.hs 152;" f @@ -4571,7 +4572,7 @@ qToV2 src/Quaternion.hs 52;" f qToV3 src/Quaternion.hs 49;" f quarterRoomSquare src/Dodge/Room/Procedural.hs 193;" f quarterRoomTri src/Dodge/Room/Procedural.hs 157;" f -quitCommand src/Dodge/Terminal.hs 107;" f +quitCommand src/Dodge/Terminal.hs 106;" f qz src/Quaternion.hs 67;" f rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f rLauncherX src/Dodge/Item/Held/Launcher.hs 30;" f @@ -4617,9 +4618,12 @@ randsSpread src/RandomHelp.hs 120;" f ratIntersectLineLine src/Geometry/Intersect.hs 216;" f rdToVec2s src/Dodge/Render.hs 424;" f readSaveSlot src/Dodge/Save.hs 45;" f -recComFindMax src/Dodge/Terminal.hs 175;" f -recComFindMin src/Dodge/Terminal.hs 169;" f -recTabComplete src/Dodge/Terminal.hs 212;" f +recComFindMax src/Dodge/Terminal.hs 174;" f +recComFindMin src/Dodge/Terminal.hs 168;" f +recComFindPredecessor src/Dodge/Terminal.hs 200;" f +recComFindSuccessor src/Dodge/Terminal.hs 190;" f +recComLookup src/Dodge/Terminal.hs 180;" f +recTabComplete src/Dodge/Terminal.hs 227;" f recoilAmount src/Dodge/HeldUse.hs 467;" f rectNSWE src/Geometry/Polygon.hs 15;" f rectVV src/Geometry/Polygon.hs 40;" f @@ -4642,9 +4646,9 @@ refract src/Dodge/Item/Weapon/LaserPath.hs 39;" f refreshOptionsSelectionList src/Dodge/Menu/Option.hs 35;" f regexCombs src/Dodge/DisplayInventory.hs 71;" f regexList src/Dodge/DisplayInventory.hs 312;" f -reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 664;" f +reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 693;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f +reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 525;" f rememberSounds src/Dodge/Creature/Perception.hs 176;" f remoteDetonator src/Dodge/Item/Scope.hs 144;" f remoteScreen src/Dodge/Item/Scope.hs 139;" f @@ -4652,7 +4656,7 @@ removeAimPosture src/Dodge/Creature/YourControl.hs 159;" f removeAmmoFromMag src/Dodge/HeldUse.hs 902;" f removeDot src/ShortShow.hs 44;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f -removeLights src/Dodge/Room/Tutorial.hs 247;" f +removeLights src/Dodge/Room/Tutorial.hs 249;" f removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f renderDataResizeUpdate src/Preload/Update.hs 27;" f @@ -4668,7 +4672,7 @@ replacePutID src/Dodge/Placement/Instance/Wall.hs 81;" f resetCrVocCoolDown src/Dodge/Creature/Vocalization.hs 47;" f resetPLUse src/Dodge/PlacementSpot.hs 92;" f resetStride src/Dodge/Creature/State/WalkCycle.hs 25;" f -resetTerminal src/Dodge/WorldEffect.hs 159;" f +resetTerminal src/Dodge/WorldEffect.hs 162;" f resizeFBOTO src/Framebuffer/Update.hs 185;" f resizeFBOTO' src/Framebuffer/Update.hs 197;" f resizeFBOTO2 src/Framebuffer/Update.hs 104;" f @@ -4683,7 +4687,7 @@ restrictRMInLinksPD src/Dodge/Room/Link.hs 25;" f resumeSound src/Dodge/SoundLogic.hs 48;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 9;" f revCard src/Dodge/Data/CardinalPoint.hs 13;" f -reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 764;" f +reverseCymbal1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 797;" f reversePair src/Dodge/LevelGen.hs 85;" f rewinder src/Dodge/Item/Held/Utility.hs 36;" f rezBox src/Dodge/Room/RezBox.hs 31;" f @@ -4782,7 +4786,7 @@ saveQuit src/Dodge/Menu.hs 79;" f saveQuitConc src/Dodge/Menu.hs 82;" f saveSlotPath src/Dodge/Save.hs 63;" f saveWorldInSlot src/Dodge/Save.hs 68;" f -sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 750;" f +sawtoothFailS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 783;" f scToTS src/Dodge/Event/Input.hs 34;" f scale src/Picture/Base.hs 152;" f scale3 src/Picture/Base.hs 148;" f @@ -4800,19 +4804,19 @@ screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 40;" f scrollAugInvSel src/Dodge/Inventory.hs 191;" f scrollAugNextInSection src/Dodge/Inventory.hs 204;" f -scrollRBOption src/Dodge/Update/Scroll.hs 200;" f +scrollRBOption src/Dodge/Update/Scroll.hs 137;" f scrollSelectionSections src/Dodge/SelectionSections.hs 28;" f scrollTimeBack src/Dodge/Update.hs 215;" f scrollTimeForward src/Dodge/Update.hs 232;" f -seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f -seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 506;" f -seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 566;" f -seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 786;" f -seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 596;" f -seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 634;" f -seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 644;" f -seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f -seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 588;" f +seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 573;" f +seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 527;" f +seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 593;" f +seagullChatterS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 819;" f +seagullCry1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 625;" f +seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 663;" f +seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 673;" f +seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 741;" f +seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 615;" f searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 213;" f secondColumnLDP src/Dodge/ListDisplayParams.hs 41;" f sectionsDesiredLines src/Dodge/DisplayInventory.hs 202;" f @@ -4826,8 +4830,8 @@ selSecDrawCursor src/Dodge/Render/List.hs 101;" f selSecSelCol src/Dodge/Render/HUD.hs 501;" f selSecSelSize src/Dodge/SelectionSections.hs 143;" f selSecYint src/Dodge/SelectionSections.hs 152;" f -selectedItemScroll src/Dodge/Update/Scroll.hs 49;" f -semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 744;" f +selectedItemScroll src/Dodge/Update/Scroll.hs 47;" f +semitoneLoop1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 777;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 53;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 59;" f senseDamage src/Dodge/Machine/Update.hs 274;" f @@ -4835,7 +4839,7 @@ sensorReqToString src/Dodge/Machine/Update.hs 252;" f sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f sensorSPic src/Dodge/Machine/Draw.hs 99;" f -sensorTut src/Dodge/Room/Tutorial.hs 358;" f +sensorTut src/Dodge/Room/Tutorial.hs 360;" f sensorTypeDamages src/Dodge/Machine/Update.hs 298;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 82;" f @@ -4862,7 +4866,7 @@ setOutLinks src/Dodge/RoomLink.hs 50;" f setOutLinksByType src/Dodge/RoomLink.hs 75;" f setOutLinksPD src/Dodge/RoomLink.hs 95;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f -setRoomInt src/Dodge/Room/Tutorial.hs 82;" f +setRoomInt src/Dodge/Room/Tutorial.hs 84;" f setSelWhileDragging src/Dodge/Update/Input/InGame.hs 342;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 97;" f setShaderSource src/Shader/Compile.hs 121;" f @@ -4871,7 +4875,7 @@ setSoundVolume src/Sound.hs 158;" f setTargetMv src/Dodge/Creature/ReaderUpdate.hs 83;" f setTile src/Dodge/Layout.hs 70;" f setTiles src/Dodge/Layout.hs 67;" f -setTreeInts src/Dodge/Room/Tutorial.hs 89;" f +setTreeInts src/Dodge/Room/Tutorial.hs 91;" f setViewDistance src/Dodge/Update/Camera.hs 243;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 69;" f setViewport src/Dodge/Render.hs 446;" f @@ -4939,7 +4943,7 @@ shootersRoom1 src/Dodge/Room/Room.hs 322;" f shootingRange src/Dodge/Room/Room.hs 349;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f shortShow src/ShortShow.hs 7;" f -shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f +shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 521;" f shoulderHeight src/Dodge/Item/HeldOffset.hs 63;" f shoulderSH src/Dodge/Creature/Picture.hs 125;" f showAttachItem src/Dodge/Item/Display.hs 92;" f @@ -4958,9 +4962,9 @@ shuffleRoomPos src/Dodge/Layout.hs 82;" f shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 151;" f simpleCrSprings src/Dodge/Update.hs 876;" f -simpleTermMessage src/Dodge/Terminal.hs 259;" f -sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f -sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 752;" f +simpleTermMessage src/Dodge/Terminal.hs 275;" f +sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 749;" f +sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 785;" f singleAmmo src/Dodge/Item/AmmoSlots.hs 64;" f singleDT src/Dodge/DoubleTree.hs 10;" f singleLDT src/Dodge/DoubleTree.hs 13;" f @@ -4968,16 +4972,22 @@ singleton src/DoubleStack.hs 11;" f singletonTrie src/SimpleTrie.hs 20;" f sizeFBOs src/Framebuffer/Update.hs 19;" f skColor src/Dodge/Spark/Draw.hs 14;" f -skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 756;" f -slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 770;" f -slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 732;" f -slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 662;" f -slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 754;" f -slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 760;" f -slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 540;" f -slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f -slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 630;" f -slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 594;" f +skwareFadeTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 789;" f +slap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 803;" f +slap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 765;" f +slap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 691;" f +slap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 787;" f +slap5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 793;" f +slap6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 565;" f +slap7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f +slapClean2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 619;" f +slapClean3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 695;" f +slapClean4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 549;" f +slapClean5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 833;" f +slapClean6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 575;" f +slapClean7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 739;" f +slapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 659;" f +slideDoorS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 623;" f slideWindow src/ListHelp.hs 81;" f slowDoorRoom src/Dodge/Room/LongDoor.hs 140;" f slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 157;" f @@ -4985,10 +4995,10 @@ smallBattery src/Dodge/Item/Ammo.hs 60;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 14;" f smallDrawTree src/Dodge/LevelGen.hs 91;" f -smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 782;" f -smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 508;" f -smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 762;" f -smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 574;" f +smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 815;" f +smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 529;" f +smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 795;" f +smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 601;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f smallSnailInt2 src/Dodge/Path.hs 81;" f @@ -5008,10 +5018,10 @@ soundMenuOptions src/Dodge/Menu.hs 163;" f soundMultiFrom src/Dodge/SoundLogic.hs 187;" f soundOriginIDsAt src/Dodge/WorldEvent/Sound.hs 18;" f soundOriginsIDsAt src/Dodge/WorldEvent/Sound.hs 13;" f -soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 328;" f +soundPathList src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 342;" f soundPic src/Dodge/Debug/Picture.hs 363;" f soundStart src/Dodge/SoundLogic.hs 118;" f -soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 166;" f +soundToOnomato src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 173;" f soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 104;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 54;" f @@ -5082,11 +5092,11 @@ startSeedGameConc src/Dodge/StartNewGame.hs 46;" f statsModifier src/Dodge/Creature/Info.hs 16;" f stickHitSound src/Dodge/Projectile/Update.hs 77;" f stickyMod src/Dodge/Item/Scope.hs 51;" f -stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 556;" f -stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f -stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 510;" f -stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 514;" f -stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 620;" f +stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 583;" f +stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 759;" f +stone3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 531;" f +stone4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 537;" f +stone5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 649;" f stopAllSounds src/Sound.hs 126;" f stopBulletAt src/Dodge/Bullet.hs 200;" f stopPushing src/Dodge/Wall/Damage.hs 95;" f @@ -5127,11 +5137,11 @@ tankShape src/Dodge/Placement/Instance/Tank.hs 23;" f tankSquareDec src/Dodge/Placement/Instance/Tank.hs 15;" f tanksPipesRoom src/Dodge/Room/Tanks.hs 69;" f tanksRoom src/Dodge/Room/Tanks.hs 77;" f -tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 740;" f -tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 490;" f -tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 688;" f -tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 772;" f -tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 600;" f +tap1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 773;" f +tap2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 511;" f +tap3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 719;" f +tap4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 805;" f +tapQuietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 629;" f targCorner src/Dodge/Targeting/Draw.hs 35;" f targetCursorPic src/Dodge/Targeting/Draw.hs 41;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 14;" f @@ -5139,18 +5149,18 @@ targetYouLOS src/Dodge/Creature/ChooseTarget.hs 8;" f targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 202;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingScope src/Dodge/Item/Scope.hs 38;" f -tbComplete src/Dodge/Terminal.hs 202;" f -teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 544;" f +tbComplete src/Dodge/Terminal.hs 217;" f +teleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 569;" f termScreenColor src/Dodge/Terminal/Color.hs 8;" f -termSoundLine src/Dodge/Terminal.hs 50;" f -termTextColor src/Dodge/Terminal.hs 53;" f +termSoundLine src/Dodge/Terminal.hs 49;" f +termTextColor src/Dodge/Terminal.hs 52;" f terminalLDP src/Dodge/ListDisplayParams.hs 44;" f -terminalReturnEffect src/Dodge/Terminal.hs 263;" f -terminalReturnLocal src/Dodge/Terminal.hs 267;" f +terminalReturnEffect src/Dodge/Terminal.hs 279;" f +terminalReturnLocal src/Dodge/Terminal.hs 283;" f terminalSPic src/Dodge/Machine/Draw.hs 47;" f terminalScreenGlow src/Dodge/Machine/Update.hs 44;" f terminalShape src/Dodge/Machine/Draw.hs 50;" f -terminalWheelEvent src/Dodge/Update/Scroll.hs 129;" f +terminalWheelEvent src/Dodge/Update/Scroll.hs 127;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 19;" f teslaGunPic src/Dodge/Item/Draw/SPic.hs 410;" f teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f @@ -5159,13 +5169,13 @@ testInventory src/Dodge/Creature.hs 290;" f testStringInit src/Dodge/TestString.hs 34;" f text src/Picture/Base.hs 196;" f textGrad src/Picture/Text.hs 5;" f -textInputBlurb src/Dodge/Terminal.hs 44;" f +textInputBlurb src/Dodge/Terminal.hs 43;" f textInputFocus src/Dodge/InputFocus.hs 11;" f textJustifyCenter src/Picture/Base.hs 227;" f textJustifyLeft src/Picture/Base.hs 223;" f textJustifyRight src/Picture/Base.hs 213;" f textRight src/Picture/Base.hs 218;" f -textTerminal src/Dodge/Terminal.hs 41;" f +textTerminal src/Dodge/Terminal.hs 40;" f textVMirror src/Picture/Base.hs 231;" f tflat2 src/Picture/Data.hs 56;" f tflat3 src/Picture/Data.hs 60;" f @@ -5184,8 +5194,8 @@ thingsHit src/Dodge/WorldEvent/ThingsHit.hs 44;" f thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 127;" f thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 52;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 67;" f -throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 758;" f -throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 720;" f +throb1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 791;" f +throbC4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 753;" f throwItem src/Dodge/Creature/Action.hs 191;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 196;" f @@ -5194,21 +5204,20 @@ timeFlowUpdate src/Dodge/Update.hs 175;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeStopper src/Dodge/Item/Held/Utility.hs 39;" f tinMag src/Dodge/Item/Ammo.hs 28;" f -ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 576;" f -ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f -ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f -ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 570;" f -ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 724;" f -tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 698;" f -tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 802;" f +ting1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 603;" f +ting2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 667;" f +ting3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 709;" f +ting4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 597;" f +ting5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 757;" f +tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 729;" f +tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 837;" f titleOptionsMenu src/Dodge/Menu.hs 106;" f titleOptionsNoWrite src/Dodge/Menu.hs 109;" f -tlDoEffect src/Dodge/Terminal.hs 116;" f -tlSetStatus src/Dodge/Terminal.hs 113;" f -tmDistributeAmmo src/Dodge/WorldEffect.hs 117;" f -tmDistributeLines src/Dodge/Room/Room.hs 449;" f +tlDoEffect src/Dodge/Terminal.hs 115;" f +tlSetStatus src/Dodge/Terminal.hs 112;" f +tmDistributeAmmo src/Dodge/WorldEffect.hs 120;" f +tmDistributeLines src/Dodge/Room/Room.hs 451;" f tmMachine src/Dodge/Placement/Instance/Terminal.hs 54;" f -tmUpdate src/Dodge/Update.hs 490;" f toBinary src/Dodge/Inventory/SelectionList.hs 144;" f toBothLnk src/Dodge/RoomLink.hs 136;" f toClosestMultiple src/HelpNum.hs 3;" f @@ -5222,22 +5231,22 @@ 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 315;" f -toggleCommands src/Dodge/Terminal.hs 87;" f +toggleCommands src/Dodge/Terminal.hs 86;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 67;" f toggleExamineInv src/Dodge/Creature/Impulse/UseItem.hs 105;" f toggleJust src/MaybeHelp.hs 39;" f toggleMapperInv src/Dodge/Creature/Impulse/UseItem.hs 110;" f -tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 654;" f -tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 568;" f -tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 622;" f -tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 626;" f +tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 683;" f +tone440raiseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 595;" f +tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f +tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 655;" f topInvW src/Dodge/ListDisplayParams.hs 50;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 50;" f torchShape src/Dodge/Item/Draw/SPic.hs 277;" f torqueAmount src/Dodge/HeldUse.hs 581;" f -torqueCr src/Dodge/WorldEffect.hs 84;" f +torqueCr src/Dodge/WorldEffect.hs 87;" f torso src/Dodge/Creature/Picture.hs 103;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f @@ -5307,12 +5316,12 @@ tryUseParent src/Dodge/Creature/State.hs 145;" f turnTo src/Dodge/Movement/Turn.hs 8;" f turretItemOffset src/Dodge/Item/HeldOffset.hs 22;" f tutAnoTree src/Dodge/Room/Tutorial.hs 47;" f -tutDrop src/Dodge/Room/Tutorial.hs 94;" f -tutHub src/Dodge/Room/Tutorial.hs 254;" f -tutLight src/Dodge/Room/Tutorial.hs 219;" f -tutRezBox src/Dodge/Room/Tutorial.hs 369;" f +tutDrop src/Dodge/Room/Tutorial.hs 96;" f +tutHub src/Dodge/Room/Tutorial.hs 256;" f +tutLight src/Dodge/Room/Tutorial.hs 221;" f +tutRezBox src/Dodge/Room/Tutorial.hs 371;" f tutRoomTree src/Dodge/Floor.hs 21;" f -tutorialMessage1 src/Dodge/Room/Tutorial.hs 392;" f +tutorialMessage1 src/Dodge/Room/Tutorial.hs 394;" f tweenAngles src/Geometry/Vector.hs 190;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 79;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 34;" f @@ -5321,9 +5330,9 @@ twoFlat src/Dodge/Creature/Test.hs 99;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 75;" f twoHandTwistAmount src/Dodge/Creature/YourControl.hs 166;" f twoRoomPoss src/Dodge/PlacementSpot.hs 146;" f -twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f -twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 536;" f -twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f +twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 513;" f +twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 561;" f +twoStepSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 641;" f ubyteSize src/Shader/Parameters.hs 13;" f ugateCalc src/Dodge/Inventory/SelectionList.hs 115;" f uncurryV src/Geometry/Data.hs 66;" f @@ -5349,7 +5358,7 @@ updateArc src/Dodge/Tesla.hs 44;" f updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 484;" f updateBarrel src/Dodge/Barreloid.hs 44;" f updateBarreloid src/Dodge/Barreloid.hs 16;" f -updateBaseWheelEvent src/Dodge/Update/Scroll.hs 32;" f +updateBaseWheelEvent src/Dodge/Update/Scroll.hs 30;" f updateBounds src/Dodge/Update/Camera.hs 265;" f updateBulVel src/Dodge/Bullet.hs 57;" f updateBullet src/Dodge/Bullet.hs 22;" f @@ -5437,7 +5446,7 @@ updateRandNode src/TreeHelp.hs 109;" f updateRenderSplit appDodge/Main.hs 104;" f updateRightParentSF src/Dodge/Item/Grammar.hs 181;" f updateRootItemID src/Dodge/Inventory/Location.hs 41;" f -updateScopeZoom src/Dodge/Update/Scroll.hs 77;" f +updateScopeZoom src/Dodge/Update/Scroll.hs 75;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 262;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 241;" f @@ -5448,6 +5457,7 @@ updateSound src/Sound.hs 72;" f updateSounds src/Sound.hs 67;" f updateSpark src/Dodge/Spark.hs 19;" f updateSparks src/Dodge/Update.hs 670;" f +updateTerminal src/Dodge/Update.hs 490;" f updateTeslaArc src/Dodge/Update.hs 586;" f updateTeslaArcs src/Dodge/Update.hs 583;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f @@ -5461,7 +5471,7 @@ updateUseInputInGame src/Dodge/Update/Input/InGame.hs 46;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 24;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 11;" f updateWallDamages src/Dodge/Update/WallDamage.hs 15;" f -updateWheelEvent src/Dodge/Update/Scroll.hs 23;" f +updateWheelEvent src/Dodge/Update/Scroll.hs 21;" f updateWheelEvents src/Dodge/Update.hs 417;" f updateWorldEventFlag src/Dodge/Update.hs 121;" f updateWorldEventFlags src/Dodge/Update.hs 109;" f @@ -5541,7 +5551,7 @@ wallsFromRooms src/Dodge/Layout.hs 137;" f wallsToDraw src/Dodge/Render/Walls.hs 18;" f warmupSound src/Dodge/HeldUse.hs 1368;" f warningRooms src/Dodge/Room/Warning.hs 31;" f -warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 800;" f +warp1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 835;" f wasdAim src/Dodge/Creature/YourControl.hs 133;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f @@ -5557,22 +5567,22 @@ weaponRoom src/Dodge/Room/Room.hs 268;" f weaponUnderCrits src/Dodge/Room/Room.hs 173;" f wedgeGeom src/Dodge/Base.hs 42;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f -whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 602;" f -whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 722;" f -whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 614;" f -whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 584;" f -whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 534;" f -whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 680;" f -whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 530;" f -whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f -whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 684;" f -whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 714;" f -whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f -whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 642;" f -whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 604;" f +whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 631;" f +whirTapS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 755;" f +whirdown1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 643;" f +whirdown2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 611;" f +whirdown3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 559;" f +whirdownS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 711;" f +whirdownShort1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 555;" f +whirdownShort2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 541;" f +whirdownShort3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 715;" f +whirdownShort4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 747;" f +whirdownSmall1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 523;" f +whirdownSmall2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 671;" f +whirupS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 633;" f white src/Color.hs 53;" f -whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 572;" f -whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 524;" f +whiteNoiseFadeInS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 599;" f +whiteNoiseFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 547;" f wiToFloat src/Dodge/Room/Modify/Girder.hs 168;" f winConfig appDodge/Main.hs 47;" f windowLine src/Dodge/Placement/Instance/Wall.hs 51;" f @@ -5604,7 +5614,7 @@ worldPosToScreen src/Dodge/Base/Coordinate.hs 22;" f worldSPic src/Dodge/Render/ShapePicture.hs 22;" f worldToGenWorld src/Dodge/LevelGen/LevelStructure.hs 14;" f wpAdd src/Dodge/Room/RezBox.hs 148;" f -wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 498;" f +wrench1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 519;" f wristArmour src/Dodge/Item/Equipment.hs 43;" f wristInvisibility src/Dodge/Item/Equipment.hs 96;" f writeConfig src/Dodge/Menu.hs 182;" f @@ -5629,7 +5639,7 @@ yourInv src/Dodge/Base/You.hs 28;" f yourRootItem src/Dodge/Base/You.hs 22;" f yourSelectedItem src/Dodge/Base/You.hs 16;" f yourStatsInfo src/Dodge/Creature/Info.hs 27;" f -zChasm src/Dodge/Room/Tutorial.hs 148;" f +zChasm src/Dodge/Room/Tutorial.hs 150;" f zConnect src/Dodge/Render/Connectors.hs 18;" f zConnectCol src/Dodge/Render/Connectors.hs 29;" f zConnectColMidX src/Dodge/Render/Connectors.hs 32;" f @@ -5664,7 +5674,7 @@ zoneWall src/Dodge/Zoning/Wall.hs 65;" f zonesAroundPoint src/Dodge/Zoning/Base.hs 98;" f zonesExtract src/Dodge/Zoning/Base.hs 62;" f zoomFloatingCamera src/Dodge/Update/Camera.hs 76;" f -zoomInLongGun src/Dodge/Update/Scroll.hs 103;" f -zoomOutLongGun src/Dodge/Update/Scroll.hs 111;" f +zoomInLongGun src/Dodge/Update/Scroll.hs 101;" f +zoomOutLongGun src/Dodge/Update/Scroll.hs 109;" f zoomScope src/Dodge/Item/Scope.hs 33;" f -zoomSpeed src/Dodge/Update/Scroll.hs 100;" f +zoomSpeed src/Dodge/Update/Scroll.hs 98;" f