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 -8
View File
@@ -2,10 +2,10 @@ module Dodge.Room.Start where
import Dodge.LevelGen.Data
--import Dodge.PlacementSpot
import Dodge.Room.RunPast
import Dodge.RoomLink
--import Dodge.RoomLink
import Dodge.Room.LasTurret
import Dodge.Data
import Dodge.Default
--import Dodge.Data
--import Dodge.Default
--import Dodge.RoomLink
import Dodge.Tree
import Dodge.RandomHelp
@@ -16,20 +16,20 @@ import Dodge.Room.Room
import Dodge.Room.Link
import Dodge.Room.Procedural
import Dodge.Room.Foreground
import Dodge.Room.RoadBlock
--import Dodge.Room.RoadBlock
import Dodge.Placement.Instance
import Dodge.Item.Random
--import Dodge.Item.Random
import Dodge.Item.Weapon.BulletGuns
import Dodge.Item.Weapon.Utility
--import Dodge.LevelGen.Data
--import Geometry.Data
import Geometry
import Padding
--import Padding
import Color
import Shape
--import Data.Maybe
import Data.Tree
--import Data.Tree
import Control.Monad.State
import Control.Lens
import System.Random
@@ -65,7 +65,8 @@ room2 :: RandomGen g => Int -> State g (SubCompTree Room)
room2 = lasCenSensEdge
startRoom :: RandomGen g => Int -> State g (SubCompTree Room)
startRoom i = join $ takeOne
--startRoom i = join $ takeOne
startRoom _ = join $ takeOne
[-- roomMiniIntro
--minigunfakeout
-- rezBoxesWp