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

Fix pathing for zChasm

Browse Source
This commit is contained in:
justin
2025-10-27 19:07:04 +00:00
parent 323a50ed31
commit 7c40db7153
4 changed files with 92 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Room/Path.hs
+14 -1
View File
@@ -1,6 +1,8 @@
{-# LANGUAGE TupleSections #-} {-# LANGUAGE TupleSections #-}
module Dodge.Room.Path (linksDAGToPath) where module Dodge.Room.Path (linksDAGToPath,addNodesCrossing) where
import Linear
import Data.Maybe
import Control.Lens import Control.Lens
import Data.Function (on) import Data.Function (on)
import Data.List import Data.List
@@ -16,3 +18,14 @@ linksDAGToPath lnks xs
ys = lnks <&> _rlPos ys = lnks <&> _rlPos
subpth = foldMap doublePairSet xs subpth = foldMap doublePairSet xs
linkClosest p = doublePairSet (p, minimumBy (compare `on` dist p) $ S.map fst subpth) linkClosest p = doublePairSet (p, minimumBy (compare `on` dist p) $ S.map fst subpth)
addNodesCrossing :: (Point2,Point2) -> S.Set (Point2,Point2) -> S.Set (Point2,Point2)
addNodesCrossing (x,y) = g . foldMap f
where
g (xs,m) = h xs <> m
f (a,b) = fromMaybe (mempty,S.singleton (a,b)) $ do
i <- intersectSegSeg x y a b
return (S.singleton i, S.fromList [(a,i),(i,b)])
h is | null is = mempty
| otherwise = let js = sortOn (distance x) $ S.toList is
in S.fromList . zip js $ tail js
src/Dodge/Room/Procedural.hs
+3 -27
View File
@@ -45,17 +45,15 @@ roomRect x y xn yn =
{ _rmPolys = [rectNSWE y 0 0 x] { _rmPolys = [rectNSWE y 0 0 x]
, _rmLinks = lnks , _rmLinks = lnks
, _rmName = "rect" , _rmName = "rect"
, _rmPath = pth , _rmPath = linksDAGToPath lnks $ latticeXsYs xs ys
, _rmPos = gridRoomPos xs ys , _rmPos = gridRoomPos xs ys
-- , _rmPos = map makeonpos (grid xs ys)
-- <> map makeoffpos (grid (mids xs) (mids ys))
, _rmPmnts = [] , _rmPmnts = []
, _rmBound = [rectNSWE (y + 5) (-5) (-5) (x + 5)] , _rmBound = [rectNSWE (y + 5) (-5) (-5) (x + 5)]
, _rmFloor = , _rmFloor =
Tiled Tiled
[ Tile [ Tile
{ _tilePoly = rectNSWE y 0 0 x { _tilePoly = rectNSWE y 0 0 x
, _tileZero = V2 0 0 , _tileZero = 0
, _tileTangentPos = V2 baseFloorTileSize 0 , _tileTangentPos = V2 baseFloorTileSize 0
, _tileArrayZ = 16 , _tileArrayZ = 16
} }
@@ -76,7 +74,6 @@ roomRect x y xn yn =
ys = take (yn + 1) [0,yd..] & each +~ 20 ys = take (yn + 1) [0,yd..] & each +~ 20
yd = (y - 40) / fromIntegral yn yd = (y - 40) / fromIntegral yn
xd = (x - 40) / fromIntegral xn xd = (x - 40) / fromIntegral xn
pth = linksDAGToPath lnks $ latticeXsYs xs ys
horilnks y' a e = xs <&> \x' -> RoomLink (rlt e) (V2 x' y') a horilnks y' a e = xs <&> \x' -> RoomLink (rlt e) (V2 x' y') a
vertlnks x' a e = ys <&> \y' -> RoomLink (rlt e) (V2 x' y') a vertlnks x' a e = ys <&> \y' -> RoomLink (rlt e) (V2 x' y') a
rlt e = S.fromList [OnEdge e, InLink, OutLink] rlt e = S.fromList [OnEdge e, InLink, OutLink]
@@ -88,28 +85,7 @@ roomRect x y xn yn =
<> imap (g West) slnks <> imap (g West) slnks
<> imap (g South) elnks <> imap (g South) elnks
<> imap (g South) wlnks <> imap (g South) wlnks
g c xi ln = ln g c xi = rlType <>~ S.fromList [FromEdge c xi,FromEdge (revCard c) (xn - xi)]
& rlType <>~ S.fromList [FromEdge c xi,FromEdge (revCard c) (xn - xi)]
grid as bs = [(V2 x' y', (xi,yi)) | (x',xi) <- zip as [0..], (y',yi) <- zip bs [0..]]
makeonpos (p, a) = RoomPos p 0 (S.singleton $ RoomPosOnGrid $ makerpedges a)
(NotLink True) mempty
makerpedges (a, b) =
S.fromList
[ PathFromEdge South b
, PathFromEdge North (yn - b)
, PathFromEdge East (xn - a)
, PathFromEdge West a
]
mids zs = zipWith (\a b -> 0.5 * (a + b)) zs $ tail zs
makeoffpos (p, a) = RoomPos
p 0 (S.singleton $ RoomPosOffGrid $ makerpedges' a) (NotLink False) mempty
makerpedges' (a, b) =
S.fromList
[ PathFromEdge South b
, PathFromEdge North (yn - (b + 1))
, PathFromEdge East (xn - (a + 1))
, PathFromEdge West a
]
gridRoomPos :: [Float] -> [Float] -> [RoomPos] gridRoomPos :: [Float] -> [Float] -> [RoomPos]
gridRoomPos xs ys = map makeonpos (grid xs ys) <> map makeoffpos (grid (mids xs) (mids ys)) gridRoomPos xs ys = map makeonpos (grid xs ys) <> map makeoffpos (grid (mids xs) (mids ys))
src/Dodge/Room/Tutorial.hs
+2 -9
View File
@@ -1,6 +1,7 @@
{-# OPTIONS_GHC -Wno-unused-imports #-} {-# OPTIONS_GHC -Wno-unused-imports #-}
module Dodge.Room.Tutorial where module Dodge.Room.Tutorial where
import Dodge.Room.Path
import Dodge.Room.Pillar import Dodge.Room.Pillar
import Dodge.Room.Boss import Dodge.Room.Boss
import Dodge.Room.Tanks import Dodge.Room.Tanks
@@ -47,15 +48,6 @@ tutAnoTree = do
foldMTRS foldMTRS
[ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox [ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
, corDoor , corDoor
, tToBTree "cor" . return . cleatOnward <$> roomPillarsSquare
, corDoor
-- , return $ tToBTree "cor" $ return $ cleatOnward $ corridor & rmPmnts .~ mempty
-- , return $ tToBTree "cor" $ return $ cleatOnward $ roomGlassOctogon 200
-- , corDoor
-- , return $ tToBTree "cor" $ return $ cleatOnward (twinSlowDoorRoom 80 200 40)
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor
-- , return $ tToBTree "cor" $ return $ cleatOnward airlock0
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor
, tToBTree "cor" . return . cleatOnward <$> (zChasm 25) , tToBTree "cor" . return . cleatOnward <$> (zChasm 25)
-- , tToBTree "x" . return . cleatOnward <$> airlockSimple -- , tToBTree "x" . return . cleatOnward <$> airlockSimple
-- , tToBTree "lastun" . return . cleatOnward <$> tanksRoom [] [] -- , tToBTree "lastun" . return . cleatOnward <$> tanksRoom [] []
@@ -173,6 +165,7 @@ zChasm z = do
roomRectAutoLinks x y roomRectAutoLinks x y
<&> rmLinks %~ setOutLinks (isCornerLink NorthWest) <&> rmLinks %~ setOutLinks (isCornerLink NorthWest)
<&> rmLinks %~ setInLinks (isCornerLink SouthEast) <&> rmLinks %~ setInLinks (isCornerLink SouthEast)
<&> rmPath %~ addNodesCrossing (V2 0 (y/2),V2 x (y/2))
<&> rmPmnts <&> rmPmnts
<>~ [ sps0 $ PutChasm (rectNSWE (y / 2 - z) 0 0 (x -50)) <>~ [ sps0 $ PutChasm (rectNSWE (y / 2 - z) 0 0 (x -50))
, sps0 $ PutChasm (rectNSWE y (y / 2 + z) 50 x) , sps0 $ PutChasm (rectNSWE y (y / 2 + z) 50 x)
tags
+73 -74
View File
@@ -192,10 +192,10 @@ CamouflageStatus src/Dodge/Data/CamouflageStatus.hs 5;" t
CapacitorBelow src/Dodge/Data/Muzzle.hs 23;" C CapacitorBelow src/Dodge/Data/Muzzle.hs 23;" C
CapacitorSF src/Dodge/Data/ComposedItem.hs 42;" C CapacitorSF src/Dodge/Data/ComposedItem.hs 42;" C
CapacitorSelf src/Dodge/Data/Muzzle.hs 24;" C CapacitorSelf src/Dodge/Data/Muzzle.hs 24;" C
CardinalCover src/Dodge/Data/CardinalPoint.hs 30;" t CardinalCover src/Dodge/Data/CardinalPoint.hs 38;" t
CardinalEightPoint src/Dodge/Data/CardinalPoint.hs 19;" t CardinalEightPoint src/Dodge/Data/CardinalPoint.hs 27;" t
CardinalPoint src/Dodge/Data/CardinalPoint.hs 5;" t CardinalPoint src/Dodge/Data/CardinalPoint.hs 6;" t
CardinalPointBetween src/Dodge/Data/CardinalPoint.hs 12;" t CardinalPointBetween src/Dodge/Data/CardinalPoint.hs 20;" t
Carriage src/Dodge/Data/Creature/Stance.hs 22;" t Carriage src/Dodge/Data/Creature/Stance.hs 22;" t
ChangePosture src/Dodge/Data/ActionPlan.hs 41;" C ChangePosture src/Dodge/Data/ActionPlan.hs 41;" C
ChangeStrategy src/Dodge/Data/ActionPlan.hs 43;" C ChangeStrategy src/Dodge/Data/ActionPlan.hs 43;" C
@@ -362,8 +362,8 @@ ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 157;" C
EQUIP src/Dodge/Data/Item/Combine.hs 17;" C EQUIP src/Dodge/Data/Item/Combine.hs 17;" C
EXPLOSIVES src/Dodge/Data/Item/Combine.hs 116;" C EXPLOSIVES src/Dodge/Data/Item/Combine.hs 116;" C
Ears src/Dodge/Data/Creature/Perception.hs 45;" C Ears src/Dodge/Data/Creature/Perception.hs 45;" C
East src/Dodge/Data/CardinalPoint.hs 7;" C East src/Dodge/Data/CardinalPoint.hs 8;" C
East8 src/Dodge/Data/CardinalPoint.hs 22;" C East8 src/Dodge/Data/CardinalPoint.hs 30;" C
EdgeObstacle src/Dodge/Data/PathGraph.hs 49;" t EdgeObstacle src/Dodge/Data/PathGraph.hs 49;" t
EighthRes src/Dodge/Data/Config.hs 100;" C EighthRes src/Dodge/Data/Config.hs 100;" C
Eldritch src/Dodge/Data/Scenario.hs 34;" C Eldritch src/Dodge/Data/Scenario.hs 34;" C
@@ -795,16 +795,16 @@ NAILBOX src/Dodge/Data/Item/Combine.hs 77;" C
NInt src/NewInt.hs 16;" C NInt src/NewInt.hs 16;" C
NIntMap src/NewInt.hs 22;" C NIntMap src/NewInt.hs 22;" C
NIntSet src/NewInt.hs 19;" C NIntSet src/NewInt.hs 19;" C
NS src/Dodge/Data/CardinalPoint.hs 34;" C NS src/Dodge/Data/CardinalPoint.hs 42;" C
NSE src/Dodge/Data/CardinalPoint.hs 32;" C NSE src/Dodge/Data/CardinalPoint.hs 40;" C
NSEW src/Dodge/Data/CardinalPoint.hs 31;" C NSEW src/Dodge/Data/CardinalPoint.hs 39;" C
NSW src/Dodge/Data/CardinalPoint.hs 33;" C NSW src/Dodge/Data/CardinalPoint.hs 41;" C
NULGATE src/Dodge/Data/Item/Combine.hs 29;" C NULGATE src/Dodge/Data/Item/Combine.hs 29;" C
NearCosmicRays src/Dodge/Data/Scenario.hs 84;" C NearCosmicRays src/Dodge/Data/Scenario.hs 84;" C
NearDustBelt src/Dodge/Data/Scenario.hs 85;" C NearDustBelt src/Dodge/Data/Scenario.hs 85;" C
NearGravityFlux src/Dodge/Data/Scenario.hs 83;" C NearGravityFlux src/Dodge/Data/Scenario.hs 83;" C
NearSolar src/Dodge/Data/Scenario.hs 82;" C NearSolar src/Dodge/Data/Scenario.hs 82;" C
NegInf src/Dodge/Data/CardinalPoint.hs 36;" C NegInf src/Dodge/Data/CardinalPoint.hs 44;" C
NeverUsable src/Dodge/Data/UseCondition.hs 8;" C NeverUsable src/Dodge/Data/UseCondition.hs 8;" C
NewInt src/NewInt.hs 16;" t NewInt src/NewInt.hs 16;" t
NewIntMap src/NewInt.hs 22;" t NewIntMap src/NewInt.hs 22;" t
@@ -840,16 +840,16 @@ Noclip src/Dodge/Data/Config.hs 72;" C
NodeMTree src/Dodge/Data/MetaTree.hs 16;" C NodeMTree src/Dodge/Data/MetaTree.hs 16;" C
NodeTree src/Dodge/Data/MetaTree.hs 15;" C NodeTree src/Dodge/Data/MetaTree.hs 15;" C
NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 82;" C NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 82;" C
NonInf src/Dodge/Data/CardinalPoint.hs 36;" C NonInf src/Dodge/Data/CardinalPoint.hs 44;" C
NormalOptions src/Dodge/Data/Universe.hs 72;" C NormalOptions src/Dodge/Data/Universe.hs 72;" C
NormalSpark src/Dodge/Data/Spark.hs 19;" C NormalSpark src/Dodge/Data/Spark.hs 19;" C
NormalTimeFlow src/Dodge/Data/World.hs 63;" C NormalTimeFlow src/Dodge/Data/World.hs 63;" C
North src/Dodge/Data/CardinalPoint.hs 6;" C North src/Dodge/Data/CardinalPoint.hs 7;" C
North8 src/Dodge/Data/CardinalPoint.hs 20;" C North8 src/Dodge/Data/CardinalPoint.hs 28;" C
NorthEast src/Dodge/Data/CardinalPoint.hs 13;" C NorthEast src/Dodge/Data/CardinalPoint.hs 21;" C
NorthEast8 src/Dodge/Data/CardinalPoint.hs 21;" C NorthEast8 src/Dodge/Data/CardinalPoint.hs 29;" C
NorthWest src/Dodge/Data/CardinalPoint.hs 16;" C NorthWest src/Dodge/Data/CardinalPoint.hs 24;" C
NorthWest8 src/Dodge/Data/CardinalPoint.hs 27;" C NorthWest8 src/Dodge/Data/CardinalPoint.hs 35;" C
NotLink src/Dodge/Data/Room.hs 69;" C NotLink src/Dodge/Data/Room.hs 69;" C
NotPushed src/Dodge/Data/Door.hs 26;" C NotPushed src/Dodge/Data/Door.hs 26;" C
Nothing' src/MaybeHelp.hs 11;" C Nothing' src/MaybeHelp.hs 11;" C
@@ -984,7 +984,7 @@ PolyEdge src/Dodge/Data/Room.hs 47;" C
PolyShad src/Picture/Data.hs 34;" C PolyShad src/Picture/Data.hs 34;" C
Polyhedra src/Polyhedra/Data.hs 13;" t Polyhedra src/Polyhedra/Data.hs 13;" t
Polyhedron src/Polyhedra/Data.hs 13;" C Polyhedron src/Polyhedra/Data.hs 13;" C
PosInf src/Dodge/Data/CardinalPoint.hs 36;" C PosInf src/Dodge/Data/CardinalPoint.hs 44;" C
PosRooms src/Dodge/Tree/Shift.hs 28;" t PosRooms src/Dodge/Tree/Shift.hs 28;" t
Posture src/Dodge/Data/Creature/Stance.hs 33;" t Posture src/Dodge/Data/Creature/Stance.hs 33;" t
PrWdLsId src/Dodge/Data/Prop.hs 45;" C PrWdLsId src/Dodge/Data/Prop.hs 45;" C
@@ -1212,12 +1212,12 @@ SoundID src/Sound/Data.hs 30;" t
SoundOrigin src/Dodge/Data/SoundOrigin.hs 10;" t SoundOrigin src/Dodge/Data/SoundOrigin.hs 10;" t
SoundStart src/Dodge/Data/WorldEffect.hs 27;" C SoundStart src/Dodge/Data/WorldEffect.hs 27;" C
SoundStatus src/Sound/Data.hs 14;" t SoundStatus src/Sound/Data.hs 14;" t
South src/Dodge/Data/CardinalPoint.hs 8;" C South src/Dodge/Data/CardinalPoint.hs 9;" C
South8 src/Dodge/Data/CardinalPoint.hs 24;" C South8 src/Dodge/Data/CardinalPoint.hs 32;" C
SouthEast src/Dodge/Data/CardinalPoint.hs 14;" C SouthEast src/Dodge/Data/CardinalPoint.hs 22;" C
SouthEast8 src/Dodge/Data/CardinalPoint.hs 23;" C SouthEast8 src/Dodge/Data/CardinalPoint.hs 31;" C
SouthWest src/Dodge/Data/CardinalPoint.hs 15;" C SouthWest src/Dodge/Data/CardinalPoint.hs 23;" C
SouthWest8 src/Dodge/Data/CardinalPoint.hs 25;" C SouthWest8 src/Dodge/Data/CardinalPoint.hs 33;" C
SpaceCity src/Dodge/Data/Scenario.hs 60;" C SpaceCity src/Dodge/Data/Scenario.hs 60;" C
SpaceColoniser src/Dodge/Data/Scenario.hs 59;" C SpaceColoniser src/Dodge/Data/Scenario.hs 59;" C
SpacePort src/Dodge/Data/Scenario.hs 58;" C SpacePort src/Dodge/Data/Scenario.hs 58;" C
@@ -1465,15 +1465,15 @@ WdWdNegateTrig src/Dodge/Data/WorldEffect.hs 30;" C
WdYouPos src/Dodge/Data/WorldEffect.hs 41;" C WdYouPos src/Dodge/Data/WorldEffect.hs 41;" C
WeaponScopeSF src/Dodge/Data/ComposedItem.hs 19;" C WeaponScopeSF src/Dodge/Data/ComposedItem.hs 19;" C
WeaponTargetingSF src/Dodge/Data/ComposedItem.hs 20;" C WeaponTargetingSF src/Dodge/Data/ComposedItem.hs 20;" C
West src/Dodge/Data/CardinalPoint.hs 9;" C West src/Dodge/Data/CardinalPoint.hs 10;" C
West8 src/Dodge/Data/CardinalPoint.hs 26;" C West8 src/Dodge/Data/CardinalPoint.hs 34;" C
WlID src/Dodge/Data/CrWlID.hs 10;" C WlID src/Dodge/Data/CrWlID.hs 10;" C
Wood src/Dodge/Data/Material.hs 11;" C Wood src/Dodge/Data/Material.hs 11;" C
World src/Dodge/Data/World.hs 34;" t World src/Dodge/Data/World.hs 34;" t
WorldEffects src/Dodge/Data/WorldEffect.hs 23;" C WorldEffects src/Dodge/Data/WorldEffect.hs 23;" C
WorldEventFlag src/Dodge/Data/World.hs 29;" t WorldEventFlag src/Dodge/Data/World.hs 29;" t
WorldGovernment src/Dodge/Data/Scenario.hs 52;" C WorldGovernment src/Dodge/Data/Scenario.hs 52;" C
XInfinity src/Dodge/Data/CardinalPoint.hs 36;" t XInfinity src/Dodge/Data/CardinalPoint.hs 44;" t
YELLOW src/Color/Data.hs 15;" C YELLOW src/Color/Data.hs 15;" C
ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 91;" C ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 91;" C
ZombieFaction src/Dodge/Data/Creature/State.hs 14;" C ZombieFaction src/Dodge/Data/Creature/State.hs 14;" C
@@ -2022,7 +2022,7 @@ _mzRot src/Dodge/Data/Muzzle.hs 11;" f
_nodeMetaTree src/Dodge/Data/MetaTree.hs 16;" f _nodeMetaTree src/Dodge/Data/MetaTree.hs 16;" f
_nodeTree src/Dodge/Data/MetaTree.hs 15;" f _nodeTree src/Dodge/Data/MetaTree.hs 15;" f
_nodesSearched src/Dodge/Data/Creature.hs 77;" f _nodesSearched src/Dodge/Data/Creature.hs 77;" f
_nonInf src/Dodge/Data/CardinalPoint.hs 36;" f _nonInf src/Dodge/Data/CardinalPoint.hs 44;" f
_numLinkEW src/Dodge/Data/Room.hs 34;" f _numLinkEW src/Dodge/Data/Room.hs 34;" f
_numLinkNS src/Dodge/Data/Room.hs 35;" f _numLinkNS src/Dodge/Data/Room.hs 35;" f
_numberChasmVerxs src/Dodge/Data/CWorld.hs 34;" f _numberChasmVerxs src/Dodge/Data/CWorld.hs 34;" f
@@ -2487,6 +2487,7 @@ addGirderNS' src/Dodge/Room/Modify/Girder.hs 55;" f
addHighGirder src/Dodge/Room/Modify/Girder.hs 132;" f addHighGirder src/Dodge/Room/Modify/Girder.hs 132;" f
addHighGirder' src/Dodge/Room/Modify/Girder.hs 142;" f addHighGirder' src/Dodge/Room/Modify/Girder.hs 142;" f
addIndefiniteArticle src/StringHelp.hs 17;" f addIndefiniteArticle src/StringHelp.hs 17;" f
addNodesCrossing src/Dodge/Room/Path.hs 22;" f
addPane src/Dodge/Placement/PlaceSpot.hs 176;" f addPane src/Dodge/Placement/PlaceSpot.hs 176;" f
addPointPolygon src/Geometry/Polygon.hs 134;" f addPointPolygon src/Geometry/Polygon.hs 134;" f
addPolyWall src/Dodge/LevelGen/StaticWalls.hs 141;" f addPolyWall src/Dodge/LevelGen/StaticWalls.hs 141;" f
@@ -2683,7 +2684,7 @@ bounceDir src/Dodge/Bullet.hs 111;" f
bouncePoint src/Dodge/Base/Collide.hs 86;" f bouncePoint src/Dodge/Base/Collide.hs 86;" f
bounceSound src/Dodge/Projectile/Update.hs 73;" f bounceSound src/Dodge/Projectile/Update.hs 73;" f
boundPoints src/Bound.hs 10;" f boundPoints src/Bound.hs 10;" f
boundedGrid src/Grid.hs 19;" f boundedGrid src/Grid.hs 17;" f
boxABC src/Polyhedra.hs 108;" f boxABC src/Polyhedra.hs 108;" f
boxEdgeIndices src/Shader/Poke.hs 358;" f boxEdgeIndices src/Shader/Poke.hs 358;" f
boxSurfaces src/Shader/Poke.hs 277;" f boxSurfaces src/Shader/Poke.hs 277;" f
@@ -2709,7 +2710,7 @@ bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f
burstRifle src/Dodge/Item/Held/Cane.hs 30;" f burstRifle src/Dodge/Item/Held/Cane.hs 30;" f
buttonFlip src/Dodge/Button/Event.hs 17;" f buttonFlip src/Dodge/Button/Event.hs 17;" f
buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f
cChasm src/Dodge/Room/Tutorial.hs 145;" f cChasm src/Dodge/Room/Tutorial.hs 139;" f
cFilledRect src/Dodge/CharacterEnums.hs 6;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f
cWireRect src/Dodge/CharacterEnums.hs 10;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f
calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f
@@ -2728,9 +2729,9 @@ ceilingTo src/Geometry/Zone.hs 15;" f
cenLasTur src/Dodge/Room/LasTurret.hs 25;" f cenLasTur src/Dodge/Room/LasTurret.hs 25;" f
centerText src/Picture/Base.hs 184;" f centerText src/Picture/Base.hs 184;" f
centerVaultExplosiveExit src/Dodge/Room/NoNeedWeapon.hs 20;" f centerVaultExplosiveExit src/Dodge/Room/NoNeedWeapon.hs 20;" f
centerVaultRoom src/Dodge/Room/Procedural.hs 286;" f centerVaultRoom src/Dodge/Room/Procedural.hs 269;" f
centroid src/Geometry/Polygon.hs 168;" f centroid src/Geometry/Polygon.hs 169;" f
centroidNum src/Geometry/Polygon.hs 171;" f centroidNum src/Geometry/Polygon.hs 172;" f
chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f
chainPairs src/Geometry.hs 360;" f chainPairs src/Geometry.hs 360;" f
changeSwapOther src/Dodge/Inventory.hs 141;" f changeSwapOther src/Dodge/Inventory.hs 141;" f
@@ -2745,7 +2746,7 @@ chaseCritInternal src/Dodge/Humanoid.hs 7;" f
chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 120;" f chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 120;" f
chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f
chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 36;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 36;" f
chasmSimpleMaze src/Dodge/Room/Tutorial.hs 215;" f chasmSimpleMaze src/Dodge/Room/Tutorial.hs 210;" f
chasmTest src/Dodge/Creature/Update.hs 132;" f chasmTest src/Dodge/Creature/Update.hs 132;" f
chasmWallToSurface src/Dodge/Base/Collide.hs 118;" f chasmWallToSurface src/Dodge/Base/Collide.hs 118;" f
checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f
@@ -2784,7 +2785,7 @@ clAlt src/Dodge/Cloud.hs 5;" f
clClSpringVel src/Dodge/Update.hs 842;" f clClSpringVel src/Dodge/Update.hs 842;" f
clColor src/Shader/Poke/Cloud.hs 35;" f clColor src/Shader/Poke/Cloud.hs 35;" f
clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f
clampPath src/Dodge/Room/Procedural.hs 163;" f clampPath src/Dodge/Room/Procedural.hs 146;" f
clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f
clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f
clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f
@@ -2841,11 +2842,11 @@ combinationsGraph src/Dodge/Combine/Graph.hs 72;" f
combinationsOf src/Multiset.hs 46;" f combinationsOf src/Multiset.hs 46;" f
combinationsTrie src/Dodge/Combine.hs 43;" f combinationsTrie src/Dodge/Combine.hs 43;" f
combineAwareness src/Dodge/Creature/Perception.hs 109;" f combineAwareness src/Dodge/Creature/Perception.hs 109;" f
combineFloors src/Dodge/Room/Procedural.hs 169;" f combineFloors src/Dodge/Room/Procedural.hs 152;" f
combineInventoryExtra src/Dodge/Render/HUD.hs 337;" f combineInventoryExtra src/Dodge/Render/HUD.hs 337;" f
combineItemListYouX src/Dodge/Combine.hs 35;" f combineItemListYouX src/Dodge/Combine.hs 35;" f
combineList src/Dodge/Combine.hs 21;" f combineList src/Dodge/Combine.hs 21;" f
combineRooms src/Dodge/Room/Procedural.hs 149;" f combineRooms src/Dodge/Room/Procedural.hs 132;" f
combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f
combineTree src/Dodge/Tree/Compose.hs 67;" f combineTree src/Dodge/Tree/Compose.hs 67;" f
commandColor src/Dodge/Terminal.hs 114;" f commandColor src/Dodge/Terminal.hs 114;" f
@@ -3498,7 +3499,7 @@ floorTo src/Geometry/Zone.hs 12;" f
floorWire src/Dodge/Wire.hs 13;" f floorWire src/Dodge/Wire.hs 13;" f
foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f
foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f
foldMTRS src/Dodge/Room/Tutorial.hs 90;" f foldMTRS src/Dodge/Room/Tutorial.hs 84;" f
foldPairs src/ListHelp.hs 37;" f foldPairs src/ListHelp.hs 37;" f
foldrWhileArb src/ListHelp.hs 110;" f foldrWhileArb src/ListHelp.hs 110;" f
followImpulse src/Dodge/Creature/Impulse.hs 24;" f followImpulse src/Dodge/Creature/Impulse.hs 24;" f
@@ -3559,8 +3560,8 @@ getCloseObj src/Dodge/Update/Input/InGame.hs 533;" f
getCommand src/Dodge/Terminal.hs 52;" f getCommand src/Dodge/Terminal.hs 52;" f
getCommands src/Dodge/Terminal.hs 49;" f getCommands src/Dodge/Terminal.hs 49;" f
getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f
getCrsFromRooms src/Dodge/Room/Tutorial.hs 364;" f getCrsFromRooms src/Dodge/Room/Tutorial.hs 359;" f
getCrsFromRooms' src/Dodge/Room/Tutorial.hs 351;" f getCrsFromRooms' src/Dodge/Room/Tutorial.hs 346;" f
getDebugMouseOver src/Dodge/Update.hs 377;" f getDebugMouseOver src/Dodge/Update.hs 377;" f
getDistortions src/Dodge/Render.hs 435;" f getDistortions src/Dodge/Render.hs 435;" f
getEdgesCrossing src/Dodge/Path.hs 42;" f getEdgesCrossing src/Dodge/Path.hs 42;" f
@@ -3577,7 +3578,7 @@ getNodePos src/Dodge/Path.hs 39;" f
getPJStabiliser src/Dodge/HeldUse.hs 1251;" f getPJStabiliser src/Dodge/HeldUse.hs 1251;" f
getPretty src/AesonHelp.hs 8;" f getPretty src/AesonHelp.hs 8;" f
getPromptTM src/Dodge/Terminal/Type.hs 3;" f getPromptTM src/Dodge/Terminal/Type.hs 3;" f
getRoomsFromInts src/Dodge/Room/Tutorial.hs 347;" f getRoomsFromInts src/Dodge/Room/Tutorial.hs 342;" f
getRootItemBounds src/Dodge/Render/HUD.hs 100;" f getRootItemBounds src/Dodge/Render/HUD.hs 100;" f
getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f
getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f
@@ -3616,11 +3617,10 @@ graphicsMenu src/Dodge/Menu.hs 185;" f
graphicsMenuOptions src/Dodge/Menu.hs 188;" f graphicsMenuOptions src/Dodge/Menu.hs 188;" f
green src/Color.hs 15;" f green src/Color.hs 15;" f
greyN src/Color.hs 124;" f greyN src/Color.hs 124;" f
gridInPolygon src/Grid.hs 12;" f gridInPolygon src/Grid.hs 10;" f
gridPoints src/Grid.hs 39;" f gridPoints' src/Grid.hs 37;" f
gridPoints' src/Grid.hs 47;" f gridPointsOff src/Grid.hs 32;" f
gridPoints'' src/Grid.hs 42;" f gridRoomPos src/Dodge/Room/Procedural.hs 90;" f
gridPointsOff src/Grid.hs 34;" f
groupSplitItemAmounts src/Dodge/Combine.hs 51;" f groupSplitItemAmounts src/Dodge/Combine.hs 51;" f
gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f
gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f
@@ -3893,7 +3893,7 @@ keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f
keyPic src/Dodge/Item/Draw/SPic.hs 459;" f keyPic src/Dodge/Item/Draw/SPic.hs 459;" f
keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f
knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f
lChasm src/Dodge/Room/Tutorial.hs 154;" f lChasm src/Dodge/Room/Tutorial.hs 148;" f
lConnect src/Dodge/Render/Connectors.hs 42;" f lConnect src/Dodge/Render/Connectors.hs 42;" f
lConnectMulti src/Dodge/Render/Connectors.hs 46;" f lConnectMulti src/Dodge/Render/Connectors.hs 46;" f
lShape src/Dodge/Placement/Instance/LightSource.hs 91;" f lShape src/Dodge/Placement/Instance/LightSource.hs 91;" f
@@ -3908,7 +3908,7 @@ lasTunnelRunPast src/Dodge/Room/LasTurret.hs 194;" f
lasTurret src/Dodge/Placement/Instance/Turret.hs 38;" f lasTurret src/Dodge/Placement/Instance/Turret.hs 38;" f
laser src/Dodge/Item/Held/BatteryGuns.hs 34;" f laser src/Dodge/Item/Held/BatteryGuns.hs 34;" f
lastMap src/Dodge/DoubleTree.hs 253;" f lastMap src/Dodge/DoubleTree.hs 253;" f
latticeXsYs src/Grid.hs 26;" f latticeXsYs src/Grid.hs 24;" f
launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f
layoutLevelFromSeed src/Dodge/LevelGen.hs 40;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 40;" f
ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f
@@ -3952,7 +3952,7 @@ lineOutputTerminal src/Dodge/Room/Warning.hs 66;" f
lineSplit src/Justify.hs 26;" f lineSplit src/Justify.hs 26;" f
lineThick src/Picture/Base.hs 234;" f lineThick src/Picture/Base.hs 234;" f
lineUp src/Dodge/Creature/Boid.hs 150;" f lineUp src/Dodge/Creature/Boid.hs 150;" f
linksDAGToPath src/Dodge/Room/Path.hs 15;" f linksDAGToPath src/Dodge/Room/Path.hs 13;" f
linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f
listConfig src/Dodge/Menu.hs 239;" f listConfig src/Dodge/Menu.hs 239;" f
listControls src/Dodge/Menu.hs 251;" f listControls src/Dodge/Menu.hs 251;" f
@@ -3961,7 +3961,6 @@ listGuard src/Dodge/Creature/ReaderUpdate.hs 195;" f
listSelectionColorPicture src/Dodge/DisplayInventory.hs 302;" f listSelectionColorPicture src/Dodge/DisplayInventory.hs 302;" f
litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f
lmt src/MatrixHelper.hs 43;" f lmt src/MatrixHelper.hs 43;" f
lnkBothAnd src/Dodge/Room/Procedural.hs 119;" f
lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 387;" f lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 387;" f
loadDodgeConfig src/Dodge/Config.hs 30;" f loadDodgeConfig src/Dodge/Config.hs 30;" f
loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f
@@ -4139,7 +4138,7 @@ mglCreate src/GLHelp.hs 8;" f
mglDelete src/GLHelp.hs 14;" f mglDelete src/GLHelp.hs 14;" f
midBarDecoration src/Dodge/Placement/TopDecoration.hs 16;" f midBarDecoration src/Dodge/Placement/TopDecoration.hs 16;" f
midBounds src/Dodge/Room/Foreground.hs 150;" f midBounds src/Dodge/Room/Foreground.hs 150;" f
midChasm src/Dodge/Room/Tutorial.hs 178;" f midChasm src/Dodge/Room/Tutorial.hs 173;" f
midPad src/Padding.hs 27;" f midPad src/Padding.hs 27;" f
midPadL src/Padding.hs 33;" f midPadL src/Padding.hs 33;" f
midPoint src/Geometry.hs 83;" f midPoint src/Geometry.hs 83;" f
@@ -4430,8 +4429,8 @@ pokeWall src/Shader/Poke.hs 78;" f
pokeWallsWindows src/Shader/Poke.hs 50;" f pokeWallsWindows src/Shader/Poke.hs 50;" f
poly3 src/Picture/Base.hs 84;" f poly3 src/Picture/Base.hs 84;" f
poly3Col src/Picture/Base.hs 88;" f poly3Col src/Picture/Base.hs 88;" f
polyChasm src/Dodge/Room/Tutorial.hs 199;" f polyChasm src/Dodge/Room/Tutorial.hs 194;" f
polyChasmC src/Dodge/Room/Tutorial.hs 208;" f polyChasmC src/Dodge/Room/Tutorial.hs 203;" f
polyCirc src/Shape.hs 46;" f polyCirc src/Shape.hs 46;" f
polyCircx src/Shape.hs 51;" f polyCircx src/Shape.hs 51;" f
polyCornerDist src/Geometry/Polygon.hs 61;" f polyCornerDist src/Geometry/Polygon.hs 61;" f
@@ -4537,8 +4536,8 @@ qID src/Quaternion.hs 58;" f
qToAng src/Quaternion.hs 55;" f qToAng src/Quaternion.hs 55;" f
qToV2 src/Quaternion.hs 52;" f qToV2 src/Quaternion.hs 52;" f
qToV3 src/Quaternion.hs 49;" f qToV3 src/Quaternion.hs 49;" f
quarterRoomSquare src/Dodge/Room/Procedural.hs 210;" f quarterRoomSquare src/Dodge/Room/Procedural.hs 193;" f
quarterRoomTri src/Dodge/Room/Procedural.hs 174;" f quarterRoomTri src/Dodge/Room/Procedural.hs 157;" f
quitCommand src/Dodge/Terminal.hs 93;" f quitCommand src/Dodge/Terminal.hs 93;" f
qz src/Quaternion.hs 67;" f qz src/Quaternion.hs 67;" f
rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f
@@ -4569,8 +4568,8 @@ randSparkExtraVel src/Dodge/Spark.hs 92;" f
randWallReflect src/Dodge/Update.hs 644;" f randWallReflect src/Dodge/Update.hs 644;" f
randomChallenges src/Dodge/Room/Start.hs 63;" f randomChallenges src/Dodge/Room/Start.hs 63;" f
randomCompass src/Dodge/Layout.hs 60;" f randomCompass src/Dodge/Layout.hs 60;" f
randomFourCornerRoom src/Dodge/Room/Procedural.hs 263;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 246;" f
randomFourCornerRoomCrsIts src/Dodge/Room/Procedural.hs 275;" f randomFourCornerRoomCrsIts src/Dodge/Room/Procedural.hs 258;" f
randomLightPositions src/Dodge/Room/Modify/Girder.hs 152;" f randomLightPositions src/Dodge/Room/Modify/Girder.hs 152;" f
randomMediumRoom src/Dodge/Room/Boss.hs 73;" f randomMediumRoom src/Dodge/Room/Boss.hs 73;" f
randomPath src/TreeHelp.hs 145;" f randomPath src/TreeHelp.hs 145;" f
@@ -4615,7 +4614,7 @@ removeAimPosture src/Dodge/Creature/YourControl.hs 159;" f
removeAmmoFromMag src/Dodge/HeldUse.hs 907;" f removeAmmoFromMag src/Dodge/HeldUse.hs 907;" f
removeDot src/ShortShow.hs 44;" f removeDot src/ShortShow.hs 44;" f
removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f
removeLights src/Dodge/Room/Tutorial.hs 264;" f removeLights src/Dodge/Room/Tutorial.hs 259;" f
removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f
removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f
renderDataResizeUpdate src/Preload/Update.hs 26;" f renderDataResizeUpdate src/Preload/Update.hs 26;" f
@@ -4642,6 +4641,7 @@ restrictOutLinks src/Dodge/RoomLink.hs 47;" f
restrictRMInLinksPD src/Dodge/Room/Link.hs 25;" f restrictRMInLinksPD src/Dodge/Room/Link.hs 25;" f
resumeSound src/Dodge/SoundLogic.hs 48;" f resumeSound src/Dodge/SoundLogic.hs 48;" f
retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 9;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 9;" f
revCard src/Dodge/Data/CardinalPoint.hs 13;" f
reversePair src/Dodge/LevelGen.hs 85;" f reversePair src/Dodge/LevelGen.hs 85;" f
rewinder src/Dodge/Item/Held/Utility.hs 36;" f rewinder src/Dodge/Item/Held/Utility.hs 36;" f
rezBox src/Dodge/Room/RezBox.hs 31;" f rezBox src/Dodge/Room/RezBox.hs 31;" f
@@ -4682,8 +4682,8 @@ roomPillars src/Dodge/Room/Pillar.hs 106;" f
roomPillarsContaining src/Dodge/Room/Containing.hs 39;" f roomPillarsContaining src/Dodge/Room/Containing.hs 39;" f
roomPillarsPassage src/Dodge/Room/Pillar.hs 93;" f roomPillarsPassage src/Dodge/Room/Pillar.hs 93;" f
roomPillarsSquare src/Dodge/Room/Pillar.hs 49;" f roomPillarsSquare src/Dodge/Room/Pillar.hs 49;" f
roomRect src/Dodge/Room/Procedural.hs 41;" f roomRect src/Dodge/Room/Procedural.hs 42;" f
roomRectAutoLinks src/Dodge/Room/Procedural.hs 136;" f roomRectAutoLinks src/Dodge/Room/Procedural.hs 119;" f
roomShuriken src/Dodge/Room/Boss.hs 120;" f roomShuriken src/Dodge/Room/Boss.hs 120;" f
roomTwistCross src/Dodge/Room/Boss.hs 151;" f roomTwistCross src/Dodge/Room/Boss.hs 151;" f
roomsContaining src/Dodge/Room/Containing.hs 20;" f roomsContaining src/Dodge/Room/Containing.hs 20;" f
@@ -4793,7 +4793,7 @@ sensorReqToString src/Dodge/Machine/Update.hs 197;" f
sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f
sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f
sensorSPic src/Dodge/Machine/Draw.hs 81;" f sensorSPic src/Dodge/Machine/Draw.hs 81;" f
sensorTut src/Dodge/Room/Tutorial.hs 373;" f sensorTut src/Dodge/Room/Tutorial.hs 368;" f
sensorTypeDamages src/Dodge/Machine/Update.hs 234;" f sensorTypeDamages src/Dodge/Machine/Update.hs 234;" f
sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f
sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 81;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 81;" f
@@ -4820,7 +4820,7 @@ setOutLinks src/Dodge/RoomLink.hs 50;" f
setOutLinksByType src/Dodge/RoomLink.hs 75;" f setOutLinksByType src/Dodge/RoomLink.hs 75;" f
setOutLinksPD src/Dodge/RoomLink.hs 95;" f setOutLinksPD src/Dodge/RoomLink.hs 95;" f
setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f
setRoomInt src/Dodge/Room/Tutorial.hs 97;" f setRoomInt src/Dodge/Room/Tutorial.hs 91;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f
setShaderSource src/Shader/Compile.hs 290;" f setShaderSource src/Shader/Compile.hs 290;" f
@@ -4829,7 +4829,7 @@ setSoundVolume src/Sound.hs 157;" f
setTargetMv src/Dodge/Creature/ReaderUpdate.hs 82;" f setTargetMv src/Dodge/Creature/ReaderUpdate.hs 82;" f
setTile src/Dodge/Layout.hs 70;" f setTile src/Dodge/Layout.hs 70;" f
setTiles src/Dodge/Layout.hs 67;" f setTiles src/Dodge/Layout.hs 67;" f
setTreeInts src/Dodge/Room/Tutorial.hs 104;" f setTreeInts src/Dodge/Room/Tutorial.hs 98;" f
setViewDistance src/Dodge/Update/Camera.hs 236;" f setViewDistance src/Dodge/Update/Camera.hs 236;" f
setViewPos src/Dodge/Creature/ReaderUpdate.hs 69;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 69;" f
setViewport src/Dodge/Render.hs 440;" f setViewport src/Dodge/Render.hs 440;" f
@@ -4916,8 +4916,8 @@ showInventoryPathing src/Dodge/Item/Display.hs 86;" f
showManObj src/Dodge/TestString.hs 48;" f showManObj src/Dodge/TestString.hs 48;" f
showTerminalError src/Dodge/Debug/Terminal.hs 80;" f showTerminalError src/Dodge/Debug/Terminal.hs 80;" f
showTimeFlow src/Dodge/TestString.hs 71;" f showTimeFlow src/Dodge/TestString.hs 71;" f
shrinkPolyOnEdges src/Geometry/Polygon.hs 174;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 175;" f
shrinkVert src/Geometry/Polygon.hs 178;" f shrinkVert src/Geometry/Polygon.hs 179;" f
shuffle src/RandomHelp.hs 49;" f shuffle src/RandomHelp.hs 49;" f
shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleLinks src/Dodge/Room/Link.hs 30;" f
shuffleRoomPos src/Dodge/Layout.hs 82;" f shuffleRoomPos src/Dodge/Layout.hs 82;" f
@@ -5260,13 +5260,13 @@ tryUseParent src/Dodge/Creature/State.hs 145;" f
turnTo src/Dodge/Movement/Turn.hs 8;" f turnTo src/Dodge/Movement/Turn.hs 8;" f
turret src/Dodge/Placement/Instance/Turret.hs 35;" f turret src/Dodge/Placement/Instance/Turret.hs 35;" f
turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f
tutAnoTree src/Dodge/Room/Tutorial.hs 44;" f tutAnoTree src/Dodge/Room/Tutorial.hs 45;" f
tutDrop src/Dodge/Room/Tutorial.hs 109;" f tutDrop src/Dodge/Room/Tutorial.hs 103;" f
tutHub src/Dodge/Room/Tutorial.hs 271;" f tutHub src/Dodge/Room/Tutorial.hs 266;" f
tutLight src/Dodge/Room/Tutorial.hs 236;" f tutLight src/Dodge/Room/Tutorial.hs 231;" f
tutRezBox src/Dodge/Room/Tutorial.hs 384;" f tutRezBox src/Dodge/Room/Tutorial.hs 379;" f
tutRoomTree src/Dodge/Floor.hs 21;" f tutRoomTree src/Dodge/Floor.hs 21;" f
tutorialMessage1 src/Dodge/Room/Tutorial.hs 408;" f tutorialMessage1 src/Dodge/Room/Tutorial.hs 403;" f
tweenAngles src/Geometry/Vector.hs 190;" f tweenAngles src/Geometry/Vector.hs 190;" f
twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 79;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 79;" f
twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 34;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 34;" f
@@ -5582,14 +5582,13 @@ yourInv src/Dodge/Base/You.hs 28;" f
yourRootItem src/Dodge/Base/You.hs 22;" f yourRootItem src/Dodge/Base/You.hs 22;" f
yourSelectedItem src/Dodge/Base/You.hs 16;" f yourSelectedItem src/Dodge/Base/You.hs 16;" f
yourStatsInfo src/Dodge/Creature/Info.hs 27;" f yourStatsInfo src/Dodge/Creature/Info.hs 27;" f
zChasm src/Dodge/Room/Tutorial.hs 164;" f zChasm src/Dodge/Room/Tutorial.hs 158;" f
zConnect src/Dodge/Render/Connectors.hs 17;" f zConnect src/Dodge/Render/Connectors.hs 17;" f
zConnectCol src/Dodge/Render/Connectors.hs 28;" f zConnectCol src/Dodge/Render/Connectors.hs 28;" f
zConnectColMidX src/Dodge/Render/Connectors.hs 31;" f zConnectColMidX src/Dodge/Render/Connectors.hs 31;" f
zeroZ src/Geometry/Vector.hs 9;" f zeroZ src/Geometry/Vector.hs 9;" f
zipArcs src/Dodge/Tesla.hs 52;" f zipArcs src/Dodge/Tesla.hs 52;" f
zipCount src/Dodge/Tree/Shift.hs 136;" f zipCount src/Dodge/Tree/Shift.hs 136;" f
zipCountDown src/Dodge/Room/Procedural.hs 116;" f
zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f
zoneClouds src/Dodge/Update.hs 477;" f zoneClouds src/Dodge/Update.hs 477;" f
zoneCreature src/Dodge/Zoning/Creature.hs 55;" f zoneCreature src/Dodge/Zoning/Creature.hs 55;" f