Commit before attempting to simplify auto door placement

src/Dodge/Default/Wall.hs

@@ -73,7 +73,7 @@ defaultDirtWall =
         , _wlColor = dirtColor
         , _wlOpacity = Opaque 6
         , _wlRotateTo = False
-        , _wlFireThrough = True
+        , _wlFireThrough = False
         , _wlPenetrable = True
         , _wlMaterial = Dirt
         }
@@ -89,7 +89,7 @@ defaultWindow =
         , _wlID = 0
         , _wlColor = withAlpha 0.5 cyan
         , _wlOpacity = SeeThrough
-        , _wlFireThrough = True
+        , _wlFireThrough = False
         , _wlMaterial = Glass
         , _wlPenetrable = True
         }

src/Dodge/Item/BackgroundEffect.hs

@@ -81,7 +81,7 @@ shieldWall crid =
         , _wlOpacity = SeeAbove
         , _wlPathable = True
         , _wlWalkable = True
-        , _wlFireThrough = True
+        , _wlFireThrough = False
         , _wlReflect = True
         , _wlRotateTo = False
         , _wlStructure = CreaturePart crid -- shieldWallDamage

src/Dodge/Placement/Instance/Door.hs

@@ -87,12 +87,8 @@ putAutoDoor a b = PlacementUsingPos (addZ 0 a) $
                 b
                 3
   where
-    --cond az bz = any (crNearSeg 40 (stripZ az) (stripZ bz)) . IM.filter isAnimate . _creatures
     cond az bz = WdBlCrFilterNearPoint 40 (0.5 *.* (stripZ az +.+ stripZ bz)) CrIsAnimate
 
---  any (crNearPoint 40 (0.5 *.* (stripZ az +.+ stripZ bz)))
--- . IM.filter isAnimate . _creatures
-
 switchDoor :: Point2 -> Float -> Point2 -> Point2 -> Color -> Placement
 switchDoor btpos btrot dra drb col = pContID
     (PS btpos btrot)

src/Dodge/Placement/Instance/Wall.hs

@@ -93,7 +93,7 @@ baseBlockPane =
         --, _wlOpacity = Opaque 10
         , _wlOpacity = Opaque 17
         , _wlUnshadowed = True
-        , _wlFireThrough = True
+        , _wlFireThrough = False
         , _wlPenetrable = True
         }
 

src/Dodge/Wall/ForceField.hs

@@ -11,7 +11,7 @@ forceField =
         , _wlOpacity = DrawnWall DrawForceField
         , _wlPathable = True
         , _wlWalkable = True
-        , _wlFireThrough = True
+        , _wlFireThrough = False
         , _wlReflect = True
         , _wlUnshadowed = True
         , _wlRotateTo = False

tags

@@ -1355,7 +1355,6 @@ 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	44;"	t
-TerminalWaiting	src/Dodge/Data/Terminal/Status.hs	16;"	C
 Terrestrial	src/Dodge/Data/Scenario.hs	72;"	C
 TerrestrialBiome	src/Dodge/Data/Scenario.hs	76;"	t
 TeslaArc	src/Dodge/Data/TeslaArc.hs	17;"	t
@@ -2909,11 +2908,11 @@ clickGetCreature	src/Dodge/Debug.hs	109;"	f
 clicker	src/Dodge/Item/Scope.hs	82;"	f
 clipV	src/Geometry/Vector.hs	47;"	f
 clipZoom	src/Dodge/Update/Camera.hs	230;"	f
-clockCycle	src/Dodge/Clock.hs	9;"	f
+clockCycle	src/Dodge/Clock.hs	7;"	f
 closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	223;"	f
 closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	208;"	f
 closeItemToTextPictures	src/Dodge/Inventory/SelectionList.hs	243;"	f
-closeObjectInfo	src/Dodge/Render/HUD.hs	222;"	f
+closeObjectInfo	src/Dodge/Render/HUD.hs	225;"	f
 closestCreatureID	src/Dodge/Debug.hs	118;"	f
 closestPointOnLine	src/Geometry/Intersect.hs	281;"	f
 closestPointOnLineParam	src/Geometry/Intersect.hs	297;"	f
@@ -2952,13 +2951,13 @@ combinationsOf	src/Multiset.hs	46;"	f
 combinationsTrie	src/Dodge/Combine.hs	43;"	f
 combineAwareness	src/Dodge/Creature/Perception.hs	110;"	f
 combineFloors	src/Dodge/Room/Procedural.hs	172;"	f
-combineInventoryExtra	src/Dodge/Render/HUD.hs	338;"	f
+combineInventoryExtra	src/Dodge/Render/HUD.hs	341;"	f
 combineItemListYouX	src/Dodge/Combine.hs	35;"	f
 combineList	src/Dodge/Combine.hs	21;"	f
 combineRooms	src/Dodge/Room/Procedural.hs	152;"	f
 combineS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	480;"	f
 combineTree	src/Dodge/Tree/Compose.hs	66;"	f
-commandColor	src/Dodge/Terminal.hs	115;"	f
+commandColor	src/Dodge/Terminal.hs	116;"	f
 commonPrefix	src/Dodge/Debug/Terminal.hs	148;"	f
 comp	src/Quaternion.hs	65;"	f
 compactDraw	src/Dodge/LevelGen.hs	93;"	f
@@ -2976,7 +2975,7 @@ 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	404;"	f
 convexHull	src/Geometry/Polygon.hs	110;"	f
 convexHullSafe	src/Geometry/Polygon.hs	117;"	f
 convexPolysOverlap	src/Geometry/ConvexPoly.hs	50;"	f
@@ -3096,7 +3095,7 @@ dShadCol	src/Dodge/Render/List.hs	215;"	f
 damMatSideEffect	src/Dodge/Material/Damage.hs	13;"	f
 damThingHitWith	src/Dodge/Damage.hs	72;"	f
 damToExpBarrel	src/Dodge/Barreloid.hs	49;"	f
-damageCodeCommand	src/Dodge/Terminal.hs	60;"	f
+damageCodeCommand	src/Dodge/Terminal.hs	61;"	f
 damageCrWl	src/Dodge/Damage.hs	29;"	f
 damageCrWlID	src/Dodge/Damage.hs	23;"	f
 damageDirection	src/Dodge/Damage.hs	35;"	f
@@ -3135,7 +3134,7 @@ debugMenuOptions	src/Dodge/Menu.hs	122;"	f
 debugOn	src/Dodge/Data/Config.hs	151;"	f
 debugSelectCreatureList	src/Dodge/Debug.hs	88;"	f
 debugSelectCreatureMessage	src/Dodge/Debug.hs	79;"	f
-decodeSensorType	src/Dodge/Terminal.hs	73;"	f
+decodeSensorType	src/Dodge/Terminal.hs	74;"	f
 decomposeSelfTree	src/Dodge/Tree/Compose.hs	60;"	f
 decomposeTree	src/Dodge/Tree/Compose.hs	57;"	f
 decontamRoom	src/Dodge/Room/Airlock.hs	26;"	f
@@ -3271,8 +3270,8 @@ doCrWdAc	src/Dodge/CreatureEffect.hs	77;"	f
 doCrWdImp	src/Dodge/CreatureEffect.hs	16;"	f
 doCrWdWd	src/Dodge/CreatureEffect.hs	20;"	f
 doDamage	src/Dodge/Creature/State.hs	42;"	f
-doDeathToggle	src/Dodge/WorldEffect.hs	86;"	f
+doDeathToggle	src/Dodge/WorldEffect.hs	85;"	f
-doDeathTriggers	src/Dodge/WorldEffect.hs	79;"	f
+doDeathTriggers	src/Dodge/WorldEffect.hs	78;"	f
 doDebugTest	src/Dodge/Update/Input/DebugTest.hs	22;"	f
 doDebugTest2	src/Dodge/Update/Input/DebugTest.hs	37;"	f
 doDebugTestF10	src/Dodge/Update/Input/DebugTest.hs	62;"	f
@@ -3309,7 +3308,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	449;"	f
 doRoomInPlacements	src/Dodge/Layout.hs	97;"	f
 doRoomOutPlacements	src/Dodge/Layout.hs	107;"	f
 doRoomPlacements	src/Dodge/Layout.hs	122;"	f
@@ -3323,7 +3322,7 @@ doTextInputOver	src/Dodge/Update/Input/Text.hs	15;"	f
 doTextInputOverUniverse	src/Dodge/Update/Input/Text.hs	12;"	f
 doThrust	src/Dodge/Projectile/Update.hs	182;"	f
 doTimeScroll	src/Dodge/Update.hs	208;"	f
-doTmWdWd	src/Dodge/WorldEffect.hs	89;"	f
+doTmWdWd	src/Dodge/WorldEffect.hs	88;"	f
 doWallRotate	src/Dodge/Update/Camera.hs	220;"	f
 doWdBl	src/Dodge/WorldBool.hs	10;"	f
 doWdCrBl	src/Dodge/CreatureEffect.hs	37;"	f
@@ -3365,7 +3364,7 @@ drawCircCollisionTest	src/Dodge/Debug/Picture.hs	117;"	f
 drawCliff	src/Dodge/Render/ShapePicture.hs	48;"	f
 drawCollisionTest	src/Dodge/Debug/Picture.hs	102;"	f
 drawCombFilter	src/Dodge/Render/Picture.hs	268;"	f
-drawCombineInventory	src/Dodge/Render/HUD.hs	178;"	f
+drawCombineInventory	src/Dodge/Render/HUD.hs	181;"	f
 drawConcurrentMessage	src/Dodge/Render/Picture.hs	69;"	f
 drawCoord	src/Dodge/Debug/Picture.hs	375;"	f
 drawCorpse	src/Dodge/Corpse/Draw.hs	6;"	f
@@ -3383,12 +3382,12 @@ drawDrag	src/Dodge/Render/Picture.hs	199;"	f
 drawDragDrop	src/Dodge/Render/Picture.hs	228;"	f
 drawDragPickup	src/Dodge/Render/Picture.hs	237;"	f
 drawDragSelect	src/Dodge/Render/Picture.hs	196;"	f
-drawDragSelected	src/Dodge/Render/HUD.hs	132;"	f
+drawDragSelected	src/Dodge/Render/HUD.hs	135;"	f
-drawDragSelecting	src/Dodge/Render/HUD.hs	149;"	f
+drawDragSelecting	src/Dodge/Render/HUD.hs	152;"	f
 drawEmptySet	src/Dodge/Render/Picture.hs	140;"	f
 drawEnergyBall	src/Dodge/EnergyBall/Draw.hs	7;"	f
 drawEquipment	src/Dodge/Creature/Picture.hs	127;"	f
-drawExamineInventory	src/Dodge/Render/HUD.hs	194;"	f
+drawExamineInventory	src/Dodge/Render/HUD.hs	197;"	f
 drawExplosiveBall	src/Dodge/EnergyBall/Draw.hs	15;"	f
 drawFarWallDetect	src/Dodge/Debug/Picture.hs	269;"	f
 drawFlame	src/Dodge/Flame/Draw.hs	8;"	f
@@ -3397,13 +3396,13 @@ drawFooterText	src/Dodge/Render/MenuScreen.hs	72;"	f
 drawForceField	src/Dodge/Wall/Draw.hs	11;"	f
 drawGapPlus	src/Dodge/Render/Picture.hs	279;"	f
 drawGib	src/Dodge/Prop/Draw.hs	39;"	f
-drawHUD	src/Dodge/Render/HUD.hs	48;"	f
+drawHUD	src/Dodge/Render/HUD.hs	51;"	f
 drawInputMenu	src/Dodge/Render/MenuScreen.hs	22;"	f
 drawInspectWall	src/Dodge/Debug/Picture.hs	244;"	f
 drawInspectWalls	src/Dodge/Debug/Picture.hs	232;"	f
-drawInventory	src/Dodge/Render/HUD.hs	55;"	f
+drawInventory	src/Dodge/Render/HUD.hs	58;"	f
-drawItemChildrenConnect	src/Dodge/Render/HUD.hs	325;"	f
+drawItemChildrenConnect	src/Dodge/Render/HUD.hs	328;"	f
-drawItemConnections	src/Dodge/Render/HUD.hs	315;"	f
+drawItemConnections	src/Dodge/Render/HUD.hs	318;"	f
 drawJumpDown	src/Dodge/Render/Picture.hs	191;"	f
 drawLabCrossCol	src/Dodge/Render/Label.hs	8;"	f
 drawLampCover	src/Dodge/Prop/Draw.hs	55;"	f
@@ -3416,13 +3415,13 @@ drawListYgapScaleYoff	src/Dodge/Render/List.hs	95;"	f
 drawListYoff	src/Dodge/Render/List.hs	92;"	f
 drawMachine	src/Dodge/Machine/Draw.hs	15;"	f
 drawMapperAR	src/Dodge/Targeting/Draw.hs	12;"	f
-drawMapperInventory	src/Dodge/Render/HUD.hs	169;"	f
+drawMapperInventory	src/Dodge/Render/HUD.hs	172;"	f
 drawMenuClick	src/Dodge/Render/Picture.hs	163;"	f
 drawMenuCursor	src/Dodge/Render/Picture.hs	177;"	f
 drawMenuOrHUD	src/Dodge/Render/Picture.hs	64;"	f
 drawMenuScreen	src/Dodge/Render/MenuScreen.hs	16;"	f
 drawMouseCursor	src/Dodge/Render/Picture.hs	80;"	f
-drawMouseOver	src/Dodge/Render/HUD.hs	105;"	f
+drawMouseOver	src/Dodge/Render/HUD.hs	108;"	f
 drawMousePosition	src/Dodge/Debug/Picture.hs	365;"	f
 drawMovingShape	src/Dodge/Prop/Draw.hs	81;"	f
 drawMovingShapeCol	src/Dodge/Prop/Draw.hs	87;"	f
@@ -3436,11 +3435,11 @@ drawProjectile	src/Dodge/Projectile/Draw.hs	13;"	f
 drawProp	src/Dodge/Prop/Draw.hs	26;"	f
 drawPulseBall	src/Dodge/Render/ShapePicture.hs	54;"	f
 drawQuitTerminal	src/Dodge/Render/Picture.hs	133;"	f
-drawRBOptions	src/Dodge/Render/HUD.hs	247;"	f
+drawRBOptions	src/Dodge/Render/HUD.hs	250;"	f
 drawRadarSweep	src/Dodge/RadarSweep/Draw.hs	14;"	f
 drawRemoteShell	src/Dodge/Projectile/Draw.hs	38;"	f
 drawReturn	src/Dodge/Render/Picture.hs	147;"	f
-drawRootCursor	src/Dodge/Render/HUD.hs	72;"	f
+drawRootCursor	src/Dodge/Render/HUD.hs	75;"	f
 drawSSCursor	src/Dodge/SelectionSections/Draw.hs	35;"	f
 drawSSMultiCursor	src/Dodge/SelectionSections/Draw.hs	46;"	f
 drawSelect	src/Dodge/Render/Picture.hs	256;"	f
@@ -3455,11 +3454,11 @@ drawShell	src/Dodge/Projectile/Draw.hs	22;"	f
 drawShockwave	src/Dodge/Shockwave/Draw.hs	6;"	f
 drawSpark	src/Dodge/Spark/Draw.hs	7;"	f
 drawStaticBall	src/Dodge/EnergyBall/Draw.hs	28;"	f
-drawSubInventory	src/Dodge/Render/HUD.hs	159;"	f
+drawSubInventory	src/Dodge/Render/HUD.hs	162;"	f
 drawSwitch	src/Dodge/Button/Draw.hs	16;"	f
 drawSwitchWire	src/Dodge/LevelGen/Switch.hs	24;"	f
 drawTargetingAR	src/Dodge/Targeting/Draw.hs	20;"	f
-drawTerminalDisplay	src/Dodge/Render/HUD.hs	361;"	f
+drawTerminalDisplay	src/Dodge/Render/HUD.hs	364;"	f
 drawTeslaArc	src/Dodge/Tesla/Draw.hs	9;"	f
 drawText	src/Picture/Base.hs	220;"	f
 drawTitle	src/Dodge/Render/MenuScreen.hs	55;"	f
@@ -3532,7 +3531,7 @@ epText	src/Dodge/Inventory/SelectionList.hs	76;"	f
 eqConstr	src/SameConstr.hs	17;"	f
 eqPosText	src/Dodge/Equipment/Text.hs	5;"	f
 eqTypeToSites	src/Dodge/Inventory/RBList.hs	77;"	f
-equipAllocString	src/Dodge/Render/HUD.hs	306;"	f
+equipAllocString	src/Dodge/Render/HUD.hs	309;"	f
 equipAttachPos	src/Dodge/Item/Draw.hs	29;"	f
 equipBackgroundEffect	src/Dodge/Euse.hs	15;"	f
 equipInfo	src/Dodge/Item/Info.hs	141;"	f
@@ -3552,7 +3551,7 @@ errorNormalizeV	src/Geometry.hs	55;"	f
 errorPointInPolygon	src/Geometry.hs	47;"	f
 evaluateRandPS	src/Dodge/Placement/PlaceSpot.hs	160;"	f
 evenOddSplit	src/Dodge/Base.hs	160;"	f
-exitTerminalSubInv	src/Dodge/WorldEffect.hs	109;"	f
+exitTerminalSubInv	src/Dodge/WorldEffect.hs	108;"	f
 expandLine	src/Dodge/Picture.hs	30;"	f
 expandPolyBy	src/Dodge/LevelGen/StaticWalls.hs	91;"	f
 expandPolyByFixed	src/Dodge/LevelGen/StaticWalls.hs	97;"	f
@@ -3623,7 +3622,7 @@ flockPointTarget	src/Dodge/Creature/Boid.hs	200;"	f
 flockPointTargetR	src/Dodge/Creature/Boid.hs	267;"	f
 flockToPointUsing	src/Dodge/Creature/Boid.hs	215;"	f
 flockToPointUsing'	src/Dodge/Creature/Boid.hs	228;"	f
-floorItemPickupInfo	src/Dodge/Render/HUD.hs	227;"	f
+floorItemPickupInfo	src/Dodge/Render/HUD.hs	230;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	122;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	558;"	f
@@ -3688,9 +3687,9 @@ 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	535;"	f
-getCommand	src/Dodge/Terminal.hs	53;"	f
+getCommand	src/Dodge/Terminal.hs	54;"	f
-getCommands	src/Dodge/Terminal.hs	50;"	f
+getCommands	src/Dodge/Terminal.hs	51;"	f
 getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	50;"	f
 getDistortions	src/Dodge/Render.hs	435;"	f
 getGrenadeHitEffect	src/Dodge/HeldUse.hs	1296;"	f
@@ -3706,7 +3705,7 @@ getNodePos	src/Dodge/Path.hs	31;"	f
 getPJStabiliser	src/Dodge/HeldUse.hs	1283;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	3;"	f
-getRootItemBounds	src/Dodge/Render/HUD.hs	96;"	f
+getRootItemBounds	src/Dodge/Render/HUD.hs	99;"	f
 getRootItemInvID	src/Dodge/Inventory/Location.hs	35;"	f
 getSelectedCloseObj	src/Dodge/SelectedClose.hs	14;"	f
 getSmoothScrollValue	src/Dodge/SmoothScroll.hs	21;"	f
@@ -3807,7 +3806,7 @@ heldItemWeight	src/Dodge/Creature/Statistics.hs	80;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	241;"	f
 heldTorqueAmount	src/Dodge/HeldUse.hs	578;"	f
 heldTriggerType	src/Dodge/BaseTriggerType.hs	27;"	f
-helpPara	src/Dodge/Terminal.hs	91;"	f
+helpPara	src/Dodge/Terminal.hs	92;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
 heron	src/Geometry.hs	221;"	f
 hiToFloat	src/Dodge/Room/Modify/Girder.hs	171;"	f
@@ -3893,7 +3892,7 @@ invDP	src/Dodge/ListDisplayParams.hs	30;"	f
 invDT	src/Dodge/Item/Grammar.hs	216;"	f
 invDT'	src/Dodge/Item/Grammar.hs	221;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	191;"	f
-invHead	src/Dodge/Render/HUD.hs	402;"	f
+invHead	src/Dodge/Render/HUD.hs	403;"	f
 invIMDT	src/Dodge/Item/Grammar.hs	245;"	f
 invIndents	src/Dodge/Item/Grammar.hs	252;"	f
 invItemEffs	src/Dodge/Creature/State.hs	62;"	f
@@ -4077,7 +4076,7 @@ listSelectionColorPicture	src/Dodge/DisplayInventory.hs	307;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
-lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	391;"	f
+lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	392;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	30;"	f
@@ -4150,8 +4149,8 @@ makeBullet	src/Dodge/HeldUse.hs	1002;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	7;"	f
-makeColorTermLine	src/Dodge/Terminal.hs	112;"	f
+makeColorTermLine	src/Dodge/Terminal.hs	113;"	f
-makeColorTermPara	src/Dodge/Terminal.hs	109;"	f
+makeColorTermPara	src/Dodge/Terminal.hs	110;"	f
 makeCorpse	src/Dodge/Corpse/Make.hs	13;"	f
 makeDebris	src/Dodge/Block/Debris.hs	45;"	f
 makeDebrisDirected	src/Dodge/Block/Debris.hs	48;"	f
@@ -4186,8 +4185,8 @@ makeSourcedShader	src/Shader/Compile.hs	167;"	f
 makeSpark	src/Dodge/Spark.hs	45;"	f
 makeSubmenuOption	src/Dodge/Menu/OptionType.hs	19;"	f
 makeSwitch	src/Dodge/LevelGen/Switch.hs	38;"	f
-makeTermLine	src/Dodge/Terminal.hs	97;"	f
+makeTermLine	src/Dodge/Terminal.hs	98;"	f
-makeTermPara	src/Dodge/Terminal.hs	106;"	f
+makeTermPara	src/Dodge/Terminal.hs	107;"	f
 makeTeslaArc	src/Dodge/Tesla.hs	29;"	f
 makeTeslaExplosionAt	src/Dodge/WorldEvent/Explosion.hs	40;"	f
 makeTileFromPoly	src/Tile.hs	34;"	f
@@ -4207,7 +4206,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	555;"	f
+maybeExitCombine	src/Dodge/Update/Input/InGame.hs	556;"	f
 maybeOpenConsole	src/Dodge/Update.hs	131;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	116;"	f
@@ -4427,7 +4426,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	527;"	f
 pauseMenu	src/Dodge/Menu.hs	56;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	61;"	f
 pauseSound	src/Dodge/SoundLogic.hs	42;"	f
@@ -4671,7 +4670,7 @@ qToV2	src/Quaternion.hs	56;"	f
 qToV3	src/Quaternion.hs	53;"	f
 quarterRoomSquare	src/Dodge/Room/Procedural.hs	213;"	f
 quarterRoomTri	src/Dodge/Room/Procedural.hs	177;"	f
-quitCommand	src/Dodge/Terminal.hs	94;"	f
+quitCommand	src/Dodge/Terminal.hs	95;"	f
 qz	src/Quaternion.hs	71;"	f
 rLauncher	src/Dodge/Item/Held/Launcher.hs	14;"	f
 rLauncherX	src/Dodge/Item/Held/Launcher.hs	30;"	f
@@ -4764,7 +4763,7 @@ replacePutID	src/Dodge/Placement/Instance/Wall.hs	102;"	f
 resetCrVocCoolDown	src/Dodge/Creature/Vocalization.hs	47;"	f
 resetPLUse	src/Dodge/PlacementSpot.hs	99;"	f
 resetStride	src/Dodge/Creature/State/WalkCycle.hs	24;"	f
-resetTerminal	src/Dodge/WorldEffect.hs	103;"	f
+resetTerminal	src/Dodge/WorldEffect.hs	102;"	f
 resizeFBOTO	src/Framebuffer/Update.hs	203;"	f
 resizeFBOTO3	src/Framebuffer/Update.hs	175;"	f
 resizeRBO	src/Framebuffer/Update.hs	87;"	f
@@ -4917,11 +4916,11 @@ sectionsSizes	src/Dodge/DisplayInventory.hs	206;"	f
 seedStartMenu	src/Dodge/Menu.hs	82;"	f
 seedStartOptions	src/Dodge/Menu.hs	85;"	f
 segOnCirc	src/Geometry.hs	114;"	f
-selNumPos	src/Dodge/Render/HUD.hs	451;"	f
+selNumPos	src/Dodge/Render/HUD.hs	452;"	f
-selNumPosCardinal	src/Dodge/Render/HUD.hs	474;"	f
+selNumPosCardinal	src/Dodge/Render/HUD.hs	475;"	f
 selSecDrawCursor	src/Dodge/Render/List.hs	126;"	f
 selSecDrawCursorAt	src/Dodge/Render/List.hs	104;"	f
-selSecSelCol	src/Dodge/Render/HUD.hs	505;"	f
+selSecSelCol	src/Dodge/Render/HUD.hs	506;"	f
 selSecSelSize	src/Dodge/SelectionSections.hs	143;"	f
 selSecYint	src/Dodge/SelectionSections.hs	152;"	f
 selectCreatureDebugItem	src/Dodge/Debug.hs	65;"	f
@@ -5065,7 +5064,7 @@ shuffleRoomPos	src/Dodge/Layout.hs	78;"	f
 shuffleTail	src/RandomHelp.hs	59;"	f
 sigmoid	src/Dodge/Base.hs	151;"	f
 simpleCrSprings	src/Dodge/Update.hs	868;"	f
-simpleTermMessage	src/Dodge/Terminal.hs	165;"	f
+simpleTermMessage	src/Dodge/Terminal.hs	166;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	680;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
 singleAmmo	src/Dodge/Item/AmmoSlots.hs	62;"	f
@@ -5115,7 +5114,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	530;"	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
@@ -5207,14 +5206,14 @@ swapInvItems	src/Dodge/Inventory/Swap.hs	21;"	f
 swapItemWith	src/Dodge/Inventory.hs	163;"	f
 swarmCrit	src/Dodge/Creature/SwarmCrit.hs	10;"	f
 swarmUsingCenter	src/Dodge/Creature/Boid.hs	172;"	f
-switchDoor	src/Dodge/Placement/Instance/Door.hs	96;"	f
+switchDoor	src/Dodge/Placement/Instance/Door.hs	92;"	f
 switchWallCol	src/Dodge/Default/Door.hs	12;"	f
 t	src/ShortShow.hs	44;"	f
 tEast	src/Dodge/Room/Corridor.hs	90;"	f
 tToBTree	src/Dodge/Tree/Compose.hs	92;"	f
 tWest	src/Dodge/Room/Corridor.hs	115;"	f
-tabComplete	src/Dodge/Terminal.hs	118;"	f
+tabComplete	src/Dodge/Terminal.hs	119;"	f
-tabComplete'	src/Dodge/Terminal.hs	124;"	f
+tabComplete'	src/Dodge/Terminal.hs	125;"	f
 takeN	src/RandomHelp.hs	44;"	f
 takeNMore	src/RandomHelp.hs	41;"	f
 takeOne	src/RandomHelp.hs	22;"	f
@@ -5242,10 +5241,10 @@ targetingScope	src/Dodge/Item/Scope.hs	38;"	f
 telRoomLev	src/Dodge/Room/Teleport.hs	14;"	f
 teleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	528;"	f
 termScreenColor	src/Dodge/Terminal/Color.hs	8;"	f
-termSoundLine	src/Dodge/Terminal.hs	44;"	f
+termSoundLine	src/Dodge/Terminal.hs	45;"	f
-termTextColor	src/Dodge/Terminal.hs	47;"	f
+termTextColor	src/Dodge/Terminal.hs	48;"	f
 terminalColor	src/Dodge/Placement/Instance/Terminal.hs	76;"	f
-terminalReturnEffect	src/Dodge/Terminal.hs	169;"	f
+terminalReturnEffect	src/Dodge/Terminal.hs	170;"	f
 terminalSPic	src/Dodge/Machine/Draw.hs	27;"	f
 terminalScreenGlow	src/Dodge/Machine/Update.hs	36;"	f
 terminalShape	src/Dodge/Machine/Draw.hs	30;"	f
@@ -5259,13 +5258,13 @@ testInventory	src/Dodge/Creature.hs	292;"	f
 testStringInit	src/Dodge/TestString.hs	33;"	f
 text	src/Picture/Base.hs	193;"	f
 textGrad	src/Picture/Text.hs	5;"	f
-textInputBlurb	src/Dodge/Terminal.hs	36;"	f
+textInputBlurb	src/Dodge/Terminal.hs	37;"	f
 textInputFocus	src/Dodge/InputFocus.hs	11;"	f
 textJustifyCenter	src/Picture/Base.hs	212;"	f
 textJustifyLeft	src/Picture/Base.hs	208;"	f
 textJustifyRight	src/Picture/Base.hs	198;"	f
 textRight	src/Picture/Base.hs	203;"	f
-textTerminal	src/Dodge/Terminal.hs	33;"	f
+textTerminal	src/Dodge/Terminal.hs	34;"	f
 textVMirror	src/Picture/Base.hs	216;"	f
 tflat2	src/Picture/Data.hs	60;"	f
 tflat3	src/Picture/Data.hs	64;"	f
@@ -5300,8 +5299,8 @@ tingS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	574;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	566;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	102;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	105;"	f
-tlDoEffect	src/Dodge/Terminal.hs	103;"	f
+tlDoEffect	src/Dodge/Terminal.hs	104;"	f
-tlSetStatus	src/Dodge/Terminal.hs	100;"	f
+tlSetStatus	src/Dodge/Terminal.hs	101;"	f
 tmUpdate	src/Dodge/Update.hs	487;"	f
 toBinary	src/Dodge/Inventory/SelectionList.hs	141;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
@@ -5316,7 +5315,7 @@ toV2	src/Geometry/Data.hs	54;"	f
 toV3	src/Geometry/Data.hs	57;"	f
 toV4	src/Geometry/Data.hs	60;"	f
 toggleCombineInv	src/Dodge/DisplayInventory.hs	316;"	f
-toggleCommands	src/Dodge/Terminal.hs	78;"	f
+toggleCommands	src/Dodge/Terminal.hs	79;"	f
 toggleEquipmentAt	src/Dodge/Creature/Impulse/UseItem.hs	67;"	f
 toggleExamineInv	src/Dodge/Creature/Impulse/UseItem.hs	105;"	f
 toggleJust	src/MaybeHelp.hs	41;"	f
@@ -5332,7 +5331,7 @@ topTestPart	src/Dodge/TestString.hs	71;"	f
 torch	src/Dodge/Item/Held/Utility.hs	23;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	290;"	f
 torqueAmount	src/Dodge/HeldUse.hs	573;"	f
-torqueCr	src/Dodge/WorldEffect.hs	72;"	f
+torqueCr	src/Dodge/WorldEffect.hs	71;"	f
 torso	src/Dodge/Creature/Picture.hs	102;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	27;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	22;"	f
@@ -5384,7 +5383,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	545;"	f
+tryCombine	src/Dodge/Update/Input/InGame.hs	546;"	f
 tryDrawToCapacitor	src/Dodge/Creature/State.hs	150;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	139;"	f
 tryGetChannel	src/Sound.hs	97;"	f
@@ -5441,7 +5440,7 @@ unusedSpotNearInLink	src/Dodge/PlacementSpot.hs	201;"	f
 updateAimPos	src/Dodge/Update.hs	321;"	f
 updateAllNodes	src/TreeHelp.hs	85;"	f
 updateArc	src/Dodge/Tesla.hs	44;"	f
-updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	479;"	f
+updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	480;"	f
 updateBarrel	src/Dodge/Barreloid.hs	41;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	15;"	f
 updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	34;"	f
@@ -5471,7 +5470,7 @@ updateDust	src/Dodge/Update.hs	829;"	f
 updateDusts	src/Dodge/Update.hs	676;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	31;"	f
 updateEnergyBalls	src/Dodge/Update.hs	664;"	f
-updateEnterRegex	src/Dodge/Update/Input/InGame.hs	506;"	f
+updateEnterRegex	src/Dodge/Update/Input/InGame.hs	507;"	f
 updateExpBarrel	src/Dodge/Barreloid.hs	20;"	f
 updateFBOTO	src/Framebuffer/Update.hs	97;"	f
 updateFBOTO3	src/Framebuffer/Update.hs	131;"	f
@@ -5485,21 +5484,21 @@ updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
 updateIMl	src/Dodge/Update.hs	532;"	f
 updateIMl'	src/Dodge/Update.hs	537;"	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	430;"	f
 updateInt2Map	src/Dodge/Zoning/Base.hs	92;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	88;"	f
 updateItemTargeting	src/Dodge/Creature/State.hs	258;"	f
-updateKeyContinueTerminal	src/Dodge/Update/Input/InGame.hs	398;"	f
+updateKeyContinueTerminal	src/Dodge/Update/Input/InGame.hs	399;"	f
-updateKeyInGame	src/Dodge/Update/Input/InGame.hs	423;"	f
+updateKeyInGame	src/Dodge/Update/Input/InGame.hs	424;"	f
 updateKeysInGame	src/Dodge/Update/Input/InGame.hs	85;"	f
-updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	383;"	f
+updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	384;"	f
-updateKeysTextInputTerminal	src/Dodge/Update/Input/InGame.hs	406;"	f
+updateKeysTextInputTerminal	src/Dodge/Update/Input/InGame.hs	407;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	11;"	f
 updateLasers	src/Dodge/Update.hs	437;"	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	443;"	f
 updateMachine	src/Dodge/Machine/Update.hs	21;"	f
 updateMagnets	src/Dodge/Update.hs	329;"	f
 updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	205;"	f
@@ -5710,7 +5709,7 @@ yV2	src/Geometry/Vector.hs	210;"	f
 yellow	src/Color.hs	17;"	f
 you	src/Dodge/Base/You.hs	13;"	f
 youDropItem	src/Dodge/Creature/Action.hs	196;"	f
-yourAugmentedItem	src/Dodge/Render/HUD.hs	234;"	f
+yourAugmentedItem	src/Dodge/Render/HUD.hs	237;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	27;"	f
 yourDefaultStrideLength	src/Dodge/Default/Creature.hs	110;"	f
 yourInfo	src/Dodge/Creature/Info.hs	10;"	f