Work on room generation/laser run past
This commit is contained in:
@@ -24,7 +24,7 @@ import System.Random
|
||||
data GenWorld = GenWorld
|
||||
{ _gwWorld :: World
|
||||
, _genRooms :: IM.IntMap Room
|
||||
, _genPmnt :: IM.IntMap Placement
|
||||
, _genPmnt :: IM.IntMap Placement -- stored generated placements
|
||||
, _genInts :: IM.IntMap Int
|
||||
}
|
||||
|
||||
@@ -138,7 +138,8 @@ data Room = Room
|
||||
, _rmPos :: [RoomPos]
|
||||
, _rmPath :: S.Set (Point2, Point2)
|
||||
, _rmPmnts :: [Placement]
|
||||
, _rmInPmnt :: [(Int,GenWorld -> Placement)]
|
||||
, _rmInPmnt :: [(Int,GenWorld -> Placement)] -- so far as I can tell,
|
||||
-- the first Int only determines the order in which these are applied
|
||||
, _rmBound :: [[Point2]]
|
||||
, _rmFloor :: Floor
|
||||
, _rmName :: String
|
||||
|
||||
@@ -17,6 +17,10 @@ data Material
|
||||
| Flesh
|
||||
| Electronics
|
||||
| ForceField
|
||||
| Photovoltaic
|
||||
| LightningRod
|
||||
| Pyroelectric
|
||||
| Piezoelectric
|
||||
deriving (Eq, Ord, Show, Bounded, Enum, Read) --Generic, Flat)
|
||||
|
||||
deriveJSON defaultOptions ''Material
|
||||
|
||||
Reference in New Issue
Block a user