Nest fields in CWorld

2022-08-19 11:28:19 +01:00
parent 9df0fa8692
commit 3b7841677a
10 changed files with 31 additions and 26 deletions
@@ -43,7 +43,7 @@ generateLevelFromRoomList gr' w =
        . setFloors
        . worldToGenWorld rs'
        $ w & cWorld . walls .~ wallsFromRooms rs
-            & cWorld . gameRooms .~ gameRoomsFromRooms (IM.elems rs')
+            & cWorld . cwGen . cwgGameRooms .~ gameRoomsFromRooms (IM.elems rs')
            & cWorld . pathGraph .~ path
            & cWorld . pnZoning .~ foldl' (flip zonePn) mempty (labNodes path)
            & cWorld . peZoning .~ foldl' (flip zonePe) mempty (labEdges path)
@@ -129,7 +129,7 @@ doRoomPlacements w rm = foldl' (\wr -> fst . placeSpot wr) (w, rm) $ _rmPmnts rm

 setupWorldBounds :: World -> World
 setupWorldBounds w =
-    w & cWorld . worldBounds
+    w & cWorld . cwGen . cwgWorldBounds
        %~ ( (bdMinX .~ f minx)
                . (bdMaxX .~ f maxx)
                . (bdMinY .~ f miny)