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

Try to simplify link code in roomRect

Browse Source
This commit is contained in:
justin
2025-10-27 15:10:19 +00:00
parent c88fc1c729
commit 0946ee1310
9 changed files with 95 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Room/Airlock.hs
+3 -4
View File
@@ -177,7 +177,7 @@ airlockZ = do
defaultRoom
{ _rmPolys = [rectNSWE 120 0 0 180]
, _rmLinks = lnks
, _rmPath = linksGridToPath' lnks $ loopPairs $ rectNSWE 100 40 40 140
, _rmPath = linksDAGToPath lnks $ loopPairs $ rectNSWE 100 40 40 140
, _rmPmnts =
[ pContID (PS (V2 90 115) pi) xSwitch $
\btid ->
@@ -212,7 +212,7 @@ airlock90 =
]
]
, _rmLinks = lnks
, _rmPath = linksGridToPath' lnks $ doublePairSet (V2 40 40, V2 80 80)
, _rmPath = linksDAGToPath lnks $ [(40,80)]
, _rmPmnts =
[ pContID
(PS (V2 120 120) (3 * pi / 4))
@@ -251,8 +251,7 @@ airlockCrystal =
defaultRoom
{ _rmPolys = [rectNSWE 140 0 0 40, switchcutout]
, _rmLinks = lnks
, _rmPath = linksGridToPath' lnks
$ loopPairs [V2 20 40, V2 100 70, V2 20 110]
, _rmPath = linksDAGToPath lnks $ loopPairs [V2 20 40, V2 100 70, V2 20 110]
, _rmPmnts =
[ pContID
(PS (V2 145 70) (pi / 2))
src/Dodge/Room/Boss.hs
+1 -5
View File
@@ -32,11 +32,7 @@ roomGlassOctogon x =
]
, _rmLinks = lnks'
, _rmPath =
linksGridToPath
lnks'
[ (V2 0 x, V2 0 (- (x + 40)))
, (V2 0 (- (x + 40)), V2 0 x)
]
linksDAGToPath lnks' [ (V2 0 x, V2 0 (- (x + 40))) ]
, _rmPmnts =
[ sPS (V2 fx fx) 0 putLamp
, sPS (V2 (- fx) fx) 0 putLamp
src/Dodge/Room/Ngon.hs
+1 -2
View File
@@ -20,7 +20,7 @@ roomNgon n x = do
defaultRoom
{ _rmPolys = [poly]
, _rmLinks = map f lnks
, _rmPath = linksGridToPath (map f lnks) path4
, _rmPath = linksDAGToPath (map f lnks) path3
, _rmPmnts = [thelight]
, _rmBound = [poly]
, _rmFloor = Tiled [makeTileFromPoly poly 2]
@@ -34,7 +34,6 @@ roomNgon n x = do
path1 = polyOrthDist n (x-10)
path2 = concat $ zipWith g path1 (tail path1 <> [head path1])
path3 = loopPairs path2 <> fmap (,V2 0 0) path2
path4 = concatMap doublePair path3
poss = map (\p -> RoomPos p 0 mempty (NotLink True) mempty)
(V2 0 0 : path1)
g z y = [z, 0.5 * (z + y)]
src/Dodge/Room/Path.hs
+8 -18
View File
@@ -1,11 +1,5 @@
module Dodge.Room.Path (
gridPoints,
linksGridToPath,
-- makeGrid,
-- createPathGrid,
gridPoints'',
linksGridToPath',
) where
{-# LANGUAGE TupleSections #-}
module Dodge.Room.Path (linksDAGToPath) where
import Control.Lens
import Data.Function (on)
@@ -13,16 +7,12 @@ import Data.List
import qualified Data.Set as S
import Dodge.Data.GenWorld
import Geometry
import Grid
-- assumes subpth is symmetric
linksGridToPath :: [RoomLink] -> [(Point2, Point2)] -> S.Set (Point2, Point2)
linksGridToPath lnks subpth = S.fromList subpth <> foldMap (linkClosest . (^. rlPos)) lnks
linksDAGToPath :: Foldable f => [RoomLink] -> f (Point2, Point2) -> S.Set (Point2, Point2)
linksDAGToPath lnks xs
| null xs = foldMap doublePairSet $ ys & each %~ (, centroid ys)
| otherwise = subpth <> foldMap (linkClosest . (^. rlPos)) lnks
where
linkClosest p = doublePairSet (p, minimumBy (compare `on` dist p) $ map fst subpth)
linksGridToPath' :: Foldable f => [RoomLink] -> f (Point2, Point2) -> S.Set (Point2, Point2)
linksGridToPath' lnks subpth' = subpth <> foldMap (linkClosest . (^. rlPos)) lnks
where
subpth = foldMap doublePairSet subpth'
ys = lnks <&> _rlPos
subpth = foldMap doublePairSet xs
linkClosest p = doublePairSet (p, minimumBy (compare `on` dist p) $ S.map fst subpth)
src/Dodge/Room/Procedural.hs
+29 -19
View File
@@ -44,12 +44,8 @@ roomRect x y xn yn =
{ _rmPolys = [rectNSWE y 0 0 x]
, _rmLinks = lnks
, _rmName = "rect"
, _rmPath = foldMap doublePairSet pth
, --, _rmPos = map (roomposat (RoomPosOnPath S.empty)) posps
-- ++ map (roomposat (RoomPosOffPath S.empty)) interposps
_rmPos =
map makeonpos posps
++ map makeoffpos interposps
, _rmPath = pth
, _rmPos = map makeonpos posps ++ map makeoffpos interposps
, _rmPmnts = []
, _rmBound = [rectNSWE (y + 5) (-5) (-5) (x + 5)]
, _rmFloor =
@@ -78,20 +74,34 @@ roomRect x y xn yn =
ys = take (yn + 1) [0,yd..] & each +~ 20
yd = (y - 40) / fromIntegral yn
xd = (x - 40) / fromIntegral xn
pth = linksGridToPath lnks
$ latticeXsYs xs ys
--pth = linksGridToPath lnks
-- $ map (bimap (+.+ V2 20 20) (+.+ V2 20 20)) (makeGrid xd xn yd yn)
pth = linksDAGToPath lnks $ latticeXsYs xs ys
hls y' a e = xs <&> \x' -> RoomLink (rlt e) (V2 x' y') a
vls x' a e = ys <&> \y' -> RoomLink (rlt e) (V2 x' y') a
rlt e = S.fromList [OnEdge e, InLink, OutLink]
somelnks poffset ps a = zip (map (+.+ poffset) ps) (repeat a)
wlnks = somelnks (V2 0 20) (gridPoints 0 1 yd (yn + 1)) (pi / 2)
elnks = somelnks (V2 x 20) (gridPoints 0 1 yd (yn + 1)) (- pi / 2)
nlnks = somelnks (V2 20 y) (gridPoints xd (xn + 1) 0 1) 0
slnks = somelnks (V2 20 0) (gridPoints xd (xn + 1) 0 1) pi
lnks =
m North (FromEdge West) (FromEdge East) nlnks
++ m East (FromEdge South) (FromEdge North) elnks
++ m West (FromEdge South) (FromEdge North) wlnks
++ m South (FromEdge West) (FromEdge East) slnks
wlnks = vls 0 (pi/2) West
elnks = vls x (-pi/2) East
nlnks = hls y 0 North --somelnks (V2 20 y) (gridPoints xd (xn + 1) 0 1) 0
slnks = hls 0 pi South --somelnks (V2 20 0) (gridPoints xd (xn + 1) 0 1) pi
lnks = zipWith g nlnks [0..]
<> zipWith g slnks [0..]
<> zipWith g' elnks [0..]
<> zipWith g' wlnks [0..]
g ln xi = ln & rlType <>~ S.fromList [FromEdge West xi,FromEdge East (xn - xi)]
g' ln xi = ln & rlType <>~ S.fromList [FromEdge South xi,FromEdge North (xn - xi)]
-- lnks= m North (FromEdge West) (FromEdge East) nlnks
-- ++ m East (FromEdge South) (FromEdge North) elnks
-- ++ m West (FromEdge South) (FromEdge North) wlnks
-- ++ m South (FromEdge West) (FromEdge East) slnks
--wlnks = somelnks (V2 0 20) (gridPoints 0 1 yd (yn + 1)) (pi / 2)
--elnks = somelnks (V2 x 20) (gridPoints 0 1 yd (yn + 1)) (- pi / 2)
--nlnks = somelnks (V2 20 y) (gridPoints xd (xn + 1) 0 1) 0
--slnks = somelnks (V2 20 0) (gridPoints xd (xn + 1) 0 1) pi
--lnks =
-- m North (FromEdge West) (FromEdge East) nlnks
-- ++ m East (FromEdge South) (FromEdge North) elnks
-- ++ m West (FromEdge South) (FromEdge North) wlnks
-- ++ m South (FromEdge West) (FromEdge East) slnks
m edge edgefrom1 edgefrom2 =
zipWith (lnkBothAnd (OnEdge edge) edgefrom1 edgefrom2) [0 ..]
. zipCountDown
src/Dodge/Room/Tutorial.hs
+2 -2
View File
@@ -47,12 +47,12 @@ tutAnoTree = do
[ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
, corDoor
-- , return $ tToBTree "cor" $ return $ cleatOnward $ corridor & rmPmnts .~ mempty
, return $ tToBTree "cor" $ return $ cleatOnward $ roomGlassOctogon 200
-- , 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
-- , return $ tToBTree "cor" $ return $ cleatOnward corridor
, tToBTree "cor" . return . cleatOnward <$> (zChasm 25)
-- , tToBTree "x" . return . cleatOnward <$> airlockSimple
-- , tToBTree "lastun" . return . cleatOnward <$> tanksRoom [] []
src/Geometry/Polygon.hs
+1
View File
@@ -165,6 +165,7 @@ grahamEliminate (x : y : z : xs)
| not $ isLHS x y z = grahamEliminate (x : z : xs)
grahamEliminate xs = xs
-- this isn't the centroid of the polygon...
centroid :: (Num (f a),Functor f, Fractional a,Foldable t) => t (f a) -> f a
centroid = L.fold $ (^/) <$> L.Fold (+) 0 id <*> L.genericLength
src/Grid.hs
+2 -1
View File
@@ -28,7 +28,8 @@ latticeXsYs xs ys =
foldMap (\y -> mkpairs xs & each . each %~ (`V2` y)) ys
<> foldMap (\x -> mkpairs ys & each . each %~ V2 x) xs
where
mkpairs zs = zip zs $ tail zs
mkpairs (z:zs) = zip (z:zs) $ zs
mkpairs [] = []
gridPointsOff :: Float -> Float -> Float -> Int -> Float -> Int -> [Point2]
gridPointsOff xoff yoff x nx y ny = map f $ gridPoints' nx ny
tags
+48 -54
View File
@@ -2568,7 +2568,7 @@ arcTest src/Picture/Test.hs 9;" f
arcTest' src/Picture/Test.hs 21;" f
argV src/Geometry/Vector.hs 81;" f
armourChaseCrit src/Dodge/Creature/ArmourChase.hs 34;" f
armouredChasers src/Dodge/Room/Boss.hs 64;" f
armouredChasers src/Dodge/Room/Boss.hs 61;" f
armouredCorridor src/Dodge/Room/RoadBlock.hs 20;" f
arms src/Dodge/Creature/Picture.hs 72;" f
arrow src/Picture/Composite.hs 19;" f
@@ -2678,12 +2678,12 @@ blowTorch src/Dodge/Item/Held/SprayGuns.hs 43;" f
blue src/Color.hs 16;" f
blunderbuss src/Dodge/Item/Held/Cone.hs 14;" f
bossKeyItems src/Dodge/LockAndKey.hs 12;" f
bossRoom src/Dodge/Room/Boss.hs 61;" f
bossRoom src/Dodge/Room/Boss.hs 58;" f
bounceDir src/Dodge/Bullet.hs 111;" f
bouncePoint src/Dodge/Base/Collide.hs 86;" f
bounceSound src/Dodge/Projectile/Update.hs 73;" f
boundPoints src/Bound.hs 10;" f
boundedGrid src/Grid.hs 21;" f
boundedGrid src/Grid.hs 19;" f
boxABC src/Polyhedra.hs 108;" f
boxEdgeIndices src/Shader/Poke.hs 358;" f
boxSurfaces src/Shader/Poke.hs 277;" f
@@ -2709,7 +2709,7 @@ bulletWeapons src/Dodge/Combine/Combinations.hs 248;" f
burstRifle src/Dodge/Item/Held/Cane.hs 30;" f
buttonFlip src/Dodge/Button/Event.hs 17;" f
buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 702;" f
cChasm src/Dodge/Room/Tutorial.hs 144;" f
cChasm src/Dodge/Room/Tutorial.hs 145;" f
cFilledRect src/Dodge/CharacterEnums.hs 6;" f
cWireRect src/Dodge/CharacterEnums.hs 10;" f
calcSmoothScroll src/Dodge/SmoothScroll.hs 11;" f
@@ -2728,7 +2728,7 @@ ceilingTo src/Geometry/Zone.hs 15;" f
cenLasTur src/Dodge/Room/LasTurret.hs 25;" f
centerText src/Picture/Base.hs 184;" f
centerVaultExplosiveExit src/Dodge/Room/NoNeedWeapon.hs 20;" f
centerVaultRoom src/Dodge/Room/Procedural.hs 297;" f
centerVaultRoom src/Dodge/Room/Procedural.hs 286;" f
centroid src/Geometry/Polygon.hs 168;" f
centroidNum src/Geometry/Polygon.hs 171;" f
chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f
@@ -2745,7 +2745,7 @@ chaseCritInternal src/Dodge/Humanoid.hs 7;" f
chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 120;" f
chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 32;" f
chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 36;" f
chasmSimpleMaze src/Dodge/Room/Tutorial.hs 214;" f
chasmSimpleMaze src/Dodge/Room/Tutorial.hs 215;" f
chasmTest src/Dodge/Creature/Update.hs 132;" f
chasmWallToSurface src/Dodge/Base/Collide.hs 118;" f
checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f
@@ -2784,7 +2784,7 @@ clAlt src/Dodge/Cloud.hs 5;" f
clClSpringVel src/Dodge/Update.hs 842;" f
clColor src/Shader/Poke/Cloud.hs 35;" f
clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f
clampPath src/Dodge/Room/Procedural.hs 174;" f
clampPath src/Dodge/Room/Procedural.hs 163;" f
clang1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 560;" f
clang2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 676;" f
clangS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 542;" f
@@ -2841,11 +2841,11 @@ combinationsGraph src/Dodge/Combine/Graph.hs 72;" f
combinationsOf src/Multiset.hs 46;" f
combinationsTrie src/Dodge/Combine.hs 43;" f
combineAwareness src/Dodge/Creature/Perception.hs 109;" f
combineFloors src/Dodge/Room/Procedural.hs 180;" f
combineFloors src/Dodge/Room/Procedural.hs 169;" f
combineInventoryExtra src/Dodge/Render/HUD.hs 337;" f
combineItemListYouX src/Dodge/Combine.hs 35;" f
combineList src/Dodge/Combine.hs 21;" f
combineRooms src/Dodge/Room/Procedural.hs 160;" f
combineRooms src/Dodge/Room/Procedural.hs 149;" f
combineS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 480;" f
combineTree src/Dodge/Tree/Compose.hs 67;" f
commandColor src/Dodge/Terminal.hs 114;" f
@@ -2936,7 +2936,6 @@ createGas src/Dodge/Gas.hs 10;" f
createHeadLamp src/Dodge/Euse.hs 58;" f
createItemYou src/Dodge/Inventory/Add.hs 61;" f
createLightMap src/Render.hs 26;" f
createPathGrid src/Dodge/Room/Path.hs 21;" f
createProjectile src/Dodge/HeldUse.hs 1276;" f
createProjectileR src/Dodge/HeldUse.hs 1225;" f
createShell src/Dodge/Projectile/Create.hs 21;" f
@@ -3499,7 +3498,7 @@ floorTo src/Geometry/Zone.hs 12;" f
floorWire src/Dodge/Wire.hs 13;" f
foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 558;" f
foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 554;" f
foldMTRS src/Dodge/Room/Tutorial.hs 89;" f
foldMTRS src/Dodge/Room/Tutorial.hs 90;" f
foldPairs src/ListHelp.hs 37;" f
foldrWhileArb src/ListHelp.hs 110;" f
followImpulse src/Dodge/Creature/Impulse.hs 24;" f
@@ -3560,8 +3559,8 @@ getCloseObj src/Dodge/Update/Input/InGame.hs 533;" f
getCommand src/Dodge/Terminal.hs 52;" f
getCommands src/Dodge/Terminal.hs 49;" f
getCrMoveSpeed src/Dodge/Creature/Statistics.hs 50;" f
getCrsFromRooms src/Dodge/Room/Tutorial.hs 363;" f
getCrsFromRooms' src/Dodge/Room/Tutorial.hs 350;" f
getCrsFromRooms src/Dodge/Room/Tutorial.hs 364;" f
getCrsFromRooms' src/Dodge/Room/Tutorial.hs 351;" f
getDebugMouseOver src/Dodge/Update.hs 377;" f
getDistortions src/Dodge/Render.hs 435;" f
getEdgesCrossing src/Dodge/Path.hs 42;" f
@@ -3578,7 +3577,7 @@ getNodePos src/Dodge/Path.hs 39;" f
getPJStabiliser src/Dodge/HeldUse.hs 1251;" f
getPretty src/AesonHelp.hs 8;" f
getPromptTM src/Dodge/Terminal/Type.hs 3;" f
getRoomsFromInts src/Dodge/Room/Tutorial.hs 346;" f
getRoomsFromInts src/Dodge/Room/Tutorial.hs 347;" f
getRootItemBounds src/Dodge/Render/HUD.hs 100;" f
getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f
getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f
@@ -3617,12 +3616,11 @@ graphicsMenu src/Dodge/Menu.hs 185;" f
graphicsMenuOptions src/Dodge/Menu.hs 188;" f
green src/Color.hs 15;" f
greyN src/Color.hs 124;" f
gridInPolygon src/Grid.hs 14;" f
gridPoints src/Grid.hs 73;" f
gridPoints' src/Grid.hs 81;" f
gridPoints'' src/Grid.hs 76;" f
gridPointsOff src/Grid.hs 68;" f
gridXsYs src/Grid.hs 47;" f
gridInPolygon src/Grid.hs 12;" f
gridPoints src/Grid.hs 39;" f
gridPoints' src/Grid.hs 47;" f
gridPoints'' src/Grid.hs 42;" f
gridPointsOff src/Grid.hs 34;" f
groupSplitItemAmounts src/Dodge/Combine.hs 51;" f
gruntS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 678;" f
gut1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 726;" f
@@ -3895,7 +3893,7 @@ keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f
keyPic src/Dodge/Item/Draw/SPic.hs 459;" f
keyholeCorridor src/Dodge/Room/Corridor.hs 39;" f
knifeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 638;" f
lChasm src/Dodge/Room/Tutorial.hs 153;" f
lChasm src/Dodge/Room/Tutorial.hs 154;" f
lConnect src/Dodge/Render/Connectors.hs 42;" f
lConnectMulti src/Dodge/Render/Connectors.hs 46;" f
lShape src/Dodge/Placement/Instance/LightSource.hs 91;" f
@@ -3910,6 +3908,7 @@ lasTunnelRunPast src/Dodge/Room/LasTurret.hs 194;" f
lasTurret src/Dodge/Placement/Instance/Turret.hs 38;" f
laser src/Dodge/Item/Held/BatteryGuns.hs 34;" f
lastMap src/Dodge/DoubleTree.hs 253;" f
latticeXsYs src/Grid.hs 26;" f
launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f
layoutLevelFromSeed src/Dodge/LevelGen.hs 40;" f
ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f
@@ -3953,8 +3952,7 @@ lineOutputTerminal src/Dodge/Room/Warning.hs 66;" f
lineSplit src/Justify.hs 26;" f
lineThick src/Picture/Base.hs 234;" f
lineUp src/Dodge/Creature/Boid.hs 150;" f
linksGridToPath src/Dodge/Room/Path.hs 38;" f
linksGridToPath' src/Dodge/Room/Path.hs 43;" f
linksDAGToPath src/Dodge/Room/Path.hs 15;" f
linksOnPath src/Dodge/Room/CheckConsistency.hs 6;" f
listConfig src/Dodge/Menu.hs 239;" f
listControls src/Dodge/Menu.hs 251;" f
@@ -3963,7 +3961,7 @@ listGuard src/Dodge/Creature/ReaderUpdate.hs 195;" f
listSelectionColorPicture src/Dodge/DisplayInventory.hs 302;" f
litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f
lmt src/MatrixHelper.hs 43;" f
lnkBothAnd src/Dodge/Room/Procedural.hs 130;" f
lnkBothAnd src/Dodge/Room/Procedural.hs 119;" f
lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 387;" f
loadDodgeConfig src/Dodge/Config.hs 30;" f
loadMusic src/Dodge/SoundLogic/LoadSound.hs 30;" f
@@ -4053,7 +4051,6 @@ makeFlameExplosionAt src/Dodge/WorldEvent/Explosion.hs 56;" f
makeFlamelet src/Dodge/EnergyBall.hs 21;" f
makeFragBullets src/Dodge/Bullet.hs 132;" f
makeGasCloud src/Dodge/WorldEvent/SpawnParticle.hs 11;" f
makeGrid src/Grid.hs 54;" f
makeIntInterval src/Dodge/Zoning/Base.hs 39;" f
makeMovingEB src/Dodge/EnergyBall.hs 60;" f
makeMuzzleFlare src/Dodge/HeldUse.hs 656;" f
@@ -4142,7 +4139,7 @@ mglCreate src/GLHelp.hs 8;" f
mglDelete src/GLHelp.hs 14;" f
midBarDecoration src/Dodge/Placement/TopDecoration.hs 16;" f
midBounds src/Dodge/Room/Foreground.hs 150;" f
midChasm src/Dodge/Room/Tutorial.hs 177;" f
midChasm src/Dodge/Room/Tutorial.hs 178;" f
midPad src/Padding.hs 27;" f
midPadL src/Padding.hs 33;" f
midPoint src/Geometry.hs 83;" f
@@ -4304,7 +4301,6 @@ overrideMeleeCloseTarget src/Dodge/Creature/ReaderUpdate.hs 35;" f
overwriteLabel src/Dodge/Tree/Compose.hs 31;" f
p src/ShortShow.hs 48;" f
pContID src/Dodge/LevelGen/PlacementHelper.hs 15;" f
pairInPolys src/Dodge/Room/Path.hs 53;" f
pairPolyPointsIntersect src/Geometry/ConvexPoly.hs 68;" f
pairsToIncGraph src/Dodge/Path.hs 99;" f
pairsToIncidence src/Dodge/Graph.hs 20;" f
@@ -4434,8 +4430,8 @@ pokeWall src/Shader/Poke.hs 78;" f
pokeWallsWindows src/Shader/Poke.hs 50;" f
poly3 src/Picture/Base.hs 84;" f
poly3Col src/Picture/Base.hs 88;" f
polyChasm src/Dodge/Room/Tutorial.hs 198;" f
polyChasmC src/Dodge/Room/Tutorial.hs 207;" f
polyChasm src/Dodge/Room/Tutorial.hs 199;" f
polyChasmC src/Dodge/Room/Tutorial.hs 208;" f
polyCirc src/Shape.hs 46;" f
polyCircx src/Shape.hs 51;" f
polyCornerDist src/Geometry/Polygon.hs 61;" f
@@ -4541,8 +4537,8 @@ qID src/Quaternion.hs 58;" f
qToAng src/Quaternion.hs 55;" f
qToV2 src/Quaternion.hs 52;" f
qToV3 src/Quaternion.hs 49;" f
quarterRoomSquare src/Dodge/Room/Procedural.hs 221;" f
quarterRoomTri src/Dodge/Room/Procedural.hs 185;" f
quarterRoomSquare src/Dodge/Room/Procedural.hs 210;" f
quarterRoomTri src/Dodge/Room/Procedural.hs 174;" f
quitCommand src/Dodge/Terminal.hs 93;" f
qz src/Quaternion.hs 67;" f
rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f
@@ -4573,10 +4569,10 @@ randSparkExtraVel src/Dodge/Spark.hs 92;" f
randWallReflect src/Dodge/Update.hs 644;" f
randomChallenges src/Dodge/Room/Start.hs 63;" f
randomCompass src/Dodge/Layout.hs 60;" f
randomFourCornerRoom src/Dodge/Room/Procedural.hs 274;" f
randomFourCornerRoomCrsIts src/Dodge/Room/Procedural.hs 286;" f
randomFourCornerRoom src/Dodge/Room/Procedural.hs 263;" f
randomFourCornerRoomCrsIts src/Dodge/Room/Procedural.hs 275;" f
randomLightPositions src/Dodge/Room/Modify/Girder.hs 152;" f
randomMediumRoom src/Dodge/Room/Boss.hs 76;" f
randomMediumRoom src/Dodge/Room/Boss.hs 73;" f
randomPath src/TreeHelp.hs 145;" f
randomPoints bench/Bench.hs 37;" f
randomRanges src/RandomHelp.hs 16;" f
@@ -4619,7 +4615,7 @@ removeAimPosture src/Dodge/Creature/YourControl.hs 159;" f
removeAmmoFromMag src/Dodge/HeldUse.hs 907;" f
removeDot src/ShortShow.hs 44;" f
removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f
removeLights src/Dodge/Room/Tutorial.hs 263;" f
removeLights src/Dodge/Room/Tutorial.hs 264;" f
removeShieldWall src/Dodge/Item/BackgroundEffect.hs 57;" f
removeWallsInPolygon src/Dodge/LevelGen/StaticWalls.hs 182;" f
renderDataResizeUpdate src/Preload/Update.hs 26;" f
@@ -4677,8 +4673,8 @@ roomC src/Dodge/Room/Room.hs 40;" f
roomCCrits src/Dodge/Room/Room.hs 271;" f
roomCenterPillar src/Dodge/Room/Room.hs 126;" f
roomCritLS src/Dodge/Room/RunPast.hs 24;" f
roomCross src/Dodge/Room/Boss.hs 85;" f
roomGlassOctogon src/Dodge/Room/Boss.hs 21;" f
roomCross src/Dodge/Room/Boss.hs 82;" f
roomGlassOctogon src/Dodge/Room/Boss.hs 22;" f
roomMiniIntro src/Dodge/Room/Room.hs 121;" f
roomNgon src/Dodge/Room/Ngon.hs 16;" f
roomPadCut src/Dodge/Room/Room.hs 61;" f
@@ -4686,10 +4682,10 @@ roomPillars src/Dodge/Room/Pillar.hs 106;" f
roomPillarsContaining src/Dodge/Room/Containing.hs 39;" f
roomPillarsPassage src/Dodge/Room/Pillar.hs 93;" f
roomPillarsSquare src/Dodge/Room/Pillar.hs 49;" f
roomRect src/Dodge/Room/Procedural.hs 40;" f
roomRectAutoLinks src/Dodge/Room/Procedural.hs 147;" f
roomShuriken src/Dodge/Room/Boss.hs 123;" f
roomTwistCross src/Dodge/Room/Boss.hs 154;" f
roomRect src/Dodge/Room/Procedural.hs 41;" f
roomRectAutoLinks src/Dodge/Room/Procedural.hs 136;" f
roomShuriken src/Dodge/Room/Boss.hs 120;" f
roomTwistCross src/Dodge/Room/Boss.hs 151;" f
roomsContaining src/Dodge/Room/Containing.hs 20;" f
roomsContaining' src/Dodge/Room/Containing.hs 25;" f
rootNotrootEff src/Dodge/Item/BackgroundEffect.hs 28;" f
@@ -4797,7 +4793,7 @@ sensorReqToString src/Dodge/Machine/Update.hs 197;" f
sensorRoom src/Dodge/Room/SensorDoor.hs 26;" f
sensorRoomRunPast src/Dodge/Room/SensorDoor.hs 46;" f
sensorSPic src/Dodge/Machine/Draw.hs 81;" f
sensorTut src/Dodge/Room/Tutorial.hs 372;" f
sensorTut src/Dodge/Room/Tutorial.hs 373;" f
sensorTypeDamages src/Dodge/Machine/Update.hs 234;" f
sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f
sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 81;" f
@@ -4824,7 +4820,7 @@ setOutLinks src/Dodge/RoomLink.hs 50;" f
setOutLinksByType src/Dodge/RoomLink.hs 75;" f
setOutLinksPD src/Dodge/RoomLink.hs 95;" f
setRBCreatureTargeting src/Dodge/Creature/State.hs 290;" f
setRoomInt src/Dodge/Room/Tutorial.hs 96;" f
setRoomInt src/Dodge/Room/Tutorial.hs 97;" f
setSelWhileDragging src/Dodge/Update/Input/InGame.hs 337;" f
setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 87;" f
setShaderSource src/Shader/Compile.hs 290;" f
@@ -4833,7 +4829,7 @@ setSoundVolume src/Sound.hs 157;" f
setTargetMv src/Dodge/Creature/ReaderUpdate.hs 82;" f
setTile src/Dodge/Layout.hs 70;" f
setTiles src/Dodge/Layout.hs 67;" f
setTreeInts src/Dodge/Room/Tutorial.hs 103;" f
setTreeInts src/Dodge/Room/Tutorial.hs 104;" f
setViewDistance src/Dodge/Update/Camera.hs 236;" f
setViewPos src/Dodge/Creature/ReaderUpdate.hs 69;" f
setViewport src/Dodge/Render.hs 440;" f
@@ -4891,7 +4887,6 @@ shiftRelativeToPS src/Dodge/Placement/Shift.hs 18;" f
shiftRoomBy src/Dodge/Room/Link.hs 37;" f
shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f
shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f
shiftedGrid src/Grid.hs 27;" f
shineTargetLaser src/Dodge/Creature/State.hs 201;" f
shineTorch src/Dodge/Creature/State.hs 238;" f
shootBullet src/Dodge/HeldUse.hs 973;" f
@@ -5117,7 +5112,6 @@ terminalWheelEvent src/Dodge/Update/Scroll.hs 131;" f
teslaGun src/Dodge/Item/Held/BatteryGuns.hs 19;" f
teslaGunPic src/Dodge/Item/Draw/SPic.hs 409;" f
teslaParams src/Dodge/Item/Held/BatteryGuns.hs 25;" f
testCrossWalls src/Dodge/Room/Path.hs 49;" f
testEvent src/Dodge/Event/Test.hs 9;" f
testInventory src/Dodge/Creature.hs 292;" f
testStringInit src/Dodge/TestString.hs 34;" f
@@ -5266,13 +5260,13 @@ tryUseParent src/Dodge/Creature/State.hs 145;" f
turnTo src/Dodge/Movement/Turn.hs 8;" f
turret src/Dodge/Placement/Instance/Turret.hs 35;" f
turretItemOffset src/Dodge/Item/HeldOffset.hs 21;" f
tutAnoTree src/Dodge/Room/Tutorial.hs 43;" f
tutDrop src/Dodge/Room/Tutorial.hs 108;" f
tutHub src/Dodge/Room/Tutorial.hs 270;" f
tutLight src/Dodge/Room/Tutorial.hs 235;" f
tutRezBox src/Dodge/Room/Tutorial.hs 383;" f
tutAnoTree src/Dodge/Room/Tutorial.hs 44;" f
tutDrop src/Dodge/Room/Tutorial.hs 109;" f
tutHub src/Dodge/Room/Tutorial.hs 271;" f
tutLight src/Dodge/Room/Tutorial.hs 236;" f
tutRezBox src/Dodge/Room/Tutorial.hs 384;" f
tutRoomTree src/Dodge/Floor.hs 21;" f
tutorialMessage1 src/Dodge/Room/Tutorial.hs 407;" f
tutorialMessage1 src/Dodge/Room/Tutorial.hs 408;" f
tweenAngles src/Geometry/Vector.hs 190;" f
twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 79;" f
twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 34;" f
@@ -5588,14 +5582,14 @@ yourInv src/Dodge/Base/You.hs 28;" f
yourRootItem src/Dodge/Base/You.hs 22;" f
yourSelectedItem src/Dodge/Base/You.hs 16;" f
yourStatsInfo src/Dodge/Creature/Info.hs 27;" f
zChasm src/Dodge/Room/Tutorial.hs 163;" f
zChasm src/Dodge/Room/Tutorial.hs 164;" f
zConnect src/Dodge/Render/Connectors.hs 17;" f
zConnectCol src/Dodge/Render/Connectors.hs 28;" f
zConnectColMidX src/Dodge/Render/Connectors.hs 31;" f
zeroZ src/Geometry/Vector.hs 9;" f
zipArcs src/Dodge/Tesla.hs 52;" f
zipCount src/Dodge/Tree/Shift.hs 136;" f
zipCountDown src/Dodge/Room/Procedural.hs 127;" f
zipCountDown src/Dodge/Room/Procedural.hs 116;" f
zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f
zoneClouds src/Dodge/Update.hs 477;" f
zoneCreature src/Dodge/Zoning/Creature.hs 55;" f