justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Allow for lights to be stored in a one-frame list

Browse Source
This commit is contained in:
justin
2024-11-26 12:50:39 +00:00
parent 851fdc2410
commit e93a804559
8 changed files with 127 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Data/WorldEffect.hs
+2
View File
@@ -5,6 +5,7 @@
module Dodge.Data.WorldEffect where
import Dodge.Data.LightSource
import Dodge.Data.ComposedItem
import Dodge.Data.DoubleTree
import Data.Aeson
@@ -33,6 +34,7 @@ data WdWd
| WdWdNegateTrig Int
| WdWdFromItixCrixWdWd Int Int ItCrWdWd
| WdWdFromItCrixWdWd (LabelDoubleTree ComposeLinkType Item) Int ItCrWdWd
| MakeTempLight LSParam Int
--deriving (Eq, Show, Read) --, Generic)
--h--deriving (Eq, Show, Read) --Generic, Flat)
src/Dodge/Machine/Update.hs
+8 -6
View File
@@ -37,12 +37,14 @@ terminalScreenGlow mc w = fromMaybe w $ do
term <- w ^? cWorld . lWorld . terminals . ix tid
V4 x y z _ <- termScreenColor term
return $
w & cWorld . lWorld . tempLightSources
.:~ TLS
{ _tlsParam = LSParam (_mcPos mc `v2z` 20) 30 (V3 x y z)
, _tlsUpdate = TimerTLS
, _tlsTime = 1
}
w & cWorld . lWorld . lights
.:~ LSParam (_mcPos mc `v2z` 20) 30 (V3 x y z)
-- 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 =
src/Dodge/Render/Lights.hs
+1
View File
@@ -17,6 +17,7 @@ lightsToRender cfig campos w = take (fromEnum $ cfig ^. graphics_num_shadow_cas
sortOn (\(_,x,_) -> negate x) $
mapMaybe getLS (IM.elems $ w ^. lightSources)
++ mapMaybe getTLS (w ^. tempLightSources)
++ mapMaybe getlsparam (w ^. lights)
where
getLS = getlsparam . _lsParam
getTLS = getlsparam . _tlsParam
src/Dodge/TestString.hs
+17 -17
View File
@@ -24,23 +24,23 @@ import Dodge.Data.Universe
import qualified IntMapHelp as IM
testStringInit :: Universe -> [String]
testStringInit u =
[ show $ u ^? uvWorld . input . mouseContext . mcoSelEnd
, show $ u ^? uvWorld . hud . hudElement . diSelection
, show $ u ^? uvWorld . input . mouseContext
, show $ u ^? uvWorld . input . mouseContext . mcoDragSection
, show $ u ^? uvWorld . input . mouseContext . mcoMaybeSelect
, show $ u ^? uvWorld . input . mouseContext . mcoAboveSelect
, show $ u ^? uvWorld . input . mouseContext . mcoBelowSelect
, show mpos
, show yint
, show $ u ^? uvWorld . hud . hudElement . diSections >>= inverseSelSecYint yint
]
where
idp = invDisplayParams $ u ^. uvWorld
cfig = u ^. uvConfig
yint = posSelSecYint cfig idp y
mpos@(V2 _ y) = u ^. uvWorld . input . mousePos
testStringInit u = [show $ length <$> u ^.. uvWorld . cWorld . lWorld . lights]
-- [ show $ u ^? uvWorld . input . mouseContext . mcoSelEnd
-- , show $ u ^? uvWorld . hud . hudElement . diSelection
-- , show $ u ^? uvWorld . input . mouseContext
-- , show $ u ^? uvWorld . input . mouseContext . mcoDragSection
-- , show $ u ^? uvWorld . input . mouseContext . mcoMaybeSelect
-- , show $ u ^? uvWorld . input . mouseContext . mcoAboveSelect
-- , show $ u ^? uvWorld . input . mouseContext . mcoBelowSelect
-- , show mpos
-- , show yint
-- , show $ u ^? uvWorld . hud . hudElement . diSections >>= inverseSelSecYint yint
-- ]
-- where
-- idp = invDisplayParams $ u ^. uvWorld
-- cfig = u ^. uvConfig
-- yint = posSelSecYint cfig idp y
-- mpos@(V2 _ y) = u ^. uvWorld . input . mousePos
-- , show . fmap (fmap _siPictures) $ u ^? uvWorld . hud . hudElement . diSections . ix (-1) . ssItems
-- <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]]
-- <> map show (IM.elems (L.postscan (L.premap _siHeight L.sum)
src/Dodge/Update.hs
+2
View File
@@ -164,6 +164,7 @@ updateUniverseMid u = case _uvScreenLayers u of
(cWorld . lWorld . radarBlips .~ [])
-- . updateIMl _props _pjUpdate
. updateLightSources
. (cWorld . lWorld . lights .~ [])
. updateClouds
)
(sl : _) -> u & updateUseInputOnScreen sl
@@ -297,6 +298,7 @@ functionalUpdate u =
. over uvWorld zoneCreatures
-- . over uvWorld updateInventorySelectionList
. set (uvWorld . cWorld . lWorld . flares) []
. set (uvWorld . cWorld . lWorld . lights) []
$ over uvWorld updatePastWorlds u
checkTermDist :: World -> World
src/Dodge/WorldEffect.hs
+3
View File
@@ -45,6 +45,9 @@ doWdWd we = case we of
WdWdFromItCrixWdWd it crid f -> \w -> fromMaybe w $ do
cr <- w ^? cWorld . lWorld . creatures . ix crid
return $ doItCrWdWd f it cr w
MakeTempLight _ 0 -> id
MakeTempLight x t -> (cWorld . lWorld . lights .:~ x)
. (cWorld . lWorld . worldEvents .:~ MakeTempLight x (t-1))
doItCrWdWd :: ItCrWdWd -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
doItCrWdWd icww = case icww of
tags
+93 -90
View File
@@ -17,7 +17,7 @@
<$> src/Dodge/Data/CWorld.hs 49;" o
<$> src/Dodge/Data/Camera.hs 39;" o
<$> src/Dodge/Data/Creature.hs 108;" o
<$> src/Dodge/Data/LWorld.hs 155;" o
<$> src/Dodge/Data/LWorld.hs 156;" o
<$> src/Dodge/Data/Terminal.hs 131;" o
AIUNIT src/Dodge/Data/Item/Combine.hs 52;" C
AMMOMAG src/Dodge/Data/Item/Combine.hs 22;" C
@@ -34,7 +34,7 @@ AUTODETECTOR src/Dodge/Data/Item/Combine.hs 116;" C
AUTOPISTOL src/Dodge/Data/Item/Combine.hs 133;" C
AUTORIFLE src/Dodge/Data/Item/Combine.hs 141;" C
AZURE src/Color/Data.hs 23;" C
AccessTerminal src/Dodge/Data/WorldEffect.hs 28;" C
AccessTerminal src/Dodge/Data/WorldEffect.hs 29;" C
Action src/Dodge/Data/ActionPlan.hs 78;" t
Action src/Dodge/Creature/Action.hs 4;" m
ActionNothing src/Dodge/Data/ActionPlan.hs 83;" C
@@ -538,7 +538,7 @@ Door src/Dodge/Room/Door.hs 2;" m
DoorClosed src/Dodge/Data/Door.hs 23;" C
DoorHalfway src/Dodge/Data/Door.hs 23;" C
DoorInt src/Dodge/Data/Door.hs 23;" C
DoorMechanism src/Dodge/Data/WorldEffect.hs 70;" C
DoorMechanism src/Dodge/Data/WorldEffect.hs 72;" C
DoorObstacle src/Dodge/Data/PathGraph.hs 50;" C
DoorOpen src/Dodge/Data/Door.hs 23;" C
DoorPane src/Dodge/LevelGen/DoorPane.hs 1;" m
@@ -550,10 +550,10 @@ DoubleTree src/Dodge/Data/DoubleTree.hs 29;" t
DoubleTree src/Dodge/Data/DoubleTree.hs 5;" m
DoubleTree src/Dodge/DoubleTree.hs 1;" m
DoubleTreeNodeType src/Dodge/Data/DoubleTree.hs 14;" t
DrWdId src/Dodge/Data/WorldEffect.hs 67;" C
DrWdMakeDoorDebris src/Dodge/Data/WorldEffect.hs 68;" C
DrWdMechanismStepwise src/Dodge/Data/WorldEffect.hs 69;" C
DrWdWd src/Dodge/Data/WorldEffect.hs 66;" t
DrWdId src/Dodge/Data/WorldEffect.hs 69;" C
DrWdMakeDoorDebris src/Dodge/Data/WorldEffect.hs 70;" C
DrWdMechanismStepwise src/Dodge/Data/WorldEffect.hs 71;" C
DrWdWd src/Dodge/Data/WorldEffect.hs 68;" t
DrWdWd src/Dodge/DrWdWd.hs 1;" m
Draw src/Dodge/Beam/Draw.hs 1;" m
Draw src/Dodge/Block/Draw.hs 1;" m
@@ -926,9 +926,9 @@ InwardShockwave src/Dodge/Data/Shockwave.hs 14;" C
IsClose src/Dodge/Data/Machine/Sensor.hs 39;" C
IsolationUnitSS src/Dodge/Data/Scenario.hs 101;" C
ItAmount src/Dodge/Data/Item/Use/Consumption.hs 39;" t
ItCrWdId src/Dodge/Data/WorldEffect.hs 19;" C
ItCrWdItemEffect src/Dodge/Data/WorldEffect.hs 20;" C
ItCrWdWd src/Dodge/Data/WorldEffect.hs 18;" t
ItCrWdId src/Dodge/Data/WorldEffect.hs 20;" C
ItCrWdItemEffect src/Dodge/Data/WorldEffect.hs 21;" C
ItCrWdWd src/Dodge/Data/WorldEffect.hs 19;" t
ItDropEffect src/Dodge/Data/Item/Effect.hs 31;" t
ItEffect src/Dodge/Data/Item/Effect.hs 12;" t
ItEffect src/Dodge/ItEffect.hs 1;" m
@@ -1123,7 +1123,8 @@ Main appDodge/Main.hs 1;" m
Make src/Dodge/Corpse/Make.hs 1;" m
MakeDefaultCorpse src/Dodge/Data/Creature.hs 91;" C
MakeSound src/Dodge/Data/ActionPlan.hs 43;" C
MakeStartCloudAt src/Dodge/Data/WorldEffect.hs 31;" C
MakeStartCloudAt src/Dodge/Data/WorldEffect.hs 32;" C
MakeTempLight src/Dodge/Data/WorldEffect.hs 37;" C
ManipulatedObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 20;" t
Manipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 14;" t
Manipulator src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" C
@@ -1138,11 +1139,11 @@ McSensor src/Dodge/Data/Machine.hs 52;" C
McStatic src/Dodge/Data/Machine.hs 50;" C
McTerminal src/Dodge/Data/Machine.hs 51;" C
McTurret src/Dodge/Data/Machine.hs 53;" C
MdFlickerUpdate src/Dodge/Data/WorldEffect.hs 48;" C
MdSetLSCol src/Dodge/Data/WorldEffect.hs 47;" C
MdTrigIf src/Dodge/Data/WorldEffect.hs 46;" C
MdWdId src/Dodge/Data/WorldEffect.hs 45;" C
MdWdWd src/Dodge/Data/WorldEffect.hs 44;" t
MdFlickerUpdate src/Dodge/Data/WorldEffect.hs 50;" C
MdSetLSCol src/Dodge/Data/WorldEffect.hs 49;" C
MdTrigIf src/Dodge/Data/WorldEffect.hs 48;" C
MdWdId src/Dodge/Data/WorldEffect.hs 47;" C
MdWdWd src/Dodge/Data/WorldEffect.hs 46;" t
MedBaySS src/Dodge/Data/Scenario.hs 100;" C
Medium src/Shape/Data.hs 30;" C
Melee src/Dodge/Data/ActionPlan.hs 41;" C
@@ -1259,7 +1260,7 @@ NoRoomClipBoundaries src/Dodge/Data/Config.hs 105;" C
NoShadowFidelity src/Shape/Data.hs 25;" C
NoShadows src/Dodge/Data/Config.hs 101;" C
NoSubInventory src/Dodge/Data/HUD.hs 35;" C
NoWorldEffect src/Dodge/Data/WorldEffect.hs 24;" C
NoWorldEffect src/Dodge/Data/WorldEffect.hs 25;" C
Noclip src/Dodge/Data/Config.hs 70;" C
NodeMTree src/Dodge/Tree/Compose/Data.hs 9;" C
NodeTree src/Dodge/Tree/Compose/Data.hs 9;" C
@@ -1685,9 +1686,9 @@ SensorDoor src/Dodge/Room/SensorDoor.hs 2;" m
SentinelAI src/Dodge/Creature/SentinelAI.hs 1;" m
SentinelAt src/Dodge/Data/ActionPlan.hs 199;" C
SetCharge src/Dodge/Data/Item/Effect.hs 23;" C
SetLSCol src/Dodge/Data/WorldEffect.hs 27;" C
SetLSCol src/Dodge/Data/WorldEffect.hs 28;" C
SetTarget src/Dodge/Creature/SetTarget.hs 2;" m
SetTrigger src/Dodge/Data/WorldEffect.hs 25;" C
SetTrigger src/Dodge/Data/WorldEffect.hs 26;" C
Setup src/Framebuffer/Setup.hs 2;" m
ShadNum src/Picture/Data.hs 35;" t
Shader src/Shader/Data.hs 51;" t
@@ -1760,7 +1761,7 @@ SoundID src/Sound/Data.hs 32;" t
SoundLogic src/Dodge/SoundLogic.hs 7;" m
SoundOrigin src/Dodge/Data/SoundOrigin.hs 12;" t
SoundOrigin src/Dodge/Data/SoundOrigin.hs 6;" m
SoundStart src/Dodge/Data/WorldEffect.hs 30;" C
SoundStart src/Dodge/Data/WorldEffect.hs 31;" C
SoundStatus src/Sound/Data.hs 17;" t
South src/Dodge/Data/CardinalPoint.hs 6;" C
South8 src/Dodge/Data/CardinalPoint.hs 15;" C
@@ -1930,13 +1931,13 @@ TmTm src/Dodge/TmTm.hs 1;" m
TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 61;" C
TmTmSetPartialCommand src/Dodge/Data/Terminal.hs 63;" C
TmTmSetStatus src/Dodge/Data/Terminal.hs 62;" C
TmWdId src/Dodge/Data/WorldEffect.hs 74;" C
TmWdWd src/Dodge/Data/WorldEffect.hs 73;" t
TmWdId src/Dodge/Data/WorldEffect.hs 76;" C
TmWdWd src/Dodge/Data/WorldEffect.hs 75;" t
TmWdWd src/Dodge/TmWdWd.hs 1;" m
TmWdWdDisconnectTerminal src/Dodge/Data/WorldEffect.hs 75;" C
TmWdWdDoDeathTriggers src/Dodge/Data/WorldEffect.hs 78;" C
TmWdWdTermSound src/Dodge/Data/WorldEffect.hs 77;" C
TmWdWdfromWdWd src/Dodge/Data/WorldEffect.hs 76;" C
TmWdWdDisconnectTerminal src/Dodge/Data/WorldEffect.hs 77;" C
TmWdWdDoDeathTriggers src/Dodge/Data/WorldEffect.hs 80;" C
TmWdWdTermSound src/Dodge/Data/WorldEffect.hs 79;" C
TmWdWdfromWdWd src/Dodge/Data/WorldEffect.hs 78;" C
ToContinueStart src/Sound/Data.hs 28;" C
ToPlaySound src/Sound/Data.hs 39;" t
ToStart src/Sound/Data.hs 27;" C
@@ -1947,7 +1948,7 @@ TopDecoration src/Dodge/Placement/TopDecoration.hs 1;" m
TopEscapeMenuOption src/Dodge/Data/Universe.hs 74;" C
TopLDT src/Dodge/Data/DoubleTree.hs 44;" C
TorpedoBaySS src/Dodge/Data/Scenario.hs 99;" C
TorqueCr src/Dodge/Data/WorldEffect.hs 32;" C
TorqueCr src/Dodge/Data/WorldEffect.hs 33;" C
TorqueDamage src/Dodge/Data/Damage.hs 27;" C
TractorBeam src/Dodge/Data/TractorBeam.hs 13;" t
TractorBeam src/Dodge/Data/TractorBeam.hs 6;" m
@@ -1987,7 +1988,7 @@ UniRandFloat src/Dodge/Data/GenFloat.hs 12;" C
Unimportant src/Shape/Data.hs 37;" C
Universe src/Dodge/Data/Universe.hs 30;" t
Universe src/Dodge/Data/Universe.hs 6;" m
UnlockInv src/Dodge/Data/WorldEffect.hs 29;" C
UnlockInv src/Dodge/Data/WorldEffect.hs 30;" C
UnusedLink src/Dodge/Data/Room.hs 65;" C
Update src/Dodge/Config/Update.hs 4;" m
Update src/Dodge/Creature/Update.hs 1;" m
@@ -2079,13 +2080,13 @@ WarningCry src/Dodge/Data/ActionPlan.hs 185;" C
WasLeftForward src/Dodge/Data/Creature/Stance.hs 34;" C
WasRightForward src/Dodge/Data/Creature/Stance.hs 35;" C
WatchAndWait src/Dodge/Data/ActionPlan.hs 183;" C
WdBl src/Dodge/Data/WorldEffect.hs 51;" t
WdBlBtNotOff src/Dodge/Data/WorldEffect.hs 58;" C
WdBlBtOn src/Dodge/Data/WorldEffect.hs 57;" C
WdBlConst src/Dodge/Data/WorldEffect.hs 54;" C
WdBlCrFilterNearPoint src/Dodge/Data/WorldEffect.hs 56;" C
WdBlDoorMoving src/Dodge/Data/WorldEffect.hs 53;" C
WdBlNegate src/Dodge/Data/WorldEffect.hs 55;" C
WdBl src/Dodge/Data/WorldEffect.hs 53;" t
WdBlBtNotOff src/Dodge/Data/WorldEffect.hs 60;" C
WdBlBtOn src/Dodge/Data/WorldEffect.hs 59;" C
WdBlConst src/Dodge/Data/WorldEffect.hs 56;" C
WdBlCrFilterNearPoint src/Dodge/Data/WorldEffect.hs 58;" C
WdBlDoorMoving src/Dodge/Data/WorldEffect.hs 55;" C
WdBlNegate src/Dodge/Data/WorldEffect.hs 57;" C
WdCrBl src/Dodge/Data/CreatureEffect.hs 31;" t
WdCrBlfromCrBl src/Dodge/Data/CreatureEffect.hs 33;" C
WdCrCr src/Dodge/Data/CreatureEffect.hs 11;" t
@@ -2093,19 +2094,19 @@ WdCrLOSTarget src/Dodge/Data/CreatureEffect.hs 35;" C
WdCrNegate src/Dodge/Data/CreatureEffect.hs 34;" C
WdCrSafeDistFromTarget src/Dodge/Data/CreatureEffect.hs 36;" C
WdCrTrue src/Dodge/Data/CreatureEffect.hs 32;" C
WdP2 src/Dodge/Data/WorldEffect.hs 39;" t
WdP2 src/Dodge/Data/WorldEffect.hs 41;" t
WdP2 src/Dodge/WdP2.hs 1;" m
WdP2Const src/Dodge/Data/WorldEffect.hs 40;" C
WdP2f src/Dodge/Data/WorldEffect.hs 61;" t
WdP2Const src/Dodge/Data/WorldEffect.hs 42;" C
WdP2f src/Dodge/Data/WorldEffect.hs 63;" t
WdP2f src/Dodge/WdP2f.hs 2;" m
WdP2f0 src/Dodge/Data/WorldEffect.hs 62;" C
WdP2fDoorPosition src/Dodge/Data/WorldEffect.hs 63;" C
WdTrig src/Dodge/Data/WorldEffect.hs 52;" C
WdWd src/Dodge/Data/WorldEffect.hs 23;" t
WdWdFromItCrixWdWd src/Dodge/Data/WorldEffect.hs 35;" C
WdWdFromItixCrixWdWd src/Dodge/Data/WorldEffect.hs 34;" C
WdWdNegateTrig src/Dodge/Data/WorldEffect.hs 33;" C
WdYouPos src/Dodge/Data/WorldEffect.hs 41;" C
WdP2f0 src/Dodge/Data/WorldEffect.hs 64;" C
WdP2fDoorPosition src/Dodge/Data/WorldEffect.hs 65;" C
WdTrig src/Dodge/Data/WorldEffect.hs 54;" C
WdWd src/Dodge/Data/WorldEffect.hs 24;" t
WdWdFromItCrixWdWd src/Dodge/Data/WorldEffect.hs 36;" C
WdWdFromItixCrixWdWd src/Dodge/Data/WorldEffect.hs 35;" C
WdWdNegateTrig src/Dodge/Data/WorldEffect.hs 34;" C
WdYouPos src/Dodge/Data/WorldEffect.hs 43;" C
Weapon src/Dodge/Item/Weapon.hs 2;" m
WeaponPlatformSF src/Dodge/Data/ComposedItem.hs 30;" C
WeaponScopeLink src/Dodge/Data/ComposedItem.hs 22;" C
@@ -2127,7 +2128,7 @@ World src/Dodge/Zoning/World.hs 1;" m
WorldBool src/Dodge/WorldBool.hs 1;" m
WorldEffect src/Dodge/Data/WorldEffect.hs 6;" m
WorldEffect src/Dodge/WorldEffect.hs 1;" m
WorldEffects src/Dodge/Data/WorldEffect.hs 26;" C
WorldEffects src/Dodge/Data/WorldEffect.hs 27;" C
WorldEvent src/Dodge/WorldEvent.hs 1;" m
WorldEventFlag src/Dodge/Data/World.hs 32;" t
WorldGovernment src/Dodge/Data/Scenario.hs 52;" C
@@ -2422,7 +2423,7 @@ _diSelection src/Dodge/Data/HUD.hs 22;" f
_dimAttachPos src/Dodge/Data/Item/Misc.hs 16;" f
_dimCenter src/Dodge/Data/Item/Misc.hs 15;" f
_dimRad src/Dodge/Data/Item/Misc.hs 14;" f
_distortions src/Dodge/Data/LWorld.hs 140;" f
_distortions src/Dodge/Data/LWorld.hs 141;" f
_dmAmount src/Dodge/Data/Damage.hs 34;" f
_dmAt src/Dodge/Data/Damage.hs 36;" f
_dmEffect src/Dodge/Data/Damage.hs 38;" f
@@ -2639,9 +2640,9 @@ _izFac src/Dodge/Data/Item/Use.hs 184;" f
_izMax src/Dodge/Data/Item/Use.hs 182;" f
_izMin src/Dodge/Data/Item/Use.hs 183;" f
_killTarget src/Dodge/Data/ActionPlan.hs 198;" f
_lClock src/Dodge/Data/LWorld.hs 141;" f
_lTestInt src/Dodge/Data/LWorld.hs 143;" f
_lTestString src/Dodge/Data/LWorld.hs 142;" f
_lClock src/Dodge/Data/LWorld.hs 142;" f
_lTestInt src/Dodge/Data/LWorld.hs 144;" f
_lTestString src/Dodge/Data/LWorld.hs 143;" f
_lWorld src/Dodge/Data/CWorld.hs 26;" f
_lampColor src/Dodge/Data/Creature/Misc.hs 72;" f
_lampHeight src/Dodge/Data/Creature/Misc.hs 72;" f
@@ -2667,6 +2668,7 @@ _lightingCapShader src/Data/Preload/Render.hs 16;" f
_lightingLineShadowShader src/Data/Preload/Render.hs 15;" f
_lightingTextureShader src/Data/Preload/Render.hs 17;" f
_lightingWallShadShader src/Data/Preload/Render.hs 14;" f
_lights src/Dodge/Data/LWorld.hs 138;" f
_lightsUBO src/Data/Preload/Render.hs 40;" f
_linearShockwaves src/Dodge/Data/LWorld.hs 117;" f
_linkGapEW src/Dodge/Data/Room.hs 35;" f
@@ -2994,9 +2996,9 @@ _scrollTestInt src/Dodge/Data/Input.hs 56;" f
_scurColor src/Dodge/Data/SelectionList.hs 27;" f
_scurPos src/Dodge/Data/SelectionList.hs 25;" f
_scurSize src/Dodge/Data/SelectionList.hs 26;" f
_seenLocations src/Dodge/Data/LWorld.hs 138;" f
_seenLocations src/Dodge/Data/LWorld.hs 139;" f
_seenWalls src/Dodge/Data/CWorld.hs 29;" f
_selLocation src/Dodge/Data/LWorld.hs 139;" f
_selLocation src/Dodge/Data/LWorld.hs 140;" f
_sensAmount src/Dodge/Data/Machine/Sensor.hs 19;" f
_sensDraw src/Dodge/Data/Machine/Sensor.hs 21;" f
_sensThreshold src/Dodge/Data/Machine/Sensor.hs 22;" f
@@ -3275,7 +3277,7 @@ aSound src/Dodge/SoundLogic.hs 68;" f
aStaticBall src/Dodge/WorldEvent/SpawnParticle.hs 41;" f
aTeslaArcAt src/Dodge/Tesla/Arc.hs 20;" f
aTreeStrut src/Dodge/Tree/GenerateStructure.hs 42;" f
accessTerminal src/Dodge/WorldEffect.hs 54;" f
accessTerminal src/Dodge/WorldEffect.hs 57;" f
activeTargetCursorPic src/Dodge/Targeting/Draw.hs 24;" f
addArmour src/Dodge/Creature.hs 83;" f
addBranchAt src/Dodge/Tree/GenerateStructure.hs 18;" f
@@ -3625,7 +3627,7 @@ colCrsWalls src/Dodge/WallCreatureCollisions.hs 17;" f
colSpark src/Dodge/Spark.hs 47;" f
colSparkRandDir src/Dodge/Spark.hs 101;" f
collectDamageTypes src/Dodge/Damage.hs 32;" f
collectInvItems src/Dodge/Update/Input/InGame.hs 259;" f
collectInvItems src/Dodge/Update/Input/InGame.hs 271;" f
collideCircWalls src/Dodge/Base/Collide.hs 149;" f
collidePoint src/Dodge/Base/Collide.hs 48;" f
collidePointTestFilter src/Dodge/Base/Collide.hs 93;" f
@@ -3659,7 +3661,7 @@ composeTree src/Dodge/Tree/Compose.hs 46;" f
computerBeepingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 472;" f
conEffects src/Dodge/Concurrent.hs 13;" f
concBall src/Dodge/WorldEvent/SpawnParticle.hs 27;" f
concurrentIS src/Dodge/Update/Input/InGame.hs 251;" f
concurrentIS src/Dodge/Update/Input/InGame.hs 263;" f
connectItemS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f
connectionBlurb src/Dodge/Terminal.hs 102;" f
connectionBlurbLines src/Dodge/Terminal.hs 47;" f
@@ -3861,7 +3863,7 @@ defaultCreatureTargeting src/Dodge/Default/Creature.hs 63;" f
defaultCrystalWall src/Dodge/Default/Wall.hs 40;" f
defaultDirtBlock src/Dodge/Default/Block.hs 19;" f
defaultDirtWall src/Dodge/Default/Wall.hs 61;" f
defaultDisplayInventory src/Dodge/Default/World.hs 163;" f
defaultDisplayInventory src/Dodge/Default/World.hs 164;" f
defaultDoor src/Dodge/Default/Door.hs 29;" f
defaultDoorWall src/Dodge/Default/Wall.hs 32;" f
defaultDrawButton src/Dodge/Button/Draw.hs 28;" f
@@ -3870,7 +3872,7 @@ defaultEquipUse src/Dodge/Default/Item/Use.hs 23;" f
defaultEquipment src/Dodge/Default.hs 27;" f
defaultFlIt src/Dodge/Default.hs 30;" f
defaultForeground src/Dodge/Default/ForegroundShape.hs 5;" f
defaultHUD src/Dodge/Default/World.hs 152;" f
defaultHUD src/Dodge/Default/World.hs 153;" f
defaultHeldItem src/Dodge/Default/Item.hs 24;" f
defaultHeldUse src/Dodge/Default/Item/Use.hs 28;" f
defaultImpulsive src/Dodge/Humanoid.hs 190;" f
@@ -3959,7 +3961,7 @@ divideLineOddNumPoints src/Geometry.hs 264;" f
doAfterPlacement src/Dodge/Layout.hs 86;" f
doAfterPlacements src/Dodge/Layout.hs 83;" f
doBackspace src/Dodge/Update/Input/Text.hs 31;" f
doBlBl src/Dodge/WorldEffect.hs 96;" f
doBlBl src/Dodge/WorldEffect.hs 99;" f
doBlSh src/Dodge/Block/Draw.hs 14;" f
doBounce src/Dodge/Base/Collide.hs 68;" f
doButtonEvent src/Dodge/Button/Event.hs 9;" f
@@ -3974,8 +3976,8 @@ doCrWdImp src/Dodge/CreatureEffect.hs 16;" f
doCrWdWd src/Dodge/CreatureEffect.hs 20;" f
doDamage src/Dodge/Creature/State.hs 124;" f
doDamagesFL src/Dodge/Flame.hs 58;" f
doDeathToggle src/Dodge/WorldEffect.hs 93;" f
doDeathTriggers src/Dodge/WorldEffect.hs 88;" f
doDeathToggle src/Dodge/WorldEffect.hs 96;" f
doDeathTriggers src/Dodge/WorldEffect.hs 91;" f
doDrWdWd src/Dodge/DrWdWd.hs 16;" f
doDrawing src/Dodge/Render.hs 35;" f
doDrawing' src/Dodge/Render.hs 46;" f
@@ -3986,7 +3988,7 @@ doIndividualPlacements src/Dodge/Layout.hs 117;" f
doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 26;" f
doIntImp src/Dodge/CreatureEffect.hs 24;" f
doInvEffect src/Dodge/ItEffect.hs 10;" f
doItCrWdWd src/Dodge/WorldEffect.hs 49;" f
doItCrWdWd src/Dodge/WorldEffect.hs 52;" f
doItemTimeScroll src/Dodge/Update.hs 199;" f
doLoop src/Loop.hs 60;" f
doMCrAc src/Dodge/CreatureEffect.hs 57;" f
@@ -4004,7 +4006,7 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" 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 398;" f
doRegexInput src/Dodge/Update/Input/InGame.hs 410;" f
doRoomInPlacements src/Dodge/Layout.hs 97;" f
doRoomOutPlacements src/Dodge/Layout.hs 107;" f
doRoomPlacements src/Dodge/Layout.hs 122;" f
@@ -4014,7 +4016,7 @@ doSectionSize src/Dodge/DisplayInventory.hs 233;" f
doSideEffects appDodge/Main.hs 118;" f
doStep src/Dodge/ArcStep.hs 9;" f
doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f
doTerminalBootProgram src/Dodge/WorldEffect.hs 102;" f
doTerminalBootProgram src/Dodge/WorldEffect.hs 105;" f
doTerminalCommandEffect src/Dodge/Terminal.hs 135;" f
doTestDrawing src/Dodge/Render.hs 42;" f
doTextInputOver src/Dodge/Update/Input/Text.hs 15;" f
@@ -4022,7 +4024,7 @@ doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f
doThrust src/Dodge/Projectile/Update.hs 74;" f
doTimeScroll src/Dodge/Update.hs 204;" f
doTmTm src/Dodge/TmTm.hs 6;" f
doTmWdWd src/Dodge/WorldEffect.hs 107;" f
doTmWdWd src/Dodge/WorldEffect.hs 110;" f
doWallRotate src/Dodge/Update/Camera.hs 188;" f
doWdBl src/Dodge/WorldBool.hs 10;" f
doWdCrBl src/Dodge/CreatureEffect.hs 37;" f
@@ -4190,7 +4192,8 @@ encircle src/Dodge/Creature/Boid.hs 115;" f
encircleCloseP src/Dodge/Creature/Boid.hs 35;" f
encircleDistP src/Dodge/Creature/Boid.hs 21;" f
encircleP src/Dodge/Creature/Boid.hs 27;" f
endRegex src/Dodge/Update/Input/InGame.hs 224;" f
endCombineRegex src/Dodge/Update/Input/InGame.hs 236;" f
endRegex src/Dodge/Update/Input/InGame.hs 225;" f
enterCombineInv src/Dodge/DisplayInventory.hs 343;" f
eqConstr src/SameConstr.hs 17;" f
eqPosText src/Dodge/Equipment/Text.hs 6;" f
@@ -4706,7 +4709,7 @@ lineCol src/Picture/Base.hs 230;" f
lineGeom src/Dodge/Base.hs 39;" f
lineOnScreenCone src/Dodge/Debug/Picture.hs 60;" f
lineOrth src/Dodge/Creature/Boid.hs 125;" f
lineOutputTerminal src/Dodge/WorldEffect.hs 76;" f
lineOutputTerminal src/Dodge/WorldEffect.hs 79;" f
lineSplit src/Justify.hs 26;" f
lineThick src/Picture/Base.hs 234;" f
lineUp src/Dodge/Creature/Boid.hs 147;" f
@@ -4851,7 +4854,7 @@ maybeClearPath src/Dodge/Block.hs 77;" f
maybeClearPaths src/Dodge/Block.hs 74;" f
maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f
maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f
maybeExitCombine src/Dodge/Update/Input/InGame.hs 575;" f
maybeExitCombine src/Dodge/Update/Input/InGame.hs 587;" f
maybeOpenTerminal src/Dodge/Update.hs 124;" f
maybeReadFile src/Dodge/LoadSeed.hs 10;" f
maybeTakeOne src/RandomHelp.hs 111;" f
@@ -5075,7 +5078,7 @@ parseNum src/Dodge/Debug/Terminal.hs 73;" 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 495;" f
pauseGame src/Dodge/Update/Input/InGame.hs 507;" f
pauseMenu src/Dodge/Menu.hs 53;" f
pauseMenuOptions src/Dodge/Menu.hs 58;" f
pauseSound src/Dodge/SoundLogic.hs 41;" f
@@ -5534,7 +5537,7 @@ sectionsSizes src/Dodge/DisplayInventory.hs 222;" f
seedStartMenu src/Dodge/Menu.hs 79;" f
seedStartOptions src/Dodge/Menu.hs 82;" f
segOnCirc src/Geometry.hs 116;" f
selCloseObj src/Dodge/Update/Input/InGame.hs 518;" f
selCloseObj src/Dodge/Update/Input/InGame.hs 530;" f
selNumPos src/Dodge/Render/HUD.hs 446;" f
selNumPosCardinal src/Dodge/Render/HUD.hs 469;" f
selSecDrawCursor src/Dodge/Render/List.hs 130;" f
@@ -5579,7 +5582,7 @@ 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 292;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 294;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 306;" f
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 85;" f
setShaderSource src/Shader/Compile.hs 290;" f
setShadowLimits src/Dodge/Shadows.hs 11;" f
@@ -5630,9 +5633,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f
shiftDraw src/Dodge/Render/ShapePicture.hs 66;" f
shiftDraw' src/Dodge/Render/ShapePicture.hs 72;" f
shiftInBy src/Dodge/PlacementSpot.hs 236;" f
shiftInvItems src/Dodge/Update/Input/InGame.hs 269;" f
shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 307;" f
shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 301;" f
shiftInvItems src/Dodge/Update/Input/InGame.hs 281;" f
shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 319;" f
shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 313;" 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
@@ -5731,7 +5734,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f
soundWithStatus src/Dodge/SoundLogic.hs 98;" f
soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f
southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f
spaceAction src/Dodge/Update/Input/InGame.hs 498;" f
spaceAction src/Dodge/Update/Input/InGame.hs 510;" f
spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 186;" f
spanColLightI src/Dodge/Placement/Instance/LightSource.hs 179;" f
spanLS src/Dodge/Placement/Instance/LightSource.hs 171;" f
@@ -5787,7 +5790,7 @@ stackText src/Picture/Base.hs 188;" f
stackedInventory src/Dodge/Creature.hs 281;" f
startCr src/Dodge/Creature.hs 91;" f
startCrafts src/Dodge/Room/Start.hs 92;" f
startDrag src/Dodge/Update/Input/InGame.hs 235;" f
startDrag src/Dodge/Update/Input/InGame.hs 247;" f
startInvList src/Dodge/Creature.hs 109;" f
startInventory src/Dodge/Creature.hs 112;" f
startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f
@@ -5927,8 +5930,8 @@ toggleCombineInv src/Dodge/DisplayInventory.hs 35;" f
toggleCommand src/Dodge/Terminal.hs 196;" f
toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 79;" f
toggleJust src/MaybeHelp.hs 41;" f
toggleMap src/Dodge/Update/Input/InGame.hs 539;" f
toggleTweakInv src/Dodge/Update/Input/InGame.hs 552;" f
toggleMap src/Dodge/Update/Input/InGame.hs 551;" f
toggleTweakInv src/Dodge/Update/Input/InGame.hs 564;" f
togglesToEffects src/Dodge/Terminal.hs 248;" f
tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f
tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f
@@ -5939,7 +5942,7 @@ topPrismIndices src/Shader/Poke.hs 402;" f
topTestPart src/Dodge/TestString.hs 60;" f
torch src/Dodge/Item/Held/Utility.hs 26;" f
torchShape src/Dodge/Item/Draw/SPic.hs 213;" f
torqueCr src/Dodge/WorldEffect.hs 69;" f
torqueCr src/Dodge/WorldEffect.hs 72;" f
torso src/Dodge/Creature/Picture.hs 103;" f
tractCr src/Dodge/TractorBeam/Update.hs 28;" f
tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f
@@ -5999,7 +6002,7 @@ trunkDepth src/TreeHelp.hs 161;" f
tryAssignHotkey src/Dodge/Creature/YourControl.hs 85;" f
tryAttachBulletBelt src/Dodge/Euse.hs 40;" f
tryChargeBattery src/Dodge/Euse.hs 43;" f
tryCombine src/Dodge/Update/Input/InGame.hs 561;" f
tryCombine src/Dodge/Update/Input/InGame.hs 573;" f
tryDropSelected src/Dodge/Update/Input/InGame.hs 104;" f
tryGetChannel src/Sound.hs 96;" f
tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f
@@ -6048,7 +6051,7 @@ updateAllNodes src/TreeHelp.hs 85;" f
updateArc src/Dodge/Tesla/Arc.hs 86;" f
updateAttachedItems src/Dodge/Creature/State.hs 173;" f
updateAutoRecharge src/Dodge/Creature/State.hs 324;" f
updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 433;" f
updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 445;" f
updateBarrel src/Dodge/Barreloid.hs 45;" f
updateBarreloid src/Dodge/Barreloid.hs 13;" f
updateBounds src/Dodge/Update/Camera.hs 245;" f
@@ -6071,35 +6074,35 @@ updateDistortion src/Dodge/Distortion.hs 5;" f
updateDistortions src/Dodge/Update.hs 529;" f
updateEnergyBall src/Dodge/EnergyBall.hs 46;" f
updateEnergyBalls src/Dodge/Update.hs 556;" f
updateEnterRegex src/Dodge/Update/Input/InGame.hs 474;" f
updateEnterRegex src/Dodge/Update/Input/InGame.hs 486;" f
updateExpBarrel src/Dodge/Barreloid.hs 19;" f
updateFBOTO src/Framebuffer/Update.hs 97;" f
updateFBOTO3 src/Framebuffer/Update.hs 131;" f
updateFlame src/Dodge/Flame.hs 71;" f
updateFlames src/Dodge/Update.hs 553;" f
updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f
updateFunctionKey src/Dodge/Update/Input/InGame.hs 324;" f
updateFunctionKeys src/Dodge/Update/Input/InGame.hs 317;" f
updateFunctionKey src/Dodge/Update/Input/InGame.hs 336;" f
updateFunctionKeys src/Dodge/Update/Input/InGame.hs 329;" f
updateGusts src/Dodge/Update.hs 707;" f
updateHeldRootItem src/Dodge/Creature/State.hs 167;" f
updateHumanoid src/Dodge/Humanoid.hs 12;" f
updateIMl src/Dodge/Update.hs 498;" f
updateIMl' src/Dodge/Update.hs 503;" f
updateInGameCamera src/Dodge/Update/Camera.hs 70;" f
updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 377;" f
updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 389;" f
updateInstantBullets src/Dodge/Update.hs 645;" f
updateInv src/Dodge/Creature/State.hs 152;" f
updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f
updateItemTargeting src/Dodge/Creature/State.hs 268;" f
updateItemWithOrientation src/Dodge/Creature/State.hs 194;" f
updateKeyInGame src/Dodge/Update/Input/InGame.hs 371;" f
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 359;" f
updateKeyInGame src/Dodge/Update/Input/InGame.hs 383;" f
updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 371;" f
updateLampoid src/Dodge/Lampoid.hs 12;" f
updateLaser src/Dodge/Laser/Update.hs 13;" f
updateLasers src/Dodge/Update.hs 427;" f
updateLightSources src/Dodge/Update.hs 532;" f
updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f
updateLongPressInGame src/Dodge/Update/Input/InGame.hs 392;" f
updateLongPressInGame src/Dodge/Update/Input/InGame.hs 404;" f
updateMIM src/Dodge/Update.hs 658;" f
updateMachine src/Dodge/Machine/Update.hs 19;" f
updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 165;" f
@@ -6115,8 +6118,8 @@ updatePastWorlds src/Dodge/Update.hs 415;" f
updatePosEvent src/Dodge/PosEvent.hs 11;" f
updatePosEvents src/Dodge/Update.hs 565;" f
updatePreload src/Preload/Update.hs 20;" f
updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 334;" f
updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 337;" f
updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 346;" f
updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 349;" f
updateProjectile src/Dodge/Projectile/Update.hs 23;" f
updateProp src/Dodge/Prop/Update.hs 11;" f
updateRBList src/Dodge/Inventory/RBList.hs 16;" f