From aba855e0a62e5fc02f35be3faa31f9e43f50c772 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 4 Oct 2025 00:34:45 +0100 Subject: [PATCH] Commit before checking where mounted lights became misplaced --- data/dodge.config.json | 1 - src/Dodge/Room/Ngon.hs | 3 +-- src/Dodge/Room/Tutorial.hs | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/dodge.config.json b/data/dodge.config.json index a463bb125..4c8eac57c 100644 --- a/data/dodge.config.json +++ b/data/dodge.config.json @@ -1,7 +1,6 @@ { "_debug_booleans": [ "Show_ms_frame", - "Enable_debug", "Pathing" ], "_debug_view_clip_bounds": "NoRoomClipBoundaries", diff --git a/src/Dodge/Room/Ngon.hs b/src/Dodge/Room/Ngon.hs index 848401077..6dfb0419d 100644 --- a/src/Dodge/Room/Ngon.hs +++ b/src/Dodge/Room/Ngon.hs @@ -4,7 +4,6 @@ module Dodge.Room.Ngon where import Dodge.Room.Path import Data.List import qualified Data.Set as S ---import Data.Maybe import Data.Tile import Dodge.Data.GenWorld import Dodge.Default.Room @@ -20,7 +19,7 @@ roomNgon n x = do return defaultRoom { _rmPolys = [poly] - , _rmLinks = map f lnks -- muout (init lnks) ++ muin[last lnks] + , _rmLinks = map f lnks , _rmPath = linksGridToPath (map f lnks) path4 , _rmPmnts = [thelight] , _rmBound = [poly] diff --git a/src/Dodge/Room/Tutorial.hs b/src/Dodge/Room/Tutorial.hs index 3d47597ff..782a1d690 100644 --- a/src/Dodge/Room/Tutorial.hs +++ b/src/Dodge/Room/Tutorial.hs @@ -1,5 +1,6 @@ module Dodge.Room.Tutorial where +import Dodge.Item.Held.Utility import Control.Monad import qualified Data.IntMap.Strict as IM import qualified Data.IntSet as IS @@ -200,7 +201,7 @@ tutLight = do return $ tToBTree "TutLight" $ treePost - [ x + [ x -- & rmPmnts <>~ [sps (PS 0 0) (PutFlIt torch)] , corridor & rmPmnts .~ mempty , removeLights y , corridor & rmPmnts .~ mempty