More hlinting

This commit is contained in:
2025-12-21 19:27:49 +00:00
parent 2fbaa47c0b
commit 51c52ace7d
18 changed files with 41 additions and 46 deletions
+1 -2
View File
@@ -99,8 +99,7 @@ roomCross x y =
, (V2 (- x) (20 - y), pi / 2)
, (V2 (20 - y) (- x), pi)
]
++ [ uncurry inLink (V2 (y -20) (- x), pi)
]
++ [ inLink (V2 (y -20) (- x)) pi ]
, _rmPath = mempty
, _rmPmnts =
[ spanLightI (V2 (x + 5) x) (V2 (x + 5) (- x))
+11 -11
View File
@@ -31,10 +31,10 @@ corridor =
where
poly = rectNSWE 80 0 0 40
lnks' =
[ uncurry outLink (V2 20 70, 0)
, uncurry outLink (V2 20 70, pi / 6)
, uncurry outLink (V2 20 70, negate $ pi / 6)
, uncurry inLink (V2 20 10, pi)
[ outLink (V2 20 70) 0
, outLink (V2 20 70) (pi / 6)
, outLink (V2 20 70) (negate $ pi / 6)
, inLink (V2 20 10) pi
]
keyholeCorridor :: Room
@@ -64,8 +64,8 @@ corridorN =
}
where
lnks =
[ uncurry outLink (V2 20 70, 0)
, uncurry inLink (V2 20 10, pi)
[ outLink (V2 20 70) 0
, inLink (V2 20 10) pi
]
pth = doublePairSet (V2 20 70, V2 20 10)
@@ -82,8 +82,8 @@ corridorWallN =
}
where
lnks =
[ uncurry outLink (V2 20 70, 0)
, uncurry inLink (V2 20 10, pi)
[ outLink (V2 20 70) 0
, inLink (V2 20 10) pi
]
pth = doublePairSet (V2 20 70, V2 20 10)
@@ -108,9 +108,9 @@ tEast =
, (V2 0 10, pi)
]
lnks' =
[ uncurry outLink (V2 30 60, - pi / 2)
, uncurry outLink (V2 (-30) 60, pi / 2)
, uncurry inLink (V2 0 10, pi)
[ outLink (V2 30 60) (- pi / 2)
, outLink (V2 (-30) 60) (pi / 2)
, inLink (V2 0 10) pi
]
tWest :: Room
+3 -3
View File
@@ -23,15 +23,15 @@ door =
}
where
lnks =
[ uncurry outLink (V2 20 35, 0)
, uncurry inLink (V2 20 5, pi)
[ outLink (V2 20 35) 0
, inLink (V2 20 5) pi
]
triggerDoorRoom :: Int -> Room
triggerDoorRoom i =
defaultRoom
{ _rmPolys = [rectNSWE 40 0 0 40]
, _rmLinks = [uncurry outLink (V2 20 35, 0), uncurry inLink (V2 20 5, pi)]
, _rmLinks = [outLink (V2 20 35) 0, inLink (V2 20 5) pi]
, _rmPath = doublePairSet (V2 20 35, V2 20 5)
, _rmInPmnt = [(0,f)]
, _rmName = "triggerDoorRoom"
+1 -1
View File
@@ -48,7 +48,7 @@ twinSlowDoorRoom w h x =
[ (V2 w (h / 2), negate $ pi / 2)
, (V2 (- w) (h / 2), pi / 2)
]
++ [uncurry inLink (V2 0 (- h), pi)]
++ [inLink (V2 0 (- h)) pi]
, _rmPath = mempty
, _rmPmnts =
[ pContID (PS (V2 0 (h -5)) pi) (PutButton $ makeButton col NoWorldEffect) $
+1 -1
View File
@@ -111,7 +111,7 @@ rezBoxesWpCrit = do
treeFromTrunk [rezBox thecol, door] $
Node centralRoom (rezrooms ++ [onwardpassage])
where
adddoor rm = treeFromPost [door & rmConnectsTo .~ S.member (OnEdge North)] rm
adddoor = treeFromPost [door & rmConnectsTo .~ S.member (OnEdge North)]
crAdd :: Room -> Room
crAdd = rmPmnts .:~ sPS (V2 20 10) (0.5 * pi) randC1
+1 -1
View File
@@ -429,7 +429,7 @@ distributerRoom atype aamount = do
(PutMachine (reverse $ polyCirc 4 20) mcstore Nothing) & plExternalID ?~ i
dst gw = let mj = gw ^? genPmnt . ix i . plMID . _Just
in putTerminal (mcdist mj) (defaultTerminal & tmBootLines .~ tmDistributeLines)
& plSpot .~ (unusedOffPathAwayFromLink 50)
& plSpot .~ unusedOffPathAwayFromLink 50
& plExternalID ?~ i1
thepipe gw =
let p1 = gw ^?! genPmnt . ix i . plSpot . psPos
+1 -1
View File
@@ -30,7 +30,7 @@ triLootRoom w h =
[ tri
, base
]
, _rmLinks = [uncurry inLink (V2 0 (-80), pi)]
, _rmLinks = [inLink (V2 0 (-80)) pi]
, _rmPath = doublePairSet (V2 0 (-80), V2 0 (h / 2))
, _rmPmnts =
[ sPS (V2 (15 - w) 15) 0 $ PutID 0
+1 -1
View File
@@ -103,7 +103,7 @@ tutDrop = do
treePost
[x & rmInPmnt .:~ (0, t j), y, cleatOnward rm]
where
t j = \gw ->
t j gw =
let x = gw ^? genInts . ix j
in putMessageTerminal
(defaultTerminal & tmBootLines .~ ss <> tlSetStatus (TerminalPressTo $ show x <> "QUIT") <> tlDoEffect TmWdWdPowerDownTerminal)