Cleanup warnings
This commit is contained in:
+22
-22
@@ -3,39 +3,39 @@ The tree of rooms that make up a level. -}
|
||||
module Dodge.Floor
|
||||
( levx
|
||||
) where
|
||||
import Geometry
|
||||
import Picture
|
||||
--import Geometry
|
||||
--import Picture
|
||||
import Dodge.Data
|
||||
import Dodge.Room
|
||||
--import Dodge.Room
|
||||
import Dodge.Creature.State.Data
|
||||
import Dodge.Creature.SwarmCrit
|
||||
--import Dodge.Creature.SwarmCrit
|
||||
import Dodge.Room.Procedural
|
||||
import Dodge.Room.RoadBlock
|
||||
import Dodge.Room.Data
|
||||
import Dodge.Room.Link
|
||||
import Dodge.Room.Door
|
||||
--import Dodge.Room.Link
|
||||
--import Dodge.Room.Door
|
||||
import Dodge.Room.Branch
|
||||
import Dodge.Room.Boss
|
||||
import Dodge.Room.Airlock
|
||||
--import Dodge.Room.Airlock
|
||||
import Dodge.Room.LongDoor
|
||||
import Dodge.Room.NoNeedWeapon
|
||||
import Dodge.Base
|
||||
import Dodge.Layout
|
||||
--import Dodge.Base
|
||||
--import Dodge.Layout
|
||||
import Dodge.Layout.Tree.Polymorphic
|
||||
import Dodge.Layout.Tree.Either
|
||||
import Dodge.Layout.Tree.GenerateStructure
|
||||
--import Dodge.Layout.Tree.GenerateStructure
|
||||
import Dodge.Layout.Tree.Annotate
|
||||
import Dodge.Layout.Tree.Shift
|
||||
import Dodge.Creature
|
||||
import Dodge.SoundLogic
|
||||
import Dodge.RandomHelp
|
||||
import Dodge.LightSources
|
||||
--import Dodge.SoundLogic
|
||||
--import Dodge.RandomHelp
|
||||
--import Dodge.LightSources
|
||||
import Dodge.LevelGen.Data
|
||||
import Dodge.LevelGen.SwarmPlacement
|
||||
--import Dodge.LevelGen.SwarmPlacement
|
||||
import Dodge.Item.Weapon
|
||||
|
||||
import Data.Tree
|
||||
import Data.Maybe (fromJust,isNothing)
|
||||
--import Data.Tree
|
||||
--import Data.Maybe (fromJust,isNothing)
|
||||
import Control.Lens
|
||||
import Control.Monad.State
|
||||
import Control.Monad.Loops
|
||||
@@ -43,7 +43,7 @@ import System.Random
|
||||
{- | A test level tree. -}
|
||||
roomTreex :: RandomGen g => State g (Maybe [Room])
|
||||
roomTreex = do
|
||||
struct' <- aTreeStrut
|
||||
--struct' <- aTreeStrut
|
||||
-- let struct = treeFromPost [[SpecificRoom $ fmap (pure . Right) pistolerRoom]] [EndRoom]
|
||||
let struct = treeFromPost [[Corridor,SpecificRoom $ fmap (pure . Right) randomFourCornerRoom]] [EndRoom]
|
||||
let t' = padCorridors struct
|
||||
@@ -51,12 +51,12 @@ roomTreex = do
|
||||
[[StartRoom]
|
||||
,[Corridor]
|
||||
,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
& rmPS %~ ([sPS (0,50) 0 $ PutCrit chaseCrit ]++)
|
||||
]
|
||||
,[Corridor]
|
||||
,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
& rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200] ]++)
|
||||
& rmPS %~ ([sPS (0,50) 0 $ PutCrit pistolCrit ]++)
|
||||
]
|
||||
-- ,[Corridor]
|
||||
-- ,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
-- & rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200] ]++)
|
||||
-- ]
|
||||
,[Corridor]
|
||||
,[Corridor]
|
||||
,[SpecificRoom $ pure . Right <$> twinSlowDoorChasers 30]
|
||||
|
||||
Reference in New Issue
Block a user