From efcd3bd84a55c24744835c0510a03ac87d1f890b Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 7 Nov 2024 19:17:38 +0000 Subject: [PATCH] Add terminal temporary screen light --- ghcidOutput | 2 +- src/Dodge/Machine/Update.hs | 15 +++- tags | 161 ++++++++++++++++++------------------ 3 files changed, 97 insertions(+), 81 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index ebefc98d8..78bb7f3e4 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 18:49:20) +All good (594 modules, at 19:17:30) diff --git a/src/Dodge/Machine/Update.hs b/src/Dodge/Machine/Update.hs index dfa5e4d40..520d20049 100644 --- a/src/Dodge/Machine/Update.hs +++ b/src/Dodge/Machine/Update.hs @@ -24,10 +24,23 @@ updateMachine mc mcTypeUpdate :: Machine -> World -> World mcTypeUpdate mc = case mc ^. mcType of McStatic -> id - McTerminal -> id + McTerminal -> terminalScreenGlow mc McTurret tu -> updateTurret (_tuTurnSpeed tu) mc McSensor se -> mcSensorTriggerUpdate se mc . mcSensorUpdate se mc +terminalScreenGlow :: Machine -> World -> World +terminalScreenGlow mc w = fromMaybe w $ do + tid <- mc ^? mcMounts . ix ObTerminal + term <- w ^? cWorld . lWorld . terminals . ix tid + guard (_tmStatus term /= TerminalOff) + let V4 x y z _ = _tmScreenColor term + return $ w & cWorld . lWorld . tempLightSources .:~ TLS + { _tlsParam = LSParam (_mcPos mc `v2z` 20) 30 (V3 x y z) + , _tlsUpdate = TimerTLS + , _tlsTime = 1 + } + + updateTurret :: Float -> Machine -> World -> World updateTurret rotSpeed mc w = w diff --git a/tags b/tags index c0524d043..58d812ee1 100644 --- a/tags +++ b/tags @@ -18,7 +18,7 @@ <$> src/Dodge/Data/Camera.hs 39;" o <$> src/Dodge/Data/Creature.hs 108;" o <$> src/Dodge/Data/LWorld.hs 155;" o -<$> src/Dodge/Data/Terminal.hs 132;" o +<$> src/Dodge/Data/Terminal.hs 133;" o AIUNIT src/Dodge/Data/Item/Combine.hs 52;" C AMMOMAG src/Dodge/Data/Item/Combine.hs 22;" C AMR src/Dodge/Data/Item/Combine.hs 145;" C @@ -162,10 +162,10 @@ BezierTrajectory src/Dodge/Data/Bullet.hs 52;" C BezierTrajectoryType src/Dodge/Data/Bullet.hs 59;" C Bind src/Shader/Bind.hs 1;" m Biome src/Dodge/Data/Scenario.hs 71;" t -BlBl src/Dodge/Data/Terminal.hs 89;" t -BlConst src/Dodge/Data/Terminal.hs 91;" C -BlId src/Dodge/Data/Terminal.hs 92;" C -BlNegate src/Dodge/Data/Terminal.hs 90;" C +BlBl src/Dodge/Data/Terminal.hs 90;" t +BlConst src/Dodge/Data/Terminal.hs 92;" C +BlId src/Dodge/Data/Terminal.hs 93;" C +BlNegate src/Dodge/Data/Terminal.hs 91;" C BlSh src/Dodge/Data/Block.hs 45;" t BlShConst src/Dodge/Data/Block.hs 47;" C BlShMempty src/Dodge/Data/Block.hs 46;" C @@ -500,7 +500,7 @@ DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 48;" C DefaultHeldParams src/Dodge/Data/Item/Use.hs 81;" C DefaultLightSourceDraw src/Dodge/Data/LightSource.hs 13;" C DefaultRoomType src/Dodge/Data/Room.hs 31;" C -DefaultTerminal src/Dodge/Data/Terminal.hs 55;" C +DefaultTerminal src/Dodge/Data/Terminal.hs 56;" C Delete src/Dodge/Wall/Delete.hs 1;" m Deprecated src/Dodge/LevelGen/StaticWalls/Deprecated.hs 1;" m Destroy src/Dodge/Machine/Destroy.hs 1;" m @@ -621,7 +621,7 @@ East8 src/Dodge/Data/CardinalPoint.hs 13;" C EdgeObstacle src/Dodge/Data/PathGraph.hs 48;" t Effect src/Dodge/Data/Item/Effect.hs 6;" m Effect src/Dodge/Default/Item/Effect.hs 1;" m -EffectArguments src/Dodge/Data/Terminal.hs 95;" t +EffectArguments src/Dodge/Data/Terminal.hs 96;" t EffectRootNotroot src/Dodge/Data/Item/Effect.hs 24;" C EffectWhileAttached src/Dodge/Data/Item/Effect.hs 28;" C EffectWhileRoot src/Dodge/Data/Item/Effect.hs 27;" C @@ -1241,7 +1241,7 @@ NewSideEffect src/Dodge/Data/Universe.hs 61;" C NextArcStep src/Dodge/Data/ArcStep.hs 21;" t Ngon src/Dodge/Room/Ngon.hs 1;" m NoAction src/Dodge/Data/ActionPlan.hs 152;" C -NoArguments src/Dodge/Data/Terminal.hs 96;" C +NoArguments src/Dodge/Data/Terminal.hs 97;" C NoBeamCombine src/Dodge/Data/Beam.hs 43;" C NoConcurrentEffect src/Loop/Data.hs 7;" C NoCrImp src/Dodge/Data/CreatureEffect.hs 24;" C @@ -1334,7 +1334,7 @@ OnRightWrist src/Dodge/Data/Equipment/Misc.hs 25;" C OnSpecial src/Dodge/Data/Equipment/Misc.hs 27;" C OnTurret src/Dodge/Data/Item/Location.hs 35;" C OnceSound src/Dodge/Data/SoundOrigin.hs 16;" C -OneArgument src/Dodge/Data/Terminal.hs 97;" C +OneArgument src/Dodge/Data/Terminal.hs 98;" C OneHand src/Dodge/Data/Item/Use.hs 178;" C OnwardCluster src/Dodge/Data/RoomCluster.hs 14;" C OnwardList src/Dodge/Annotation/Data.hs 15;" C @@ -1875,31 +1875,31 @@ TerminalBootLines src/Dodge/Data/Terminal.hs 28;" C TerminalBootMempty src/Dodge/Data/Terminal.hs 27;" C TerminalBootProgram src/Dodge/Data/Terminal.hs 26;" t TerminalBusy src/Dodge/Data/Terminal.hs 15;" C -TerminalCommand src/Dodge/Data/Terminal.hs 117;" t -TerminalCommandArguments src/Dodge/Data/Terminal.hs 105;" C -TerminalCommandEffect src/Dodge/Data/Terminal.hs 104;" t +TerminalCommand src/Dodge/Data/Terminal.hs 118;" t +TerminalCommandArguments src/Dodge/Data/Terminal.hs 106;" C +TerminalCommandEffect src/Dodge/Data/Terminal.hs 105;" t TerminalCommandEffect src/Dodge/TerminalCommandEffect.hs 1;" m -TerminalCommandEffectCommands src/Dodge/Data/Terminal.hs 111;" C -TerminalCommandEffectDamageCoding src/Dodge/Data/Terminal.hs 106;" C -TerminalCommandEffectHelp src/Dodge/Data/Terminal.hs 109;" C -TerminalCommandEffectLinkedObject src/Dodge/Data/Terminal.hs 108;" C -TerminalCommandEffectNoArgumentsStr src/Dodge/Data/Terminal.hs 110;" C -TerminalCommandEffectNone src/Dodge/Data/Terminal.hs 113;" C -TerminalCommandEffectSensorParameter src/Dodge/Data/Terminal.hs 107;" C -TerminalCommandEffectSingleCommand src/Dodge/Data/Terminal.hs 112;" C +TerminalCommandEffectCommands src/Dodge/Data/Terminal.hs 112;" C +TerminalCommandEffectDamageCoding src/Dodge/Data/Terminal.hs 107;" C +TerminalCommandEffectHelp src/Dodge/Data/Terminal.hs 110;" C +TerminalCommandEffectLinkedObject src/Dodge/Data/Terminal.hs 109;" C +TerminalCommandEffectNoArgumentsStr src/Dodge/Data/Terminal.hs 111;" C +TerminalCommandEffectNone src/Dodge/Data/Terminal.hs 114;" C +TerminalCommandEffectSensorParameter src/Dodge/Data/Terminal.hs 108;" C +TerminalCommandEffectSingleCommand src/Dodge/Data/Terminal.hs 113;" C TerminalInput src/Dodge/Data/Terminal.hs 19;" t -TerminalLine src/Dodge/Data/Terminal.hs 67;" t -TerminalLineConst src/Dodge/Data/Terminal.hs 57;" C -TerminalLineDisplay src/Dodge/Data/Terminal.hs 68;" C -TerminalLineEffect src/Dodge/Data/Terminal.hs 76;" C -TerminalLineString src/Dodge/Data/Terminal.hs 57;" t -TerminalLineTerminalEffect src/Dodge/Data/Terminal.hs 72;" C +TerminalLine src/Dodge/Data/Terminal.hs 68;" t +TerminalLineConst src/Dodge/Data/Terminal.hs 58;" C +TerminalLineDisplay src/Dodge/Data/Terminal.hs 69;" C +TerminalLineEffect src/Dodge/Data/Terminal.hs 77;" C +TerminalLineString src/Dodge/Data/Terminal.hs 58;" t +TerminalLineTerminalEffect src/Dodge/Data/Terminal.hs 73;" C TerminalOff src/Dodge/Data/Terminal.hs 15;" C TerminalReady src/Dodge/Data/Terminal.hs 15;" C TerminalSound src/Dodge/Data/SoundOrigin.hs 23;" C TerminalStatus src/Dodge/Data/Terminal.hs 15;" t -TerminalToggle src/Dodge/Data/Terminal.hs 83;" t -TerminalType src/Dodge/Data/Terminal.hs 55;" t +TerminalToggle src/Dodge/Data/Terminal.hs 84;" t +TerminalType src/Dodge/Data/Terminal.hs 56;" t Terrestrial src/Dodge/Data/Scenario.hs 72;" C TerrestrialBiome src/Dodge/Data/Scenario.hs 76;" t Tesla src/Dodge/Tesla.hs 1;" m @@ -1928,12 +1928,12 @@ TimeFlowStatus src/Dodge/Data/World.hs 58;" t TimePU src/Dodge/Data/Item/Use/Consumption/Ammo.hs 35;" C TimerTLS src/Dodge/Data/LightSource.hs 23;" C Tiny src/Shape/Data.hs 32;" C -TmId src/Dodge/Data/Terminal.hs 61;" C -TmTm src/Dodge/Data/Terminal.hs 60;" t +TmId src/Dodge/Data/Terminal.hs 62;" C +TmTm src/Dodge/Data/Terminal.hs 61;" t TmTm src/Dodge/TmTm.hs 1;" m -TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 62;" C -TmTmSetPartialCommand src/Dodge/Data/Terminal.hs 64;" C -TmTmSetStatus src/Dodge/Data/Terminal.hs 63;" C +TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 63;" C +TmTmSetPartialCommand src/Dodge/Data/Terminal.hs 65;" C +TmTmSetStatus src/Dodge/Data/Terminal.hs 64;" C TmWdId src/Dodge/Data/WorldEffect.hs 74;" C TmWdWd src/Dodge/Data/WorldEffect.hs 73;" t TmWdWd src/Dodge/TmWdWd.hs 1;" m @@ -2190,8 +2190,8 @@ _arTime src/Dodge/Data/Item/Use/Consumption.hs 30;" f _arbitraryAction src/Dodge/Data/ActionPlan.hs 167;" f _arcNumber src/Dodge/Data/Item/Params.hs 24;" f _arcSize src/Dodge/Data/Item/Params.hs 23;" f -_argList src/Dodge/Data/Terminal.hs 99;" f -_argType src/Dodge/Data/Terminal.hs 98;" f +_argList src/Dodge/Data/Terminal.hs 100;" f +_argType src/Dodge/Data/Terminal.hs 99;" f _asDir src/Dodge/Data/ArcStep.hs 16;" f _asObject src/Dodge/Data/ArcStep.hs 17;" f _asPos src/Dodge/Data/ArcStep.hs 15;" f @@ -2319,7 +2319,7 @@ _cloudEBO src/Data/Preload/Render.hs 49;" f _cloudShader src/Data/Preload/Render.hs 48;" f _cloudVBO src/Data/Preload/Render.hs 47;" f _clouds src/Dodge/Data/LWorld.hs 100;" f -_cmdEffect src/Dodge/Data/Terminal.hs 96;" f +_cmdEffect src/Dodge/Data/Terminal.hs 97;" f _cmeRecoil src/Dodge/Data/MuzzleEffect.hs 12;" f _cmeSound src/Dodge/Data/MuzzleEffect.hs 14;" f _cmeTorque src/Dodge/Data/MuzzleEffect.hs 13;" f @@ -3099,10 +3099,10 @@ _tbPos src/Dodge/Data/TractorBeam.hs 14;" f _tbStartPos src/Dodge/Data/TractorBeam.hs 15;" f _tbTime src/Dodge/Data/TractorBeam.hs 17;" f _tbVel src/Dodge/Data/TractorBeam.hs 16;" f -_tcAlias src/Dodge/Data/Terminal.hs 119;" f -_tcEffect src/Dodge/Data/Terminal.hs 121;" f -_tcHelp src/Dodge/Data/Terminal.hs 120;" f -_tcString src/Dodge/Data/Terminal.hs 118;" f +_tcAlias src/Dodge/Data/Terminal.hs 120;" f +_tcEffect src/Dodge/Data/Terminal.hs 122;" f +_tcHelp src/Dodge/Data/Terminal.hs 121;" f +_tcString src/Dodge/Data/Terminal.hs 119;" f _tempLightSources src/Dodge/Data/LWorld.hs 137;" f _termID src/Dodge/Data/HUD.hs 46;" f _terminals src/Dodge/Data/LWorld.hs 123;" f @@ -3120,33 +3120,34 @@ _tileZero src/Data/Tile.hs 16;" f _tiles src/Data/Tile.hs 13;" f _timeFlow src/Dodge/Data/World.hs 40;" f _timeFlowCharge src/Dodge/Data/World.hs 78;" f -_tlEffect src/Dodge/Data/Terminal.hs 78;" f -_tlPause src/Dodge/Data/Terminal.hs 69;" f -_tlPause src/Dodge/Data/Terminal.hs 73;" f -_tlPause src/Dodge/Data/Terminal.hs 77;" f -_tlString src/Dodge/Data/Terminal.hs 70;" f -_tlTermEffect src/Dodge/Data/Terminal.hs 74;" f +_tlEffect src/Dodge/Data/Terminal.hs 79;" f +_tlPause src/Dodge/Data/Terminal.hs 70;" f +_tlPause src/Dodge/Data/Terminal.hs 74;" f +_tlPause src/Dodge/Data/Terminal.hs 78;" f +_tlString src/Dodge/Data/Terminal.hs 71;" f +_tlTermEffect src/Dodge/Data/Terminal.hs 75;" f _tlsParam src/Dodge/Data/LightSource.hs 43;" f _tlsTime src/Dodge/Data/LightSource.hs 45;" f _tlsUpdate src/Dodge/Data/LightSource.hs 44;" f _tmBootProgram src/Dodge/Data/Terminal.hs 34;" f _tmButtonID src/Dodge/Data/Terminal.hs 35;" f -_tmCommandHistory src/Dodge/Data/Terminal.hs 47;" f -_tmDeathEffect src/Dodge/Data/Terminal.hs 45;" f -_tmDisplayedLines src/Dodge/Data/Terminal.hs 39;" f +_tmCommandHistory src/Dodge/Data/Terminal.hs 48;" f +_tmDeathEffect src/Dodge/Data/Terminal.hs 46;" f +_tmDisplayedLines src/Dodge/Data/Terminal.hs 40;" f _tmExternalColor src/Dodge/Data/Terminal.hs 38;" f -_tmFutureLines src/Dodge/Data/Terminal.hs 40;" f +_tmFutureLines src/Dodge/Data/Terminal.hs 41;" f _tmID src/Dodge/Data/Terminal.hs 33;" f -_tmInput src/Dodge/Data/Terminal.hs 42;" f +_tmInput src/Dodge/Data/Terminal.hs 43;" f _tmMachineID src/Dodge/Data/Terminal.hs 36;" f _tmName src/Dodge/Data/Terminal.hs 37;" f -_tmPartialCommand src/Dodge/Data/Terminal.hs 49;" f -_tmScrollCommands src/Dodge/Data/Terminal.hs 43;" f -_tmStatus src/Dodge/Data/Terminal.hs 46;" f -_tmTitle src/Dodge/Data/Terminal.hs 41;" f -_tmToggles src/Dodge/Data/Terminal.hs 48;" f -_tmType src/Dodge/Data/Terminal.hs 50;" f -_tmWriteCommands src/Dodge/Data/Terminal.hs 44;" f +_tmPartialCommand src/Dodge/Data/Terminal.hs 50;" f +_tmScreenColor src/Dodge/Data/Terminal.hs 39;" f +_tmScrollCommands src/Dodge/Data/Terminal.hs 44;" f +_tmStatus src/Dodge/Data/Terminal.hs 47;" f +_tmTitle src/Dodge/Data/Terminal.hs 42;" f +_tmToggles src/Dodge/Data/Terminal.hs 49;" f +_tmType src/Dodge/Data/Terminal.hs 51;" f +_tmWriteCommands src/Dodge/Data/Terminal.hs 45;" f _toPlaySoundChunkID src/Sound/Data.hs 45;" f _toPlaySoundPos src/Sound/Data.hs 42;" f _toPlaySoundStatus src/Sound/Data.hs 41;" f @@ -3163,8 +3164,8 @@ _trieMVal src/SimpleTrie.hs 10;" f _triggers src/Dodge/Data/LWorld.hs 127;" f _tryLeftLink src/Dodge/Data/ComposedItem.hs 58;" f _tryRightLink src/Dodge/Data/ComposedItem.hs 59;" f -_ttDeathEffect src/Dodge/Data/Terminal.hs 85;" f -_ttTriggerID src/Dodge/Data/Terminal.hs 84;" f +_ttDeathEffect src/Dodge/Data/Terminal.hs 86;" f +_ttTriggerID src/Dodge/Data/Terminal.hs 85;" f _tuDir src/Dodge/Data/Machine.hs 61;" f _tuFireTime src/Dodge/Data/Machine.hs 60;" f _tuTurnSpeed src/Dodge/Data/Machine.hs 59;" f @@ -3804,7 +3805,7 @@ damageSensor src/Dodge/Placement/Instance/Sensor.hs 15;" f damageStone src/Dodge/Material/Damage.hs 20;" f damageThingHit src/Dodge/Bullet.hs 176;" f damageTypeThreshold src/Dodge/Placement/Instance/Sensor.hs 45;" f -damageUsing src/Dodge/Machine/Update.hs 151;" f +damageUsing src/Dodge/Machine/Update.hs 163;" f damageWall src/Dodge/Wall/Damage.hs 15;" f damageWallEffect src/Dodge/Wall/DamageEffect.hs 11;" f damageWlCircle src/Dodge/DamageCircle.hs 26;" f @@ -3923,7 +3924,7 @@ defaultState src/Dodge/Default/Creature.hs 140;" f defaultSwitchWall src/Dodge/Default/Door.hs 22;" f defaultTLS src/Dodge/Default/LightSource.hs 20;" f defaultTerminal src/Dodge/Default/Terminal.hs 9;" f -defaultTerminalInput src/Dodge/Default/Terminal.hs 32;" f +defaultTerminalInput src/Dodge/Default/Terminal.hs 33;" f defaultVision src/Dodge/Default/Creature.hs 92;" f defaultWall src/Dodge/Default/Wall.hs 10;" f defaultWindow src/Dodge/Default/Wall.hs 74;" f @@ -4072,7 +4073,7 @@ doubleTreeToIndentList src/Dodge/DoubleTree.hs 72;" f doubleV2 src/Geometry.hs 156;" f drawAllShadows src/Dodge/Shadows.hs 5;" f drawAugmentedHUD src/Dodge/Creature/State.hs 210;" f -drawBaseMachine src/Dodge/Machine/Draw.hs 52;" f +drawBaseMachine src/Dodge/Machine/Draw.hs 60;" f drawBeam src/Dodge/Beam/Draw.hs 6;" f drawBlip src/Dodge/RadarBlip.hs 13;" f drawBlock src/Dodge/Block/Draw.hs 7;" f @@ -4124,7 +4125,7 @@ drawList src/Dodge/Render/List.hs 207;" f drawListElement src/Dodge/Render/List.hs 187;" f drawListYgapScaleYoff src/Dodge/Render/List.hs 94;" f drawListYoff src/Dodge/Render/List.hs 91;" f -drawMachine src/Dodge/Machine/Draw.hs 14;" f +drawMachine src/Dodge/Machine/Draw.hs 16;" f drawMapWall src/Dodge/Render/HUD/Carte.hs 33;" f drawMenuOrHUD src/Dodge/Render/Picture.hs 57;" f drawMenuScreen src/Dodge/Render/MenuScreen.hs 12;" f @@ -4151,7 +4152,7 @@ drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 41;" f drawSelectionList src/Dodge/Render/List.hs 33;" f drawSelectionListBackground src/Dodge/Render/List.hs 52;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 17;" f -drawSensor src/Dodge/Machine/Draw.hs 21;" f +drawSensor src/Dodge/Machine/Draw.hs 23;" f drawShader src/Shader.hs 27;" f drawShaderLay src/Shader.hs 16;" f drawShadowsByImportance src/Dodge/Shadows.hs 8;" f @@ -4171,7 +4172,7 @@ drawText src/Picture/Base.hs 220;" f drawTitle src/Dodge/Render/MenuScreen.hs 48;" f drawTitleBackground src/Dodge/Render/List.hs 47;" f drawTractorBeam src/Dodge/TractorBeam/Draw.hs 7;" f -drawTurret src/Dodge/Machine/Draw.hs 60;" f +drawTurret src/Dodge/Machine/Draw.hs 68;" f drawVerticalLampCover src/Dodge/Prop/Draw.hs 59;" f drawWall src/Dodge/Wall/Draw.hs 7;" f drawWallFace src/Dodge/Debug/Picture.hs 73;" f @@ -4394,6 +4395,7 @@ getRootItemBounds src/Dodge/Render/HUD.hs 98;" f getSensor src/Dodge/Terminal.hs 190;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 17;" f getSplitString src/Dodge/Debug/Terminal.hs 123;" f +getTermScreenColor src/Dodge/Machine/Draw.hs 55;" f getTiles src/Dodge/Layout.hs 208;" f getViewpoints src/Dodge/Viewpoints.hs 29;" f getWallSPic src/Dodge/Render/Walls.hs 51;" f @@ -4891,20 +4893,20 @@ maybeOpenTerminal src/Dodge/Update.hs 120;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 111;" f maybeWarmupStatus src/Dodge/Item/Display.hs 119;" f -mcApplyDamage src/Dodge/Machine/Update.hs 90;" f +mcApplyDamage src/Dodge/Machine/Update.hs 102;" f mcKillBut src/Dodge/Machine/Destroy.hs 34;" f mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f -mcPlaySound src/Dodge/Machine/Update.hs 80;" f -mcProxTest src/Dodge/Machine/Update.hs 126;" f -mcProximitySensorUpdate src/Dodge/Machine/Update.hs 104;" f +mcPlaySound src/Dodge/Machine/Update.hs 92;" f +mcProxTest src/Dodge/Machine/Update.hs 138;" f +mcProximitySensorUpdate src/Dodge/Machine/Update.hs 116;" f mcSPic src/Dodge/Render/ShapePicture.hs 131;" f -mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 69;" f -mcSensorUpdate src/Dodge/Machine/Update.hs 99;" f +mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 81;" f +mcSensorUpdate src/Dodge/Machine/Update.hs 111;" f mcShootLaser src/Dodge/HeldUse.hs 465;" f -mcTriggerVal src/Dodge/Machine/Update.hs 75;" f +mcTriggerVal src/Dodge/Machine/Update.hs 87;" f mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f mcUseHeld src/Dodge/HeldUse.hs 404;" f -mcUseItem src/Dodge/Machine/Update.hs 61;" f +mcUseItem src/Dodge/Machine/Update.hs 73;" f medkit src/Dodge/Item/Consumable.hs 8;" f megaBattery src/Dodge/Item/Ammo.hs 84;" f megaShellMag src/Dodge/Item/Ammo.hs 61;" f @@ -5588,12 +5590,12 @@ selectUse src/Dodge/SelectUse.hs 11;" f selectedCloseObject src/Dodge/Inventory.hs 287;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 63;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 69;" f -senseDamage src/Dodge/Machine/Update.hs 134;" f +senseDamage src/Dodge/Machine/Update.hs 146;" f sensorCommand src/Dodge/Terminal.hs 209;" f sensorInfoMap src/Dodge/Terminal.hs 181;" f sensorRoom src/Dodge/Room/SensorDoor.hs 27;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 48;" f -sensorSPic src/Dodge/Machine/Draw.hs 65;" f +sensorSPic src/Dodge/Machine/Draw.hs 73;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f @@ -5904,8 +5906,9 @@ termTextColor src/Dodge/Terminal.hs 115;" f termTextColor src/Dodge/Terminal/Line.hs 22;" f terminalColor src/Dodge/Placement/Instance/Terminal.hs 66;" f terminalReturnEffect src/Dodge/Terminal.hs 276;" f -terminalSPic src/Dodge/Machine/Draw.hs 26;" f -terminalShape src/Dodge/Machine/Draw.hs 29;" f +terminalSPic src/Dodge/Machine/Draw.hs 28;" f +terminalScreenGlow src/Dodge/Machine/Update.hs 31;" f +terminalShape src/Dodge/Machine/Draw.hs 31;" f terminalWheelEvent src/Dodge/Update/Scroll.hs 79;" f teslaGun src/Dodge/Item/Held/BatteryGuns.hs 21;" f teslaGunPic src/Dodge/Item/Draw/SPic.hs 348;" f @@ -6180,7 +6183,7 @@ updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f updateTeslaArcs src/Dodge/Update.hs 547;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f updateTractorBeams src/Dodge/Update.hs 550;" f -updateTurret src/Dodge/Machine/Update.hs 31;" f +updateTurret src/Dodge/Machine/Update.hs 43;" f updateUniverse src/Dodge/Update.hs 69;" f updateUniverseFirst src/Dodge/Update.hs 80;" f updateUniverseLast src/Dodge/Update.hs 130;" f