Add in "linear" lWorld to separate time reversable worlds
This commit is contained in:
@@ -114,6 +114,11 @@ data CWCam = CWCam
|
||||
}
|
||||
|
||||
data CWorld = CWorld
|
||||
{ _lWorld :: LWorld
|
||||
, _cwGen :: CWGen
|
||||
}
|
||||
|
||||
data LWorld = LWorld
|
||||
{ _cwCam :: CWCam
|
||||
, _creatures :: IM.IntMap Creature
|
||||
, _crZoning :: IM.IntMap (IM.IntMap IS.IntSet)
|
||||
@@ -165,7 +170,6 @@ data CWorld = CWorld
|
||||
, _corpses :: IM.IntMap Corpse
|
||||
, _pathGraph :: Gr Point2 PathEdge
|
||||
, _pnZoning :: IM.IntMap (IM.IntMap [(Int, Point2)]) --Zoning IM.IntMap Creature
|
||||
--, _peZoning :: IM.IntMap (IM.IntMap [(Int, Int, PathEdge)]) --Zoning IM.IntMap Creature
|
||||
, _peZoning :: IM.IntMap (IM.IntMap (Set PathEdgeNodes))
|
||||
, _hud :: HUD
|
||||
, _lightSources :: IM.IntMap LightSource
|
||||
@@ -174,16 +178,8 @@ data CWorld = CWorld
|
||||
, _seenLocations :: IM.IntMap (WdP2, String)
|
||||
, _selLocation :: Int
|
||||
, _distortions :: [Distortion]
|
||||
, _cwGen :: CWGen
|
||||
}
|
||||
|
||||
--deriving (Eq, Show, Read) --, Generic)
|
||||
--h--deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
|
||||
--deriving (Eq, Show, Read) --, Generic)
|
||||
--h--deriving (Eq, Show, Read) --Generic, Flat)
|
||||
|
||||
data CWGen = CWGen
|
||||
{ _cwgParams :: GenParams
|
||||
, _cwgWorldBounds :: Bounds
|
||||
@@ -201,9 +197,8 @@ data WorldBeams = WorldBeams
|
||||
, _electronBeams :: [Beam]
|
||||
}
|
||||
|
||||
--deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
makeLenses ''CWorld
|
||||
makeLenses ''LWorld
|
||||
makeLenses ''WorldBeams
|
||||
makeLenses ''CWCam
|
||||
makeLenses ''CWGen
|
||||
@@ -213,6 +208,6 @@ concat
|
||||
[ ''WorldBeams
|
||||
, ''CWCam
|
||||
, ''CWGen
|
||||
-- , ''CWTime
|
||||
, ''CWorld
|
||||
, ''LWorld
|
||||
]
|
||||
|
||||
@@ -60,6 +60,8 @@ data TimeFlowStatus
|
||||
, _futureWorlds :: [CWorld]
|
||||
, _scrollItemLocation :: Int
|
||||
}
|
||||
| RewindLeftClick
|
||||
{ _reverseAmount :: Int }
|
||||
-- deriving (Eq, Ord, Show, Read) --Generic, Flat)
|
||||
|
||||
data WorldHammer
|
||||
|
||||
Reference in New Issue
Block a user