Remove duplicated creature movement code
This commit is contained in:
+12
-7
@@ -8,7 +8,7 @@ module Dodge.Floor
|
||||
import Dodge.Data
|
||||
--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
|
||||
@@ -31,7 +31,7 @@ import Dodge.Creature
|
||||
--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
|
||||
@@ -52,12 +52,14 @@ roomTreex = do
|
||||
,[Corridor]
|
||||
,[Corridor]
|
||||
,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
& rmPS %~ ([sPS (0,50) 0 $ PutCrit armourChaseCrit ]++)
|
||||
]
|
||||
,[Corridor]
|
||||
,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
& rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200,202] ]++)
|
||||
& rmPS %~ ([sPS (0,50) 0 $ PutCrit armourChaseCrit
|
||||
,sPS (50,25) 0 $ PutCrit armourChaseCrit
|
||||
]++)
|
||||
]
|
||||
--,[Corridor]
|
||||
--,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
-- & rmPS %~ ([swarmPS 0 (x,y) 0 swarmCrit | x <- [-20,-19.5.. 20] , y <- [200,202] ]++)
|
||||
-- ]
|
||||
,[SpecificRoom . pure . pure . Right $ roomGlassOctogon 400
|
||||
& rmPS %~ ([sPS (0,50) 0 $ PutCrit pistolCrit ]++)
|
||||
]
|
||||
@@ -90,5 +92,8 @@ roomTreex = do
|
||||
t'
|
||||
shiftExpandTree . expandTreeBy id <$> mapM annoToRoomTree t
|
||||
|
||||
--swarmTestRoom ::
|
||||
|
||||
|
||||
levx :: RandomGen g => State g [Room]
|
||||
levx = untilJust roomTreex
|
||||
|
||||
Reference in New Issue
Block a user