From 60fdd138e3a206b56aae2deb006abd27fb7da659 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 23 Sep 2025 17:14:30 +0100 Subject: [PATCH] Remove outplacements --- src/Dodge/Data/GenWorld.hs | 2 +- src/Dodge/Default/Room.hs | 2 +- src/Dodge/Layout.hs | 28 ++++++++++++++-------------- src/Dodge/Room/RunPast.hs | 1 - 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/Dodge/Data/GenWorld.hs b/src/Dodge/Data/GenWorld.hs index 77ad331dc..c367fc6dc 100644 --- a/src/Dodge/Data/GenWorld.hs +++ b/src/Dodge/Data/GenWorld.hs @@ -107,7 +107,7 @@ data Room = Room , _rmPath :: S.Set (Point2, Point2) , _rmPmnts :: [Placement] , _rmInPmnt :: [GenWorld -> Placement] - , _rmOutPmnt :: IM.IntMap Placement +-- , _rmOutPmnt :: IM.IntMap Placement , _rmBound :: [[Point2]] , _rmFloor :: Floor , _rmName :: String diff --git a/src/Dodge/Default/Room.hs b/src/Dodge/Default/Room.hs index e6d302b5e..53125f833 100644 --- a/src/Dodge/Default/Room.hs +++ b/src/Dodge/Default/Room.hs @@ -16,7 +16,7 @@ defaultRoom = , _rmPath = mempty , _rmPmnts = mempty , _rmInPmnt = mempty - , _rmOutPmnt = mempty +-- , _rmOutPmnt = mempty , _rmBound = mempty , _rmFloor = InheritFloor , _rmName = "defaultRoom" diff --git a/src/Dodge/Layout.hs b/src/Dodge/Layout.hs index 4d837292e..b8e5283fa 100644 --- a/src/Dodge/Layout.hs +++ b/src/Dodge/Layout.hs @@ -37,7 +37,7 @@ generateLevelFromRoomList gr' w = . over gwWorld setupWorldBounds -- . over (gwWorld . cWorld . lWorld) initItemLocations . doInPlacements - . doOutPlacements +-- . doOutPlacements . doIndividualPlacements . setTiles . worldToGenWorld rs' @@ -88,20 +88,20 @@ doRoomInPlacements w rm = foldr f (w, rm) $ _rmInPmnt rm where f plf (w', r') = fst $ placeSpot (w', r') (plf (w')) -doOutPlacements :: GenWorld -> GenWorld -doOutPlacements w = - let ((pmnts, gw), rms) = mapAccumR doRoomOutPlacements (IM.empty, w) (_genRooms w) - in gw & genRooms .~ rms & genPmnt <>~ pmnts +--doOutPlacements :: GenWorld -> GenWorld +--doOutPlacements w = +-- let ((pmnts, gw), rms) = mapAccumR doRoomOutPlacements (IM.empty, w) (_genRooms w) +-- in gw & genRooms .~ rms & genPmnt <>~ pmnts -doRoomOutPlacements :: - (IM.IntMap [Placement], GenWorld) -> - Room -> - ((IM.IntMap [Placement], GenWorld), Room) -doRoomOutPlacements imw r = foldr f (imw, r) $ IM.toList $ _rmOutPmnt r - where - f (i, pl) ((im, w), rm) = - let ((neww, newrm), plmnts) = placeSpot (w, rm) pl - in ((IM.insert i plmnts im, neww), newrm) +--doRoomOutPlacements :: +-- (IM.IntMap [Placement], GenWorld) -> +-- Room -> +-- ((IM.IntMap [Placement], GenWorld), Room) +--doRoomOutPlacements imw r = foldr f (imw, r) $ IM.toList $ _rmOutPmnt r +-- where +-- f (i, pl) ((im, w), rm) = +-- let ((neww, newrm), plmnts) = placeSpot (w, rm) pl +-- in ((IM.insert i plmnts im, neww), newrm) doIndividualPlacements :: GenWorld -> GenWorld doIndividualPlacements gw = diff --git a/src/Dodge/Room/RunPast.hs b/src/Dodge/Room/RunPast.hs index ca7da1455..04d043561 100644 --- a/src/Dodge/Room/RunPast.hs +++ b/src/Dodge/Room/RunPast.hs @@ -2,7 +2,6 @@ module Dodge.Room.RunPast ( lockedStart, ) where -import qualified Data.IntMap.Strict as IM import Color import qualified Data.Set as S import Dodge.Cleat