Play around with terminal messages

log/aGeneratedRoomLayout

@@ -1,4 +1,4 @@
-Seed: 7114951007332849727
+Seed: 8032054640819015688
 Room layout (compact): 
 0,1,2,3
 |

log/attemptedSeeds

@@ -1,4 +1,4 @@
-Generating level with seed 7114951007332849727
+Generating level with seed 8032054640819015688
 
-After 1 attempt(s), Successful generation of level with seed 7114951007332849727
+After 1 attempt(s), Successful generation of level with seed 8032054640819015688
 13 rooms in total

log/treeCluster

@@ -1,4 +1,4 @@
-Seed: 7114951007332849727
+Seed: 8032054640819015688
 0:TutStartRez
 |
 1:corDoor

saveSlot/seed

@@ -1 +1 @@
-7114951007332849727
+8032054640819015688

src/Dodge/LevelGen.hs

@@ -27,9 +27,11 @@ generateWorldFromSeed rdata i = do
     generateGraphs
     (roomList, bounds) <- layoutLevelFromSeed 0 i
     postGenerationProcessing rdata
-        $! generateLevelFromRoomList roomList initialWorld{_randGen = mkStdGen i}
-        & gwWorld . cWorld . cwGen . cwgRoomClipping .~ bounds
-        & gwWorld . cWorld . cwGen . cwgSeed .~ i
+        $! generateLevelFromRoomList roomList $ initialWorld{_randGen = mkStdGen i}
+        & cWorld . cwGen . cwgRoomClipping .~ bounds
+        & cWorld . cwGen . cwgSeed .~ i
+--        & gwWorld . cWorld . cwGen . cwgRoomClipping .~ bounds
+--        & gwWorld . cWorld . cwGen . cwgSeed .~ i
 
 postGenerationProcessing :: RenderData -> GenWorld -> IO World
 postGenerationProcessing _ gw = do

src/Dodge/Room/Tutorial.hs

@@ -1,11 +1,5 @@
 module Dodge.Room.Tutorial where
 
-import Dodge.Room.Room
-import Dodge.Room.Corridor
-import Dodge.Room.Airlock
-import Dodge.Room.RoadBlock
-import Dodge.Item.Held.Cane
-import Dodge.Item.Ammo
 import Dodge.Annotation.Data
 import Dodge.Cleat
 --import Control.Monad
@@ -13,10 +7,15 @@ import Dodge.Cleat
 --import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Default.Terminal
+import Dodge.Item.Ammo
+import Dodge.Item.Held.Cane
 --import Dodge.Item.Random
 import Dodge.LevelGen.PlacementHelper
 --import Dodge.LightSource
 import Dodge.Placement.Instance
+import Dodge.PlacementSpot
+import Dodge.Room.Airlock
+import Dodge.Room.Corridor
 import Dodge.Room.Door
 import Dodge.Room.LasTurret
 import Dodge.Room.Link
@@ -26,6 +25,8 @@ import Dodge.Room.Ngon
 --import Dodge.Room.Link
 import Dodge.Room.Procedural
 import Dodge.Room.RezBox
+import Dodge.Room.RoadBlock
+import Dodge.Room.Room
 import Dodge.Room.Warning
 --import Dodge.Room.RoadBlock
 import Dodge.RoomLink
@@ -42,16 +43,16 @@ import TreeHelp
 
 tutAnoTree :: Annotation
 tutAnoTree =
-    OnwardList 
---        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
---        , AnTree $ tutDrop
+    OnwardList
+        --        [ AnTree $ return $ tToBTree "teststart" $ return $ cleatOnward corridor
+        --        , AnTree $ tutDrop
         [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
         , AnTree corDoor
         , AnTree $ tutRooms
         , AnTree $ tutDrop
         , AnTree $ return $ tToBTree "cor" $ return $ cleatOnward corridor
-----        , AnTree $ pickupTut
-----        , AnTree $ weaponTut
+        ----        , AnTree $ pickupTut
+        ----        , AnTree $ weaponTut
         ]
 
 tutDrop :: State LayoutVars (MetaTree Room String)
@@ -60,31 +61,72 @@ tutDrop = do
     i <- nextLayoutInt
     let y = decontamRoom i
     rm <- roomRectAutoLinks 40 100
-    return $ tToBTree "TutDrop" $ treePost [x,y,cleatOnward rm]
+    return $
+        tToBTree "TutDrop" $
+            treePost
+                [x & rmPmnts .:~ t, y, cleatOnward rm]
+  where
+    t =
+        putMessageTerminal
+            terminalColor
+            (defaultTerminal & tmBootLines .~ ss <> tlSetStatus (TerminalPressTo "QUIT") <> tlDoEffect TmWdWdPowerDownTerminal)
+            & plSpot .~ rprBoolShift isUnusedLnk 
+                (\(p, a) -> (p + 10 *.* unitVectorAtAngle (a - pi/2), a))
+    ss =
+        [ makeTermLine "USE [F] OR CLICK AND DRAG TO DROP ITEMS"
+        ]
 
 tutRooms :: State LayoutVars (MetaTree Room String)
 tutRooms = do
     i <- nextLayoutInt
     j <- nextLayoutInt
-    x <- shuffleLinks =<< analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i 
-         <$> addDoorAtNthLinkToggleTerminal 1 ss j
+    x <-
+        shuffleLinks =<< analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i
+            <$> addDoorAtNthLinkToggleTerminal 1 ss j
             <$> roomNgon 6 100
     bcor <- blockedCorridor
-    r1 <-(r burstRifle)
-    r2 <-(r (drumMag & itConsumables ?~ 100))
-    return $ tToBTree "DoorTest" $ Node x 
-        [treeFromPost [triggerDoorRoom i] r1
-        ,treeFromPost [triggerDoorRoom j] r2
-        ,bcor
-        ]
+    r1 <- (r burstRifle) <&> rmPmnts .:~ t
+    r2 <- (r (drumMag & itConsumables ?~ 500))
+    return $
+        tToBTree "DoorTest" $
+            Node
+                x
+                [ treeFromPost [triggerDoorRoom i] r1
+                , treeFromPost [triggerDoorRoom j] r2
+                , bcor
+                ]
   where
-    ss = [makeTermLine "BE READY TO PERFORM SOME BASIC TASKS"
+    ss =
+        [ makeTermLine "SOME TERMINALS CAN BE INTERACTED WITH DIRECTLY"
+        , makeTermLine "            THESE WILL DISPLAY A PROMPT SYMBOL"
+        , makeTermLine "   _____"
+        , makeTermLine "  |     |     TYPE OR SCROLL TO ENTER COMMANDS"
+        , makeTermLine "  |  >  |"
+        , makeTermLine "  |     |     CLICK OR USE [RETURN] TO CONFIRM"
+        , makeTermLine "   ^^^^^"
         , makeTermLine ""
-        , makeTermLine "INTERACTION TEST"
-        , makeTermLine "<TYPE OR SCROLL TO SELECT COMMANDS>"
-        , makeTermLine "<USE CLICK OR RETURN TO ENTER COMMANDS>"
         ]
     r x = roomRectAutoLinks 100 100 <&> rmPmnts .:~ sps (PS 50 0) (PutFlIt x)
+    t = 
+        putMessageTerminal
+            terminalColor
+            (defaultTerminal & tmBootLines .~ ss' <> tlSetStatus (TerminalPressTo "QUIT") <> tlDoEffect TmWdWdPowerDownTerminal)
+            & plSpot .~ rprBoolShift isUnusedLnk 
+                (\(p, a) -> (p + 10 *.* unitVectorAtAngle (a - pi/2), a))
+    ss' =
+        [ makeTermLine "HOLD [CAPS] AND SCROLL\\"
+        , makeTermLine "     OR                }~ TO REARRANGE INVENTORY ITEMS"
+        , makeTermLine "        CLICK AND DRAG/"
+        , makeTermLine ""
+        , makeTermLine "AMMO MAGS ARE TYPICALLY LOADED BENEATH WEAPONS"
+        , makeTermLine "               .-------."
+        , makeTermLine "  BURSTRIFLE   |DRUMMAG|"
+        , makeTermLine "        <--------------'"
+        , makeTermLine ""
+        , makeTermLine "HOLD [RMB]\\"
+        , makeTermLine "  AND TAP }~ TO FIRE LOADED WEAPONS"
+        , makeTermLine " TAP [LMB]/"
+        ]
 
 tutRezBox :: RandomGen g => State g Room
 tutRezBox = do
@@ -93,26 +135,27 @@ tutRezBox = do
         roomRect 40 60 1 1
             & rmPmnts
                 .~ [ sPS (V2 20 1) 0 $ PutLS ls
-                   , putImmediateMessageTerminal terminalColor 
-                    (defaultTerminal & tmBootLines .~ s 
-                    <> tlSetStatus (TerminalPressTo "USE [WASD] TO MOVE") <> tlDoEffect 
-                    (TmWdWdLeaveTerminal "USE [WASD] TO MOVE"))
+                   , Placement (PS 0 0) PutNothing Nothing $ \w _ -> Just $ putImmediateMessageTerminal
+                        terminalColor
+                        ( defaultTerminal & tmBootLines .~ s w
+                            <> tlSetStatus (TerminalPressTo "USE [WASD] TO MOVE")
+                            <> tlDoEffect
+                                (TmWdWdLeaveTerminal "USE [WASD] TO MOVE")
+                        )
                         & plSpot .~ PS (V2 20 0) 0
                    ]
             & restrictInLinks (\(V2 _ h, _) -> h < 1)
             & restrictOutLinks (\(V2 _ h, _) -> h > 59)
             & rmName .~ "tutRezBox"
   where
-    s = tutorialMessage1
+    s w = tutorialMessage1 (w ^. cWorld . cwGen . cwgSeed)
 
-tutorialMessage1 :: [TerminalLine]
-tutorialMessage1 = 
-    [makeTermLine "SYNTHESIS SUCCESSFUL..."
-    ,makeTermLine "WELCOME TO THE STATION!"
-    ,makeTermLine ""
-    ,makeTermLine "INTERACTION TEST"
-    ] <> tlSetStatus (TerminalPressTo "USE [SPACE] TO INTERACT")
-    <> [makeTermLine "<USE [SPACE] TO INTERACT>"
-    ,makeTermLine ""
-    ,makeTermLine "MOBILITY TEST"
+tutorialMessage1 :: Int -> [TerminalLine]
+tutorialMessage1 i =
+    [ makeTermLine $ "WELCOME TO ENVIRONMENT " ++ show i
+    , makeTermLine ""
     ]
+        <> tlSetStatus (TerminalPressTo "USE [SPACE] TO INTERACT")
+        <> [ makeTermLine "USE [SPACE] TO INTERACT"
+           , makeTermLine ""
+           ]

src/Dodge/Update/Input/InGame.hs

@@ -158,8 +158,7 @@ tryPickupSelected k mpos w = do
         _ -> foldl' (flip $ pickUpItem 0) w ispickup & newdisel (length (cr ^. crInv)) xs
   where
     newdisel j xs =
-        hud . diSelection
-            ?~ Sel 0 j (IS.fromDistinctAscList [j .. j + IS.size xs -1])
+        hud . diSelection ?~ Sel 0 j (IS.fromDistinctAscList [j .. j + IS.size xs -1])
     g i = do
         NInt j <- w ^? hud . closeItems . ix i
         w ^? cWorld . lWorld . items . ix j

tags

@@ -2841,7 +2841,7 @@ checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	100;"	f
 checkConnection	src/Dodge/Inventory/Swap.hs	65;"	f
 checkDeath	src/Dodge/Creature/Update.hs	68;"	f
 checkDeath'	src/Dodge/Creature/Update.hs	71;"	f
-checkEndGame	src/Dodge/Update.hs	757;"	f
+checkEndGame	src/Dodge/Update.hs	754;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -2872,7 +2872,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	830;"	f
+clClSpringVel	src/Dodge/Update.hs	827;"	f
 clColor	src/Shader/Poke/Cloud.hs	35;"	f
 clZoneSize	src/Dodge/Zoning/Cloud.hs	21;"	f
 clampPath	src/Dodge/Room/Procedural.hs	165;"	f
@@ -2901,7 +2901,7 @@ closestCreatureID	src/Dodge/Debug.hs	118;"	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	782;"	f
+cloudEffect	src/Dodge/Update.hs	779;"	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
@@ -2913,7 +2913,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	296;"	f
+collectInvItems	src/Dodge/Update/Input/InGame.hs	295;"	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
@@ -2953,13 +2953,13 @@ 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	288;"	f
+concurrentIS	src/Dodge/Update/Input/InGame.hs	287;"	f
 connectItemS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	722;"	f
 constDPic	src/Dodge/Debug.hs	62;"	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	403;"	f
+continueTerminal	src/Dodge/Update/Input/InGame.hs	402;"	f
 convexHull	src/Geometry/Polygon.hs	110;"	f
 convexHullSafe	src/Geometry/Polygon.hs	117;"	f
 convexPolysOverlap	src/Geometry/ConvexPoly.hs	48;"	f
@@ -2980,7 +2980,7 @@ crAwayFromPost	src/Dodge/Creature/Test.hs	82;"	f
 crBlips	src/Dodge/RadarSweep.hs	87;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	33;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	51;"	f
-crCrSpring	src/Dodge/Update.hs	859;"	f
+crCrSpring	src/Dodge/Update.hs	855;"	f
 crCurrentEquipment	src/Dodge/Creature/Statistics.hs	62;"	f
 crDexterity	src/Dodge/Creature/Statistics.hs	19;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	38;"	f
@@ -3008,7 +3008,7 @@ crRad	src/Dodge/Creature/Radius.hs	7;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	72;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	55;"	f
 crShape	src/Dodge/Creature/Shape.hs	8;"	f
-crSpring	src/Dodge/Update.hs	854;"	f
+crSpring	src/Dodge/Update.hs	852;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	77;"	f
 crStrength	src/Dodge/Creature/Statistics.hs	29;"	f
 crUpdate'	src/Dodge/Creature/Update.hs	57;"	f
@@ -3224,7 +3224,7 @@ displayFrameTicks	src/Dodge/Render/Picture.hs	45;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	192;"	f
 displayIndents	src/Dodge/DisplayInventory.hs	110;"	f
 displayPulse	src/Dodge/Inventory/SelectionList.hs	179;"	f
-displayTerminalLineString	src/Dodge/Update.hs	466;"	f
+displayTerminalLineString	src/Dodge/Update.hs	467;"	f
 dist	src/Geometry/Vector.hs	190;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -3290,7 +3290,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	448;"	f
+doRegexInput	src/Dodge/Update/Input/InGame.hs	447;"	f
 doRoomInPlacements	src/Dodge/Layout.hs	86;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	96;"	f
 doRoomPlacements	src/Dodge/Layout.hs	111;"	f
@@ -3484,7 +3484,7 @@ dtToRootIntMap'	src/Dodge/DoubleTree.hs	153;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	158;"	f
 dummyMenuOption	src/Dodge/Menu/Option.hs	72;"	f
 dustColor	src/Shader/Poke/Cloud.hs	71;"	f
-dustSpringVel	src/Dodge/Update.hs	841;"	f
+dustSpringVel	src/Dodge/Update.hs	838;"	f
 ebColor	src/Dodge/EnergyBall.hs	77;"	f
 ebDamage	src/Dodge/EnergyBall.hs	85;"	f
 ebEffect	src/Dodge/EnergyBall.hs	45;"	f
@@ -3505,8 +3505,8 @@ 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	272;"	f
-endRegex	src/Dodge/Update/Input/InGame.hs	266;"	f
+endCombineRegex	src/Dodge/Update/Input/InGame.hs	271;"	f
+endRegex	src/Dodge/Update/Input/InGame.hs	265;"	f
 energyReleaseS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	592;"	f
 enterCombineInv	src/Dodge/DisplayInventory.hs	317;"	f
 epText	src/Dodge/Inventory/SelectionList.hs	76;"	f
@@ -3669,7 +3669,7 @@ getAutoSpringLinks	src/Dodge/Item/Grammar.hs	85;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
 getBulHitDams	src/Dodge/Bullet.hs	170;"	f
 getBulletType	src/Dodge/HeldUse.hs	924;"	f
-getCloseObj	src/Dodge/Update/Input/InGame.hs	534;"	f
+getCloseObj	src/Dodge/Update/Input/InGame.hs	533;"	f
 getCommand	src/Dodge/Terminal.hs	52;"	f
 getCommands	src/Dodge/Terminal.hs	49;"	f
 getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	50;"	f
@@ -3901,7 +3901,7 @@ isAnimate	src/Dodge/Creature/Test.hs	130;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	106;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	76;"	f
 isElectrical	src/Dodge/Machine/Update.hs	81;"	f
-isGroupSelectableSection	src/Dodge/Update/Input/InGame.hs	198;"	f
+isGroupSelectableSection	src/Dodge/Update/Input/InGame.hs	197;"	f
 isInLnk	src/Dodge/PlacementSpot.hs	168;"	f
 isJust'	src/MaybeHelp.hs	29;"	f
 isLHS	src/Geometry/LHS.hs	8;"	f
@@ -4189,7 +4189,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	563;"	f
+maybeExitCombine	src/Dodge/Update/Input/InGame.hs	562;"	f
 maybeOpenConsole	src/Dodge/Update.hs	124;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	116;"	f
@@ -4304,7 +4304,7 @@ muzFlareAt	src/Dodge/HeldUse.hs	674;"	f
 mvButton	src/Dodge/Placement/PlaceSpot.hs	154;"	f
 mvCr	src/Dodge/Placement/PlaceSpot.hs	160;"	f
 mvFS	src/Dodge/Placement/PlaceSpot.hs	163;"	f
-mvGust	src/Dodge/Update.hs	773;"	f
+mvGust	src/Dodge/Update.hs	770;"	f
 mvLS	src/Dodge/Placement/PlaceSpot.hs	220;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
 mvPP	src/Dodge/Placement/PlaceSpot.hs	157;"	f
@@ -4412,7 +4412,7 @@ parseNum	src/Dodge/Debug/Terminal.hs	77;"	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	526;"	f
+pauseGame	src/Dodge/Update/Input/InGame.hs	525;"	f
 pauseMenu	src/Dodge/Menu.hs	56;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	63;"	f
 pauseSound	src/Dodge/SoundLogic.hs	42;"	f
@@ -4570,7 +4570,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	119;"	f
-ppEvents	src/Dodge/Update.hs	736;"	f
+ppEvents	src/Dodge/Update.hs	733;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	83;"	f
 prePos	src/Quaternion.hs	68;"	f
@@ -4680,7 +4680,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	629;"	f
+randWallReflect	src/Dodge/Update.hs	626;"	f
 randomChallenges	src/Dodge/Room/Start.hs	63;"	f
 randomCompass	src/Dodge/Layout.hs	57;"	f
 randomFourCornerRoom	src/Dodge/Room/Procedural.hs	265;"	f
@@ -4934,12 +4934,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	485;"	f
+setOldPos	src/Dodge/Update.hs	486;"	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	288;"	f
-setSelWhileDragging	src/Dodge/Update/Input/InGame.hs	338;"	f
+setSelWhileDragging	src/Dodge/Update/Input/InGame.hs	337;"	f
 setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	87;"	f
 setShaderSource	src/Shader/Compile.hs	290;"	f
 setShadowLimits	src/Dodge/Shadows.hs	11;"	f
@@ -4993,9 +4993,9 @@ shiftChildren	src/Dodge/Tree/Compose.hs	43;"	f
 shiftDraw	src/Dodge/Render/ShapePicture.hs	79;"	f
 shiftDraw'	src/Dodge/Render/ShapePicture.hs	85;"	f
 shiftInBy	src/Dodge/PlacementSpot.hs	250;"	f
-shiftInvItems	src/Dodge/Update/Input/InGame.hs	306;"	f
-shiftInvItemsDown	src/Dodge/Update/Input/InGame.hs	351;"	f
-shiftInvItemsUp	src/Dodge/Update/Input/InGame.hs	345;"	f
+shiftInvItems	src/Dodge/Update/Input/InGame.hs	305;"	f
+shiftInvItemsDown	src/Dodge/Update/Input/InGame.hs	350;"	f
+shiftInvItemsUp	src/Dodge/Update/Input/InGame.hs	344;"	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
@@ -5045,7 +5045,7 @@ shuffleLinks	src/Dodge/Room/Link.hs	30;"	f
 shuffleRoomPos	src/Dodge/Layout.hs	76;"	f
 shuffleTail	src/RandomHelp.hs	59;"	f
 sigmoid	src/Dodge/Base.hs	151;"	f
-simpleCrSprings	src/Dodge/Update.hs	850;"	f
+simpleCrSprings	src/Dodge/Update.hs	847;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	164;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	680;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
@@ -5096,7 +5096,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	529;"	f
+spaceAction	src/Dodge/Update/Input/InGame.hs	528;"	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
@@ -5152,7 +5152,7 @@ stackText	src/Picture/Base.hs	188;"	f
 stackedInventory	src/Dodge/Creature.hs	311;"	f
 startCr	src/Dodge/Creature.hs	92;"	f
 startCrafts	src/Dodge/Room/Start.hs	93;"	f
-startDrag	src/Dodge/Update/Input/InGame.hs	281;"	f
+startDrag	src/Dodge/Update/Input/InGame.hs	280;"	f
 startInvList	src/Dodge/Creature.hs	107;"	f
 startInventory	src/Dodge/Creature.hs	110;"	f
 startNewGameInSlot	src/Dodge/StartNewGame.hs	15;"	f
@@ -5283,7 +5283,7 @@ titleOptionsMenu	src/Dodge/Menu.hs	104;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	107;"	f
 tlDoEffect	src/Dodge/Terminal.hs	102;"	f
 tlSetStatus	src/Dodge/Terminal.hs	99;"	f
-tmUpdate	src/Dodge/Update.hs	469;"	f
+tmUpdate	src/Dodge/Update.hs	470;"	f
 toBinary	src/Dodge/Inventory/SelectionList.hs	141;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
@@ -5365,7 +5365,7 @@ truncate	src/Polyhedra/Geodesic.hs	38;"	f
 trunkDepth	src/TreeHelp.hs	161;"	f
 tryAttachItems	src/Dodge/Item/Grammar.hs	34;"	f
 tryClickUse	src/Dodge/Creature/YourControl.hs	236;"	f
-tryCombine	src/Dodge/Update/Input/InGame.hs	546;"	f
+tryCombine	src/Dodge/Update/Input/InGame.hs	545;"	f
 tryDrawToCapacitor	src/Dodge/Creature/State.hs	150;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	138;"	f
 tryGetChannel	src/Sound.hs	97;"	f
@@ -5383,12 +5383,12 @@ tryUseParent	src/Dodge/Creature/State.hs	144;"	f
 turnTo	src/Dodge/Movement/Turn.hs	8;"	f
 turret	src/Dodge/Placement/Instance/Turret.hs	37;"	f
 turretItemOffset	src/Dodge/Item/HeldOffset.hs	21;"	f
-tutAnoTree	src/Dodge/Room/Tutorial.hs	43;"	f
-tutDrop	src/Dodge/Room/Tutorial.hs	57;"	f
-tutRezBox	src/Dodge/Room/Tutorial.hs	89;"	f
+tutAnoTree	src/Dodge/Room/Tutorial.hs	44;"	f
+tutDrop	src/Dodge/Room/Tutorial.hs	58;"	f
+tutRezBox	src/Dodge/Room/Tutorial.hs	110;"	f
 tutRoomTree	src/Dodge/Floor.hs	26;"	f
-tutRooms	src/Dodge/Room/Tutorial.hs	65;"	f
-tutorialMessage1	src/Dodge/Room/Tutorial.hs	108;"	f
+tutRooms	src/Dodge/Room/Tutorial.hs	81;"	f
+tutorialMessage1	src/Dodge/Room/Tutorial.hs	132;"	f
 tweenAngles	src/Geometry/Vector.hs	195;"	f
 twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	80;"	f
 twinSlowDoorRoom	src/Dodge/Room/LongDoor.hs	28;"	f
@@ -5422,88 +5422,88 @@ unusedSpotNearInLink	src/Dodge/PlacementSpot.hs	200;"	f
 updateAimPos	src/Dodge/Update.hs	302;"	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	478;"	f
 updateBarrel	src/Dodge/Barreloid.hs	41;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	15;"	f
 updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	34;"	f
 updateBounds	src/Dodge/Update/Camera.hs	258;"	f
 updateBulVel	src/Dodge/Bullet.hs	56;"	f
 updateBullet	src/Dodge/Bullet.hs	21;"	f
-updateBullets	src/Dodge/Update.hs	552;"	f
+updateBullets	src/Dodge/Update.hs	549;"	f
 updateCamera	src/Dodge/Update/Camera.hs	30;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	114;"	f
-updateCloud	src/Dodge/Update.hs	787;"	f
-updateClouds	src/Dodge/Update.hs	655;"	f
+updateCloud	src/Dodge/Update.hs	784;"	f
+updateClouds	src/Dodge/Update.hs	652;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	40;"	f
 updateCombineSections	src/Dodge/DisplayInventory.hs	47;"	f
 updateCreature	src/Dodge/Creature/Update.hs	31;"	f
 updateCreature'	src/Dodge/Creature/Update.hs	39;"	f
-updateCreatureGroups	src/Dodge/Update.hs	524;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	500;"	f
-updateDebris	src/Dodge/Update.hs	559;"	f
+updateCreatureGroups	src/Dodge/Update.hs	521;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	501;"	f
+updateDebris	src/Dodge/Update.hs	556;"	f
 updateDebrisChunk	src/Dodge/Prop/Moving.hs	16;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	93;"	f
-updateDelayedEvents	src/Dodge/Update.hs	879;"	f
+updateDelayedEvents	src/Dodge/Update.hs	875;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	545;"	f
+updateDistortions	src/Dodge/Update.hs	542;"	f
 updateDoor	src/Dodge/Update.hs	307;"	f
-updateDust	src/Dodge/Update.hs	811;"	f
-updateDusts	src/Dodge/Update.hs	658;"	f
+updateDust	src/Dodge/Update.hs	808;"	f
+updateDusts	src/Dodge/Update.hs	655;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	31;"	f
-updateEnergyBalls	src/Dodge/Update.hs	646;"	f
-updateEnterRegex	src/Dodge/Update/Input/InGame.hs	506;"	f
+updateEnergyBalls	src/Dodge/Update.hs	643;"	f
+updateEnterRegex	src/Dodge/Update/Input/InGame.hs	505;"	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	643;"	f
+updateFlames	src/Dodge/Update.hs	640;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	35;"	f
-updateFunctionKey	src/Dodge/Update/Input/InGame.hs	364;"	f
-updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	360;"	f
-updateGusts	src/Dodge/Update.hs	770;"	f
+updateFunctionKey	src/Dodge/Update/Input/InGame.hs	363;"	f
+updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	359;"	f
+updateGusts	src/Dodge/Update.hs	767;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
-updateIMl	src/Dodge/Update.hs	514;"	f
-updateIMl'	src/Dodge/Update.hs	519;"	f
+updateIMl	src/Dodge/Update.hs	515;"	f
+updateIMl'	src/Dodge/Update.hs	518;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	79;"	f
-updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	429;"	f
+updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	428;"	f
 updateInt2Map	src/Dodge/Zoning/Base.hs	92;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	86;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	258;"	f
-updateKeyContinueTerminal	src/Dodge/Update/Input/InGame.hs	397;"	f
-updateKeyInGame	src/Dodge/Update/Input/InGame.hs	423;"	f
+updateKeyContinueTerminal	src/Dodge/Update/Input/InGame.hs	396;"	f
+updateKeyInGame	src/Dodge/Update/Input/InGame.hs	422;"	f
 updateKeysInGame	src/Dodge/Update/Input/InGame.hs	83;"	f
-updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	383;"	f
-updateKeysTextInputTerminal	src/Dodge/Update/Input/InGame.hs	406;"	f
+updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	382;"	f
+updateKeysTextInputTerminal	src/Dodge/Update/Input/InGame.hs	405;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	11;"	f
 updateLasers	src/Dodge/Update.hs	419;"	f
 updateLeftParentSF	src/Dodge/Item/Grammar.hs	170;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
-updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	442;"	f
+updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	441;"	f
 updateMachine	src/Dodge/Machine/Update.hs	21;"	f
 updateMagnets	src/Dodge/Update.hs	310;"	f
-updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	204;"	f
+updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	203;"	f
 updateMouseContext	src/Dodge/Update.hs	323;"	f
 updateMouseContextGame	src/Dodge/Update.hs	328;"	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	167;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	536;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	529;"	f
+updateMouseReleaseInGame	src/Dodge/Update/Input/InGame.hs	166;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	533;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	526;"	f
 updatePastWorlds	src/Dodge/Update.hs	408;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
 updateProjectile	src/Dodge/Projectile/Update.hs	27;"	f
 updateProp	src/Dodge/Prop/Update.hs	11;"	f
 updatePulse	src/Dodge/Creature/Update.hs	136;"	f
 updatePulseBall	src/Dodge/Update.hs	433;"	f
-updatePulseLaser	src/Dodge/Update.hs	599;"	f
+updatePulseLaser	src/Dodge/Update.hs	596;"	f
 updatePulseLasers	src/Dodge/Update.hs	428;"	f
 updateRBList	src/Dodge/Inventory/RBList.hs	22;"	f
 updateRadarBlip	src/Dodge/RadarBlip.hs	11;"	f
-updateRadarBlips	src/Dodge/Update.hs	548;"	f
+updateRadarBlips	src/Dodge/Update.hs	545;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	39;"	f
-updateRadarSweeps	src/Dodge/Update.hs	649;"	f
+updateRadarSweeps	src/Dodge/Update.hs	646;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	110;"	f
 updateRightParentSF	src/Dodge/Item/Grammar.hs	181;"	f
@@ -5513,16 +5513,16 @@ updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	258;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	237;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	8;"	f
-updateShockwaves	src/Dodge/Update.hs	640;"	f
+updateShockwaves	src/Dodge/Update.hs	637;"	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	652;"	f
-updateTeslaArc	src/Dodge/Update.hs	569;"	f
-updateTeslaArcs	src/Dodge/Update.hs	566;"	f
+updateSparks	src/Dodge/Update.hs	649;"	f
+updateTeslaArc	src/Dodge/Update.hs	566;"	f
+updateTeslaArcs	src/Dodge/Update.hs	563;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	8;"	f
-updateTractorBeams	src/Dodge/Update.hs	637;"	f
+updateTractorBeams	src/Dodge/Update.hs	634;"	f
 updateTurret	src/Dodge/Machine/Update.hs	46;"	f
 updateUniverse	src/Dodge/Update.hs	72;"	f
 updateUniverseFirst	src/Dodge/Update.hs	83;"	f
@@ -5709,9 +5709,9 @@ zipCountDown	src/Dodge/Room/Procedural.hs	118;"	f
 zoneCloud	src/Dodge/Zoning/Cloud.hs	27;"	f
 zoneClouds	src/Dodge/Update.hs	460;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	54;"	f
-zoneCreatures	src/Dodge/Update.hs	495;"	f
+zoneCreatures	src/Dodge/Update.hs	496;"	f
 zoneDust	src/Dodge/Zoning/Cloud.hs	48;"	f
-zoneDusts	src/Dodge/Update.hs	463;"	f
+zoneDusts	src/Dodge/Update.hs	464;"	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