Unify PutDoor PSType

2025-10-24 22:31:08 +01:00
parent b6736e2735
commit b4012af312
7 changed files with 58 additions and 54 deletions
@@ -52,9 +52,9 @@ data PSType
        , _putEndPoint :: Point2
        }
    | PutWall {_pwPoly :: [Point2], _pwWall :: Wall}
-    | PutSlideDr Door Wall Float Point2 Point2
+--    | PutSlideDr Door Wall Float Point2 Point2
    | PutDoor' Door Wall
-    | PutDoor WdBl Float Point2A Point2A
+--    | PutDoor WdBl Float Point2A Point2A
    | RandPS (State StdGen PSType)
    | PutForeground ForegroundShape
    | PutWorldUpdate (Int -> PlacementSpot -> GenWorld -> GenWorld)
@@ -79,8 +79,8 @@ instance ShortShow PSType where
    shortShow PutTrigger {} = "PutTrigger"
    shortShow PutLineBlock {} = "PutLineBlock"
    shortShow PutWall {} = "PutWall"
-    shortShow PutSlideDr {} = "PutSlideDr"
-    shortShow PutDoor {} = "PutDoor"
+--    shortShow PutSlideDr {} = "PutSlideDr"
+--    shortShow PutDoor {} = "PutDoor"
    shortShow PutDoor' {} = "PutDoor'"
    shortShow RandPS {} = "RandPS"
    shortShow PutForeground {} = "PutForeground"
@@ -4,7 +4,7 @@ module Dodge.Placement.Instance.Door (
    putDoubleDoorThen,
 ) where

-import Linear
+import Dodge.Door.PutSlideDoor
 import Control.Lens
 import Dodge.Data.CreatureEffect
 import Dodge.Data.GenWorld
@@ -12,6 +12,7 @@ import Dodge.Default.Door
 import Dodge.Default.Wall
 import Dodge.LevelGen.PlacementHelper
 import Geometry
+import Linear

 putDoubleDoor ::
    Bool ->
@@ -53,15 +54,16 @@ doorBetween ::
    (Placement -> Maybe Placement) ->
    Placement
 doorBetween isauto wl cond soff pa pb speed g = case divideLine 40 pa pb of
-    [x, y] -> ptCont (PutSlideDr adoor wl soff x y) g
+    [x, y] -> ptCont (putSlideDr adoor wl soff x y) g
    (x : y : zs) -> divideDoorPane isauto Nothing wl cond (soff - dist y pb) speed (zip (x : y : zs) (y : zs)) g
-    _ -> undefined
+    _ -> error "tried to create doorBetween with too few points"
  where
    adoor =
        defaultDoor
            & drTrigger .~ cond
            & drUpdate . drLerpSpeed .~ speed

+
 divideDoorPane ::
    Bool ->
    Maybe Int ->
@@ -77,7 +79,7 @@ divideDoorPane isauto mid wl cond soff speed ppairs g = case ppairs of
    (p : ps) -> ptCont (adoor p) $ \pl -> Just $ divideDoorPane isauto (_plMID pl) wl cond soff speed ps g
    _ -> undefined
  where
-    adoor (x, y) = PutSlideDr thedoor wl soff x y
+    adoor (x, y) = putSlideDr thedoor wl soff x y
    thedoor =
        defaultDoor & drUpdate . drLerpSpeed .~ speed & drTrigger .~ cond
            & drPushedBy .~ maybe PushesItself PushedBy mid
@@ -134,9 +134,9 @@ placeSpotID rid ps pt w = case pt of
    PutMachine pps mc mitm -> plMachine (map doShift pps) mc mitm p rot w
    PutLS ls -> plNewUpID (gwWorld . cWorld . lWorld . lightSources) lsID (mvLS p' rot ls) w
    RandPS _ -> error "RandPS should not be reachable here" --evaluateRandPS rid rgn ps w
-    PutDoor f l p1 p2 -> plDoor f l (pashift p1) (pashift p2) w
+--    PutDoor f l p1 p2 -> plDoor f l (pashift p1) (pashift p2) w
    PutDoor' dr wl -> plDoor' (dr & drZeroPos %~ pashift & drOnePos %~ pashift) wl w
-    PutSlideDr wl dr off a b -> plSlideDoor wl dr off (doShift a) (doShift b) w
+--    PutSlideDr wl dr off a b -> plSlideDoor wl dr off (doShift a) (doShift b) w
    PutCoord cp -> plNewID (gwWorld . coordinates) (doShift cp) w
    PutBlock bl wl ps' ->
        plBlock
@@ -229,7 +229,7 @@ airlock90 =
            [ pContID
                (PS (V2 120 120) (3 * pi / 4))
                (PutButton $ makeSwitch col red NoWorldEffect NoWorldEffect)
-                $ \btid -> jsps (V2 5 5) 0 $ PutDoor (WdBlBtOn btid) l1 x1 y1
+                $ \btid -> jsps (V2 5 5) 0 $ putDoor (WdBlBtOn btid) l1 x1 y1
            , mntLS vShape (V2 35 35) (V3 70 70 50)
            ]
        , _rmBound =
@@ -263,7 +263,7 @@ airlockCrystal =
            [ pContID
                (PS (V2 145 70) (pi / 2))
                (PutButton $ makeSwitch col red NoWorldEffect NoWorldEffect)
-                $ \btid -> jsps (V2 40 70) 0 $ PutDoor (WdBlBtOn btid) l1 x1 y1
+                $ \btid -> jsps (V2 40 70) 0 $ putDoor (WdBlBtOn btid) l1 x1 y1
            , crystalLine (V2 0 70) (V2 40 70)
            , mntLS vShape (V2 150 70) (V3 110 70 70)
            ]
@@ -2,6 +2,7 @@
 -- | Rooms containing long doors, probably with a big reveal behind them.
 module Dodge.Room.LongDoor where

+import Dodge.Door.PutSlideDoor
 import Dodge.Default.Wall
 import Control.Monad
 import Dodge.LevelGen.Switch
@@ -48,8 +49,8 @@ twinSlowDoorRoom w h x =
        , _rmPath = mempty
        , _rmPmnts =
            [ pContID (PS (V2 0 (h -5)) pi) (PutButton $ makeButton col NoWorldEffect) $
-                \btid -> jsps0J (PutSlideDr (thedoor btid) thewall 1 (V2 x 1) (V2 x h)) $
-                    ps0 (PutSlideDr (thedoor btid) thewall 1 (V2 (- x) 1) (V2 (- x) h)) $
+                \btid -> jsps0J (putSlideDr (thedoor btid) thewall 1 (V2 x 1) (V2 x h)) $
+                    ps0 (putSlideDr (thedoor btid) thewall 1 (V2 (- x) 1) (V2 (- x) h)) $
                        \did -> jps0' (PutLS (lsColPos (V3 0.75 0 0) (V3 0 (h -1) lampheight))) $
                            \lspl -> jsps0 $ PutProp $ addColorChange (fromJust $ _plMID lspl) did $ lampCoverWhen (WdBlDoorMoving did) (V2 0 (h -1)) lampheight
            ]
@@ -10,6 +10,7 @@ module Dodge.Room.Procedural (
    makeGrid,
 ) where

+import Dodge.Door.PutSlideDoor
 import Dodge.Default.Wall
 import Control.Monad
 import Tile
@@ -328,8 +329,8 @@ centerVaultRoom w h d =
    theDoor =
        [ pContID (PS (V2 35 (d + 4)) 0) (PutButton $ makeSwitch col red NoWorldEffect NoWorldEffect) $
            \btid ->
-                jspsJ (V2 0 (d -10)) 0 (PutSlideDr (thedoor btid) thewall 1 (V2 (-21) 0) (V2 0 0)) $
-                    sPS (V2 0 (d -10)) 0 (PutSlideDr (thedoor btid) thewall 1 (V2 21 0) (V2 0 0))
+                jspsJ (V2 0 (d -10)) 0 (putSlideDr (thedoor btid) thewall 1 (V2 (-21) 0) (V2 0 0)) $
+                    sPS (V2 0 (d -10)) 0 (putSlideDr (thedoor btid) thewall 1 (V2 21 0) (V2 0 0))
        ]
    --thewall = switchWallCol col
    thewall = defaultDoorWall
@@ -1032,7 +1032,6 @@ PutButton	src/Dodge/Data/GenWorld.hs	40;"	C
 PutChasm	src/Dodge/Data/GenWorld.hs	63;"	C
 PutCoord	src/Dodge/Data/GenWorld.hs	45;"	C
 PutCrit	src/Dodge/Data/GenWorld.hs	32;"	C
-PutDoor	src/Dodge/Data/GenWorld.hs	57;"	C
 PutDoor'	src/Dodge/Data/GenWorld.hs	56;"	C
 PutFlIt	src/Dodge/Data/GenWorld.hs	43;"	C
 PutForeground	src/Dodge/Data/GenWorld.hs	59;"	C
@@ -1045,7 +1044,6 @@ PutMod	src/Dodge/Data/GenWorld.hs	46;"	C
 PutNothing	src/Dodge/Data/GenWorld.hs	61;"	C
 PutOnEquipment	src/Dodge/Data/RightButtonOptions.hs	19;"	C
 PutProp	src/Dodge/Data/GenWorld.hs	41;"	C
-PutSlideDr	src/Dodge/Data/GenWorld.hs	55;"	C
 PutTerminal	src/Dodge/Data/GenWorld.hs	42;"	C
 PutTrigger	src/Dodge/Data/GenWorld.hs	47;"	C
 PutWall	src/Dodge/Data/GenWorld.hs	54;"	C
@@ -2514,13 +2512,13 @@ advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	60;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	287;"	f
 aimStanceInfo	src/Dodge/Item/Info.hs	243;"	f
 aimTurn	src/Dodge/Creature/YourControl.hs	181;"	f
-airlock	src/Dodge/Room/Airlock.hs	24;"	f
-airlock0	src/Dodge/Room/Airlock.hs	72;"	f
-airlock90	src/Dodge/Room/Airlock.hs	196;"	f
-airlockCrystal	src/Dodge/Room/Airlock.hs	241;"	f
-airlockDoubleDoor	src/Dodge/Room/Airlock.hs	98;"	f
-airlockSimple	src/Dodge/Room/Airlock.hs	113;"	f
-airlockZ	src/Dodge/Room/Airlock.hs	151;"	f
+airlock	src/Dodge/Room/Airlock.hs	27;"	f
+airlock0	src/Dodge/Room/Airlock.hs	75;"	f
+airlock90	src/Dodge/Room/Airlock.hs	211;"	f
+airlockCrystal	src/Dodge/Room/Airlock.hs	256;"	f
+airlockDoubleDoor	src/Dodge/Room/Airlock.hs	101;"	f
+airlockSimple	src/Dodge/Room/Airlock.hs	128;"	f
+airlockZ	src/Dodge/Room/Airlock.hs	166;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	223;"	f
 alongSegBy	src/Geometry.hs	40;"	f
 alteRifle	src/Dodge/Item/Held/Cane.hs	22;"	f
@@ -2717,7 +2715,7 @@ 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	702;"	f
-cChasm	src/Dodge/Room/Tutorial.hs	135;"	f
+cChasm	src/Dodge/Room/Tutorial.hs	136;"	f
 cFilledRect	src/Dodge/CharacterEnums.hs	6;"	f
 cWireRect	src/Dodge/CharacterEnums.hs	10;"	f
 calcSmoothScroll	src/Dodge/SmoothScroll.hs	11;"	f
@@ -2752,7 +2750,7 @@ chaseCritInternal	src/Dodge/Humanoid.hs	7;"	f
 chaseCritMv	src/Dodge/Creature/ReaderUpdate.hs	120;"	f
 chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	32;"	f
 chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	36;"	f
-chasmSimpleMaze	src/Dodge/Room/Tutorial.hs	202;"	f
+chasmSimpleMaze	src/Dodge/Room/Tutorial.hs	203;"	f
 chasmTest	src/Dodge/Creature/Update.hs	132;"	f
 chasmWallToSurface	src/Dodge/Base/Collide.hs	118;"	f
 checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	100;"	f
@@ -3039,7 +3037,7 @@ debugWritableValues	src/Dodge/Debug.hs	84;"	f
 decodeSensorType	src/Dodge/Terminal.hs	72;"	f
 decomposeSelfTree	src/Dodge/Tree/Compose.hs	61;"	f
 decomposeTree	src/Dodge/Tree/Compose.hs	58;"	f
-decontamRoom	src/Dodge/Room/Airlock.hs	29;"	f
+decontamRoom	src/Dodge/Room/Airlock.hs	32;"	f
 decoratedBlock	src/Dodge/Placement/Instance/Block.hs	11;"	f
 decorationToShape	src/Dodge/Placement/TopDecoration.hs	9;"	f
 decreaseAwareness	src/Dodge/Creature/Perception.hs	118;"	f
@@ -3141,7 +3139,7 @@ dist	src/Geometry/Vector.hs	185;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
 divideCircle	src/Geometry.hs	321;"	f
-divideDoorPane	src/Dodge/Placement/Instance/Door.hs	65;"	f
+divideDoorPane	src/Dodge/Placement/Instance/Door.hs	68;"	f
 divideLine	src/Geometry.hs	248;"	f
 divideLineExact	src/Geometry.hs	276;"	f
 divideLineOddNumPoints	src/Geometry.hs	261;"	f
@@ -3171,7 +3169,7 @@ doDebugTestF12	src/Dodge/Update/Input/DebugTest.hs	84;"	f
 doDebugTestF6	src/Dodge/Update/Input/DebugTest.hs	41;"	f
 doDebugTestF7	src/Dodge/Update/Input/DebugTest.hs	51;"	f
 doDebugTestF8	src/Dodge/Update/Input/DebugTest.hs	59;"	f
-doDoorLerp	src/Dodge/Door/DoorLerp.hs	5;"	f
+doDoorLerp	src/Dodge/Door/DoorLerp.hs	8;"	f
 doDrag	src/Dodge/Update/Input/InGame.hs	127;"	f
 doDrawing	src/Dodge/Render.hs	34;"	f
 doDrawing'	src/Dodge/Render.hs	45;"	f
@@ -3213,8 +3211,8 @@ doWdWd	src/Dodge/WorldEffect.hs	28;"	f
 doWorldEvents	src/Dodge/Update.hs	428;"	f
 doWorldPos	src/Dodge/WorldPos.hs	10;"	f
 door	src/Dodge/Room/Door.hs	13;"	f
-doorBetween	src/Dodge/Placement/Instance/Door.hs	45;"	f
-doorLerp	src/Dodge/DrWdWd.hs	26;"	f
+doorBetween	src/Dodge/Placement/Instance/Door.hs	47;"	f
+doorLerp	src/Dodge/DrWdWd.hs	27;"	f
 dotV	src/Geometry/Vector.hs	76;"	f
 dotV3	src/Geometry/Vector3D.hs	119;"	f
 doubleCorridorBarrels	src/Dodge/Room/Room.hs	276;"	f
@@ -3497,7 +3495,7 @@ floorItemSPic	src/Dodge/Render/ShapePicture.hs	122;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	558;"	f
 foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	554;"	f
-foldMTRS	src/Dodge/Room/Tutorial.hs	80;"	f
+foldMTRS	src/Dodge/Room/Tutorial.hs	81;"	f
 foldPairs	src/ListHelp.hs	37;"	f
 foldrWhileArb	src/ListHelp.hs	110;"	f
 followImpulse	src/Dodge/Creature/Impulse.hs	24;"	f
@@ -3558,8 +3556,8 @@ 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
-getCrsFromRooms	src/Dodge/Room/Tutorial.hs	351;"	f
-getCrsFromRooms'	src/Dodge/Room/Tutorial.hs	338;"	f
+getCrsFromRooms	src/Dodge/Room/Tutorial.hs	352;"	f
+getCrsFromRooms'	src/Dodge/Room/Tutorial.hs	339;"	f
 getDebugMouseOver	src/Dodge/Update.hs	376;"	f
 getDistortions	src/Dodge/Render.hs	435;"	f
 getEdgesCrossing	src/Dodge/Path.hs	49;"	f
@@ -3576,7 +3574,7 @@ getNodePos	src/Dodge/Path.hs	38;"	f
 getPJStabiliser	src/Dodge/HeldUse.hs	1251;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	3;"	f
-getRoomsFromInts	src/Dodge/Room/Tutorial.hs	334;"	f
+getRoomsFromInts	src/Dodge/Room/Tutorial.hs	335;"	f
 getRootItemBounds	src/Dodge/Render/HUD.hs	100;"	f
 getRootItemInvID	src/Dodge/Inventory/Location.hs	35;"	f
 getSelectedCloseObj	src/Dodge/SelectedClose.hs	14;"	f
@@ -3892,7 +3890,7 @@ keyCardRunPastRand	src/Dodge/LockAndKey.hs	36;"	f
 keyPic	src/Dodge/Item/Draw/SPic.hs	459;"	f
 keyholeCorridor	src/Dodge/Room/Corridor.hs	39;"	f
 knifeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	638;"	f
-lChasm	src/Dodge/Room/Tutorial.hs	144;"	f
+lChasm	src/Dodge/Room/Tutorial.hs	145;"	f
 lConnect	src/Dodge/Render/Connectors.hs	42;"	f
 lConnectMulti	src/Dodge/Render/Connectors.hs	46;"	f
 lShape	src/Dodge/Placement/Instance/LightSource.hs	89;"	f
@@ -4142,7 +4140,7 @@ mglCreate	src/GLHelp.hs	8;"	f
 mglDelete	src/GLHelp.hs	14;"	f
 midBarDecoration	src/Dodge/Placement/TopDecoration.hs	16;"	f
 midBounds	src/Dodge/Room/Foreground.hs	151;"	f
-midChasm	src/Dodge/Room/Tutorial.hs	165;"	f
+midChasm	src/Dodge/Room/Tutorial.hs	166;"	f
 midPad	src/Padding.hs	27;"	f
 midPadL	src/Padding.hs	33;"	f
 midPoint	src/Geometry.hs	83;"	f
@@ -4434,8 +4432,8 @@ pokeWall	src/Shader/Poke.hs	78;"	f
 pokeWallsWindows	src/Shader/Poke.hs	50;"	f
 poly3	src/Picture/Base.hs	84;"	f
 poly3Col	src/Picture/Base.hs	88;"	f
-polyChasm	src/Dodge/Room/Tutorial.hs	186;"	f
-polyChasmC	src/Dodge/Room/Tutorial.hs	195;"	f
+polyChasm	src/Dodge/Room/Tutorial.hs	187;"	f
+polyChasmC	src/Dodge/Room/Tutorial.hs	196;"	f
 polyCirc	src/Shape.hs	46;"	f
 polyCircx	src/Shape.hs	51;"	f
 polyCornerDist	src/Geometry/Polygon.hs	61;"	f
@@ -4516,12 +4514,13 @@ pushOutFromWall	src/Dodge/WallCreatureCollisions.hs	101;"	f
 pushOutFromWalls	src/Dodge/WallCreatureCollisions.hs	64;"	f
 pushR	src/DoubleStack.hs	24;"	f
 pushScreen	src/Dodge/Menu/PushPop.hs	9;"	f
-putAutoDoor	src/Dodge/Placement/Instance/Door.hs	85;"	f
+putAutoDoor	src/Dodge/Placement/Instance/Door.hs	88;"	f
 putBlockN	src/Dodge/Placement/Instance/Wall.hs	169;"	f
 putBlockRect	src/Dodge/Placement/Instance/Wall.hs	148;"	f
 putBlockV	src/Dodge/Placement/Instance/Wall.hs	156;"	f
-putDoubleDoor	src/Dodge/Placement/Instance/Door.hs	16;"	f
-putDoubleDoorThen	src/Dodge/Placement/Instance/Door.hs	27;"	f
+putDoor	src/Dodge/Room/Airlock.hs	116;"	f
+putDoubleDoor	src/Dodge/Placement/Instance/Door.hs	18;"	f
+putDoubleDoorThen	src/Dodge/Placement/Instance/Door.hs	29;"	f
 putImmediateMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	65;"	f
 putLamp	src/Dodge/Placement/Instance/LightSource.hs	222;"	f
 putLasTurret	src/Dodge/Placement/Instance/Turret.hs	23;"	f
@@ -4530,6 +4529,7 @@ putLitButOnPosExtTrig	src/Dodge/Placement/Instance/Button.hs	103;"	f
 putLitButOnPosExtTrig'	src/Dodge/Placement/Instance/Button.hs	106;"	f
 putMessageTerminal	src/Dodge/Placement/Instance/Terminal.hs	57;"	f
 putShape	src/Dodge/Room/Foreground.hs	134;"	f
+putSlideDr	src/Dodge/Door/PutSlideDoor.hs	7;"	f
 putStrLnAppend	src/Dodge/LevelGen.hs	82;"	f
 putTerminal	src/Dodge/Placement/Instance/Terminal.hs	54;"	f
 putTerminalFull	src/Dodge/Placement/Instance/Terminal.hs	22;"	f
@@ -4621,7 +4621,7 @@ removeAimPosture	src/Dodge/Creature/YourControl.hs	159;"	f
 removeAmmoFromMag	src/Dodge/HeldUse.hs	907;"	f
 removeDot	src/ShortShow.hs	44;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
-removeLights	src/Dodge/Room/Tutorial.hs	251;"	f
+removeLights	src/Dodge/Room/Tutorial.hs	252;"	f
 removeShieldWall	src/Dodge/Item/BackgroundEffect.hs	57;"	f
 removeWallsInPolygon	src/Dodge/LevelGen/StaticWalls.hs	182;"	f
 renderDataResizeUpdate	src/Preload/Update.hs	26;"	f
@@ -4800,7 +4800,7 @@ sensorReqToString	src/Dodge/Machine/Update.hs	197;"	f
 sensorRoom	src/Dodge/Room/SensorDoor.hs	26;"	f
 sensorRoomRunPast	src/Dodge/Room/SensorDoor.hs	46;"	f
 sensorSPic	src/Dodge/Machine/Draw.hs	81;"	f
-sensorTut	src/Dodge/Room/Tutorial.hs	360;"	f
+sensorTut	src/Dodge/Room/Tutorial.hs	361;"	f
 sensorTypeDamages	src/Dodge/Machine/Update.hs	234;"	f
 sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
 sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	81;"	f
@@ -4827,7 +4827,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	87;"	f
+setRoomInt	src/Dodge/Room/Tutorial.hs	88;"	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
@@ -4837,7 +4837,7 @@ setTargetMv	src/Dodge/Creature/ReaderUpdate.hs	82;"	f
 setTile	src/Dodge/Layout.hs	70;"	f
 setTiles	src/Dodge/Layout.hs	67;"	f
 setToggle	src/Dodge/Prop/Update.hs	44;"	f
-setTreeInts	src/Dodge/Room/Tutorial.hs	94;"	f
+setTreeInts	src/Dodge/Room/Tutorial.hs	95;"	f
 setViewDistance	src/Dodge/Update/Camera.hs	236;"	f
 setViewPos	src/Dodge/Creature/ReaderUpdate.hs	69;"	f
 setViewport	src/Dodge/Render.hs	440;"	f
@@ -5270,12 +5270,12 @@ turnTo	src/Dodge/Movement/Turn.hs	8;"	f
 turret	src/Dodge/Placement/Instance/Turret.hs	35;"	f
 turretItemOffset	src/Dodge/Item/HeldOffset.hs	21;"	f
 tutAnoTree	src/Dodge/Room/Tutorial.hs	43;"	f
-tutDrop	src/Dodge/Room/Tutorial.hs	99;"	f
-tutHub	src/Dodge/Room/Tutorial.hs	258;"	f
-tutLight	src/Dodge/Room/Tutorial.hs	223;"	f
-tutRezBox	src/Dodge/Room/Tutorial.hs	371;"	f
+tutDrop	src/Dodge/Room/Tutorial.hs	100;"	f
+tutHub	src/Dodge/Room/Tutorial.hs	259;"	f
+tutLight	src/Dodge/Room/Tutorial.hs	224;"	f
+tutRezBox	src/Dodge/Room/Tutorial.hs	372;"	f
 tutRoomTree	src/Dodge/Floor.hs	21;"	f
-tutorialMessage1	src/Dodge/Room/Tutorial.hs	395;"	f
+tutorialMessage1	src/Dodge/Room/Tutorial.hs	396;"	f
 tweenAngles	src/Geometry/Vector.hs	190;"	f
 twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	83;"	f
 twinSlowDoorRoom	src/Dodge/Room/LongDoor.hs	30;"	f
@@ -5334,7 +5334,7 @@ updateDelayedEvents	src/Dodge/Update.hs	890;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
 updateDistortions	src/Dodge/Update.hs	558;"	f
-updateDoor	src/Dodge/DrWdWd.hs	20;"	f
+updateDoor	src/Dodge/DrWdWd.hs	21;"	f
 updateDoors	src/Dodge/Update.hs	310;"	f
 updateDust	src/Dodge/Update.hs	822;"	f
 updateDusts	src/Dodge/Update.hs	672;"	f
@@ -5589,7 +5589,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	153;"	f
+zChasm	src/Dodge/Room/Tutorial.hs	154;"	f
 zConnect	src/Dodge/Render/Connectors.hs	17;"	f
 zConnectCol	src/Dodge/Render/Connectors.hs	28;"	f
 zConnectColMidX	src/Dodge/Render/Connectors.hs	31;"	f