Cleanup, work towards allowing for placements to interact across rooms

This commit is contained in:
2021-11-25 01:13:41 +00:00
parent 4ad02f29b2
commit 5b7d9fccf1
7 changed files with 27 additions and 35 deletions
+9 -10
View File
@@ -1,9 +1,9 @@
module Dodge.Room.RezBox where
import Dodge.LevelGen.Data
--import Dodge.PlacementSpot
import Dodge.Room.RunPast
--import Dodge.Room.RunPast
import Dodge.RoomLink
import Dodge.Room.LasTurret
--import Dodge.Room.LasTurret
import Dodge.Data
import Dodge.Default
--import Dodge.RoomLink
@@ -11,21 +11,21 @@ import Dodge.Tree
import Dodge.RandomHelp
import Dodge.Room.Door
import Dodge.Room.Corridor
import Dodge.Room.Room
--import Dodge.Room.Room
import Dodge.Room.Link
import Dodge.Room.Procedural
import Dodge.Room.Foreground
--import Dodge.Room.Foreground
import Dodge.Room.RoadBlock
import Dodge.Placement.Instance
import Dodge.Item.Random
import Dodge.Item.Weapon.BulletGuns
import Dodge.Item.Weapon.Utility
--import Dodge.Item.Weapon.BulletGuns
--import Dodge.Item.Weapon.Utility
--import Dodge.LevelGen.Data
--import Geometry.Data
import Geometry
import Padding
import Color
import Shape
--import Color
--import Shape
import qualified Data.Set as S
--import Data.Maybe
@@ -69,7 +69,7 @@ rezBoxesWpCrit = do
h <- state $ randomR (40,40)
thecol <- rezColor
theweapon <- randBlockBreakWeapon
horedge <- takeOne [OnEdge North,OnEdge South]
--horedge <- takeOne [OnEdge North,OnEdge South]
let centralRoom = (roomRectAutoLinks w h) {_rmPmnts = []}
onwardpassage <- fmap
(applyToCompRoot (rmConnectsTo .~ S.singleton (OnEdge West))) $ maybeBlockedPassage
@@ -78,7 +78,6 @@ rezBoxesWpCrit = do
let n = length $ filter bottomEdgeTest $ map lnkPosDir $ _rmLinks centralRoom
i <- state $ randomR (0,n-3)
j <- state $ randomR (i,n-2)
blcor <- blockedCorridorCloseBlocks
let rezrooms = map adddoor
$ insertAt i (wpAdd theweapon aroom)
$ insertAt j (crAdd aroom)