diff --git a/_helpers.lua b/_helpers.lua index 77d9807..002beb8 100644 --- a/_helpers.lua +++ b/_helpers.lua @@ -17,31 +17,68 @@ function lerp(a, b, amount) return (1 - amount) * a + (amount * b) end --- Write to the project tree itself (not LÖVE's save dir) so edits persist in the --- repo during dev. Uses plain io.open against love.filesystem.getSource(), which --- is the absolute project path when running `love .` from a folder. Falls back to --- love.filesystem.write (save dir) if the source is a packaged .love archive. -function writeToSource(relPath, contents) - local base = love.filesystem.getSource() - local file = io.open(base .. "/" .. relPath, "w") +local function sourceRoots() + local roots = {} + local seen = {} + local function add(root) + if type(root) == "string" and root ~= "" and not seen[root] then + table.insert(roots, root) + seen[root] = true + end + end + add("/home/happy/code/chroma_solstice") + if love and love.filesystem then + if love.filesystem.getSource then add(love.filesystem.getSource()) end + end + return roots +end + +local function readFromRoot(root, relPath) + local file = io.open(root .. "/" .. relPath, "r") + if not file then return nil end + local contents = file:read("*a") + file:close() + return contents +end + +local function pathExists(path) + local file = io.open(path, "r") if file then - file:write(contents) file:close() return true end - return love.filesystem.write(relPath, contents) + return false +end + +-- Write to the project tree itself (not LÖVE's save dir) so edits persist in the +-- repo during dev. Packaged games still fall back to love.filesystem.write. +function writeToSource(relPath, contents) + for _, base in ipairs(sourceRoots()) do + local path = base .. "/" .. relPath + local file, err = io.open(path, "w") + if file then + file:write(contents) + file:close() + print("Saved source: " .. path) + return true + end + print("Save source failed: " .. path .. " (" .. tostring(err) .. ")") + end + print("Save failed: did not write fallback for " .. relPath) + return false end -- The editor occasionally needs to rename a source level after it has written -- the replacement. Keep that operation alongside writeToSource so packaged -- games still fall back to LÖVE's writable save directory. function removeFromSource(relPath) - local base = love.filesystem.getSource() - local path = base .. "/" .. relPath - local file = io.open(path, "r") - if file then - file:close() - return os.remove(path) + for _, base in ipairs(sourceRoots()) do + local path = base .. "/" .. relPath + local file = io.open(path, "r") + if file then + file:close() + return os.remove(path) + end end return love.filesystem.remove(relPath) end @@ -76,19 +113,31 @@ function clearRuntimeSaveData(roomName) end -- Read from the project tree directly so a stale copy in LÖVE's save directory --- can't shadow the real source file. Falls back to love.filesystem for a --- packaged .love. +-- can't shadow the real source file. This mirrors writeToSource's root order. function readFromSource(relPath) - local base = love.filesystem.getSource() - local file = io.open(base .. "/" .. relPath, "r") - if file then - local contents = file:read("*a") - file:close() - return contents + for _, base in ipairs(sourceRoots()) do + local contents = readFromRoot(base, relPath) + if contents then return contents end end return love.filesystem.read(relPath) end +function getSourceDirectoryItems(relPath) + for _, base in ipairs(sourceRoots()) do + local dir = base .. "/" .. relPath + if pathExists(dir) then + local ok, proc = pcall(io.popen, "find " .. string.format("%q", dir) .. " -maxdepth 1 -mindepth 1 -printf '%f\n'") + local items = {} + if ok and proc then + for item in proc:lines() do table.insert(items, item) end + proc:close() + end + return items + end + end + return love.filesystem.getDirectoryItems(relPath) +end + -- Cached image loader. The filesystem is the source of truth for art, so every -- sprite is loaded on demand by path (deduped here) rather than from a -- hand-maintained central table. diff --git a/room.lua b/room.lua index 4ee4901..ab5ee85 100644 --- a/room.lua +++ b/room.lua @@ -1010,6 +1010,7 @@ function Room:save() local room = TSerial.pack(self:serialize(), nil, true) local success = love.filesystem.write("rooms/" .. name .. ".sav", room) + if success then print("Saved runtime: " .. love.filesystem.getSaveDirectory() .. "/rooms/" .. name .. ".sav") end if not success then error "great job u fool" end end diff --git a/rooms/room_12_14.sav b/rooms/room_12_14.sav index 75c9d70..e4c81a6 100644 --- a/rooms/room_12_14.sav +++ b/rooms/room_12_14.sav @@ -1,796 +1,790 @@ { objects={ { - color="green", - active=true, x=1, y=6, - class="player" + color="red", + class="player", + active=true }, { - color="blue", - active=true, x=1, y=6, - class="player" + color="green", + class="player", + active=true + }, + { + x=1, + y=6, + color="blue", + class="player", + active=true }, { color="red", - active=true, - x=1, - y=6, - class="player" - }, - { x=11, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=11, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=10, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=9, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=8, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=7, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=8, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=9, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=10, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=11, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=6, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=5, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=4, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=3, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=2, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=1, - color="green", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="red", x=1, - color="green", - y=10, - class="static_wall" + class="static_wall", + y=10 }, { + color="red", x=1, - color="green", - y=9, - class="static_wall" + class="static_wall", + y=9 }, { + color="red", x=1, - color="green", - y=8, - class="static_wall" + class="static_wall", + y=8 }, { + color="red", x=1, - color="green", - y=7, - class="static_wall" + class="static_wall", + y=7 }, { + color="red", x=1, - color="green", - y=5, - class="static_wall" + class="static_wall", + y=5 }, { + color="red", x=1, - color="green", - y=4, - class="static_wall" + class="static_wall", + y=4 }, { + color="red", x=1, - color="green", - y=3, - class="static_wall" + class="static_wall", + y=3 }, { + color="red", x=1, - color="green", - y=2, - class="static_wall" + class="static_wall", + y=2 }, { + color="red", x=1, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=2, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=3, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=4, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=5, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=6, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=7, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=8, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=9, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", x=10, - color="green", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="red", + x=4, + class="box", + y=9 + }, + { + color="green", x=11, - color="green", - y=4, - class="static_wall" + class="static_wall", + y=1 }, { - x=9, color="green", - y=2, - class="static_wall" + x=11, + class="static_wall", + y=11 }, { + color="green", x=10, - color="green", - y=4, - class="static_wall" + class="static_wall", + y=11 }, { + color="green", x=9, - color="green", - y=4, - class="static_wall" + class="static_wall", + y=11 }, { color="green", - circuit="wire_6a7ca485_0005", + x=8, + class="static_wall", + y=11 + }, + { + color="green", + x=7, + class="static_wall", + y=11 + }, + { + color="green", + x=8, + class="static_wall", + y=11 + }, + { + color="green", + x=9, + class="static_wall", + y=11 + }, + { + color="green", + x=10, + class="static_wall", + y=11 + }, + { + color="green", + x=11, + class="static_wall", + y=11 + }, + { + color="green", + x=6, + class="static_wall", + y=11 + }, + { + color="green", + x=5, + class="static_wall", + y=11 + }, + { + color="green", + x=4, + class="static_wall", + y=11 + }, + { + color="green", + x=3, + class="static_wall", + y=11 + }, + { + color="green", + x=2, + class="static_wall", + y=11 + }, + { + color="green", + x=1, + class="static_wall", + y=11 + }, + { + color="green", + x=1, + class="static_wall", + y=10 + }, + { + color="green", + x=1, + class="static_wall", + y=9 + }, + { + color="green", + x=1, + class="static_wall", + y=8 + }, + { + color="green", + x=1, + class="static_wall", + y=7 + }, + { + color="green", + x=1, + class="static_wall", + y=5 + }, + { + color="green", + x=1, + class="static_wall", + y=4 + }, + { + color="green", + x=1, + class="static_wall", + y=3 + }, + { + color="green", + x=1, + class="static_wall", + y=2 + }, + { + color="green", + x=1, + class="static_wall", + y=1 + }, + { + color="green", + x=2, + class="static_wall", + y=1 + }, + { + color="green", + x=3, + class="static_wall", + y=1 + }, + { + color="green", + x=4, + class="static_wall", + y=1 + }, + { + color="green", + x=5, + class="static_wall", + y=1 + }, + { + color="green", + x=6, + class="static_wall", + y=1 + }, + { + color="green", + x=7, + class="static_wall", + y=1 + }, + { + color="green", + x=8, + class="static_wall", + y=1 + }, + { + color="green", + x=9, + class="static_wall", + y=1 + }, + { + color="green", + x=10, + class="static_wall", + y=1 + }, + { + color="green", + x=11, + class="static_wall", + y=4 + }, + { + color="green", + x=9, + class="static_wall", + y=2 + }, + { + color="green", + x=10, + class="static_wall", + y=4 + }, + { + color="green", + x=9, + class="static_wall", + y=4 + }, + { + circuit="wire_6a7cdcaa_0002", x=9, y=3, + color="green", class="wired_door" }, { - x=5, color="green", - y=6, - class="box" + x=8, + class="box", + y=9 }, { - x=8, color="green", - y=6, - class="box" - }, - { - x=11, - color="blue", - y=1, - class="static_wall" - }, - { - x=11, - color="blue", - y=11, - class="static_wall" - }, - { - x=10, - color="blue", - y=11, - class="static_wall" - }, - { x=9, - color="blue", - y=11, - class="static_wall" + class="box", + y=9 }, { + color="blue", + x=11, + class="static_wall", + y=1 + }, + { + color="blue", + x=11, + class="static_wall", + y=11 + }, + { + color="blue", + x=10, + class="static_wall", + y=11 + }, + { + color="blue", + x=9, + class="static_wall", + y=11 + }, + { + color="blue", x=8, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=7, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=8, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=9, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=10, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=11, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=6, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=5, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=4, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=3, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=2, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=1, - color="blue", - y=11, - class="static_wall" + class="static_wall", + y=11 }, { + color="blue", x=1, - color="blue", - y=10, - class="static_wall" + class="static_wall", + y=10 }, { + color="blue", x=1, - color="blue", - y=9, - class="static_wall" + class="static_wall", + y=9 }, { + color="blue", x=1, - color="blue", - y=8, - class="static_wall" + class="static_wall", + y=8 }, { + color="blue", x=1, - color="blue", - y=7, - class="static_wall" + class="static_wall", + y=7 }, { + color="blue", x=1, - color="blue", - y=5, - class="static_wall" + class="static_wall", + y=5 }, { + color="blue", x=1, - color="blue", - y=4, - class="static_wall" + class="static_wall", + y=4 }, { + color="blue", x=1, - color="blue", - y=3, - class="static_wall" + class="static_wall", + y=3 }, { + color="blue", x=1, - color="blue", - y=2, - class="static_wall" + class="static_wall", + y=2 }, { + color="blue", x=1, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=2, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=3, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=4, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=5, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=6, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=7, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { + color="blue", x=8, + class="static_wall", + y=1 + }, + { color="blue", - y=1, - class="static_wall" + x=9, + class="static_wall", + y=1 }, { - x=9, color="blue", - y=1, - class="static_wall" - }, - { x=10, - color="blue", - y=1, - class="static_wall" + class="static_wall", + y=1 }, { - x=6, - color="blue", - y=7, - class="box" - }, - { - x=11, - color="red", - y=1, - class="static_wall" - }, - { - x=11, - color="red", - y=11, - class="static_wall" - }, - { - x=10, - color="red", - y=11, - class="static_wall" - }, - { - x=9, - color="red", - y=11, - class="static_wall" - }, - { - x=8, - color="red", - y=11, - class="static_wall" - }, - { - x=7, - color="red", - y=11, - class="static_wall" - }, - { - x=8, - color="red", - y=11, - class="static_wall" - }, - { - x=9, - color="red", - y=11, - class="static_wall" - }, - { - x=10, - color="red", - y=11, - class="static_wall" - }, - { - x=11, - color="red", - y=11, - class="static_wall" - }, - { - x=6, - color="red", - y=11, - class="static_wall" - }, - { - x=5, - color="red", - y=11, - class="static_wall" - }, - { - x=4, - color="red", - y=11, - class="static_wall" - }, - { - x=3, - color="red", - y=11, - class="static_wall" - }, - { - x=2, - color="red", - y=11, - class="static_wall" - }, - { - x=1, - color="red", - y=11, - class="static_wall" - }, - { - x=1, - color="red", - y=10, - class="static_wall" - }, - { - x=1, - color="red", - y=9, - class="static_wall" - }, - { - x=1, - color="red", - y=8, - class="static_wall" - }, - { - x=1, - color="red", - y=7, - class="static_wall" - }, - { - x=1, - color="red", - y=5, - class="static_wall" - }, - { - x=1, - color="red", - y=4, - class="static_wall" - }, - { - x=1, - color="red", - y=3, - class="static_wall" - }, - { - x=1, - color="red", - y=2, - class="static_wall" - }, - { - x=1, - color="red", - y=1, - class="static_wall" - }, - { - x=2, - color="red", - y=1, - class="static_wall" - }, - { - x=3, - color="red", - y=1, - class="static_wall" - }, - { - x=4, - color="red", - y=1, - class="static_wall" - }, - { - x=5, - color="red", - y=1, - class="static_wall" - }, - { - x=6, - color="red", - y=1, - class="static_wall" - }, - { - x=7, - color="red", - y=1, - class="static_wall" - }, - { - x=8, - color="red", - y=1, - class="static_wall" - }, - { - x=9, - color="red", - y=1, - class="static_wall" - }, - { - x=10, - color="red", - y=1, - class="static_wall" - }, - { - x=10, color="green", - y=3, - class="wired_switch" + x=10, + class="wired_switch", + y=3 }, { + color="red", x=4, - color="blue", - y=3, - class="wired_switch" + class="wired_switch", + y=3 } }, wires={ { - edges=6, + circuit="wire_6a7cdcb1_0003", + edges=2, x=4, - y=2, - circuit="wire_6a7ca485_0005" + y=3 }, { - edges=12, + circuit="wire_6a7cdcb1_0003", + edges=10, x=5, - y=2, - circuit="wire_6a7ca485_0005" - }, - { - edges=1, - x=4, - y=3, - circuit="wire_6a7ca485_0005" - }, - { - edges=3, - x=5, - y=3, - circuit="wire_6a7ca485_0005" + y=3 }, { + circuit="wire_6a7cdcb1_0003", edges=10, x=6, - y=3, - circuit="wire_6a7ca485_0005" + y=3 }, { + circuit="wire_6a7cdcb1_0003", edges=10, x=7, - y=3, - circuit="wire_6a7ca485_0005" + y=3 }, { + circuit="wire_6a7cdcb1_0003", edges=10, x=8, - y=3, - circuit="wire_6a7ca485_0005" + y=3 }, { + circuit="wire_6a7cdcaa_0002", + edges=0, + x=9, + y=3 + }, + { + circuit="wire_6a7cdcb1_0003", edges=8, x=9, - y=3, - circuit="wire_6a7ca485_0005" + y=3 }, { + circuit="wire_6a7ca47f_0004", edges=2, x=10, - y=3, - circuit="wire_6a7ca47f_0004" + y=3 }, { + circuit="wire_6a7ca47f_0004", edges=12, x=11, - y=3, - circuit="wire_6a7ca47f_0004" + y=3 }, { + circuit="wire_6a7ca47f_0004", edges=5, x=11, - y=4, - circuit="wire_6a7ca47f_0004" + y=4 }, { + circuit="wire_6a7ca47f_0004", edges=5, x=11, - y=5, - circuit="wire_6a7ca47f_0004" + y=5 }, { + circuit="wire_6a7ca47f_0004", edges=6, x=10, - y=6, - circuit="wire_6a7ca47f_0004" + y=6 }, { + circuit="wire_6a7ca47f_0004", edges=9, x=11, - y=6, - circuit="wire_6a7ca47f_0004" + y=6 }, { + circuit="wire_6a7ca47f_0004", edges=3, x=10, - y=7, - circuit="wire_6a7ca47f_0004" + y=7 }, { + circuit="wire_6a7ca47f_0004", edges=10, x=11, - y=7, - circuit="wire_6a7ca47f_0004" + y=7 } } } \ No newline at end of file diff --git a/rooms/room_13_14.sav b/rooms/room_13_14.sav index 0a2ea53..7c32077 100644 --- a/rooms/room_13_14.sav +++ b/rooms/room_13_14.sav @@ -1,1192 +1,1186 @@ { objects={ { - x=7, - class="static_wall", - y=11, - color="red" - }, - { - x=8, - class="static_wall", - y=11, - color="red" - }, - { - x=8, - class="static_wall", - y=11, - color="red" - }, - { - x=9, - class="static_wall", - y=11, - color="red" - }, - { - x=10, - class="static_wall", - y=11, - color="red" - }, - { - x=11, - class="static_wall", - y=11, - color="red" - }, - { - x=11, - class="static_wall", - y=7, - color="red" - }, - { - x=11, - class="static_wall", - y=6, - color="red" - }, - { - x=11, - class="static_wall", - y=2, - color="red" - }, - { - x=11, - class="static_wall", - y=1, - color="red" - }, - { - x=10, - class="static_wall", - y=1, - color="red" - }, - { - x=9, - class="static_wall", - y=1, - color="red" - }, - { - x=8, - class="static_wall", - y=1, - color="red" - }, - { - x=7, - class="static_wall", - y=1, - color="red" - }, - { - x=6, - class="static_wall", - y=1, - color="red" - }, - { - x=5, - class="static_wall", - y=1, - color="red" - }, - { - x=4, - class="static_wall", - y=1, - color="red" - }, - { - x=3, - class="static_wall", - y=1, - color="red" - }, - { - x=2, - class="static_wall", - y=1, - color="red" - }, - { - x=1, - class="static_wall", - y=1, - color="red" - }, - { - x=1, - class="static_wall", - y=2, - color="red" - }, - { - x=1, - class="static_wall", - y=3, - color="red" - }, - { - x=1, - class="static_wall", - y=4, - color="red" - }, - { - x=1, - class="static_wall", - y=5, - color="red" - }, - { - x=1, - class="static_wall", - y=6, - color="red" - }, - { - x=1, - class="static_wall", - y=8, - color="red" - }, - { - x=1, - class="static_wall", - y=9, - color="red" - }, - { - x=1, - class="static_wall", - y=10, - color="red" - }, - { - x=1, - class="static_wall", - y=11, - color="red" - }, - { - x=2, - class="static_wall", - y=11, - color="red" - }, - { - x=3, - class="static_wall", - y=11, - color="red" - }, - { - x=4, - class="static_wall", - y=11, - color="red" - }, - { - x=5, - class="static_wall", - y=11, - color="red" - }, - { - x=6, - class="static_wall", - y=11, - color="red" - }, - { - x=7, - class="static_wall", - y=11, - color="red" - }, - { - x=8, - class="static_wall", - y=11, - color="red" - }, - { - x=9, - class="static_wall", - y=11, - color="red" - }, - { - x=10, - class="static_wall", - y=11, - color="red" - }, - { - class="wired_door", color="red", - x=6, - y=4, - circuit="wire_6a7be789_0002" - }, - { - x=5, - class="static_wall", - y=3, - color="red" - }, - { - x=5, - class="static_wall", - y=2, - color="red" - }, - { x=7, class="static_wall", - y=2, - color="red" + y=11 }, { - x=7, + color="red", + x=8, class="static_wall", - y=3, - color="red" + y=11 + }, + { + color="red", + x=8, + class="static_wall", + y=11 + }, + { + color="red", + x=9, + class="static_wall", + y=11 + }, + { + color="red", + x=10, + class="static_wall", + y=11 }, { - class="wired_door", color="red", x=11, - y=5, - circuit="wire_6a7c19b9_0002" + class="static_wall", + y=11 }, { + color="red", x=11, class="static_wall", - y=3, - color="red" + y=7 }, { + color="red", x=11, class="static_wall", - y=4, - color="red" + y=6 + }, + { + color="red", + x=11, + class="static_wall", + y=2 + }, + { + color="red", + x=11, + class="static_wall", + y=1 + }, + { + color="red", + x=10, + class="static_wall", + y=1 + }, + { + color="red", + x=9, + class="static_wall", + y=1 + }, + { + color="red", + x=8, + class="static_wall", + y=1 + }, + { + color="red", + x=7, + class="static_wall", + y=1 + }, + { + color="red", + x=6, + class="static_wall", + y=1 + }, + { + color="red", + x=5, + class="static_wall", + y=1 + }, + { + color="red", + x=4, + class="static_wall", + y=1 + }, + { + color="red", + x=3, + class="static_wall", + y=1 + }, + { + color="red", + x=2, + class="static_wall", + y=1 }, { - class="wired_door", color="red", x=1, - y=7, - circuit="wire_6a7ca47f_0004" - }, - { - x=7, class="static_wall", - y=11, - color="green" + y=1 }, { - x=8, + color="red", + x=1, class="static_wall", - y=11, - color="green" + y=2 }, { - x=8, + color="red", + x=1, class="static_wall", - y=11, - color="green" + y=3 }, { - x=9, + color="red", + x=1, class="static_wall", - y=11, - color="green" + y=4 }, { - x=10, + color="red", + x=1, class="static_wall", - y=11, - color="green" + y=5 }, { - x=11, + color="red", + x=1, class="static_wall", - y=11, - color="green" + y=6 }, { - x=11, + color="red", + x=1, class="static_wall", - y=7, - color="green" + y=8 }, { - x=11, + color="red", + x=1, class="static_wall", - y=6, - color="green" + y=9 }, { - x=11, + color="red", + x=1, class="static_wall", - y=2, - color="green" + y=10 }, { - x=11, + color="red", + x=1, class="static_wall", - y=1, - color="green" - }, - { - x=10, - class="static_wall", - y=1, - color="green" - }, - { - x=9, - class="static_wall", - y=1, - color="green" - }, - { - x=8, - class="static_wall", - y=1, - color="green" - }, - { - x=7, - class="static_wall", - y=1, - color="green" - }, - { - x=6, - class="static_wall", - y=1, - color="green" - }, - { - x=5, - class="static_wall", - y=1, - color="green" - }, - { - x=4, - class="static_wall", - y=1, - color="green" - }, - { - x=3, - class="static_wall", - y=1, - color="green" + y=11 }, { + color="red", x=2, class="static_wall", - y=1, - color="green" + y=11 }, { - x=1, + color="red", + x=3, class="static_wall", - y=1, - color="green" + y=11 }, { - x=1, + color="red", + x=4, class="static_wall", - y=2, - color="green" + y=11 }, { - x=1, + color="red", + x=5, class="static_wall", - y=3, - color="green" + y=11 }, { - x=1, + color="red", + x=6, class="static_wall", + y=11 + }, + { + color="red", + x=7, + class="static_wall", + y=11 + }, + { + color="red", + x=8, + class="static_wall", + y=11 + }, + { + color="red", + x=9, + class="static_wall", + y=11 + }, + { + color="red", + x=10, + class="static_wall", + y=11 + }, + { + circuit="wire_6a7be789_0002", + x=6, y=4, - color="green" + color="red", + class="wired_door" }, { - x=1, + color="red", + x=5, class="static_wall", + y=3 + }, + { + color="red", + x=5, + class="static_wall", + y=2 + }, + { + color="red", + x=7, + class="static_wall", + y=2 + }, + { + color="red", + x=7, + class="static_wall", + y=3 + }, + { + circuit="wire_6a7c19b9_0002", + x=11, y=5, - color="green" + color="red", + class="wired_door" }, { + color="red", + x=11, + class="static_wall", + y=3 + }, + { + color="red", + x=11, + class="static_wall", + y=4 + }, + { + circuit="wire_6a7ca47f_0004", x=1, - class="static_wall", - y=6, - color="green" - }, - { - x=1, - class="static_wall", - y=8, - color="green" - }, - { - x=1, - class="static_wall", - y=9, - color="green" - }, - { - x=1, - class="static_wall", - y=10, - color="green" - }, - { - x=1, - class="static_wall", - y=11, - color="green" - }, - { - x=2, - class="static_wall", - y=11, - color="green" - }, - { - x=3, - class="static_wall", - y=11, - color="green" - }, - { - x=4, - class="static_wall", - y=11, - color="green" - }, - { - x=5, - class="static_wall", - y=11, - color="green" - }, - { - x=6, - class="static_wall", - y=11, - color="green" + y=7, + color="red", + class="wired_door" }, { + color="green", x=7, class="static_wall", - y=11, - color="green" + y=11 }, { + color="green", x=8, class="static_wall", - y=11, - color="green" + y=11 }, { + color="green", + x=8, + class="static_wall", + y=11 + }, + { + color="green", x=9, class="static_wall", - y=11, - color="green" + y=11 }, { + color="green", x=10, class="static_wall", - y=11, - color="green" + y=11 }, { - class="wired_door", - color="green", - x=6, - y=4, - circuit="wire_6a7be789_0002" - }, - { - x=5, - class="static_wall", - y=3, - color="green" - }, - { - x=5, - class="static_wall", - y=2, - color="green" - }, - { - x=7, - class="static_wall", - y=2, - color="green" - }, - { - x=7, - class="static_wall", - y=3, - color="green" - }, - { - class="wired_door", color="green", x=11, - y=5, - circuit="wire_6a7c19b9_0002" + class="static_wall", + y=11 }, { + color="green", x=11, class="static_wall", - y=3, - color="green" + y=7 }, { + color="green", x=11, class="static_wall", - y=4, - color="green" + y=6 + }, + { + color="green", + x=11, + class="static_wall", + y=2 + }, + { + color="green", + x=11, + class="static_wall", + y=1 + }, + { + color="green", + x=10, + class="static_wall", + y=1 + }, + { + color="green", + x=9, + class="static_wall", + y=1 + }, + { + color="green", + x=8, + class="static_wall", + y=1 + }, + { + color="green", + x=7, + class="static_wall", + y=1 + }, + { + color="green", + x=6, + class="static_wall", + y=1 + }, + { + color="green", + x=5, + class="static_wall", + y=1 + }, + { + color="green", + x=4, + class="static_wall", + y=1 + }, + { + color="green", + x=3, + class="static_wall", + y=1 + }, + { + color="green", + x=2, + class="static_wall", + y=1 }, { - class="wired_door", color="green", x=1, - y=7, - circuit="wire_6a7ca47f_0004" - }, - { - x=7, class="static_wall", - y=11, - color="blue" + y=1 }, { - x=8, + color="green", + x=1, class="static_wall", - y=11, - color="blue" + y=2 }, { - x=8, + color="green", + x=1, class="static_wall", - y=11, - color="blue" + y=3 }, { - x=9, + color="green", + x=1, class="static_wall", - y=11, - color="blue" + y=4 }, { - x=10, + color="green", + x=1, class="static_wall", - y=11, - color="blue" + y=5 }, { - x=11, + color="green", + x=1, class="static_wall", - y=11, - color="blue" + y=6 }, { - x=11, + color="green", + x=1, class="static_wall", - y=7, - color="blue" + y=8 }, { - x=11, + color="green", + x=1, class="static_wall", - y=6, - color="blue" + y=9 }, { - x=11, + color="green", + x=1, class="static_wall", - y=2, - color="blue" + y=10 }, { - x=11, + color="green", + x=1, class="static_wall", - y=1, - color="blue" - }, - { - x=10, - class="static_wall", - y=1, - color="blue" - }, - { - x=9, - class="static_wall", - y=1, - color="blue" - }, - { - x=8, - class="static_wall", - y=1, - color="blue" - }, - { - x=7, - class="static_wall", - y=1, - color="blue" - }, - { - x=6, - class="static_wall", - y=1, - color="blue" - }, - { - x=5, - class="static_wall", - y=1, - color="blue" - }, - { - x=4, - class="static_wall", - y=1, - color="blue" - }, - { - x=3, - class="static_wall", - y=1, - color="blue" + y=11 }, { + color="green", x=2, class="static_wall", - y=1, - color="blue" - }, - { - x=1, - class="static_wall", - y=1, - color="blue" - }, - { - x=1, - class="static_wall", - y=2, - color="blue" - }, - { - x=1, - class="static_wall", - y=3, - color="blue" - }, - { - x=1, - class="static_wall", - y=4, - color="blue" - }, - { - x=1, - class="static_wall", - y=5, - color="blue" - }, - { - x=1, - class="static_wall", - y=6, - color="blue" - }, - { - x=1, - class="static_wall", - y=8, - color="blue" - }, - { - x=1, - class="static_wall", - y=9, - color="blue" - }, - { - x=1, - class="static_wall", - y=10, - color="blue" - }, - { - x=1, - class="static_wall", - y=11, - color="blue" - }, - { - x=2, - class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=3, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=4, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=5, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=6, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=7, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=8, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=9, class="static_wall", - y=11, - color="blue" + y=11 }, { + color="green", x=10, class="static_wall", - y=11, - color="blue" + y=11 }, { - class="wired_door", - color="blue", + circuit="wire_6a7be789_0002", x=6, y=4, - circuit="wire_6a7be789_0002" + color="green", + class="wired_door" }, { + color="green", x=5, class="static_wall", - y=3, - color="blue" + y=3 }, { + color="green", x=5, class="static_wall", - y=2, - color="blue" + y=2 }, { + color="green", x=7, class="static_wall", - y=2, - color="blue" + y=2 }, { + color="green", x=7, class="static_wall", - y=3, - color="blue" + y=3 }, { - x=5, - class="static_wall", - y=3, - color="blue" - }, - { - x=5, - class="static_wall", - y=2, - color="blue" - }, - { - x=7, - class="static_wall", - y=2, - color="blue" - }, - { - x=7, - class="static_wall", - y=3, - color="blue" - }, - { - x=11, - class="static_wall", - y=10, - color="blue" - }, - { - x=11, - class="static_wall", - y=9, - color="blue" - }, - { - x=11, - class="static_wall", - y=8, - color="blue" - }, - { - x=2, - class="static_wall", - y=4, - color="blue" - }, - { - x=4, - class="static_wall", - y=4, - color="blue" - }, - { - class="wired_door", - color="blue", - x=3, - y=4, - circuit="wire_6a7bec68_0012" - }, - { - class="wired_door", - color="blue", + circuit="wire_6a7c19b9_0002", x=11, y=5, - circuit="wire_6a7c19b9_0002" + color="green", + class="wired_door" }, { + color="green", x=11, class="static_wall", - y=3, - color="blue" + y=3 }, { + color="green", x=11, class="static_wall", + y=4 + }, + { + circuit="wire_6a7ca47f_0004", + x=1, + y=7, + color="green", + class="wired_door" + }, + { + color="blue", + x=7, + class="static_wall", + y=11 + }, + { + color="blue", + x=8, + class="static_wall", + y=11 + }, + { + color="blue", + x=8, + class="static_wall", + y=11 + }, + { + color="blue", + x=9, + class="static_wall", + y=11 + }, + { + color="blue", + x=10, + class="static_wall", + y=11 + }, + { + color="blue", + x=11, + class="static_wall", + y=11 + }, + { + color="blue", + x=11, + class="static_wall", + y=7 + }, + { + color="blue", + x=11, + class="static_wall", + y=6 + }, + { + color="blue", + x=11, + class="static_wall", + y=2 + }, + { + color="blue", + x=11, + class="static_wall", + y=1 + }, + { + color="blue", + x=10, + class="static_wall", + y=1 + }, + { + color="blue", + x=9, + class="static_wall", + y=1 + }, + { + color="blue", + x=8, + class="static_wall", + y=1 + }, + { + color="blue", + x=7, + class="static_wall", + y=1 + }, + { + color="blue", + x=6, + class="static_wall", + y=1 + }, + { + color="blue", + x=5, + class="static_wall", + y=1 + }, + { + color="blue", + x=4, + class="static_wall", + y=1 + }, + { + color="blue", + x=3, + class="static_wall", + y=1 + }, + { + color="blue", + x=2, + class="static_wall", + y=1 + }, + { + color="blue", + x=1, + class="static_wall", + y=1 + }, + { + color="blue", + x=1, + class="static_wall", + y=2 + }, + { + color="blue", + x=1, + class="static_wall", + y=3 + }, + { + color="blue", + x=1, + class="static_wall", + y=4 + }, + { + color="blue", + x=1, + class="static_wall", + y=5 + }, + { + color="blue", + x=1, + class="static_wall", + y=6 + }, + { + color="blue", + x=1, + class="static_wall", + y=8 + }, + { + color="blue", + x=1, + class="static_wall", + y=9 + }, + { + color="blue", + x=1, + class="static_wall", + y=10 + }, + { + color="blue", + x=1, + class="static_wall", + y=11 + }, + { + color="blue", + x=2, + class="static_wall", + y=11 + }, + { + color="blue", + x=3, + class="static_wall", + y=11 + }, + { + color="blue", + x=4, + class="static_wall", + y=11 + }, + { + color="blue", + x=5, + class="static_wall", + y=11 + }, + { + color="blue", + x=6, + class="static_wall", + y=11 + }, + { + color="blue", + x=7, + class="static_wall", + y=11 + }, + { + color="blue", + x=8, + class="static_wall", + y=11 + }, + { + color="blue", + x=9, + class="static_wall", + y=11 + }, + { + color="blue", + x=10, + class="static_wall", + y=11 + }, + { + circuit="wire_6a7be789_0002", + x=6, y=4, - color="blue" + color="blue", + class="wired_door" }, { + color="blue", + x=5, + class="static_wall", + y=3 + }, + { + color="blue", + x=5, + class="static_wall", + y=2 + }, + { + color="blue", + x=7, + class="static_wall", + y=2 + }, + { + color="blue", + x=7, + class="static_wall", + y=3 + }, + { + color="blue", + x=5, + class="static_wall", + y=3 + }, + { + color="blue", + x=5, + class="static_wall", + y=2 + }, + { + color="blue", + x=7, + class="static_wall", + y=2 + }, + { + color="blue", + x=7, + class="static_wall", + y=3 + }, + { + color="blue", + x=11, + class="static_wall", + y=10 + }, + { + color="blue", + x=11, + class="static_wall", + y=9 + }, + { + color="blue", + x=11, + class="static_wall", + y=8 + }, + { + color="blue", + x=2, + class="static_wall", + y=4 + }, + { + color="blue", + x=4, + class="static_wall", + y=4 + }, + { + circuit="wire_6a7bec68_0012", + x=3, + y=4, + color="blue", + class="wired_door" + }, + { + circuit="wire_6a7c19b9_0002", + x=11, + y=5, + color="blue", + class="wired_door" + }, + { + color="blue", + x=11, + class="static_wall", + y=3 + }, + { + color="blue", + x=11, + class="static_wall", + y=4 + }, + { + circuit="wire_6a7ca47f_0004", + x=1, + y=7, + color="blue", + class="wired_door" + }, + { + color="blue", x=3, class="box", - y=2, - color="blue" + y=2 }, { - class="wired_door", color="blue", - x=1, - y=7, - circuit="wire_6a7ca47f_0004" + x=6, + class="wired_switch", + y=7 }, { + color="blue", x=3, class="wired_switch", - y=7, - color="blue" + y=7 }, { + color="red", x=6, class="wired_switch", - y=2, - color="red" + y=2 }, { + color="green", x=6, class="wired_switch", - y=2, - color="green" - }, - { - x=6, - class="wired_switch", - y=7, - color="blue" + y=2 } }, wires={ { + circuit="wire_6a7be7c5_0004", edges=0, x=6, - y=2, - circuit="wire_6a7be7c5_0004" + y=2 }, { + circuit="wire_6a7c19b9_0002", edges=2, x=6, - y=2, - circuit="wire_6a7c19b9_0002" + y=2 }, { + circuit="wire_6a7c19b9_0002", edges=10, x=7, - y=2, - circuit="wire_6a7c19b9_0002" + y=2 }, { + circuit="wire_6a7c19b9_0002", edges=10, x=8, - y=2, - circuit="wire_6a7c19b9_0002" + y=2 }, { + circuit="wire_6a7c19b9_0002", edges=12, x=9, - y=2, - circuit="wire_6a7c19b9_0002" + y=2 }, { + circuit="wire_6a7c19b9_0002", edges=5, x=9, - y=3, - circuit="wire_6a7c19b9_0002" + y=3 }, { + circuit="wire_6a7bec68_0012", edges=4, x=3, - y=4, - circuit="wire_6a7bec68_0012" + y=4 }, { + circuit="wire_6a7be789_0002", edges=4, x=6, - y=4, - circuit="wire_6a7be789_0002" + y=4 }, { + circuit="wire_6a7c19b9_0002", edges=5, x=9, - y=4, - circuit="wire_6a7c19b9_0002" + y=4 }, { + circuit="wire_6a7bec68_0012", edges=3, x=3, - y=5, - circuit="wire_6a7bec68_0012" + y=5 }, { + circuit="wire_6a7bec68_0012", edges=12, x=4, - y=5, - circuit="wire_6a7bec68_0012" + y=5 }, { + circuit="wire_6a7be789_0002", edges=5, x=6, - y=5, - circuit="wire_6a7be789_0002" + y=5 }, { + circuit="wire_6a7c19b9_0002", edges=3, x=9, - y=5, - circuit="wire_6a7c19b9_0002" + y=5 }, { + circuit="wire_6a7c19b9_0002", edges=10, x=10, - y=5, - circuit="wire_6a7c19b9_0002" + y=5 }, { + circuit="wire_6a7c19b9_0002", edges=8, x=11, - y=5, - circuit="wire_6a7c19b9_0002" + y=5 }, { + circuit="wire_6a7bec68_0012", edges=5, x=4, - y=6, - circuit="wire_6a7bec68_0012" + y=6 }, { + circuit="wire_6a7be789_0002", edges=5, x=6, - y=6, - circuit="wire_6a7be789_0002" + y=6 }, { + circuit="wire_6a7ca47f_0004", edges=8, x=1, - y=7, - circuit="wire_6a7ca47f_0004" + y=7 }, { + circuit="wire_6a7cdb53_0001", edges=4, x=3, - y=7, - circuit="wire_6a7be918_000b" + y=7 }, { + circuit="wire_6a7bec68_0012", edges=5, x=4, - y=7, - circuit="wire_6a7bec68_0012" + y=7 }, { + circuit="wire_6a7be789_0002", edges=1, x=6, - y=7, - circuit="wire_6a7be789_0002" + y=7 }, { + circuit="wire_6a7cdb53_0001", edges=5, x=3, - y=8, - circuit="wire_6a7be918_000b" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=3, x=4, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=5, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=6, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=7, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=8, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=9, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=10, - y=8, - circuit="wire_6a7bec68_0012" + y=8 }, { + circuit="wire_6a7bec68_0012", edges=10, x=11, - y=8, - circuit="wire_6a7bec68_0012" - }, - { - edges=5, - x=3, - y=9, - circuit="wire_6a7be918_000b" + y=8 }, { + circuit="wire_6a7cdb53_0001", edges=3, x=3, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=4, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=5, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=6, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=7, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=8, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=9, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=10, - y=10, - circuit="wire_6a7be918_000b" + y=9 }, { + circuit="wire_6a7cdb53_0001", edges=10, x=11, - y=10, - circuit="wire_6a7be918_000b" + y=9 } } } \ No newline at end of file diff --git a/rooms/room_14_14.sav b/rooms/room_14_14.sav index 0758234..7cde3ed 100644 --- a/rooms/room_14_14.sav +++ b/rooms/room_14_14.sav @@ -1,1071 +1,1005 @@ { objects={ { - color="blue", - y=11, + color="red", + x=1, class="static_wall", - x=1 + y=11 }, { - color="blue", - y=11, + color="red", + x=2, class="static_wall", - x=2 + y=11 }, { - color="blue", - y=11, + color="red", + x=3, class="static_wall", - x=3 + y=11 }, { - color="blue", - y=11, + color="red", + x=4, class="static_wall", - x=4 + y=11 }, { - color="blue", - y=11, + color="red", + x=5, class="static_wall", - x=5 + y=11 }, { - color="blue", - y=11, + color="red", + x=6, class="static_wall", - x=6 + y=11 }, { - color="blue", - y=11, + color="red", + x=7, class="static_wall", - x=7 + y=11 }, { - color="blue", - y=11, + color="red", + x=8, class="static_wall", - x=8 + y=11 }, { - color="blue", - y=11, + color="red", + x=9, class="static_wall", - x=9 + y=11 }, { - color="blue", - y=11, + color="red", + x=10, class="static_wall", - x=10 + y=11 }, { - color="blue", - y=11, - class="static_wall", - x=11 - }, - { - color="blue", - y=10, - class="static_wall", - x=11 - }, - { - color="blue", - y=9, - class="static_wall", - x=11 - }, - { - color="blue", - y=8, - class="static_wall", - x=11 - }, - { - color="blue", - y=7, - class="static_wall", - x=11 - }, - { - color="blue", - y=5, - class="static_wall", - x=11 - }, - { - color="blue", - y=2, - class="static_wall", - x=11 - }, - { - color="blue", - y=3, - class="static_wall", - x=11 - }, - { - color="blue", - y=4, - class="static_wall", - x=11 - }, - { - color="blue", - y=3, - class="static_wall", - x=11 - }, - { - color="blue", - y=2, - class="static_wall", - x=11 - }, - { - color="blue", - y=1, - class="static_wall", - x=11 - }, - { - color="blue", - y=1, - class="static_wall", - x=10 - }, - { - color="blue", - y=2, - class="static_wall", - x=9 - }, - { - color="blue", - y=2, - class="static_wall", - x=8 - }, - { - color="blue", - y=2, - class="static_wall", - x=7 - }, - { - color="blue", - y=1, - class="static_wall", - x=7 - }, - { - color="blue", - y=1, - class="static_wall", - x=6 - }, - { - color="blue", - y=1, - class="static_wall", - x=5 - }, - { - color="blue", - y=1, - class="static_wall", - x=4 - }, - { - color="blue", - y=1, - class="static_wall", - x=3 - }, - { - color="blue", - y=1, - class="static_wall", - x=2 - }, - { - color="blue", - y=1, - class="static_wall", - x=1 - }, - { - color="blue", - y=1, - class="static_wall", - x=2 - }, - { - color="blue", - y=1, - class="static_wall", - x=3 - }, - { - color="blue", - y=1, - class="static_wall", - x=4 - }, - { - color="blue", - y=1, - class="static_wall", - x=5 - }, - { - color="blue", - y=1, - class="static_wall", - x=6 - }, - { - color="blue", - y=1, - class="static_wall", - x=7 - }, - { - color="blue", - y=1, - class="static_wall", - x=8 - }, - { - color="blue", - y=1, - class="static_wall", - x=9 - }, - { - class="wired_door", + color="red", x=11, - color="blue", - circuit="wire_6a7be918_000b", - y=6 - }, - { - color="blue", - y=2, class="static_wall", - x=1 - }, - { - color="blue", - y=4, - class="box", - x=9 - }, - { - color="blue", - y=4, - class="box", - x=3 + y=11 }, { color="red", - y=11, - class="static_wall", - x=1 - }, - { - color="red", - y=11, - class="static_wall", - x=2 - }, - { - color="red", - y=11, - class="static_wall", - x=3 - }, - { - color="red", - y=11, - class="static_wall", - x=4 - }, - { - color="red", - y=11, - class="static_wall", - x=5 - }, - { - color="red", - y=11, - class="static_wall", - x=6 - }, - { - color="red", - y=11, - class="static_wall", - x=7 - }, - { - color="red", - y=11, - class="static_wall", - x=8 - }, - { - color="red", - y=11, - class="static_wall", - x=9 - }, - { - color="red", - y=11, - class="static_wall", - x=10 - }, - { - color="red", - y=11, - class="static_wall", - x=11 - }, - { - color="red", - y=10, - class="static_wall", - x=11 - }, - { - color="red", - y=9, - class="static_wall", - x=11 - }, - { - color="red", - y=8, - class="static_wall", - x=11 - }, - { - color="red", - y=7, - class="static_wall", - x=11 - }, - { - color="red", - y=5, - class="static_wall", - x=11 - }, - { - color="red", - y=2, - class="static_wall", - x=11 - }, - { - color="red", - y=3, - class="static_wall", - x=11 - }, - { - color="red", - y=4, - class="static_wall", - x=11 - }, - { - color="red", - y=3, - class="static_wall", - x=11 - }, - { - color="red", - y=2, - class="static_wall", - x=11 - }, - { - color="red", - y=1, - class="static_wall", - x=11 - }, - { - color="red", - y=1, - class="static_wall", - x=10 - }, - { - color="red", - y=2, - class="static_wall", - x=9 - }, - { - color="red", - y=2, - class="static_wall", - x=8 - }, - { - color="red", - y=2, - class="static_wall", - x=7 - }, - { - color="red", - y=1, - class="static_wall", - x=7 - }, - { - color="red", - y=1, - class="static_wall", - x=6 - }, - { - color="red", - y=1, - class="static_wall", - x=5 - }, - { - color="red", - y=1, - class="static_wall", - x=4 - }, - { - color="red", - y=1, - class="static_wall", - x=3 - }, - { - color="red", - y=1, - class="static_wall", - x=2 - }, - { - color="red", - y=1, - class="static_wall", - x=1 - }, - { - color="red", - y=1, - class="static_wall", - x=2 - }, - { - color="red", - y=1, - class="static_wall", - x=3 - }, - { - color="red", - y=1, - class="static_wall", - x=4 - }, - { - color="red", - y=1, - class="static_wall", - x=5 - }, - { - color="red", - y=1, - class="static_wall", - x=6 - }, - { - color="red", - y=1, - class="static_wall", - x=7 - }, - { - color="red", - y=1, - class="static_wall", - x=8 - }, - { - color="red", - y=1, - class="static_wall", - x=9 - }, - { - class="wired_door", x=11, - color="red", - circuit="wire_6a7be918_000b", - y=6 - }, - { - color="red", - y=2, class="static_wall", - x=1 + y=10 }, { color="red", + x=11, + class="static_wall", + y=9 + }, + { + color="red", + x=11, + class="static_wall", + y=8 + }, + { + color="red", + x=11, + class="static_wall", + y=5 + }, + { + color="red", + x=11, + class="static_wall", + y=2 + }, + { + color="red", + x=11, + class="static_wall", + y=3 + }, + { + color="red", + x=11, + class="static_wall", + y=4 + }, + { + color="red", + x=11, + class="static_wall", + y=3 + }, + { + color="red", + x=11, + class="static_wall", + y=2 + }, + { + color="red", + x=11, + class="static_wall", + y=1 + }, + { + color="red", + x=10, + class="static_wall", + y=1 + }, + { + color="red", + x=7, + class="static_wall", + y=1 + }, + { + color="red", + x=6, + class="static_wall", + y=1 + }, + { + color="red", + x=5, + class="static_wall", + y=1 + }, + { + color="red", + x=4, + class="static_wall", + y=1 + }, + { + color="red", + x=3, + class="static_wall", + y=1 + }, + { + color="red", + x=2, + class="static_wall", + y=1 + }, + { + color="red", + x=1, + class="static_wall", + y=1 + }, + { + color="red", + x=2, + class="static_wall", + y=1 + }, + { + color="red", + x=3, + class="static_wall", + y=1 + }, + { + color="red", + x=4, + class="static_wall", + y=1 + }, + { + color="red", + x=5, + class="static_wall", + y=1 + }, + { + color="red", + x=6, + class="static_wall", + y=1 + }, + { + color="red", + x=7, + class="static_wall", + y=1 + }, + { + color="red", + x=8, + class="static_wall", + y=1 + }, + { + color="red", + x=9, + class="static_wall", + y=1 + }, + { + circuit="wire_6a7cdaa2_0003", + x=11, y=6, - class="box_1x2_1-1", - x=6 + color="red", + class="wired_door" }, { - color="green", - y=11, - class="static_wall", - x=1 + color="red", + x=6, + class="box", + y=6 }, { - color="green", - y=11, - class="static_wall", - x=2 - }, - { - color="green", - y=11, - class="static_wall", - x=3 - }, - { - color="green", - y=11, - class="static_wall", - x=4 - }, - { - color="green", - y=11, - class="static_wall", - x=5 - }, - { - color="green", - y=11, - class="static_wall", - x=6 - }, - { - color="green", - y=11, - class="static_wall", - x=7 - }, - { - color="green", - y=11, - class="static_wall", - x=8 - }, - { - color="green", - y=11, - class="static_wall", - x=9 - }, - { - color="green", - y=11, - class="static_wall", - x=10 - }, - { - color="green", - y=11, - class="static_wall", - x=11 - }, - { - color="green", - y=10, - class="static_wall", - x=11 - }, - { - color="green", - y=9, - class="static_wall", - x=11 - }, - { - color="green", - y=8, - class="static_wall", - x=11 - }, - { - color="green", - y=7, - class="static_wall", - x=11 - }, - { - color="green", - y=5, - class="static_wall", - x=11 - }, - { - color="green", - y=2, - class="static_wall", - x=11 - }, - { - color="green", - y=3, - class="static_wall", - x=11 - }, - { - color="green", - y=4, - class="static_wall", - x=11 - }, - { - color="green", - y=3, - class="static_wall", - x=11 - }, - { - color="green", - y=2, - class="static_wall", - x=11 - }, - { - color="green", - y=1, - class="static_wall", - x=11 - }, - { - color="green", - y=1, - class="static_wall", - x=10 - }, - { - color="green", - y=2, - class="static_wall", - x=9 - }, - { - color="green", - y=2, - class="static_wall", - x=8 - }, - { - color="green", - y=2, - class="static_wall", - x=7 - }, - { - color="green", - y=1, - class="static_wall", - x=7 - }, - { - color="green", - y=1, - class="static_wall", - x=6 - }, - { - color="green", - y=1, - class="static_wall", - x=5 - }, - { - color="green", - y=1, - class="static_wall", - x=4 - }, - { - color="green", - y=1, - class="static_wall", - x=3 - }, - { - color="green", - y=1, - class="static_wall", - x=2 - }, - { - color="green", - y=1, - class="static_wall", - x=1 - }, - { - color="green", - y=1, - class="static_wall", - x=2 - }, - { - color="green", - y=1, - class="static_wall", - x=3 - }, - { - color="green", - y=1, - class="static_wall", - x=4 - }, - { - color="green", - y=1, - class="static_wall", - x=5 - }, - { - color="green", - y=1, - class="static_wall", - x=6 - }, - { - color="green", - y=1, - class="static_wall", - x=7 - }, - { - color="green", - y=1, - class="static_wall", - x=8 - }, - { - color="green", - y=1, - class="static_wall", - x=9 - }, - { - class="wired_door", + color="red", x=11, + class="static_wall", + y=7 + }, + { color="green", - circuit="wire_6a7be918_000b", + x=1, + class="static_wall", + y=11 + }, + { + color="green", + x=2, + class="static_wall", + y=11 + }, + { + color="green", + x=3, + class="static_wall", + y=11 + }, + { + color="green", + x=4, + class="static_wall", + y=11 + }, + { + color="green", + x=5, + class="static_wall", + y=11 + }, + { + color="green", + x=6, + class="static_wall", + y=11 + }, + { + color="green", + x=7, + class="static_wall", + y=11 + }, + { + color="green", + x=8, + class="static_wall", + y=11 + }, + { + color="green", + x=9, + class="static_wall", + y=11 + }, + { + color="green", + x=10, + class="static_wall", + y=11 + }, + { + color="green", + x=11, + class="static_wall", + y=11 + }, + { + color="green", + x=11, + class="static_wall", + y=10 + }, + { + color="green", + x=11, + class="static_wall", + y=9 + }, + { + color="green", + x=11, + class="static_wall", + y=8 + }, + { + color="green", + x=11, + class="static_wall", + y=5 + }, + { + color="green", + x=11, + class="static_wall", + y=2 + }, + { + color="green", + x=11, + class="static_wall", + y=3 + }, + { + color="green", + x=11, + class="static_wall", + y=4 + }, + { + color="green", + x=11, + class="static_wall", + y=3 + }, + { + color="green", + x=11, + class="static_wall", + y=2 + }, + { + color="green", + x=11, + class="static_wall", + y=1 + }, + { + color="green", + x=10, + class="static_wall", + y=1 + }, + { + color="green", + x=7, + class="static_wall", + y=1 + }, + { + color="green", + x=6, + class="static_wall", + y=1 + }, + { + color="green", + x=5, + class="static_wall", + y=1 + }, + { + color="green", + x=4, + class="static_wall", + y=1 + }, + { + color="green", + x=3, + class="static_wall", + y=1 + }, + { + color="green", + x=2, + class="static_wall", + y=1 + }, + { + color="green", + x=1, + class="static_wall", + y=1 + }, + { + color="green", + x=2, + class="static_wall", + y=1 + }, + { + color="green", + x=3, + class="static_wall", + y=1 + }, + { + color="green", + x=4, + class="static_wall", + y=1 + }, + { + color="green", + x=5, + class="static_wall", + y=1 + }, + { + color="green", + x=6, + class="static_wall", + y=1 + }, + { + color="green", + x=7, + class="static_wall", + y=1 + }, + { + color="green", + x=8, + class="static_wall", + y=1 + }, + { + color="green", + x=9, + class="static_wall", + y=1 + }, + { + circuit="wire_6a7cdaa2_0003", + x=11, + y=6, + color="green", + class="wired_door" + }, + { + color="green", + x=6, + class="box", y=6 }, { color="green", - y=2, + x=11, class="static_wall", - x=1 + y=7 + }, + { + color="blue", + x=1, + class="static_wall", + y=11 + }, + { + color="blue", + x=2, + class="static_wall", + y=11 + }, + { + color="blue", + x=3, + class="static_wall", + y=11 + }, + { + color="blue", + x=4, + class="static_wall", + y=11 + }, + { + color="blue", + x=5, + class="static_wall", + y=11 + }, + { + color="blue", + x=6, + class="static_wall", + y=11 + }, + { + color="blue", + x=7, + class="static_wall", + y=11 + }, + { + color="blue", + x=8, + class="static_wall", + y=11 + }, + { + color="blue", + x=9, + class="static_wall", + y=11 + }, + { + color="blue", + x=10, + class="static_wall", + y=11 + }, + { + color="blue", + x=11, + class="static_wall", + y=11 + }, + { + color="blue", + x=11, + class="static_wall", + y=10 + }, + { + color="blue", + x=11, + class="static_wall", + y=9 + }, + { + color="blue", + x=11, + class="static_wall", + y=8 + }, + { + color="blue", + x=11, + class="static_wall", + y=5 + }, + { + color="blue", + x=11, + class="static_wall", + y=2 + }, + { + color="blue", + x=11, + class="static_wall", + y=3 + }, + { + color="blue", + x=11, + class="static_wall", + y=4 + }, + { + color="blue", + x=11, + class="static_wall", + y=3 + }, + { + color="blue", + x=11, + class="static_wall", + y=2 + }, + { + color="blue", + x=11, + class="static_wall", + y=1 + }, + { + color="blue", + x=10, + class="static_wall", + y=1 + }, + { + color="blue", + x=7, + class="static_wall", + y=1 + }, + { + color="blue", + x=6, + class="static_wall", + y=1 + }, + { + color="blue", + x=5, + class="static_wall", + y=1 + }, + { + color="blue", + x=4, + class="static_wall", + y=1 + }, + { + color="blue", + x=3, + class="static_wall", + y=1 + }, + { + color="blue", + x=2, + class="static_wall", + y=1 + }, + { + color="blue", + x=1, + class="static_wall", + y=1 + }, + { + color="blue", + x=2, + class="static_wall", + y=1 + }, + { + color="blue", + x=3, + class="static_wall", + y=1 + }, + { + color="blue", + x=4, + class="static_wall", + y=1 + }, + { + color="blue", + x=5, + class="static_wall", + y=1 + }, + { + color="blue", + x=6, + class="static_wall", + y=1 + }, + { + color="blue", + x=7, + class="static_wall", + y=1 + }, + { + color="blue", + x=8, + class="static_wall", + y=1 + }, + { + color="blue", + x=9, + class="static_wall", + y=1 + }, + { + circuit="wire_6a7cdaa2_0003", + x=11, + y=6, + color="blue", + class="wired_door" + }, + { + color="blue", + x=6, + class="box", + y=6 + }, + { + color="blue", + x=11, + class="static_wall", + y=7 }, { color="green", - y=6, - class="box_1x2_1-1", - x=6 + x=6, + class="wired_switch", + y=8 }, { color="red", - y=8, + x=6, class="wired_switch", - x=6 + y=8 }, { color="blue", - y=4, + x=3, class="wired_switch", - x=9 - }, - { - color="blue", - y=4, - class="wired_switch", - x=3 - }, - { - color="green", - y=8, - class="wired_switch", - x=6 + y=4 } }, wires={ { - y=4, - edges=0, circuit="wire_6a7c1868_0003", - x=3 + edges=0, + x=3, + y=4 }, { - y=4, + circuit="wire_6a7cdaa2_0003", edges=2, - circuit="wire_6a7c1890_0006", - x=3 + x=3, + y=4 }, { - y=4, + circuit="wire_6a7cdaa2_0003", edges=10, - circuit="wire_6a7c1890_0006", - x=4 + x=4, + y=4 }, { - y=4, + circuit="wire_6a7cdaa2_0003", edges=10, - circuit="wire_6a7c1890_0006", - x=5 + x=5, + y=4 }, { - y=4, + circuit="wire_6a7cdaa2_0003", edges=10, - circuit="wire_6a7c1890_0006", - x=6 + x=6, + y=4 }, { - y=4, + circuit="wire_6a7cdaa2_0003", edges=12, - circuit="wire_6a7c1890_0006", - x=7 + x=7, + y=4 }, { - y=4, - edges=4, - circuit="wire_6a7c1873_0004", - x=9 - }, - { - y=5, - edges=5, - circuit="wire_6a7c1890_0006", - x=7 - }, - { - y=5, - edges=5, - circuit="wire_6a7c1873_0004", - x=9 - }, - { - y=6, + circuit="wire_6a7cdaa2_0003", edges=3, - circuit="wire_6a7c1890_0006", - x=7 + x=7, + y=5 }, { - y=6, + circuit="wire_6a7cdaa2_0003", edges=10, - circuit="wire_6a7c1890_0006", - x=8 + x=8, + y=5 }, { - y=6, + circuit="wire_6a7cdaa2_0003", + edges=12, + x=9, + y=5 + }, + { + circuit="wire_6a7cdaa2_0003", + edges=3, + x=9, + y=6 + }, + { + circuit="wire_6a7cdaa2_0003", + edges=10, + x=10, + y=6 + }, + { + circuit="wire_6a7cdaa5_0004", edges=6, - circuit="wire_6a7be918_000b", - x=9 + x=10, + y=6 }, { - y=6, - edges=3, - circuit="wire_6a7c1873_0004", - x=9 + circuit="wire_6a7cdaac_0005", + edges=2, + x=10, + y=6 }, { - y=6, - edges=10, - circuit="wire_6a7c1890_0006", - x=9 + circuit="wire_6a7cdb53_0001", + edges=6, + x=10, + y=6 }, { - y=6, - edges=10, - circuit="wire_6a7be918_000b", - x=10 - }, - { - y=6, - edges=10, - circuit="wire_6a7c1873_0004", - x=10 - }, - { - y=6, - edges=10, - circuit="wire_6a7c1890_0006", - x=10 - }, - { - y=6, + circuit="wire_6a7cdaa2_0003", edges=8, - circuit="wire_6a7be918_000b", - x=11 + x=11, + y=6 }, { - y=6, + circuit="wire_6a7cdaa5_0004", edges=8, - circuit="wire_6a7c1873_0004", - x=11 + x=11, + y=6 }, { - y=6, - edges=0, - circuit="wire_6a7c1875_0005", - x=11 - }, - { - y=6, + circuit="wire_6a7cdaac_0005", edges=8, - circuit="wire_6a7c1890_0006", - x=11 + x=11, + y=6 }, { - y=7, + circuit="wire_6a7cdb53_0001", + edges=8, + x=11, + y=6 + }, + { + circuit="wire_6a7cdaa5_0004", edges=5, - circuit="wire_6a7be918_000b", - x=9 + x=10, + y=7 + }, + { + circuit="wire_6a7cdb53_0001", + edges=5, + x=10, + y=7 }, { - y=8, - edges=10, circuit="wire_6a7bec68_0012", - x=1 - }, - { - y=8, edges=10, - circuit="wire_6a7bec68_0012", - x=2 + x=1, + y=8 }, { - y=8, + circuit="wire_6a7bec68_0012", edges=10, - circuit="wire_6a7bec68_0012", - x=3 + x=2, + y=8 }, { - y=8, + circuit="wire_6a7bec68_0012", edges=10, - circuit="wire_6a7bec68_0012", - x=4 + x=3, + y=8 }, { - y=8, + circuit="wire_6a7bec68_0012", edges=10, - circuit="wire_6a7bec68_0012", - x=5 + x=4, + y=8 + }, + { + circuit="wire_6a7bec68_0012", + edges=10, + x=5, + y=8 }, { - y=8, - edges=0, circuit="wire_6a7be8d1_000a", - x=6 + edges=0, + x=6, + y=8 }, { - y=8, - edges=8, circuit="wire_6a7bec68_0012", - x=6 + edges=8, + x=6, + y=8 }, { - y=8, - edges=6, - circuit="wire_6a7be918_000b", - x=8 + circuit="wire_6a7cdaa5_0004", + edges=2, + x=6, + y=8 }, { - y=8, + circuit="wire_6a7cdaa5_0004", + edges=10, + x=7, + y=8 + }, + { + circuit="wire_6a7cdaa5_0004", + edges=10, + x=8, + y=8 + }, + { + circuit="wire_6a7cdaa5_0004", + edges=10, + x=9, + y=8 + }, + { + circuit="wire_6a7cdaa5_0004", edges=9, - circuit="wire_6a7be918_000b", - x=9 + x=10, + y=8 }, { - y=9, + circuit="wire_6a7cdb53_0001", edges=5, - circuit="wire_6a7be918_000b", - x=8 + x=10, + y=8 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=1 + x=1, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=2 + x=2, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=3 + x=3, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=4 + x=4, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=5 + x=5, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=6 + x=6, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", edges=10, - circuit="wire_6a7be918_000b", - x=7 + x=7, + y=9 }, { - y=10, + circuit="wire_6a7cdb53_0001", + edges=10, + x=8, + y=9 + }, + { + circuit="wire_6a7cdb53_0001", + edges=10, + x=9, + y=9 + }, + { + circuit="wire_6a7cdb53_0001", edges=9, - circuit="wire_6a7be918_000b", - x=8 + x=10, + y=9 } } } \ No newline at end of file diff --git a/world.lua b/world.lua index 4e15355..35187ca 100644 --- a/world.lua +++ b/world.lua @@ -83,7 +83,7 @@ end function World:listRoomNames() local names = {} - for _, file in ipairs(love.filesystem.getDirectoryItems("rooms")) do + for _, file in ipairs(getSourceDirectoryItems("rooms")) do local name = file:match("^(.+)%.sav$") if name and name ~= "world" then table.insert(names, name) end end