Move zoning up world spheres

src/Dodge/Data/CWorld.hs

@@ -9,6 +9,7 @@ module Dodge.Data.CWorld (
     module Dodge.Data.CamPos
 ) where
 
+import Geometry.Data
 import Dodge.Data.LWorld
 import Control.Lens
 import Data.Aeson
@@ -27,6 +28,7 @@ data CWorld = CWorld
     , _pastWorlds :: [LWorld]
     , _timeFlow :: TimeFlowStatus
     , _seenWalls :: IS.IntSet
+    , _floorTiles :: [(Point3, Point3)]
     }
 
 data TimeFlowStatus

src/Dodge/Data/LWorld.hs

@@ -47,12 +47,10 @@ module Dodge.Data.LWorld (
     module Dodge.Data.WorldEffect,
 ) where
 
-import Data.Set (Set)
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Data.Graph.Inductive
-import qualified Data.IntSet as IS
 import Dodge.Data.Beam
 import Dodge.Data.Block
 import Dodge.Data.Bounds
@@ -99,13 +97,10 @@ import Picture.Data
 
 data LWorld = LWorld
     { _creatures :: IM.IntMap Creature
-    , _crZoning :: IM.IntMap (IM.IntMap IS.IntSet)
     , _creatureGroups :: IM.IntMap CrGroupParams
     , _itemLocations :: IM.IntMap ItemLocation
     , _clouds :: [Cloud]
-    , _clZoning :: IM.IntMap (IM.IntMap [Cloud])
     , _gusts :: IM.IntMap Gust
-    , _gsZoning :: IM.IntMap (IM.IntMap IS.IntSet)
     , _props :: IM.IntMap Prop
     , _projectiles :: IM.IntMap Proj
     , _instantBullets :: [Bullet]
@@ -134,9 +129,7 @@ data LWorld = LWorld
     , _blocks :: IM.IntMap Block
     , _coordinates :: IM.IntMap Point2
     , _triggers :: IM.IntMap Bool
-    , _wlZoning :: IM.IntMap (IM.IntMap IS.IntSet) -- Zoning IM.IntMap Wall
     , _floorItems :: IM.IntMap FloorItem
-    , _floorTiles :: [(Point3, Point3)]
     , _modifications :: IM.IntMap Modification
     , _worldEvents :: [WdWd]
     , _delayedEvents :: [(Int, WdWd)]
@@ -146,8 +139,6 @@ data LWorld = LWorld
     , _foregroundShapes :: IM.IntMap ForegroundShape
     , _corpses :: IM.IntMap Corpse
     , _pathGraph :: Gr Point2 PathEdge
-    , _pnZoning :: IM.IntMap (IM.IntMap [(Int, Point2)]) --Zoning IM.IntMap Creature
-    , _peZoning :: IM.IntMap (IM.IntMap (Set PathEdgeNodes))
     , _lightSources :: IM.IntMap LightSource
     , _tempLightSources :: [TempLightSource]
     , _seenLocations :: IM.IntMap (WdP2, String)

src/Dodge/Data/World.hs

@@ -13,6 +13,9 @@ module Dodge.Data.World (
     module Dodge.Data.Input,
 ) where
 
+import Geometry.Data
+import Data.IntMap.Strict (IntMap)
+import Data.IntSet (IntSet)
 import Data.Set (Set)
 import Dodge.Data.SaveSlot
 import Control.Lens
@@ -39,6 +42,12 @@ data World = World
     , _rbOptions :: RightButtonOptions
     , _hud :: HUD
     , _worldEventFlags :: Set WorldEventFlag
+    , _crZoning :: IntMap (IntMap IntSet)
+    , _clZoning :: IntMap (IntMap [Cloud])
+    , _wlZoning :: IntMap (IntMap IntSet) -- Zoning IM.IntMap Wall
+    , _pnZoning :: IntMap (IntMap [(Int, Point2)]) --Zoning IM.IntMap Creature
+    , _peZoning :: IntMap (IntMap (Set PathEdgeNodes))
+    , _gsZoning :: IntMap (IntMap IntSet)
     }
 
 --    deriving (Eq, Ord, Show, Read) --Generic, Flat)