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

Commit before tweaking placementn/room generation

Browse Source
This commit is contained in:
justin
2025-09-23 09:52:52 +01:00
parent 4179115023
commit d1bb8a985b
18 changed files with 308 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
log/aGeneratedRoomLayout
+19 -5
View File
@@ -6,7 +6,7 @@ Room layout (compact):
| |
+- 6,7 +- 6,7
| |
8,9,10,11,12 8,9,10,11,12,13,14,15,16,17,18,19
Layout with room names: Layout with room names:
tutRezBox-0 tutRezBox-0
@@ -27,11 +27,25 @@ doorToggle-6gon-3
| |
Corridor-8 Corridor-8
| |
6gon-9 autoDoor-9
| |
defaultRoom-10 Corridor-10
| |
autoRect-11 Corridor-11
| |
Corridor-12 roomCenterPillar-12
|
corridorN-13
|
autoDoor-14
|
Corridor-15
|
6gon-16
|
defaultRoom-17
|
autoRect-18
|
Corridor-19
log/attemptedSeeds
+1 -1
View File
@@ -1,4 +1,4 @@
Generating level with seed 7114951007332849727 Generating level with seed 7114951007332849727
After 1 attempt(s), Successful generation of level with seed 7114951007332849727 After 1 attempt(s), Successful generation of level with seed 7114951007332849727
13 rooms in total 20 rooms in total
log/treeCluster
+33 -7
View File
@@ -5,9 +5,15 @@ Seed: 7114951007332849727
| |
2:DoorTest 2:DoorTest
| |
3:TutDrop 3:corDoor
| |
4:cor 4:critroom
|
5:corDoor
|
6:TutDrop
|
7:cor
0:0:TutStartRez 0:0:TutStartRez
@@ -33,13 +39,33 @@ Seed: 7114951007332849727
| |
2:0:5:Corridor 2:0:5:Corridor
3:0:TutDrop 3:0:corDoor
3:0:0:6gon 3:0:0:autoDoor
| |
3:0:1:defaultRoom 3:0:1:Corridor
4:0:critroom
4:0:0:Corridor
| |
3:0:2:autoRect 4:0:1:roomCenterPillar
|
4:0:2:corridorN
4:0:Corridor 5:0:corDoor
5:0:0:autoDoor
|
5:0:1:Corridor
6:0:TutDrop
6:0:0:6gon
|
6:0:1:defaultRoom
|
6:0:2:autoRect
7:0:Corridor
saveSlot/LevelStart0
+1 -1
View File
File diff suppressed because one or more lines are too long
src/Dodge/Data/GenWorld.hs
+3 -2
View File
@@ -23,6 +23,7 @@ import System.Random
data GenWorld = GenWorld data GenWorld = GenWorld
{ _gwWorld :: World { _gwWorld :: World
, _genRooms :: IM.IntMap Room , _genRooms :: IM.IntMap Room
, _genPmnt :: IM.IntMap [Placement]
} }
---- ROOM DATATYPES ---- ROOM DATATYPES
@@ -80,7 +81,7 @@ data Placement = Placement
{ _plSpot :: PlacementSpot { _plSpot :: PlacementSpot
, _plType :: PSType , _plType :: PSType
, _plMID :: Maybe Int , _plMID :: Maybe Int
, _plIDCont :: World -> Placement -> Maybe Placement , _plIDCont :: GenWorld -> Placement -> Maybe Placement
} }
{- The '_rmPolys' lists which polygons should be cut out to form the indestructible walls of the room. {- The '_rmPolys' lists which polygons should be cut out to form the indestructible walls of the room.
@@ -124,7 +125,7 @@ data Room = Room
} }
data InPlacement = InPlacement data InPlacement = InPlacement
{ _ipPlacement :: World -> [Placement] -> Placement { _ipPlacement :: GenWorld -> [Placement] -> Placement
, _ipPlacementID :: Int , _ipPlacementID :: Int
} }
src/Dodge/DisplayInventory.hs
+4 -4
View File
@@ -176,10 +176,10 @@ filterSectionsPair infocus filtfn itms s mfilt = (x, itms')
white white
0 0
Nothing Nothing
f y f y = y
| null y = -- | null y =
IM.singleton 0 $ SelItem ["(NONE)"] 1 (length s) True (greyN 0.5) 0 Nothing -- IM.singleton 0 $ SelItem ["(NONE)"] 1 (length s) True (greyN 0.5) 0 Nothing
| otherwise = y -- | otherwise = y
itms' = f $ maybe id (IM.filter . filtfn) mfilt itms itms' = f $ maybe id (IM.filter . filtfn) mfilt itms
numfiltitems = show (length itms - length itms') ++ " FILTERED" numfiltitems = show (length itms - length itms') ++ " FILTERED"
src/Dodge/Layout.hs
+4 -2
View File
@@ -86,7 +86,7 @@ doInPlacements (im, w) =
doRoomInPlacements :: IM.IntMap [Placement] -> GenWorld -> Room -> (GenWorld, Room) doRoomInPlacements :: IM.IntMap [Placement] -> GenWorld -> Room -> (GenWorld, Room)
doRoomInPlacements im w rm = foldr f (w, rm) $ _rmInPmnt rm doRoomInPlacements im w rm = foldr f (w, rm) $ _rmInPmnt rm
where where
f (InPlacement plf i) (w', r') = fst $ placeSpot (w', r') (plf (w' ^. gwWorld) $ im IM.! i) f (InPlacement plf i) (w', r') = fst $ placeSpot (w', r') (plf (w') $ im IM.! i)
doOutPlacements :: GenWorld -> (IM.IntMap [Placement], GenWorld) doOutPlacements :: GenWorld -> (IM.IntMap [Placement], GenWorld)
doOutPlacements w = doOutPlacements w =
@@ -109,7 +109,9 @@ doIndividualPlacements gw =
in gw' & genRooms .~ rms in gw' & genRooms .~ rms
doRoomPlacements :: GenWorld -> Room -> (GenWorld, Room) doRoomPlacements :: GenWorld -> Room -> (GenWorld, Room)
doRoomPlacements w rm = foldl' (\wr -> fst . placeSpot wr) (w, rm) $ _rmPmnts rm --doRoomPlacements w rm = foldl' (\wr -> fst . placeSpot wr) (w, rm) $ _rmPmnts rm
doRoomPlacements w rm = foldl' (\wr -> fst . placeSpot wr) (w, rm & rmPmnts .~ mempty)
$ _rmPmnts rm
setupWorldBounds :: World -> World setupWorldBounds :: World -> World
setupWorldBounds w = setupWorldBounds w =
src/Dodge/LevelGen/LevelStructure.hs
+1
View File
@@ -16,6 +16,7 @@ worldToGenWorld rms w =
GenWorld GenWorld
{ _gwWorld = w & cWorld . cwGen . cwgParams .~ evalState generateGenParams (_randGen w) { _gwWorld = w & cWorld . cwGen . cwgParams .~ evalState generateGenParams (_randGen w)
, _genRooms = rms , _genRooms = rms
, _genPmnt = mempty
} }
generateGenParams :: RandomGen g => State g GenParams generateGenParams :: RandomGen g => State g GenParams
src/Dodge/LevelGen/PlacementHelper.hs
+2 -2
View File
@@ -54,7 +54,7 @@ ps0 pst = Placement (PS (V2 0 0) 0) pst Nothing . contToIDCont
pt0 :: PSType -> (Placement -> Maybe Placement) -> Placement pt0 :: PSType -> (Placement -> Maybe Placement) -> Placement
pt0 pst = Placement (PS (V2 0 0) 0) pst Nothing . const pt0 pst = Placement (PS (V2 0 0) 0) pst Nothing . const
contToIDCont :: (Int -> Maybe Placement) -> World -> Placement -> Maybe Placement contToIDCont :: (Int -> Maybe Placement) -> GenWorld -> Placement -> Maybe Placement
contToIDCont f _ = f . fromJust . _plMID contToIDCont f _ = f . fromJust . _plMID
jps0' :: PSType -> (Placement -> Maybe Placement) -> Maybe Placement jps0' :: PSType -> (Placement -> Maybe Placement) -> Maybe Placement
@@ -80,7 +80,7 @@ ps0PushPS :: PSType -> (Placement -> Maybe Placement) -> Placement
ps0PushPS pst f = Placement (PSNoShiftCont (V2 0 0) 0) pst Nothing $ ps0PushPS pst f = Placement (PSNoShiftCont (V2 0 0) 0) pst Nothing $
\_ pl -> f pl & _Just . plSpot %~ const (_plSpot pl) \_ pl -> f pl & _Just . plSpot %~ const (_plSpot pl)
ps0PushPSw :: PSType -> (World -> Placement -> Maybe Placement) -> Placement ps0PushPSw :: PSType -> (GenWorld -> Placement -> Maybe Placement) -> Placement
ps0PushPSw pst f = Placement (PSNoShiftCont (V2 0 0) 0) pst Nothing $ ps0PushPSw pst f = Placement (PSNoShiftCont (V2 0 0) 0) pst Nothing $
\w pl -> f w pl & _Just . plSpot %~ const (_plSpot pl) \w pl -> f w pl & _Just . plSpot %~ const (_plSpot pl)
src/Dodge/Machine/Update.hs
+1 -1
View File
@@ -174,7 +174,7 @@ mcProximitySensorUpdate mc sens pr w
& mcsenslens . proxToggle ?~ True & mcsenslens . proxToggle ?~ True
& playsound dedaS & playsound dedaS
& mctermlens . tmFutureLines & mctermlens . tmFutureLines
<>~ [makeTermLine "SENSOR SUCCESS, DEACTIVATED"] <>~ [makeTermLine "SENSOR SUCCESS: DEACTIVATED"]
<> tlSetStatus (TerminalPressTo "QUIT") <> tlSetStatus (TerminalPressTo "QUIT")
<> tlDoEffect (TmWdWdLeaveTerminal "QUIT") <> tlDoEffect (TmWdWdLeaveTerminal "QUIT")
| notog = | notog =
src/Dodge/Placement/Instance/Analyser.hs
+12 -3
View File
@@ -1,4 +1,7 @@
module Dodge.Placement.Instance.Analyser (analyser) where module Dodge.Placement.Instance.Analyser (
analyser,
analyserWithPrompt,
) where
import Color import Color
import Dodge.Data.GenWorld import Dodge.Data.GenWorld
@@ -7,7 +10,11 @@ import Dodge.Placement.Instance
import LensHelp import LensHelp
analyser :: ProximitySensorType -> PlacementSpot -> PlacementSpot -> Placement analyser :: ProximitySensorType -> PlacementSpot -> PlacementSpot -> Placement
analyser pst pslight psmc = extTrigLitPos pslight $ \tp -> analyser = analyserWithPrompt []
analyserWithPrompt ::
[TerminalLine] -> ProximitySensorType -> PlacementSpot -> PlacementSpot -> Placement
analyserWithPrompt l pst pslight psmc = extTrigLitPos pslight $ \tp ->
Just $ Just $
plSpot .~ psmc $ plSpot .~ psmc $
putTerminal putTerminal
@@ -15,7 +22,9 @@ analyser pst pslight psmc = extTrigLitPos pslight $ \tp ->
(themachine & mcMounts . at OTTrigger .~ _plMID tp) (themachine & mcMounts . at OTTrigger .~ _plMID tp)
tparams tparams
where where
tparams = defaultTerminal & tmStatus .~ TerminalLineRead tparams =
defaultTerminal & tmStatus .~ TerminalLineRead
& tmFutureLines .~ l
themachine = themachine =
defaultMachine & mcColor .~ aquamarine defaultMachine & mcColor .~ aquamarine
& mcType .~ McTerminal & mcType .~ McTerminal
src/Dodge/Placement/Instance/Door.hs
+2 -2
View File
@@ -78,8 +78,8 @@ divideDoorPane mid wl cond soff speed ppairs g = case ppairs of
putAutoDoor :: Point2 -> Point2 -> Placement putAutoDoor :: Point2 -> Point2 -> Placement
putAutoDoor a b = Placement (PS 0 0) (PutCoord a) Nothing $ \_ apl -> putAutoDoor a b = Placement (PS 0 0) (PutCoord a) Nothing $ \_ apl ->
Just $ Placement (PS 0 0) (PutCoord b) Nothing $ \w bpl -> Just $ Placement (PS 0 0) (PutCoord b) Nothing $ \w bpl ->
let x = w ^?! coordinates . ix (apl ^?! plMID . _Just) let x = w ^?! gwWorld . coordinates . ix (apl ^?! plMID . _Just)
y = w ^?! coordinates . ix (bpl ^?! plMID . _Just) y = w ^?! gwWorld . coordinates . ix (bpl ^?! plMID . _Just)
in Just $ putDoubleDoor in Just $ putDoubleDoor
AutoDoorObstacle AutoDoorObstacle
defaultAutoWall defaultAutoWall
src/Dodge/Placement/PlaceSpot.hs
+1 -1
View File
@@ -41,7 +41,7 @@ placePlainPSSpot
placePlainPSSpot w rm plmnt shift = placePlainPSSpot w rm plmnt shift =
let (i, w') = placeSpotID (shiftPSBy shift (_plSpot plmnt)) (_plType plmnt) w let (i, w') = placeSpotID (shiftPSBy shift (_plSpot plmnt)) (_plType plmnt) w
newplmnt = plmnt & plMID ?~ i newplmnt = plmnt & plMID ?~ i
in maybe ((w', rm), [newplmnt]) (recrPlace newplmnt w') (_plIDCont plmnt (_gwWorld w') newplmnt) in maybe ((w', rm & rmPmnts .:~ newplmnt), [newplmnt]) (recrPlace newplmnt w') (_plIDCont plmnt (w') newplmnt)
where where
recrPlace newplmnt w' pl = recrPlace newplmnt w' pl =
let (wr, newplmnts) = placeSpot (w', rm) pl let (wr, newplmnts) = placeSpot (w', rm) pl
src/Dodge/Room/LasTurret.hs
+18
View File
@@ -90,9 +90,27 @@ analyserByNthLink n proxreq i rm =
where where
sensorshift (p, a) = (p +.+ rotateV a (V2 (-30) (-10)), a) sensorshift (p, a) = (p +.+ rotateV a (V2 (-30) (-10)), a)
analyserByNthLinkWithPrompt
:: Int -> [TerminalLine] -> ProximityRequirement -> Int -> Room -> Room
analyserByNthLinkWithPrompt n l proxreq i rm =
rm
& rmPmnts
.++~ [ psPt (atNthLinkOut n) $ PutForeground $ verticalWire (V2 20 0) 0 80
]
& rmOutPmnt . at i ?~
analyserWithPrompt l
(SensorWithRequirement proxreq)
(atNthLnkOutShiftBy n (\(p, a) -> (p +.+ rotateV a (V2 18.5 (-2.5)), a)))
(atNthLnkOutShiftBy n sensorshift)
where
sensorshift (p, a) = (p +.+ rotateV a (V2 (-30) (-10)), a)
analyserByDoor :: ProximityRequirement -> Int -> Room -> Room analyserByDoor :: ProximityRequirement -> Int -> Room -> Room
analyserByDoor = analyserByNthLink 0 analyserByDoor = analyserByNthLink 0
analyserByDoorWithPrompt :: [TerminalLine] -> ProximityRequirement -> Int -> Room -> Room
analyserByDoorWithPrompt = analyserByNthLinkWithPrompt 0
healthTest :: RandomGen g => Int -> State g (Tree Room) healthTest :: RandomGen g => Int -> State g (Tree Room)
healthTest n = do healthTest n = do
cenroom <- shuffleLinks =<< healthAnalyserByDoor n <$> roomNgon 8 200 cenroom <- shuffleLinks =<< healthAnalyserByDoor n <$> roomNgon 8 200
src/Dodge/Room/Room.hs
+1
View File
@@ -8,6 +8,7 @@ module Dodge.Room.Room (
pistolerRoom, pistolerRoom,
spawnerRoom, spawnerRoom,
corDoor, corDoor,
weaponBehindPillar,
) where ) where
import qualified Data.Set as S import qualified Data.Set as S
src/Dodge/Room/Tutorial.hs
+61 -31
View File
@@ -1,5 +1,6 @@
module Dodge.Room.Tutorial where module Dodge.Room.Tutorial where
import Dodge.Room.Room
import Dodge.Annotation.Data import Dodge.Annotation.Data
import Dodge.Cleat import Dodge.Cleat
--import Control.Monad --import Control.Monad
@@ -26,7 +27,6 @@ import Dodge.Room.Ngon
import Dodge.Room.Procedural import Dodge.Room.Procedural
import Dodge.Room.RezBox import Dodge.Room.RezBox
import Dodge.Room.RoadBlock import Dodge.Room.RoadBlock
import Dodge.Room.Room
import Dodge.Room.Warning import Dodge.Room.Warning
--import Dodge.Room.RoadBlock --import Dodge.Room.RoadBlock
import Dodge.RoomLink import Dodge.RoomLink
@@ -49,6 +49,9 @@ tutAnoTree =
[ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox [ AnTree $ tToBTree "TutStartRez" . return . cleatOnward <$> tutRezBox
, AnTree corDoor , AnTree corDoor
, AnTree $ tutRooms , AnTree $ tutRooms
, AnTree corDoor
, AnTree $ tToBTree "critroom" <$> weaponBehindPillar
, AnTree corDoor
, AnTree $ tutDrop , AnTree $ tutDrop
, AnTree $ return $ tToBTree "cor" $ return $ cleatOnward corridor , AnTree $ return $ tToBTree "cor" $ return $ cleatOnward corridor
---- , AnTree $ pickupTut ---- , AnTree $ pickupTut
@@ -73,7 +76,18 @@ tutDrop = do
& plSpot .~ rprBoolShift isUnusedLnk & plSpot .~ rprBoolShift isUnusedLnk
(\(p, a) -> (p + 10 *.* unitVectorAtAngle (a - pi/2), a)) (\(p, a) -> (p + 10 *.* unitVectorAtAngle (a - pi/2), a))
ss = ss =
[ makeTermLine "USE [F] OR CLICK AND DRAG TO DROP ITEMS" [makeTermLine "--------------------------------------------"
,makeTermLine "YOU CAN ONLY CARRY A LIMITED AMOUNT OF ITEMS"
,makeTermLine "--------------------------------------------"
]
<> tlSetStatus (TerminalPressTo "CONTINUE") <>
[ makeTermLine "USE [F] TO DROP SINGLE ITEMS"
,makeTermLine "--------------------------------------------"
]
<> tlSetStatus (TerminalPressTo "CONTINUE") <>
[ makeTermLine "YOU CAN SELECT AND MOVE MULTIPLE ITEMS"
, makeTermLine " WITH THE MOUSE"
, makeTermLine "-------------------------------------------"
] ]
tutRooms :: State LayoutVars (MetaTree Room String) tutRooms :: State LayoutVars (MetaTree Room String)
@@ -81,7 +95,7 @@ tutRooms = do
i <- nextLayoutInt i <- nextLayoutInt
j <- nextLayoutInt j <- nextLayoutInt
x <- x <-
shuffleLinks =<< analyserByDoor (RequireEquipment (AMMOMAG DRUMMAG)) i shuffleLinks =<< analyserByDoorWithPrompt sensorTut (RequireEquipment (AMMOMAG DRUMMAG)) i
<$> addDoorAtNthLinkToggleTerminal 1 ss j <$> addDoorAtNthLinkToggleTerminal 1 ss j
<$> roomNgon 6 100 <$> roomNgon 6 100
bcor <- blockedCorridor bcor <- blockedCorridor
@@ -97,13 +111,15 @@ tutRooms = do
] ]
where where
ss = ss =
[ makeTermLine "SOME TERMINALS CAN BE INTERACTED WITH DIRECTLY" [ makeTermLine "---------------------------------------------"
, makeTermLine " THESE WILL DISPLAY A PROMPT SYMBOL" , makeTermLine "YOU CAN INTERACT WITH SOME TERMINALS DIRECTLY"
, makeTermLine " _____" , makeTermLine " THESE WILL DISPLAY A PROMPT SYMBOL"
, makeTermLine " | | TYPE OR SCROLL TO ENTER COMMANDS" , makeTermLine " *****"
, makeTermLine " | > |" , makeTermLine " * * TYPE OR SCROLL TO ENTER COMMANDS"
, makeTermLine " | | CLICK OR USE [RETURN] TO CONFIRM" , makeTermLine " * > *"
, makeTermLine " ^^^^^" , makeTermLine " * * CLICK OR USE [RETURN] TO CONFIRM"
, makeTermLine " ***** "
, makeTermLine "---------------------------------------------"
, makeTermLine "" , makeTermLine ""
] ]
r x = roomRectAutoLinks 100 100 <&> rmPmnts .:~ sps (PS 50 0) (PutFlIt x) r x = roomRectAutoLinks 100 100 <&> rmPmnts .:~ sps (PS 50 0) (PutFlIt x)
@@ -114,27 +130,34 @@ tutRooms = do
& plSpot .~ rprBoolShift isUnusedLnk & plSpot .~ rprBoolShift isUnusedLnk
(\(p, a) -> (p + 10 *.* unitVectorAtAngle (a - pi/2), a)) (\(p, a) -> (p + 10 *.* unitVectorAtAngle (a - pi/2), a))
ss' = ss' =
[ makeTermLine "HOLD [CAPS] AND SCROLL" [ makeTermLine "---------------------------------------------"
, makeTermLine " OR CLICK AND DRAG TO REARRANGE INVENTORY ITEMS" , makeTermLine "HOLD [CAPS] AND SCROLL"
, makeTermLine "" , makeTermLine " OR CLICK AND DRAG"
, makeTermLine "AMMO MAGS ARE TYPICALLY LOADED BENEATH WEAPONS" , makeTermLine " TO REARRANGE INVENTORY ITEMS"
, makeTermLine "---------------------------------------------"
]
<> tlSetStatus (TerminalPressTo "CONTINUE") <>
[ makeTermLine "AMMO MAGS ARE NORMALLY LOADED BENEATH WEAPONS"
, makeTermLine " .-------." , makeTermLine " .-------."
, makeTermLine " BURSTRIFLE |DRUMMAG|" , makeTermLine " BURSTRIFLE |DRUMMAG|"
, makeTermLine " <------^-------^" , makeTermLine " <------^-------^"
, makeTermLine "" , makeTermLine "---------------------------------------------"
, makeTermLine "HOLD [RMB] TO AIM" ]
, makeTermLine "*AND* THEN TAP [LMB] TO FIRE LOADED WEAPONS" <> tlSetStatus (TerminalPressTo "CONTINUE") <>
[ makeTermLine "HOLD [RMB] TO AIM"
, makeTermLine " THEN CLICK [LMB] TO FIRE LOADED WEAPONS"
, makeTermLine "---------------------------------------------"
] ]
sensorTut :: [TerminalLine] sensorTut :: [TerminalLine]
sensorTut = sensorTut =
[ makeTermLine "SOME TERMINALS DETECT EXTERNAL CONDITIONS" [ makeTermLine "--------------------------------------------"
, makeTermLine "WHILE WORKING THESE DISPLAY SPINNING SYMBOL" , makeTermLine "SOME TERMINALS DETECT EXTERNAL CONDITIONS"
, makeTermLine "" , makeTermLine "WHILE ACTIVE THESE DISPLAY A SPINNING SYMBOL"
, makeTermLine "**CAUTION**" , makeTermLine " | / - \\"
, makeTermLine "THE CONDITIONS AND ANY EFFECTS MAY BE HIDDEN" , makeTermLine "--------------------------------------------"
, makeTermLine ""
] ]
<> tlSetStatus (TerminalPressTo "CONTINUE")
tutRezBox :: RandomGen g => State g Room tutRezBox :: RandomGen g => State g Room
tutRezBox = do tutRezBox = do
@@ -156,17 +179,24 @@ tutRezBox = do
& restrictOutLinks (\(V2 _ h, _) -> h > 59) & restrictOutLinks (\(V2 _ h, _) -> h > 59)
& rmName .~ "tutRezBox" & rmName .~ "tutRezBox"
where where
s w = tutorialMessage1 (w ^. cWorld . cwGen . cwgSeed) s w = tutorialMessage1 (w ^. gwWorld . cWorld . cwGen . cwgSeed)
tutorialMessage1 :: Int -> [TerminalLine] tutorialMessage1 :: Int -> [TerminalLine]
tutorialMessage1 i = tutorialMessage1 i =
[ makeTermLine $ "WELCOME TO ENVIRONMENT " ++ show i [ makeTermLine "--------------------------------------------"
, makeTermLine $ "WELCOME TO ENVIRONMENT " ++ show i
, makeTermLine "" , makeTermLine ""
, makeTermLine "USE [SPACE] TO INTERACT WITH NEARBY OBJECTS"
, makeTermLine "--------------------------------------------"
] ]
<> tlSetStatus (TerminalPressTo "USE [SPACE] TO INTERACT WITH NEARBY OBJECTS") <> tlSetStatus (TerminalPressTo "CONTINUE")
<> [ makeTermLine "USE [SPACE] TO INTERACT WITH NEARBY OBJECTS" <> [ makeTermLine "USE [W]"
, makeTermLine "" , makeTermLine " [A] [S]"
, makeTermLine "USE [W]" , makeTermLine " [D] TO MOVE"
, makeTermLine " [A] [S]" , makeTermLine "--------------------------------------------"
, makeTermLine " [D] TO MOVE" ]
<> tlSetStatus (TerminalPressTo "CONTINUE") <>
[ makeTermLine "AFTER EXITING THIS TERMINAL YOUR INVENTORY"
, makeTermLine " AND NEARBY OBJECTS WILL BE DISPLAYED"
, makeTermLine "--------------------------------------------"
] ]
src/Dodge/Tree/Shift.hs
+1 -1
View File
@@ -39,7 +39,7 @@ positionRoomsFromTree (Node (r, i) ts) =
(fmap (prRooms %~ map (first createUnusedLinkPos))) (fmap (prRooms %~ map (first createUnusedLinkPos)))
(posRms (PosRooms (map pointsToPoly $ _rmBound r') []) (r', i) (zipCount ts) Empty) (posRms (PosRooms (map pointsToPoly $ _rmBound r') []) (r', i) (zipCount ts) Empty)
where where
r' = r & rmMID ?~ 0 r' = r & rmMID ?~ i
posRms :: posRms ::
PosRooms -> PosRooms ->
tags
+143 -138
View File
@@ -587,7 +587,7 @@ InDream src/Dodge/Data/Scenario.hs 19;" C
InInv src/Dodge/Data/Item/Location.hs 27;" C InInv src/Dodge/Data/Item/Location.hs 27;" C
InLink src/Dodge/Data/Room.hs 44;" C InLink src/Dodge/Data/Room.hs 44;" C
InParallelUniverse src/Dodge/Data/Scenario.hs 21;" C InParallelUniverse src/Dodge/Data/Scenario.hs 21;" C
InPlacement src/Dodge/Data/GenWorld.hs 126;" t InPlacement src/Dodge/Data/GenWorld.hs 127;" t
InRealWorld src/Dodge/Data/Scenario.hs 18;" C InRealWorld src/Dodge/Data/Scenario.hs 18;" C
InSimulation src/Dodge/Data/Scenario.hs 20;" C InSimulation src/Dodge/Data/Scenario.hs 20;" C
InVoid src/Dodge/Data/Item/Location.hs 37;" C InVoid src/Dodge/Data/Item/Location.hs 37;" C
@@ -982,11 +982,11 @@ PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 89;" C
POWERLEGS src/Dodge/Data/Item/Combine.hs 130;" C POWERLEGS src/Dodge/Data/Item/Combine.hs 130;" C
PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C
PRISM src/Dodge/Data/Item/Combine.hs 66;" C PRISM src/Dodge/Data/Item/Combine.hs 66;" C
PS src/Dodge/Data/GenWorld.hs 66;" C PS src/Dodge/Data/GenWorld.hs 67;" C
PSNoShiftCont src/Dodge/Data/GenWorld.hs 67;" C PSNoShiftCont src/Dodge/Data/GenWorld.hs 68;" C
PSPos src/Dodge/Data/GenWorld.hs 68;" C PSPos src/Dodge/Data/GenWorld.hs 69;" C
PSRoomRand src/Dodge/Data/GenWorld.hs 73;" C PSRoomRand src/Dodge/Data/GenWorld.hs 74;" C
PSType src/Dodge/Data/GenWorld.hs 29;" t PSType src/Dodge/Data/GenWorld.hs 30;" t
PUMP src/Dodge/Data/Item/Combine.hs 63;" C PUMP src/Dodge/Data/Item/Combine.hs 63;" C
PaletteColor src/Color/Data.hs 14;" t PaletteColor src/Color/Data.hs 14;" t
PassthroughLockKeyLists src/Dodge/Annotation/Data.hs 24;" C PassthroughLockKeyLists src/Dodge/Annotation/Data.hs 24;" C
@@ -1005,8 +1005,8 @@ PhysicalSensor src/Dodge/Data/Machine/Sensor.hs 18;" C
Picture src/Picture/Data.hs 46;" t Picture src/Picture/Data.hs 46;" t
Piercing src/Dodge/Data/Damage.hs 20;" C Piercing src/Dodge/Data/Damage.hs 20;" C
PistolAI src/Dodge/Data/Creature/Misc.hs 43;" C PistolAI src/Dodge/Data/Creature/Misc.hs 43;" C
Placement src/Dodge/Data/GenWorld.hs 79;" t Placement src/Dodge/Data/GenWorld.hs 80;" t
PlacementSpot src/Dodge/Data/GenWorld.hs 65;" t PlacementSpot src/Dodge/Data/GenWorld.hs 66;" t
PlainBarrel src/Dodge/Data/Creature/Misc.hs 88;" C PlainBarrel src/Dodge/Data/Creature/Misc.hs 88;" C
PlantNurserySS src/Dodge/Data/Scenario.hs 96;" C PlantNurserySS src/Dodge/Data/Scenario.hs 96;" C
PlayStatus src/Sound/Data.hs 23;" t PlayStatus src/Sound/Data.hs 23;" t
@@ -1074,28 +1074,28 @@ PulseStatus src/Dodge/Data/Creature/Misc.hs 54;" C
PushSource src/Dodge/Data/Door.hs 27;" t PushSource src/Dodge/Data/Door.hs 27;" t
PushedBy src/Dodge/Data/Door.hs 29;" C PushedBy src/Dodge/Data/Door.hs 29;" C
PushesItself src/Dodge/Data/Door.hs 28;" C PushesItself src/Dodge/Data/Door.hs 28;" C
PutBlock src/Dodge/Data/GenWorld.hs 43;" C PutBlock src/Dodge/Data/GenWorld.hs 44;" C
PutButton src/Dodge/Data/GenWorld.hs 38;" C PutButton src/Dodge/Data/GenWorld.hs 39;" C
PutChasm src/Dodge/Data/GenWorld.hs 61;" C PutChasm src/Dodge/Data/GenWorld.hs 62;" C
PutCoord src/Dodge/Data/GenWorld.hs 44;" C PutCoord src/Dodge/Data/GenWorld.hs 45;" C
PutCrit src/Dodge/Data/GenWorld.hs 30;" C PutCrit src/Dodge/Data/GenWorld.hs 31;" C
PutDoor src/Dodge/Data/GenWorld.hs 55;" C PutDoor src/Dodge/Data/GenWorld.hs 56;" C
PutFlIt src/Dodge/Data/GenWorld.hs 41;" C PutFlIt src/Dodge/Data/GenWorld.hs 42;" C
PutForeground src/Dodge/Data/GenWorld.hs 57;" C PutForeground src/Dodge/Data/GenWorld.hs 58;" C
PutID src/Dodge/Data/GenWorld.hs 60;" C PutID src/Dodge/Data/GenWorld.hs 61;" C
PutLS src/Dodge/Data/GenWorld.hs 37;" C PutLS src/Dodge/Data/GenWorld.hs 38;" C
PutLineBlock src/Dodge/Data/GenWorld.hs 47;" C PutLineBlock src/Dodge/Data/GenWorld.hs 48;" C
PutMachine src/Dodge/Data/GenWorld.hs 31;" C PutMachine src/Dodge/Data/GenWorld.hs 32;" C
PutMod src/Dodge/Data/GenWorld.hs 45;" C PutMod src/Dodge/Data/GenWorld.hs 46;" C
PutNothing src/Dodge/Data/GenWorld.hs 59;" C PutNothing src/Dodge/Data/GenWorld.hs 60;" C
PutOnEquipment src/Dodge/Data/RightButtonOptions.hs 21;" C PutOnEquipment src/Dodge/Data/RightButtonOptions.hs 21;" C
PutPPlate src/Dodge/Data/GenWorld.hs 42;" C PutPPlate src/Dodge/Data/GenWorld.hs 43;" C
PutProp src/Dodge/Data/GenWorld.hs 39;" C PutProp src/Dodge/Data/GenWorld.hs 40;" C
PutSlideDr src/Dodge/Data/GenWorld.hs 54;" C PutSlideDr src/Dodge/Data/GenWorld.hs 55;" C
PutTerminal src/Dodge/Data/GenWorld.hs 40;" C PutTerminal src/Dodge/Data/GenWorld.hs 41;" C
PutTrigger src/Dodge/Data/GenWorld.hs 46;" C PutTrigger src/Dodge/Data/GenWorld.hs 47;" C
PutWall src/Dodge/Data/GenWorld.hs 53;" C PutWall src/Dodge/Data/GenWorld.hs 54;" C
PutWorldUpdate src/Dodge/Data/GenWorld.hs 58;" C PutWorldUpdate src/Dodge/Data/GenWorld.hs 59;" C
QFloat src/Geometry/Data.hs 50;" t QFloat src/Geometry/Data.hs 50;" t
QuarterRes src/Dodge/Data/Config.hs 97;" C QuarterRes src/Dodge/Data/Config.hs 97;" C
QuicksaveSlot src/Dodge/Data/SaveSlot.hs 10;" C QuicksaveSlot src/Dodge/Data/SaveSlot.hs 10;" C
@@ -1119,7 +1119,7 @@ RadialDistortion src/Dodge/Data/Distortion.hs 13;" C
RandImpulse src/Dodge/Data/ActionPlan.hs 62;" t RandImpulse src/Dodge/Data/ActionPlan.hs 62;" t
RandImpulseCircMove src/Dodge/Data/ActionPlan.hs 64;" C RandImpulseCircMove src/Dodge/Data/ActionPlan.hs 64;" C
RandImpulseList src/Dodge/Data/ActionPlan.hs 63;" C RandImpulseList src/Dodge/Data/ActionPlan.hs 63;" C
RandPS src/Dodge/Data/GenWorld.hs 56;" C RandPS src/Dodge/Data/GenWorld.hs 57;" C
RandomImpulse src/Dodge/Data/ActionPlan.hs 32;" C RandomImpulse src/Dodge/Data/ActionPlan.hs 32;" C
RandomTurn src/Dodge/Data/ActionPlan.hs 31;" C RandomTurn src/Dodge/Data/ActionPlan.hs 31;" C
ReactorSS src/Dodge/Data/Scenario.hs 111;" C ReactorSS src/Dodge/Data/Scenario.hs 111;" C
@@ -1154,7 +1154,7 @@ Rocket src/Dodge/Data/Projectile.hs 34;" C
RocketHoming src/Dodge/Data/Projectile.hs 41;" t RocketHoming src/Dodge/Data/Projectile.hs 41;" t
RocketSmoke src/Dodge/Data/Projectile.hs 54;" t RocketSmoke src/Dodge/Data/Projectile.hs 54;" t
RocketSmoke src/Dodge/Data/Cloud.hs 24;" C RocketSmoke src/Dodge/Data/Cloud.hs 24;" C
Room src/Dodge/Data/GenWorld.hs 93;" t Room src/Dodge/Data/GenWorld.hs 94;" t
RoomClipping src/Dodge/Data/Config.hs 107;" t RoomClipping src/Dodge/Data/Config.hs 107;" t
RoomInt src/Dodge/Tree/Shift.hs 26;" t RoomInt src/Dodge/Tree/Shift.hs 26;" t
RoomLink src/Dodge/Data/Room.hs 23;" t RoomLink src/Dodge/Data/Room.hs 23;" t
@@ -1868,6 +1868,7 @@ _fullscreenShader src/Data/Preload/Render.hs 20;" f
_futureWorlds src/Dodge/Data/World.hs 67;" f _futureWorlds src/Dodge/Data/World.hs 67;" f
_futureWorlds src/Dodge/Data/World.hs 73;" f _futureWorlds src/Dodge/Data/World.hs 73;" f
_gameplay_rotate_to_wall src/Dodge/Data/Config.hs 55;" f _gameplay_rotate_to_wall src/Dodge/Data/Config.hs 55;" f
_genPlacements src/Dodge/Data/GenWorld.hs 26;" f
_genRooms src/Dodge/Data/GenWorld.hs 25;" f _genRooms src/Dodge/Data/GenWorld.hs 25;" f
_getAttentiveTo src/Dodge/Data/Creature/Perception.hs 61;" f _getAttentiveTo src/Dodge/Data/Creature/Perception.hs 61;" f
_getCombAmount src/Dodge/Data/CombAmount.hs 12;" f _getCombAmount src/Dodge/Data/CombAmount.hs 12;" f
@@ -1935,8 +1936,8 @@ _impulseUseTarget src/Dodge/Data/ActionPlan.hs 53;" f
_impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f _impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f
_impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f _impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f
_input src/Dodge/Data/World.hs 43;" f _input src/Dodge/Data/World.hs 43;" f
_ipPlacement src/Dodge/Data/GenWorld.hs 127;" f _ipPlacement src/Dodge/Data/GenWorld.hs 128;" f
_ipPlacementID src/Dodge/Data/GenWorld.hs 128;" f _ipPlacementID src/Dodge/Data/GenWorld.hs 129;" f
_isWarming src/Dodge/Data/Item/Params.hs 23;" f _isWarming src/Dodge/Data/Item/Params.hs 23;" f
_ispCloseButton src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" f _ispCloseButton src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" f
_ispCloseItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 31;" f _ispCloseItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 31;" f
@@ -2138,10 +2139,10 @@ _pjSpin src/Dodge/Data/Projectile.hs 21;" f
_pjTimer src/Dodge/Data/Projectile.hs 24;" f _pjTimer src/Dodge/Data/Projectile.hs 24;" f
_pjType src/Dodge/Data/Projectile.hs 26;" f _pjType src/Dodge/Data/Projectile.hs 26;" f
_pjVel src/Dodge/Data/Projectile.hs 19;" f _pjVel src/Dodge/Data/Projectile.hs 19;" f
_plIDCont src/Dodge/Data/GenWorld.hs 83;" f _plIDCont src/Dodge/Data/GenWorld.hs 84;" f
_plMID src/Dodge/Data/GenWorld.hs 82;" f _plMID src/Dodge/Data/GenWorld.hs 83;" f
_plSpot src/Dodge/Data/GenWorld.hs 80;" f _plSpot src/Dodge/Data/GenWorld.hs 81;" f
_plType src/Dodge/Data/GenWorld.hs 81;" f _plType src/Dodge/Data/GenWorld.hs 82;" f
_playStatus src/Sound/Data.hs 17;" f _playStatus src/Sound/Data.hs 17;" f
_playingSounds src/Dodge/Data/World.hs 42;" f _playingSounds src/Dodge/Data/World.hs 42;" f
_pnZoning src/Dodge/Data/World.hs 52;" f _pnZoning src/Dodge/Data/World.hs 52;" f
@@ -2180,34 +2181,34 @@ _proxReqEquipment src/Dodge/Data/Machine/Sensor.hs 38;" f
_proxReqMinHealth src/Dodge/Data/Machine/Sensor.hs 37;" f _proxReqMinHealth src/Dodge/Data/Machine/Sensor.hs 37;" f
_proxSensorType src/Dodge/Data/Machine/Sensor.hs 28;" f _proxSensorType src/Dodge/Data/Machine/Sensor.hs 28;" f
_proxToggle src/Dodge/Data/Machine/Sensor.hs 29;" f _proxToggle src/Dodge/Data/Machine/Sensor.hs 29;" f
_psFallback src/Dodge/Data/GenWorld.hs 71;" f _psFallback src/Dodge/Data/GenWorld.hs 72;" f
_psPos src/Dodge/Data/GenWorld.hs 66;" f _psPos src/Dodge/Data/GenWorld.hs 67;" f
_psRandShift src/Dodge/Data/GenWorld.hs 75;" f _psRandShift src/Dodge/Data/GenWorld.hs 76;" f
_psRoomEff src/Dodge/Data/GenWorld.hs 70;" f _psRoomEff src/Dodge/Data/GenWorld.hs 71;" f
_psRoomRandPointNum src/Dodge/Data/GenWorld.hs 74;" f _psRoomRandPointNum src/Dodge/Data/GenWorld.hs 75;" f
_psRot src/Dodge/Data/GenWorld.hs 66;" f _psRot src/Dodge/Data/GenWorld.hs 67;" f
_psSelect src/Dodge/Data/GenWorld.hs 69;" f _psSelect src/Dodge/Data/GenWorld.hs 70;" f
_pulseBalls src/Dodge/Data/LWorld.hs 121;" f _pulseBalls src/Dodge/Data/LWorld.hs 121;" f
_pulseLasers src/Dodge/Data/LWorld.hs 120;" f _pulseLasers src/Dodge/Data/LWorld.hs 120;" f
_pulseProgress src/Dodge/Data/Creature/Misc.hs 56;" f _pulseProgress src/Dodge/Data/Creature/Misc.hs 56;" f
_pulseRate src/Dodge/Data/Creature/Misc.hs 55;" f _pulseRate src/Dodge/Data/Creature/Misc.hs 55;" f
_putBlock src/Dodge/Data/GenWorld.hs 43;" f _putBlock src/Dodge/Data/GenWorld.hs 44;" f
_putButton src/Dodge/Data/GenWorld.hs 38;" f _putButton src/Dodge/Data/GenWorld.hs 39;" f
_putChasmPoly src/Dodge/Data/GenWorld.hs 61;" f _putChasmPoly src/Dodge/Data/GenWorld.hs 62;" f
_putEndPoint src/Dodge/Data/GenWorld.hs 51;" f _putEndPoint src/Dodge/Data/GenWorld.hs 52;" f
_putID src/Dodge/Data/GenWorld.hs 60;" f _putID src/Dodge/Data/GenWorld.hs 61;" f
_putItem src/Dodge/Data/GenWorld.hs 41;" f _putItem src/Dodge/Data/GenWorld.hs 42;" f
_putMachineMachine src/Dodge/Data/GenWorld.hs 33;" f _putMachineMachine src/Dodge/Data/GenWorld.hs 34;" f
_putMachineMaybeItem src/Dodge/Data/GenWorld.hs 35;" f _putMachineMaybeItem src/Dodge/Data/GenWorld.hs 36;" f
_putMachinePoly src/Dodge/Data/GenWorld.hs 32;" f _putMachinePoly src/Dodge/Data/GenWorld.hs 33;" f
_putMachineWall src/Dodge/Data/GenWorld.hs 34;" f _putMachineWall src/Dodge/Data/GenWorld.hs 35;" f
_putPoly src/Dodge/Data/GenWorld.hs 43;" f _putPoly src/Dodge/Data/GenWorld.hs 44;" f
_putStartPoint src/Dodge/Data/GenWorld.hs 50;" f _putStartPoint src/Dodge/Data/GenWorld.hs 51;" f
_putWall src/Dodge/Data/GenWorld.hs 43;" f _putWall src/Dodge/Data/GenWorld.hs 44;" f
_putWall src/Dodge/Data/GenWorld.hs 48;" f _putWall src/Dodge/Data/GenWorld.hs 49;" f
_putWidth src/Dodge/Data/GenWorld.hs 49;" f _putWidth src/Dodge/Data/GenWorld.hs 50;" f
_pwPoly src/Dodge/Data/GenWorld.hs 53;" f _pwPoly src/Dodge/Data/GenWorld.hs 54;" f
_pwWall src/Dodge/Data/GenWorld.hs 53;" f _pwWall src/Dodge/Data/GenWorld.hs 54;" f
_pyFaces src/Polyhedra/Data.hs 14;" f _pyFaces src/Polyhedra/Data.hs 14;" f
_pzDamage src/Dodge/Data/PulseLaser.hs 15;" f _pzDamage src/Dodge/Data/PulseLaser.hs 15;" f
_pzDir src/Dodge/Data/PulseLaser.hs 14;" f _pzDir src/Dodge/Data/PulseLaser.hs 14;" f
@@ -2235,29 +2236,29 @@ _rkSmoke src/Dodge/Data/Projectile.hs 36;" f
_rlDir src/Dodge/Data/Room.hs 26;" f _rlDir src/Dodge/Data/Room.hs 26;" f
_rlPos src/Dodge/Data/Room.hs 25;" f _rlPos src/Dodge/Data/Room.hs 25;" f
_rlType src/Dodge/Data/Room.hs 24;" f _rlType src/Dodge/Data/Room.hs 24;" f
_rmBound src/Dodge/Data/GenWorld.hs 110;" f _rmBound src/Dodge/Data/GenWorld.hs 111;" f
_rmChildren src/Dodge/Data/GenWorld.hs 121;" f _rmChildren src/Dodge/Data/GenWorld.hs 122;" f
_rmClusterStatus src/Dodge/Data/GenWorld.hs 123;" f _rmClusterStatus src/Dodge/Data/GenWorld.hs 124;" f
_rmConnectsTo src/Dodge/Data/GenWorld.hs 118;" f _rmConnectsTo src/Dodge/Data/GenWorld.hs 119;" f
_rmEndWires src/Dodge/Data/GenWorld.hs 117;" f _rmEndWires src/Dodge/Data/GenWorld.hs 118;" f
_rmFloor src/Dodge/Data/GenWorld.hs 111;" f _rmFloor src/Dodge/Data/GenWorld.hs 112;" f
_rmHeight src/Dodge/Data/Room.hs 38;" f _rmHeight src/Dodge/Data/Room.hs 38;" f
_rmInPmnt src/Dodge/Data/GenWorld.hs 107;" f _rmInPmnt src/Dodge/Data/GenWorld.hs 108;" f
_rmLinkEff src/Dodge/Data/GenWorld.hs 97;" f _rmLinkEff src/Dodge/Data/GenWorld.hs 98;" f
_rmLinks src/Dodge/Data/GenWorld.hs 95;" f _rmLinks src/Dodge/Data/GenWorld.hs 96;" f
_rmMID src/Dodge/Data/GenWorld.hs 119;" f _rmMID src/Dodge/Data/GenWorld.hs 120;" f
_rmMParent src/Dodge/Data/GenWorld.hs 120;" f _rmMParent src/Dodge/Data/GenWorld.hs 121;" f
_rmName src/Dodge/Data/GenWorld.hs 112;" f _rmName src/Dodge/Data/GenWorld.hs 113;" f
_rmOutPmnt src/Dodge/Data/GenWorld.hs 109;" f _rmOutPmnt src/Dodge/Data/GenWorld.hs 110;" f
_rmPath src/Dodge/Data/GenWorld.hs 105;" f _rmPath src/Dodge/Data/GenWorld.hs 106;" f
_rmPmnts src/Dodge/Data/GenWorld.hs 106;" f _rmPmnts src/Dodge/Data/GenWorld.hs 107;" f
_rmPolys src/Dodge/Data/GenWorld.hs 94;" f _rmPolys src/Dodge/Data/GenWorld.hs 95;" f
_rmPos src/Dodge/Data/GenWorld.hs 104;" f _rmPos src/Dodge/Data/GenWorld.hs 105;" f
_rmRandPSs src/Dodge/Data/GenWorld.hs 115;" f _rmRandPSs src/Dodge/Data/GenWorld.hs 116;" f
_rmShift src/Dodge/Data/GenWorld.hs 113;" f _rmShift src/Dodge/Data/GenWorld.hs 114;" f
_rmStartWires src/Dodge/Data/GenWorld.hs 116;" f _rmStartWires src/Dodge/Data/GenWorld.hs 117;" f
_rmType src/Dodge/Data/GenWorld.hs 122;" f _rmType src/Dodge/Data/GenWorld.hs 123;" f
_rmViewpoints src/Dodge/Data/GenWorld.hs 114;" f _rmViewpoints src/Dodge/Data/GenWorld.hs 115;" f
_rmWidth src/Dodge/Data/Room.hs 37;" f _rmWidth src/Dodge/Data/Room.hs 37;" f
_rpDir src/Dodge/Data/Room.hs 16;" f _rpDir src/Dodge/Data/Room.hs 16;" f
_rpLinkStatus src/Dodge/Data/Room.hs 18;" f _rpLinkStatus src/Dodge/Data/Room.hs 18;" f
@@ -2448,12 +2449,12 @@ _unNInt src/NewInt.hs 17;" f
_unNIntMap src/NewInt.hs 23;" f _unNIntMap src/NewInt.hs 23;" f
_unNIntSet src/NewInt.hs 20;" f _unNIntSet src/NewInt.hs 20;" f
_unPrimitiveMode src/Shader/Data.hs 99;" f _unPrimitiveMode src/Shader/Data.hs 99;" f
_unPutCrit src/Dodge/Data/GenWorld.hs 30;" f _unPutCrit src/Dodge/Data/GenWorld.hs 31;" f
_unST src/Dodge/Data/MetaTree.hs 18;" f _unST src/Dodge/Data/MetaTree.hs 18;" f
_unTO src/Shader/Data.hs 59;" f _unTO src/Shader/Data.hs 59;" f
_unfiredBarrels src/Dodge/Data/Item/Params.hs 19;" f _unfiredBarrels src/Dodge/Data/Item/Params.hs 19;" f
_unpauseClock src/Dodge/Data/World.hs 56;" f _unpauseClock src/Dodge/Data/World.hs 56;" f
_unputTerminal src/Dodge/Data/GenWorld.hs 40;" f _unputTerminal src/Dodge/Data/GenWorld.hs 41;" f
_useAheadPos src/Dodge/Data/ActionPlan.hs 161;" f _useAheadPos src/Dodge/Data/ActionPlan.hs 161;" f
_useExactly src/Dodge/Data/Muzzle.hs 62;" f _useExactly src/Dodge/Data/Muzzle.hs 62;" f
_useMapperLines src/Dodge/Data/Item/Use.hs 40;" f _useMapperLines src/Dodge/Data/Item/Use.hs 40;" f
@@ -2616,9 +2617,12 @@ ammoMagInfo src/Dodge/Item/Info.hs 49;" f
ammoMagSPic src/Dodge/Item/Draw/SPic.hs 145;" f ammoMagSPic src/Dodge/Item/Draw/SPic.hs 145;" f
amr src/Dodge/Item/Held/Rod.hs 34;" f amr src/Dodge/Item/Held/Rod.hs 34;" f
anRoom src/Dodge/Floor.hs 130;" f anRoom src/Dodge/Floor.hs 130;" f
analyser src/Dodge/Placement/Instance/Analyser.hs 10;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f
analyserByDoor src/Dodge/Room/LasTurret.hs 93;" f analyserByDoor src/Dodge/Room/LasTurret.hs 108;" f
analyserByDoorWithPrompt src/Dodge/Room/LasTurret.hs 111;" f
analyserByNthLink src/Dodge/Room/LasTurret.hs 79;" f analyserByNthLink src/Dodge/Room/LasTurret.hs 79;" f
analyserByNthLinkWithPrompt src/Dodge/Room/LasTurret.hs 93;" f
analyserWithPrompt src/Dodge/Placement/Instance/Analyser.hs 15;" f
andOrRegex src/Dodge/DisplayInventory.hs 78;" f andOrRegex src/Dodge/DisplayInventory.hs 78;" f
angleBetween src/Geometry.hs 161;" f angleBetween src/Geometry.hs 161;" f
angleVV src/Geometry/Vector.hs 57;" f angleVV src/Geometry/Vector.hs 57;" f
@@ -2668,7 +2672,7 @@ arms src/Dodge/Creature/Picture.hs 72;" f
arrow src/Picture/Composite.hs 19;" f arrow src/Picture/Composite.hs 19;" f
arrowPath src/Picture/Composite.hs 8;" f arrowPath src/Picture/Composite.hs 8;" f
assignHotkey src/Dodge/AssignHotkey.hs 9;" f assignHotkey src/Dodge/AssignHotkey.hs 9;" f
assignPushDoors src/Dodge/LevelGen.hs 43;" f assignPushDoors src/Dodge/LevelGen.hs 45;" f
atFstLnkOut src/Dodge/PlacementSpot.hs 221;" f atFstLnkOut src/Dodge/PlacementSpot.hs 221;" f
atFstLnkOutShiftBy src/Dodge/PlacementSpot.hs 240;" f atFstLnkOutShiftBy src/Dodge/PlacementSpot.hs 240;" f
atFstLnkOutShiftInward src/Dodge/PlacementSpot.hs 243;" f atFstLnkOutShiftInward src/Dodge/PlacementSpot.hs 243;" f
@@ -2786,7 +2790,7 @@ boxXYZ src/Polyhedra.hs 94;" f
boxXYZnobase src/Polyhedra.hs 80;" f boxXYZnobase src/Polyhedra.hs 80;" f
brainHat src/Dodge/Item/Equipment.hs 73;" f brainHat src/Dodge/Item/Equipment.hs 73;" f
branchRectWith src/Dodge/Room/Branch.hs 15;" f branchRectWith src/Dodge/Room/Branch.hs 15;" f
branchWith src/Dodge/Room/Room.hs 67;" f branchWith src/Dodge/Room/Room.hs 68;" f
bright src/Color.hs 120;" f bright src/Color.hs 120;" f
brightX src/Color.hs 116;" f brightX src/Color.hs 116;" f
btSPic src/Dodge/Render/ShapePicture.hs 129;" f btSPic src/Dodge/Render/ShapePicture.hs 129;" f
@@ -2944,9 +2948,9 @@ combineTree src/Dodge/Tree/Compose.hs 66;" f
commandColor src/Dodge/Terminal.hs 114;" f commandColor src/Dodge/Terminal.hs 114;" f
commonPrefix src/Dodge/Debug/Terminal.hs 148;" f commonPrefix src/Dodge/Debug/Terminal.hs 148;" f
comp src/Quaternion.hs 65;" f comp src/Quaternion.hs 65;" f
compactDraw src/Dodge/LevelGen.hs 93;" f compactDraw src/Dodge/LevelGen.hs 95;" f
compactDraw' src/Dodge/LevelGen.hs 104;" f compactDraw' src/Dodge/LevelGen.hs 106;" f
compactDrawTree src/Dodge/LevelGen.hs 87;" f compactDrawTree src/Dodge/LevelGen.hs 89;" f
compileAndCheckShader src/Shader/Compile.hs 277;" f compileAndCheckShader src/Shader/Compile.hs 277;" f
composeNode src/Dodge/Tree/Compose.hs 76;" f composeNode src/Dodge/Tree/Compose.hs 76;" f
composeTree src/Dodge/Tree/Compose.hs 46;" f composeTree src/Dodge/Tree/Compose.hs 46;" f
@@ -2968,7 +2972,7 @@ coolMinigun src/Dodge/Creature/State.hs 94;" f
copier src/Dodge/Item/Scope.hs 88;" f copier src/Dodge/Item/Scope.hs 88;" f
copierItemUpdate src/Dodge/Creature/State.hs 130;" f copierItemUpdate src/Dodge/Creature/State.hs 130;" f
copyItemToFloor src/Dodge/FloorItem.hs 14;" f copyItemToFloor src/Dodge/FloorItem.hs 14;" f
corDoor src/Dodge/Room/Room.hs 376;" f corDoor src/Dodge/Room/Room.hs 377;" f
cornerList src/Preload/Render.hs 198;" f cornerList src/Preload/Render.hs 198;" f
corpseOrGib src/Dodge/Creature/Update.hs 102;" f corpseOrGib src/Dodge/Creature/Update.hs 102;" f
corridor src/Dodge/Room/Corridor.hs 17;" f corridor src/Dodge/Room/Corridor.hs 17;" f
@@ -3040,7 +3044,7 @@ creatureShootPulseLaser src/Dodge/HeldUse.hs 859;" f
creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 53;" f creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 53;" f
creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 74;" f creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 74;" f
creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 63;" f creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 63;" f
critInDeadEnd src/Dodge/Room/Room.hs 234;" f critInDeadEnd src/Dodge/Room/Room.hs 235;" f
crixsNearSeg src/Dodge/Zoning/Creature.hs 29;" f crixsNearSeg src/Dodge/Zoning/Creature.hs 29;" f
crossPic src/Dodge/Render/Label.hs 27;" f crossPic src/Dodge/Render/Label.hs 27;" f
crossProd src/Geometry/Vector3D.hs 41;" f crossProd src/Geometry/Vector3D.hs 41;" f
@@ -3101,7 +3105,7 @@ dbArgChain src/Dodge/Base.hs 170;" f
dbwMuzzles src/Dodge/HeldUse.hs 314;" f dbwMuzzles src/Dodge/HeldUse.hs 314;" f
deZoneIX src/Dodge/Zoning/Base.hs 89;" f deZoneIX src/Dodge/Zoning/Base.hs 89;" f
deZoneWall src/Dodge/Zoning/Wall.hs 70;" f deZoneWall src/Dodge/Zoning/Wall.hs 70;" f
deadEndRoom src/Dodge/Room/Room.hs 237;" f deadEndRoom src/Dodge/Room/Room.hs 238;" f
deadFeet src/Dodge/Creature/Picture.hs 68;" f deadFeet src/Dodge/Creature/Picture.hs 68;" f
deadRot src/Dodge/Creature/Picture.hs 84;" f deadRot src/Dodge/Creature/Picture.hs 84;" f
deadScalp src/Dodge/Creature/Picture.hs 81;" f deadScalp src/Dodge/Creature/Picture.hs 81;" f
@@ -3319,7 +3323,7 @@ doorMechanism src/Dodge/DrWdWd.hs 24;" f
doorMechanismStepwise src/Dodge/DrWdWd.hs 59;" f doorMechanismStepwise src/Dodge/DrWdWd.hs 59;" f
dotV src/Geometry/Vector.hs 75;" f dotV src/Geometry/Vector.hs 75;" f
dotV3 src/Geometry/Vector3D.hs 119;" f dotV3 src/Geometry/Vector3D.hs 119;" f
doubleCorridorBarrels src/Dodge/Room/Room.hs 267;" f doubleCorridorBarrels src/Dodge/Room/Room.hs 268;" f
doubleFindMax src/Dodge/Update/Scroll.hs 181;" f doubleFindMax src/Dodge/Update/Scroll.hs 181;" f
doubleFindMin src/Dodge/Update/Scroll.hs 160;" f doubleFindMin src/Dodge/Update/Scroll.hs 160;" f
doubleFindPred src/Dodge/Update/Scroll.hs 188;" f doubleFindPred src/Dodge/Update/Scroll.hs 188;" f
@@ -3646,14 +3650,14 @@ gLauncher src/Dodge/Item/Held/Launcher.hs 24;" f
gRandify src/Dodge/Randify.hs 11;" f gRandify src/Dodge/Randify.hs 11;" f
gadgetEffect src/Dodge/HeldUse.hs 46;" f gadgetEffect src/Dodge/HeldUse.hs 46;" f
gameOverMenu src/Dodge/Menu.hs 189;" f gameOverMenu src/Dodge/Menu.hs 189;" f
gameRoomFromRoom src/Dodge/Layout.hs 150;" f gameRoomFromRoom src/Dodge/Layout.hs 152;" f
gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f
gameRoomsFromRooms src/Dodge/Layout.hs 147;" f gameRoomsFromRooms src/Dodge/Layout.hs 149;" f
gameplayMenu src/Dodge/Menu.hs 136;" f gameplayMenu src/Dodge/Menu.hs 136;" f
gameplayMenuOptions src/Dodge/Menu.hs 139;" f gameplayMenuOptions src/Dodge/Menu.hs 139;" f
gasType src/Dodge/HeldUse.hs 1141;" f gasType src/Dodge/HeldUse.hs 1141;" f
generateGenParams src/Dodge/LevelGen/LevelStructure.hs 21;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f
generateGraphs src/Dodge/LevelGen.hs 40;" f generateGraphs src/Dodge/LevelGen.hs 42;" f
generateLayout src/Dodge/Layout/Generate.hs 10;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f
generateLevelFromRoomList src/Dodge/Layout.hs 33;" f generateLevelFromRoomList src/Dodge/Layout.hs 33;" f
generateWorldFromSeed src/Dodge/LevelGen.hs 20;" f generateWorldFromSeed src/Dodge/LevelGen.hs 20;" f
@@ -3692,7 +3696,7 @@ getRootItemInvID src/Dodge/Inventory/Location.hs 35;" f
getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f getSelectedCloseObj src/Dodge/SelectedClose.hs 14;" f
getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 21;" f
getSplitString src/Dodge/Debug/Terminal.hs 128;" f getSplitString src/Dodge/Debug/Terminal.hs 128;" f
getTiles src/Dodge/Layout.hs 197;" f getTiles src/Dodge/Layout.hs 199;" f
getViewpoints src/Dodge/Viewpoints.hs 29;" f getViewpoints src/Dodge/Viewpoints.hs 29;" f
getVolleyBurst src/Dodge/HeldUse.hs 125;" f getVolleyBurst src/Dodge/HeldUse.hs 125;" f
getWallSPic src/Dodge/Render/Walls.hs 51;" f getWallSPic src/Dodge/Render/Walls.hs 51;" f
@@ -3709,8 +3713,8 @@ glassShat1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 648;" f
glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f glassShat2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 618;" f
glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 458;" f glassShat3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 458;" f
glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f glassShat4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 612;" f
glassSwitchBack src/Dodge/Room/Room.hs 70;" f glassSwitchBack src/Dodge/Room/Room.hs 71;" f
glassSwitchBackCrits src/Dodge/Room/Room.hs 99;" f glassSwitchBackCrits src/Dodge/Room/Room.hs 100;" f
glauncherPic src/Dodge/Item/Draw/SPic.hs 412;" f glauncherPic src/Dodge/Item/Draw/SPic.hs 412;" f
glushortSize src/Shader/Parameters.hs 25;" f glushortSize src/Shader/Parameters.hs 25;" f
goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f
@@ -3769,7 +3773,7 @@ headMap src/Dodge/DoubleTree.hs 249;" f
headPQ src/Dodge/Creature/HandPos.hs 115;" f headPQ src/Dodge/Creature/HandPos.hs 115;" f
healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f healS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 492;" f
healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 76;" f healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 76;" f
healthTest src/Dodge/Room/LasTurret.hs 96;" f healthTest src/Dodge/Room/LasTurret.hs 114;" f
heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f
heldAimStance src/Dodge/Item/AimStance.hs 24;" f heldAimStance src/Dodge/Item/AimStance.hs 24;" f
heldAimZoom src/Dodge/Update/Camera.hs 149;" f heldAimZoom src/Dodge/Update/Camera.hs 149;" f
@@ -3998,17 +4002,17 @@ lamp src/Dodge/Creature/Lamp.hs 21;" f
lampCover src/Dodge/Placement/Instance/LightSource/Cover.hs 8;" f lampCover src/Dodge/Placement/Instance/LightSource/Cover.hs 8;" f
lampCoverWhen src/Dodge/Placement/Instance/LightSource/Cover.hs 19;" f lampCoverWhen src/Dodge/Placement/Instance/LightSource/Cover.hs 19;" f
lampCrSPic src/Dodge/Render/ShapePicture.hs 74;" f lampCrSPic src/Dodge/Render/ShapePicture.hs 74;" f
lasCenSensEdge src/Dodge/Room/LasTurret.hs 115;" f lasCenSensEdge src/Dodge/Room/LasTurret.hs 133;" f
lasGunPic src/Dodge/Item/Draw/SPic.hs 424;" f lasGunPic src/Dodge/Item/Draw/SPic.hs 424;" f
lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f lasPulseS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 526;" f
lasSensorTurretTest src/Dodge/Room/LasTurret.hs 108;" f lasSensorTurretTest src/Dodge/Room/LasTurret.hs 126;" f
lasTunnel src/Dodge/Room/LasTurret.hs 127;" f lasTunnel src/Dodge/Room/LasTurret.hs 145;" f
lasTunnelRunPast src/Dodge/Room/LasTurret.hs 168;" f lasTunnelRunPast src/Dodge/Room/LasTurret.hs 186;" f
lasTurret src/Dodge/Placement/Instance/Turret.hs 40;" f lasTurret src/Dodge/Placement/Instance/Turret.hs 40;" 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
launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f launcherCrit src/Dodge/Creature/LauncherCrit.hs 12;" f
layoutLevelFromSeed src/Dodge/LevelGen.hs 48;" f layoutLevelFromSeed src/Dodge/LevelGen.hs 50;" f
ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f ldpSelection src/Dodge/Update/Input/ScreenLayer.hs 74;" f
ldtIL src/Dodge/DoubleTree.hs 225;" f ldtIL src/Dodge/DoubleTree.hs 225;" f
ldtPropagate src/Dodge/DoubleTree.hs 69;" f ldtPropagate src/Dodge/DoubleTree.hs 69;" f
@@ -4253,7 +4257,7 @@ miniGunX src/Dodge/Item/Held/Cane.hs 33;" f
miniGunXPict src/Dodge/Item/Draw/SPic.hs 384;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 384;" f
miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 381;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 381;" f
miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 716;" f
miniTree2 src/Dodge/Room/Room.hs 106;" f miniTree2 src/Dodge/Room/Room.hs 107;" f
minimumOn src/FoldlHelp.hs 14;" f minimumOn src/FoldlHelp.hs 14;" f
mirrorXAxis src/Geometry/Polygon.hs 49;" f mirrorXAxis src/Geometry/Polygon.hs 49;" f
mirrorxz src/Picture/Base.hs 335;" f mirrorxz src/Picture/Base.hs 335;" f
@@ -4446,7 +4450,7 @@ pincerP''' src/Dodge/Creature/Boid.hs 75;" f
pingPongBetween src/Render.hs 221;" f pingPongBetween src/Render.hs 221;" f
pipe src/Dodge/Item/Craftable.hs 32;" f pipe src/Dodge/Item/Craftable.hs 32;" f
pistol src/Dodge/Item/Held/Stick.hs 40;" f pistol src/Dodge/Item/Held/Stick.hs 40;" f
pistolerRoom src/Dodge/Room/Room.hs 321;" f pistolerRoom src/Dodge/Room/Room.hs 322;" f
pjRemoteSetDirection src/Dodge/Projectile/Update.hs 225;" f pjRemoteSetDirection src/Dodge/Projectile/Update.hs 225;" f
plBlock src/Dodge/Placement/PlaceSpot/Block.hs 18;" f plBlock src/Dodge/Placement/PlaceSpot/Block.hs 18;" f
plDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 22;" f plDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 22;" f
@@ -4559,7 +4563,7 @@ popScreen src/Dodge/Menu/PushPop.hs 6;" f
posRms src/Dodge/Tree/Shift.hs 44;" f posRms src/Dodge/Tree/Shift.hs 44;" f
posSelSecYint src/Dodge/SelectionSections.hs 147;" f posSelSecYint src/Dodge/SelectionSections.hs 147;" f
positionRoomsFromTree src/Dodge/Tree/Shift.hs 35;" f positionRoomsFromTree src/Dodge/Tree/Shift.hs 35;" f
postGenerationProcessing src/Dodge/LevelGen.hs 34;" f postGenerationProcessing src/Dodge/LevelGen.hs 36;" f
postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f postUniverseLoadSideEffect src/Dodge/WorldLoad.hs 11;" f
postWorldLoad src/Dodge/WorldLoad.hs 15;" f postWorldLoad src/Dodge/WorldLoad.hs 15;" f
powerFakeout src/Dodge/Room/Start.hs 28;" f powerFakeout src/Dodge/Room/Start.hs 28;" f
@@ -4639,7 +4643,7 @@ putLitButOnPosExtTrig src/Dodge/Placement/Instance/Button.hs 103;" f
putLitButOnPosExtTrig' src/Dodge/Placement/Instance/Button.hs 106;" f putLitButOnPosExtTrig' src/Dodge/Placement/Instance/Button.hs 106;" f
putMessageTerminal src/Dodge/Placement/Instance/Terminal.hs 58;" f putMessageTerminal src/Dodge/Placement/Instance/Terminal.hs 58;" f
putShape src/Dodge/Room/Foreground.hs 134;" f putShape src/Dodge/Room/Foreground.hs 134;" f
putStrLnAppend src/Dodge/LevelGen.hs 81;" f putStrLnAppend src/Dodge/LevelGen.hs 83;" f
putTerminal src/Dodge/Placement/Instance/Terminal.hs 55;" f putTerminal src/Dodge/Placement/Instance/Terminal.hs 55;" f
putTerminalFull src/Dodge/Placement/Instance/Terminal.hs 22;" f putTerminalFull src/Dodge/Placement/Instance/Terminal.hs 22;" f
putTerminalImediateAccess src/Dodge/Placement/Instance/Terminal.hs 17;" f putTerminalImediateAccess src/Dodge/Placement/Instance/Terminal.hs 17;" f
@@ -4759,7 +4763,7 @@ resumeSound src/Dodge/SoundLogic.hs 48;" f
retreatActionsPistol src/Dodge/Humanoid.hs 249;" f retreatActionsPistol src/Dodge/Humanoid.hs 249;" f
retreatFireLauncher src/Dodge/Humanoid.hs 270;" f retreatFireLauncher src/Dodge/Humanoid.hs 270;" f
retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f
reversePair src/Dodge/LevelGen.hs 84;" f reversePair src/Dodge/LevelGen.hs 86;" 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
rezBox' src/Dodge/Room/RezBox.hs 46;" f rezBox' src/Dodge/Room/RezBox.hs 46;" f
@@ -4786,15 +4790,15 @@ rmInLinks src/Dodge/RoomLink.hs 138;" f
rmInvItem src/Dodge/Inventory.hs 73;" f rmInvItem src/Dodge/Inventory.hs 73;" f
rmLinksOfType src/Dodge/RoomLink.hs 135;" f rmLinksOfType src/Dodge/RoomLink.hs 135;" f
rmOutLinks src/Dodge/RoomLink.hs 138;" f rmOutLinks src/Dodge/RoomLink.hs 138;" f
roomC src/Dodge/Room/Room.hs 38;" f roomC src/Dodge/Room/Room.hs 39;" f
roomCCrits src/Dodge/Room/Room.hs 262;" f roomCCrits src/Dodge/Room/Room.hs 263;" f
roomCenterPillar src/Dodge/Room/Room.hs 119;" f roomCenterPillar src/Dodge/Room/Room.hs 120;" f
roomCritLS src/Dodge/Room/RunPast.hs 25;" f roomCritLS src/Dodge/Room/RunPast.hs 25;" f
roomCross src/Dodge/Room/Boss.hs 84;" f roomCross src/Dodge/Room/Boss.hs 84;" f
roomGlassOctogon src/Dodge/Room/Boss.hs 21;" f roomGlassOctogon src/Dodge/Room/Boss.hs 21;" f
roomMiniIntro src/Dodge/Room/Room.hs 114;" f roomMiniIntro src/Dodge/Room/Room.hs 115;" f
roomNgon src/Dodge/Room/Ngon.hs 15;" f roomNgon src/Dodge/Room/Ngon.hs 15;" f
roomPadCut src/Dodge/Room/Room.hs 59;" f roomPadCut src/Dodge/Room/Room.hs 60;" f
roomPillars src/Dodge/Room/Pillar.hs 106;" f 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
@@ -4914,6 +4918,7 @@ sensorReqToString src/Dodge/Machine/Update.hs 194;" 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 152;" f
sensorTypeDamages src/Dodge/Machine/Update.hs 228;" f sensorTypeDamages src/Dodge/Machine/Update.hs 228;" f
sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f
sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f
@@ -4969,7 +4974,7 @@ setupVBOStatic src/Shader/Compile.hs 116;" f
setupVBOVAO src/Shader/Compile.hs 200;" f setupVBOVAO src/Shader/Compile.hs 200;" f
setupVertexAttribPointer src/Shader/Compile.hs 224;" f setupVertexAttribPointer src/Shader/Compile.hs 224;" f
setupVertexAttribs src/Shader/Compile.hs 218;" f setupVertexAttribs src/Shader/Compile.hs 218;" f
setupWorldBounds src/Dodge/Layout.hs 114;" f setupWorldBounds src/Dodge/Layout.hs 116;" f
sfInvColor src/Dodge/Item/InventoryColor.hs 12;" f sfInvColor src/Dodge/Item/InventoryColor.hs 12;" f
shadVBOptr src/Shader.hs 40;" f shadVBOptr src/Shader.hs 40;" f
shaderTypeExt src/Shader/Compile.hs 172;" f shaderTypeExt src/Shader/Compile.hs 172;" f
@@ -5020,10 +5025,10 @@ shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f
shootTeslaArc src/Dodge/HeldUse.hs 1211;" f shootTeslaArc src/Dodge/HeldUse.hs 1211;" f
shootTillEmpty src/Dodge/Creature/Volition.hs 19;" f shootTillEmpty src/Dodge/Creature/Volition.hs 19;" f
shootTractorBeam src/Dodge/HeldUse.hs 794;" f shootTractorBeam src/Dodge/HeldUse.hs 794;" f
shootersRoom src/Dodge/Room/Room.hs 315;" f shootersRoom src/Dodge/Room/Room.hs 316;" f
shootersRoom' src/Dodge/Room/Room.hs 282;" f shootersRoom' src/Dodge/Room/Room.hs 283;" f
shootersRoom1 src/Dodge/Room/Room.hs 305;" f shootersRoom1 src/Dodge/Room/Room.hs 306;" f
shootingRange src/Dodge/Room/Room.hs 332;" f shootingRange src/Dodge/Room/Room.hs 333;" f
shortPoint2 src/Dodge/ShortShow.hs 4;" f shortPoint2 src/Dodge/ShortShow.hs 4;" f
shortShow src/ShortShow.hs 7;" f shortShow src/ShortShow.hs 7;" f
shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f shotgunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 708;" f
@@ -5067,7 +5072,7 @@ slowDoorRoomRunPast src/Dodge/Room/LongDoor.hs 171;" f
smallBattery src/Dodge/Item/Ammo.hs 60;" f smallBattery src/Dodge/Item/Ammo.hs 60;" f
smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f smallBranch src/Dodge/Tree/GenerateStructure.hs 32;" f
smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 14;" f smallChaseCrit src/Dodge/Creature/ChaseCrit.hs 14;" f
smallDrawTree src/Dodge/LevelGen.hs 90;" f smallDrawTree src/Dodge/LevelGen.hs 92;" f
smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 470;" f smallGlass1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 470;" f
smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f smallGlass2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 646;" f
smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 518;" f
@@ -5108,7 +5113,7 @@ sparkRandDir src/Dodge/Spark.hs 116;" f
sparkToDamage src/Dodge/Spark.hs 39;" f sparkToDamage src/Dodge/Spark.hs 39;" f
spawnAt src/Dodge/SpawnAt.hs 14;" f spawnAt src/Dodge/SpawnAt.hs 14;" f
spawnerCrit src/Dodge/Creature.hs 56;" f spawnerCrit src/Dodge/Creature.hs 56;" f
spawnerRoom src/Dodge/Room/Room.hs 360;" f spawnerRoom src/Dodge/Room/Room.hs 361;" f
speedLegs src/Dodge/Item/Equipment.hs 90;" f speedLegs src/Dodge/Item/Equipment.hs 90;" f
splashMenu src/Dodge/Menu.hs 30;" f splashMenu src/Dodge/Menu.hs 30;" f
splashMenuOptions src/Dodge/Menu.hs 35;" f splashMenuOptions src/Dodge/Menu.hs 35;" f
@@ -5266,7 +5271,7 @@ thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 92;" f
threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f
throwItem src/Dodge/Creature/Action.hs 211;" f throwItem src/Dodge/Creature/Action.hs 211;" f
tileTexCoords src/Tile.hs 11;" f tileTexCoords src/Tile.hs 11;" f
tilesFromRooms src/Dodge/Layout.hs 194;" f tilesFromRooms src/Dodge/Layout.hs 196;" f
tilesToLine src/Shader/AuxAddition.hs 66;" f tilesToLine src/Shader/AuxAddition.hs 66;" f
timeFlowUpdate src/Dodge/Update.hs 167;" f timeFlowUpdate src/Dodge/Update.hs 167;" f
timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f
@@ -5384,11 +5389,11 @@ turnTo src/Dodge/Movement/Turn.hs 8;" f
turret src/Dodge/Placement/Instance/Turret.hs 37;" f turret src/Dodge/Placement/Instance/Turret.hs 37;" 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 44;" f
tutDrop src/Dodge/Room/Tutorial.hs 58;" f tutDrop src/Dodge/Room/Tutorial.hs 61;" f
tutRezBox src/Dodge/Room/Tutorial.hs 110;" f tutRezBox src/Dodge/Room/Tutorial.hs 162;" f
tutRoomTree src/Dodge/Floor.hs 26;" f tutRoomTree src/Dodge/Floor.hs 26;" f
tutRooms src/Dodge/Room/Tutorial.hs 81;" f tutRooms src/Dodge/Room/Tutorial.hs 93;" f
tutorialMessage1 src/Dodge/Room/Tutorial.hs 132;" f tutorialMessage1 src/Dodge/Room/Tutorial.hs 184;" f
tweenAngles src/Geometry/Vector.hs 195;" f tweenAngles src/Geometry/Vector.hs 195;" f
twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 80;" f twinSlowDoorChasers src/Dodge/Room/LongDoor.hs 80;" f
twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 28;" f twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 28;" f
@@ -5610,7 +5615,7 @@ wallBuffer src/Dodge/WallCreatureCollisions.hs 52;" f
wallIsZeroLength src/Dodge/LevelGen/StaticWalls.hs 179;" f wallIsZeroLength src/Dodge/LevelGen/StaticWalls.hs 179;" f
wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f
wallToSurface src/Dodge/Base/Collide.hs 172;" f wallToSurface src/Dodge/Base/Collide.hs 172;" f
wallsFromRooms src/Dodge/Layout.hs 135;" f wallsFromRooms src/Dodge/Layout.hs 137;" f
wallsToDraw src/Dodge/Render/Walls.hs 17;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f
warmupSound src/Dodge/HeldUse.hs 1421;" f warmupSound src/Dodge/HeldUse.hs 1421;" f
warningRooms src/Dodge/Room/Warning.hs 26;" f warningRooms src/Dodge/Room/Warning.hs 26;" f
@@ -5622,12 +5627,12 @@ wasdWithAiming src/Dodge/Creature/YourControl.hs 125;" f
watchCombinations src/Dodge/Combine/Combinations.hs 16;" f watchCombinations src/Dodge/Combine/Combinations.hs 16;" f
watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 179;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 179;" f
weakenMatS src/Dodge/Material/Sound.hs 18;" f weakenMatS src/Dodge/Material/Sound.hs 18;" f
weaponBehindPillar src/Dodge/Room/Room.hs 177;" f weaponBehindPillar src/Dodge/Room/Room.hs 178;" f
weaponBetweenPillars src/Dodge/Room/Room.hs 193;" f weaponBetweenPillars src/Dodge/Room/Room.hs 194;" f
weaponEmptyRoom src/Dodge/Room/Room.hs 138;" f weaponEmptyRoom src/Dodge/Room/Room.hs 139;" f
weaponLongCorridor src/Dodge/Room/Room.hs 218;" f weaponLongCorridor src/Dodge/Room/Room.hs 219;" f
weaponRoom src/Dodge/Room/Room.hs 251;" f weaponRoom src/Dodge/Room/Room.hs 252;" f
weaponUnderCrits src/Dodge/Room/Room.hs 156;" f weaponUnderCrits src/Dodge/Room/Room.hs 157;" f
wedgeGeom src/Dodge/Base.hs 42;" f wedgeGeom src/Dodge/Base.hs 42;" f
wedgeOfThickness src/Dodge/Picture.hs 9;" f wedgeOfThickness src/Dodge/Picture.hs 9;" f
whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f whirS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 712;" f