diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java index 58d08b2..5fc8603 100644 --- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java +++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java @@ -71,7 +71,9 @@ public class SchematicLoader //TODO: In the future, remove this dungeon from the generation lists altogether. //That will have to wait until our code is updated to support that more easily. System.err.println("The dungeon will not be loaded."); - dungeon = checkSourceAndLoad(DungeonHelper.instance().defaultBreak.schematicPath); + DungeonGenerator defaultError = DungeonHelper.instance().getDefaultErrorDungeon(); + dimList.get(destDimID).dungeonGenerator = defaultError; + dungeon = checkSourceAndLoad(defaultError.schematicPath); dungeon.applyImportFilters(properties); } diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java b/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java index ac89ef2..3259ca4 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java @@ -69,10 +69,10 @@ public class CommandCreateDungeonRift extends DDCommandBase } else { - result = findDungeonByPartialName(command[0], dungeonHelper.registeredDungeons); + result = findDungeonByPartialName(command[0], dungeonHelper.getRegisteredDungeons()); if (result == null) { - result = findDungeonByPartialName(command[0], dungeonHelper.customDungeons); + result = findDungeonByPartialName(command[0], dungeonHelper.getUntaggedDungeons()); } //Check if we found any matches if (result != null) diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java b/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java index 9ba047c..ff833b3 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java @@ -132,7 +132,7 @@ public class CommandExportDungeon extends DDCommandBase if (dungeonHelper.exportDungeon(player.worldObj, x, y, z, exportPath)) { player.sendChatToPlayer("Saved dungeon schematic in " + exportPath); - dungeonHelper.registerCustomDungeon(new File(exportPath)); + dungeonHelper.registerDungeon(exportPath, false, true); return DDCommandResult.SUCCESS; } else diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java index 1236497..0a280db 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java @@ -1,11 +1,15 @@ package StevenDimDoors.mod_pocketDim.helpers; +import java.io.BufferedReader; import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Random; import java.util.regex.Pattern; @@ -26,6 +30,11 @@ public class DungeonHelper private static DDProperties properties = null; public static final Pattern SchematicNamePattern = Pattern.compile("[A-Za-z0-9_\\-]+"); public static final Pattern DungeonNamePattern = Pattern.compile("[A-Za-z0-9\\-]+"); + + private static final String DEFAULT_UP_SCHEMATIC_PATH = "/schematics/core/simpleStairsUp.schematic"; + private static final String DEFAULT_DOWN_SCHEMATIC_PATH = "/schematics/core/simpleStairsDown.schematic"; + private static final String DEFAULT_ERROR_SCHEMATIC_PATH = "/schematics/core/somethingBroke.schematic"; + private static final String BUNDLED_DUNGEONS_LIST_PATH = "/schematics/schematics.txt"; public static final String SCHEMATIC_FILE_EXTENSION = ".schematic"; private static final int DEFAULT_DUNGEON_WEIGHT = 100; @@ -60,8 +69,8 @@ public class DungeonHelper private Random rand = new Random(); - public ArrayList customDungeons = new ArrayList(); - public ArrayList registeredDungeons = new ArrayList(); + private ArrayList untaggedDungeons = new ArrayList(); + private ArrayList registeredDungeons = new ArrayList(); private ArrayList simpleHalls = new ArrayList(); private ArrayList complexHalls = new ArrayList(); @@ -70,9 +79,10 @@ public class DungeonHelper private ArrayList mazes = new ArrayList(); private ArrayList pistonTraps = new ArrayList(); private ArrayList exits = new ArrayList(); - - public DungeonGenerator defaultBreak = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/somethingBroke.schematic", true); - public DungeonGenerator defaultUp = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleStairsUp.schematic", true); + + private DungeonGenerator defaultUp; + private DungeonGenerator defaultDown; + private DungeonGenerator defaultError; private HashSet dungeonTypeChecker; private HashMap> dungeonTypeMapping; @@ -105,17 +115,6 @@ public class DungeonHelper registerCustomDungeons(); } - private void registerCustomDungeons() - { - File file = new File(properties.CustomSchematicDirectory); - if (file.exists() || file.mkdir()) - { - copyfile.copyFile("/mods/DimDoors/text/How_to_add_dungeons.txt", file.getAbsolutePath() + "/How_to_add_dungeons.txt"); - } - importCustomDungeons(properties.CustomSchematicDirectory); - registerBaseDungeons(); - } - public static DungeonHelper initialize() { if (instance == null) @@ -141,6 +140,42 @@ public class DungeonHelper return instance; } + private void registerCustomDungeons() + { + File file = new File(properties.CustomSchematicDirectory); + if (file.exists() || file.mkdir()) + { + copyfile.copyFile("/mods/DimDoors/text/How_to_add_dungeons.txt", file.getAbsolutePath() + "/How_to_add_dungeons.txt"); + } + registerBundledDungeons(); + importCustomDungeons(properties.CustomSchematicDirectory); + } + + public List getRegisteredDungeons() + { + return Collections.unmodifiableList(this.registeredDungeons); + } + + public List getUntaggedDungeons() + { + return Collections.unmodifiableList(this.untaggedDungeons); + } + + public DungeonGenerator getDefaultErrorDungeon() + { + return defaultError; + } + + public DungeonGenerator getDefaultUpDungeon() + { + return defaultUp; + } + + public DungeonGenerator getDefaultDownDungeon() + { + return defaultDown; + } + public LinkData createCustomDungeonDoor(World world, int x, int y, int z) { //Create a link above the specified position. Link to a new pocket dimension. @@ -202,10 +237,13 @@ public class DungeonHelper return true; } - public void registerCustomDungeon(File schematicFile) + public void registerDungeon(String schematicPath, boolean isInternal, boolean verbose) { + //We use schematicPath as the real path for internal files (inside our JAR) because it seems + //that File tries to interpret it as a local drive path and mangles it. + File schematicFile = new File(schematicPath); String name = schematicFile.getName(); - String path = schematicFile.getAbsolutePath(); + String path = isInternal ? schematicPath : schematicFile.getAbsolutePath(); try { if (validateSchematicName(name)) @@ -222,24 +260,29 @@ public class DungeonHelper dungeonTypeMapping.get(dungeonType).add(generator); registeredDungeons.add(generator); - customDungeons.add(generator); - System.out.println("Imported " + name); + if (verbose) + { + System.out.println("Registered dungeon: " + name); + } } else { - System.out.println("Could not parse dungeon filename, not adding dungeon to generation lists"); - customDungeons.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, path, true)); - System.out.println("Imported " + name); + if (verbose) + { + System.out.println("Could not parse dungeon filename, not adding dungeon to generation lists"); + } + untaggedDungeons.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, path, true)); + System.out.println("Registered untagged dungeon: " + name); } } catch(Exception e) { + System.err.println("Failed to register dungeon: " + name); e.printStackTrace(); - System.out.println("Failed to import " + name); } } - public void importCustomDungeons(String path) + private void importCustomDungeons(String path) { File directory = new File(path); File[] schematicNames = directory.listFiles(); @@ -250,92 +293,48 @@ public class DungeonHelper { if (schematicFile.getName().endsWith(SCHEMATIC_FILE_EXTENSION)) { - registerCustomDungeon(schematicFile); + registerDungeon(schematicFile.getPath(), false, true); } } } } - public void registerBaseDungeons() + private void registerBundledDungeons() { - hubs.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/4WayBasicHall.schematic", false)); - hubs.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/4WayHallExit.schematic", false)); - hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/doorTotemRuins.schematic", true)); - hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/hallwayTrapRooms1.schematic", false)); - hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/longDoorHallway.schematic", false)); - hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallRotundaWithExit.schematic", false)); - hubs.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fortRuins.schematic", true)); - hubs.add(new DungeonGenerator(10, "/schematics/Hub_SK-Claustrophobia_Open_10.schematic", true)); - hubs.add(new DungeonGenerator(50, "/schematics/Hub_SK-HeartOfDisorder_Open_50.schematic", true)); - - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/collapsedSingleTunnel1.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/singleStraightHall1.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallBranchWithExit.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallSimpleLeft.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallSimpleRight.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleStairsUp.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleStairsDown.schematic", false)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleSmallT1.schematic", false)); - simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-LeftDownStairs_Open_50.schematic", true)); - simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-LeftUpPath_Open_50.schematic", true)); - simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-RightDownStairs_Open_50.schematic", true)); - simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-RightUpPath_Open_50.schematic", true)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/SimpleHall_SK-SpiralHallway_Open_100.schematic", true)); - simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/complexHall_largeBrokenHall_closed_100.schematic", false)); - + //Register the core schematics + //These are used for debugging and in case of unusual errors while loading dungeons + defaultUp = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, DEFAULT_UP_SCHEMATIC_PATH, true); + defaultDown = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, DEFAULT_DOWN_SCHEMATIC_PATH, true); + defaultError = new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, DEFAULT_ERROR_SCHEMATIC_PATH, true); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/tntPuzzleTrap.schematic", false)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/brokenPillarsO.schematic", true)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/buggyTopEntry1.schematic", true)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/exitRuinsWithHiddenDoor.schematic", true)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/hallwayHiddenTreasure.schematic", false)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/mediumPillarStairs.schematic", true)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/ruinsO.schematic", true)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pitStairs.schematic", true)); - complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/ComplexHall_SK-HiddenStairs_Open_100.schematic", true)); - complexHalls.add(new DungeonGenerator(10, "/schematics/ComplexHall_SK-LostGarden_Open_10.schematic", true)); - - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/azersDungeonO.schematic", false)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/diamondTowerTemple1.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fallingTrapO.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/hiddenStaircaseO.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/lavaTrapO.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/randomTree.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallHiddenTowerO.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallSilverfishRoom.schematic", false)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/tntTrapO.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallDesert.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallPond.schematic", true)); - deadEnds.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic", true)); - deadEnds.add(new DungeonGenerator(50, "/schematics/DeadEnd_SK-UnstableDesert_Open_50.schematic", true)); - - pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/hallwayPitFallTrap.schematic", false)); - pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFloorHall.schematic", false)); - pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/wallFallcomboPistonHall.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fakeTNTTrap.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFallRuins.schematic", true)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonSmasherHall.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleDropHall.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fallingTNThall.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/lavaPyramid.schematic", true)); - pistonTraps.add(new DungeonGenerator(10, "/schematics/Trap_SK-RestlessCorridor_Open_10.schematic", true)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/trap_pistonFloorPlatform_closed_100.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT/2, "/schematics/trap_pistonFloorPlatform2_closed_100.schematic", false)); - - mazes.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallMaze1.schematic", false)); - mazes.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallMultilevelMaze.schematic", false)); - - exits.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/lockingExitHall.schematic", false)); - exits.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/exitCube.schematic", true)); - exits.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallExitPrison.schematic", true)); + //Open the list of dungeons packaged with our mod and register their schematics + InputStream listStream = this.getClass().getResourceAsStream(BUNDLED_DUNGEONS_LIST_PATH); + if (listStream == null) + { + System.err.println("Unable to open list of bundled dungeon schematics."); + return; + } - registeredDungeons.addAll(simpleHalls); - registeredDungeons.addAll(exits); - registeredDungeons.addAll(pistonTraps); - registeredDungeons.addAll(mazes); - registeredDungeons.addAll(deadEnds); - registeredDungeons.addAll(complexHalls); - registeredDungeons.addAll(hubs); + try + { + BufferedReader listReader = new BufferedReader(new InputStreamReader(listStream)); + String schematicPath = listReader.readLine(); + while (schematicPath != null) + { + schematicPath = schematicPath.trim(); + if (!schematicPath.isEmpty()) + { + registerDungeon(schematicPath, true, false); + } + schematicPath = listReader.readLine(); + } + listReader.close(); + } + catch (Exception e) + { + System.err.println("An exception occurred while reading the list of bundled dungeon schematics."); + e.printStackTrace(); + } } public boolean exportDungeon(World world, int centerX, int centerY, int centerZ, String exportPath) @@ -517,11 +516,11 @@ public class DungeonHelper //but it's a fool-proof workaround. HashSet dungeonNames = new HashSet(); dungeonNames.addAll( parseDungeonNames(registeredDungeons) ); - dungeonNames.addAll( parseDungeonNames(customDungeons) ); + dungeonNames.addAll( parseDungeonNames(untaggedDungeons) ); //Sort dungeon names alphabetically ArrayList sortedNames = new ArrayList(dungeonNames); - Collections.sort(sortedNames); + Collections.sort(sortedNames, String.CASE_INSENSITIVE_ORDER); return sortedNames; } diff --git a/schematics/azersDungeonO.schematic b/schematics/azersDungeonO.schematic deleted file mode 100644 index 9766d12..0000000 Binary files a/schematics/azersDungeonO.schematic and /dev/null differ diff --git a/schematics/brokenPillarsO.schematic b/schematics/brokenPillarsO.schematic deleted file mode 100644 index 40fa1ad..0000000 Binary files a/schematics/brokenPillarsO.schematic and /dev/null differ diff --git a/schematics/buggyTopEntry1.schematic b/schematics/buggyTopEntry1.schematic deleted file mode 100644 index d82ac2c..0000000 Binary files a/schematics/buggyTopEntry1.schematic and /dev/null differ diff --git a/schematics/collapsedSingleTunnel1.schematic b/schematics/collapsedSingleTunnel1.schematic deleted file mode 100644 index dfbf69a..0000000 Binary files a/schematics/collapsedSingleTunnel1.schematic and /dev/null differ diff --git a/schematics/simpleStairsDown.schematic b/schematics/core/simpleStairsDown.schematic similarity index 100% rename from schematics/simpleStairsDown.schematic rename to schematics/core/simpleStairsDown.schematic diff --git a/schematics/simpleStairsUp.schematic b/schematics/core/simpleStairsUp.schematic similarity index 100% rename from schematics/simpleStairsUp.schematic rename to schematics/core/simpleStairsUp.schematic diff --git a/schematics/renamedDungeons/somethingBroke.schematic b/schematics/core/somethingBroke.schematic similarity index 100% rename from schematics/renamedDungeons/somethingBroke.schematic rename to schematics/core/somethingBroke.schematic diff --git a/schematics/diamondTowerTemple1.schematic b/schematics/diamondTowerTemple1.schematic deleted file mode 100644 index 030299d..0000000 Binary files a/schematics/diamondTowerTemple1.schematic and /dev/null differ diff --git a/schematics/doorTotemRuins.schematic b/schematics/doorTotemRuins.schematic deleted file mode 100644 index 32996f5..0000000 Binary files a/schematics/doorTotemRuins.schematic and /dev/null differ diff --git a/schematics/dungeon.schematic b/schematics/dungeon.schematic deleted file mode 100644 index 8a23dd0..0000000 Binary files a/schematics/dungeon.schematic and /dev/null differ diff --git a/schematics/dungeon6.schematic b/schematics/dungeon6.schematic deleted file mode 100644 index 9f0dca4..0000000 Binary files a/schematics/dungeon6.schematic and /dev/null differ diff --git a/schematics/dungeon7.schematic b/schematics/dungeon7.schematic deleted file mode 100644 index 37ff31b..0000000 Binary files a/schematics/dungeon7.schematic and /dev/null differ diff --git a/schematics/exitCube.schematic b/schematics/exitCube.schematic deleted file mode 100644 index 411c4ec..0000000 Binary files a/schematics/exitCube.schematic and /dev/null differ diff --git a/schematics/exitRuinsWithHiddenDoor.schematic b/schematics/exitRuinsWithHiddenDoor.schematic deleted file mode 100644 index eef2733..0000000 Binary files a/schematics/exitRuinsWithHiddenDoor.schematic and /dev/null differ diff --git a/schematics/fakeTNTTrap.schematic b/schematics/fakeTNTTrap.schematic deleted file mode 100644 index d2811b0..0000000 Binary files a/schematics/fakeTNTTrap.schematic and /dev/null differ diff --git a/schematics/fallingTNThall.schematic b/schematics/fallingTNThall.schematic deleted file mode 100644 index 819575f..0000000 Binary files a/schematics/fallingTNThall.schematic and /dev/null differ diff --git a/schematics/fallingTrapO.schematic b/schematics/fallingTrapO.schematic deleted file mode 100644 index b631bf9..0000000 Binary files a/schematics/fallingTrapO.schematic and /dev/null differ diff --git a/schematics/fortRuins.schematic b/schematics/fortRuins.schematic deleted file mode 100644 index f67c75c..0000000 Binary files a/schematics/fortRuins.schematic and /dev/null differ diff --git a/schematics/hallwayHiddenTreasure.schematic b/schematics/hallwayHiddenTreasure.schematic deleted file mode 100644 index f088af7..0000000 Binary files a/schematics/hallwayHiddenTreasure.schematic and /dev/null differ diff --git a/schematics/hallwayPitFallTrap.schematic b/schematics/hallwayPitFallTrap.schematic deleted file mode 100644 index a292fd6..0000000 Binary files a/schematics/hallwayPitFallTrap.schematic and /dev/null differ diff --git a/schematics/hallwayTrapRooms1.schematic b/schematics/hallwayTrapRooms1.schematic deleted file mode 100644 index 192207c..0000000 Binary files a/schematics/hallwayTrapRooms1.schematic and /dev/null differ diff --git a/schematics/hiddenStaircaseO.schematic b/schematics/hiddenStaircaseO.schematic deleted file mode 100644 index 82b1c98..0000000 Binary files a/schematics/hiddenStaircaseO.schematic and /dev/null differ diff --git a/schematics/lavaPyramid.schematic b/schematics/lavaPyramid.schematic deleted file mode 100644 index fdf741f..0000000 Binary files a/schematics/lavaPyramid.schematic and /dev/null differ diff --git a/schematics/lavaTrapO.schematic b/schematics/lavaTrapO.schematic deleted file mode 100644 index bee6b2a..0000000 Binary files a/schematics/lavaTrapO.schematic and /dev/null differ diff --git a/schematics/longDoorHallway.schematic b/schematics/longDoorHallway.schematic deleted file mode 100644 index 86d815d..0000000 Binary files a/schematics/longDoorHallway.schematic and /dev/null differ diff --git a/schematics/mediumPillarStairs.schematic b/schematics/mediumPillarStairs.schematic deleted file mode 100644 index 499f0b3..0000000 Binary files a/schematics/mediumPillarStairs.schematic and /dev/null differ diff --git a/schematics/pistonFallRuins.schematic b/schematics/pistonFallRuins.schematic deleted file mode 100644 index 198d529..0000000 Binary files a/schematics/pistonFallRuins.schematic and /dev/null differ diff --git a/schematics/pistonFloorHall.schematic b/schematics/pistonFloorHall.schematic deleted file mode 100644 index 523dc92..0000000 Binary files a/schematics/pistonFloorHall.schematic and /dev/null differ diff --git a/schematics/pistonSmasherHall.schematic b/schematics/pistonSmasherHall.schematic deleted file mode 100644 index 6b83a34..0000000 Binary files a/schematics/pistonSmasherHall.schematic and /dev/null differ diff --git a/schematics/pitStairs.schematic b/schematics/pitStairs.schematic deleted file mode 100644 index 653f09f..0000000 Binary files a/schematics/pitStairs.schematic and /dev/null differ diff --git a/schematics/raceTheTNTHall.schematic b/schematics/raceTheTNTHall.schematic deleted file mode 100644 index 5e689a4..0000000 Binary files a/schematics/raceTheTNTHall.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/Exit_lockingExitHall_closed_100.schematic b/schematics/renamedDungeons/Exit_lockingExitHall_closed_100.schematic deleted file mode 100644 index 5adbe70..0000000 Binary files a/schematics/renamedDungeons/Exit_lockingExitHall_closed_100.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/Hub_4WayBasicHall_closed_200.schematic b/schematics/renamedDungeons/Hub_4WayBasicHall_closed_200.schematic deleted file mode 100644 index 50ac14a..0000000 Binary files a/schematics/renamedDungeons/Hub_4WayBasicHall_closed_200.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/Hub_4WayHallExit_closed_200.schematic b/schematics/renamedDungeons/Hub_4WayHallExit_closed_200.schematic deleted file mode 100644 index 0adb3e9..0000000 Binary files a/schematics/renamedDungeons/Hub_4WayHallExit_closed_200.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/deadend_randomTree_open_75.schematic b/schematics/renamedDungeons/deadend_randomTree_open_75.schematic deleted file mode 100644 index e6b0edb..0000000 Binary files a/schematics/renamedDungeons/deadend_randomTree_open_75.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/dungeon.schematic b/schematics/renamedDungeons/dungeon.schematic deleted file mode 100644 index 8a23dd0..0000000 Binary files a/schematics/renamedDungeons/dungeon.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/dungeon6.schematic b/schematics/renamedDungeons/dungeon6.schematic deleted file mode 100644 index 9f0dca4..0000000 Binary files a/schematics/renamedDungeons/dungeon6.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/dungeon7.schematic b/schematics/renamedDungeons/dungeon7.schematic deleted file mode 100644 index 37ff31b..0000000 Binary files a/schematics/renamedDungeons/dungeon7.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/trap_fallingTNThall_closed_100.schematic b/schematics/renamedDungeons/trap_fallingTNThall_closed_100.schematic deleted file mode 100644 index 819575f..0000000 Binary files a/schematics/renamedDungeons/trap_fallingTNThall_closed_100.schematic and /dev/null differ diff --git a/schematics/renamedDungeons/trap_pistonHallway_closed_100_NOTDONE.schematic b/schematics/renamedDungeons/trap_pistonHallway_closed_100_NOTDONE.schematic deleted file mode 100644 index 7606995..0000000 Binary files a/schematics/renamedDungeons/trap_pistonHallway_closed_100_NOTDONE.schematic and /dev/null differ diff --git a/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic b/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic new file mode 100644 index 0000000..ea76db4 Binary files /dev/null and b/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic differ diff --git a/schematics/ComplexHall_SK-HiddenStairs_Open_100.schematic b/schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic similarity index 100% rename from schematics/ComplexHall_SK-HiddenStairs_Open_100.schematic rename to schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic diff --git a/schematics/ComplexHall_SK-LostGarden_Open_10.schematic b/schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic similarity index 100% rename from schematics/ComplexHall_SK-LostGarden_Open_10.schematic rename to schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic diff --git a/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic b/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic new file mode 100644 index 0000000..5dfb8d4 Binary files /dev/null and b/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic differ diff --git a/schematics/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic b/schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic similarity index 100% rename from schematics/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic rename to schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic diff --git a/schematics/DeadEnd_SK-UnstableDesert_Open_50.schematic b/schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic similarity index 100% rename from schematics/DeadEnd_SK-UnstableDesert_Open_50.schematic rename to schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic diff --git a/schematics/Hub_SK-Claustrophobia_Open_10.schematic b/schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic similarity index 100% rename from schematics/Hub_SK-Claustrophobia_Open_10.schematic rename to schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic diff --git a/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic b/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic new file mode 100644 index 0000000..5074908 Binary files /dev/null and b/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic differ diff --git a/schematics/Hub_SK-HeartOfDisorder_Open_50.schematic b/schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic similarity index 100% rename from schematics/Hub_SK-HeartOfDisorder_Open_50.schematic rename to schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic diff --git a/schematics/SimpleHall_SK-LeftDownStairs_Open_50.schematic b/schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic similarity index 100% rename from schematics/SimpleHall_SK-LeftDownStairs_Open_50.schematic rename to schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic diff --git a/schematics/SimpleHall_SK-LeftUpPath_Open_50.schematic b/schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic similarity index 100% rename from schematics/SimpleHall_SK-LeftUpPath_Open_50.schematic rename to schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic diff --git a/schematics/SimpleHall_SK-RightDownStairs_Open_50.schematic b/schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic similarity index 100% rename from schematics/SimpleHall_SK-RightDownStairs_Open_50.schematic rename to schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic diff --git a/schematics/SimpleHall_SK-RightUpPath_Open_50.schematic b/schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic similarity index 100% rename from schematics/SimpleHall_SK-RightUpPath_Open_50.schematic rename to schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic diff --git a/schematics/SimpleHall_SK-SpiralHallway_Open_100.schematic b/schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic similarity index 100% rename from schematics/SimpleHall_SK-SpiralHallway_Open_100.schematic rename to schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic diff --git a/schematics/Trap_SK-RestlessCorridor_Open_10.schematic b/schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic similarity index 100% rename from schematics/Trap_SK-RestlessCorridor_Open_10.schematic rename to schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic diff --git a/schematics/renamedDungeons/complexHall_buggyTopEntry1_open_100.schematic b/schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_buggyTopEntry1_open_100.schematic rename to schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic diff --git a/schematics/renamedDungeons/complexHall_exitRuinsWithHiddenDoor_open_100.schematic b/schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_exitRuinsWithHiddenDoor_open_100.schematic rename to schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic diff --git a/schematics/renamedDungeons/complexHall_hallwayHiddenTreasure_closed_100.schematic b/schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_hallwayHiddenTreasure_closed_100.schematic rename to schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic diff --git a/schematics/complexHall_largeBrokenHall_closed_100.schematic b/schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic similarity index 100% rename from schematics/complexHall_largeBrokenHall_closed_100.schematic rename to schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic diff --git a/schematics/renamedDungeons/complexHall_mediumPillarStairs_open_100.schematic b/schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_mediumPillarStairs_open_100.schematic rename to schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic diff --git a/schematics/renamedDungeons/complexHall_pitStairs_open_100.schematic b/schematics/ruins/complexHall_pitStairs_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_pitStairs_open_100.schematic rename to schematics/ruins/complexHall_pitStairs_open_100.schematic diff --git a/schematics/renamedDungeons/complexHall_ruinsO_open_100.schematic b/schematics/ruins/complexHall_ruinsO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_ruinsO_open_100.schematic rename to schematics/ruins/complexHall_ruinsO_open_100.schematic diff --git a/schematics/renamedDungeons/complexHall_smallBranchWithExit_closed_100.schematic b/schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_smallBranchWithExit_closed_100.schematic rename to schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic diff --git a/schematics/renamedDungeons/complexHall_smallRotundaWithExit_closed_100_NOT DONE.schematic b/schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_smallRotundaWithExit_closed_100_NOT DONE.schematic rename to schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic diff --git a/schematics/renamedDungeons/complexHall_tntPuzzleTrap_closed_50.schematic b/schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic similarity index 100% rename from schematics/renamedDungeons/complexHall_tntPuzzleTrap_closed_50.schematic rename to schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic diff --git a/schematics/renamedDungeons/deadEnd_azersDungeonO_closed_100.schematic b/schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_azersDungeonO_closed_100.schematic rename to schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_brokenPillarsO_open_100.schematic b/schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_brokenPillarsO_open_100.schematic rename to schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_diamondTowerTemple1_open_100.schematic b/schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_diamondTowerTemple1_open_100.schematic rename to schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_fallingTrapO_open_100.schematic b/schematics/ruins/deadEnd_fallingTrapO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_fallingTrapO_open_100.schematic rename to schematics/ruins/deadEnd_fallingTrapO_open_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_hiddenStaircaseO_open_100.schematic b/schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_hiddenStaircaseO_open_100.schematic rename to schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_lavaTrapO_open_100.schematic b/schematics/ruins/deadEnd_lavaTrapO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_lavaTrapO_open_100.schematic rename to schematics/ruins/deadEnd_lavaTrapO_open_100.schematic diff --git a/schematics/randomTree.schematic b/schematics/ruins/deadEnd_randomTree_open_75.schematic similarity index 100% rename from schematics/randomTree.schematic rename to schematics/ruins/deadEnd_randomTree_open_75.schematic diff --git a/schematics/renamedDungeons/deadEnd_smallDesert_open_75.schematic b/schematics/ruins/deadEnd_smallDesert_open_75.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_smallDesert_open_75.schematic rename to schematics/ruins/deadEnd_smallDesert_open_75.schematic diff --git a/schematics/renamedDungeons/deadEnd_smallHiddenTowerO_open_100.schematic b/schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_smallHiddenTowerO_open_100.schematic rename to schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_smallPond_open_75.schematic b/schematics/ruins/deadEnd_smallPond_open_75.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_smallPond_open_75.schematic rename to schematics/ruins/deadEnd_smallPond_open_75.schematic diff --git a/schematics/renamedDungeons/deadEnd_smallSilverfishRoom_closed_100.schematic b/schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_smallSilverfishRoom_closed_100.schematic rename to schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic diff --git a/schematics/renamedDungeons/deadEnd_tntTrapO_open_100.schematic b/schematics/ruins/deadEnd_tntTrapO_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/deadEnd_tntTrapO_open_100.schematic rename to schematics/ruins/deadEnd_tntTrapO_open_100.schematic diff --git a/schematics/renamedDungeons/exit_exitCube_open_100.schematic b/schematics/ruins/exit_exitCube_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/exit_exitCube_open_100.schematic rename to schematics/ruins/exit_exitCube_open_100.schematic diff --git a/schematics/lockingExitHall.schematic b/schematics/ruins/exit_lockingExitHall_closed_100.schematic similarity index 100% rename from schematics/lockingExitHall.schematic rename to schematics/ruins/exit_lockingExitHall_closed_100.schematic diff --git a/schematics/renamedDungeons/exit_smallExitPrison_open_100.schematic b/schematics/ruins/exit_smallExitPrison_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/exit_smallExitPrison_open_100.schematic rename to schematics/ruins/exit_smallExitPrison_open_100.schematic diff --git a/schematics/4WayBasicHall.schematic b/schematics/ruins/hub_4WayBasicHall_closed_200.schematic similarity index 100% rename from schematics/4WayBasicHall.schematic rename to schematics/ruins/hub_4WayBasicHall_closed_200.schematic diff --git a/schematics/4WayHallExit.schematic b/schematics/ruins/hub_4WayHallExit_closed_200.schematic similarity index 100% rename from schematics/4WayHallExit.schematic rename to schematics/ruins/hub_4WayHallExit_closed_200.schematic diff --git a/schematics/renamedDungeons/hub_doorTotemRuins_open_100.schematic b/schematics/ruins/hub_doorTotemRuins_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/hub_doorTotemRuins_open_100.schematic rename to schematics/ruins/hub_doorTotemRuins_open_100.schematic diff --git a/schematics/renamedDungeons/hub_fortRuins_open_100.schematic b/schematics/ruins/hub_fortRuins_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/hub_fortRuins_open_100.schematic rename to schematics/ruins/hub_fortRuins_open_100.schematic diff --git a/schematics/renamedDungeons/hub_hallwayTrapRooms1_closed_100.schematic b/schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/hub_hallwayTrapRooms1_closed_100.schematic rename to schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic diff --git a/schematics/renamedDungeons/hub_longDoorHallway_closed_100.schematic b/schematics/ruins/hub_longDoorHallway_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/hub_longDoorHallway_closed_100.schematic rename to schematics/ruins/hub_longDoorHallway_closed_100.schematic diff --git a/schematics/renamedDungeons/maze_smallMaze1_closed_100.schematic b/schematics/ruins/maze_smallMaze1_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/maze_smallMaze1_closed_100.schematic rename to schematics/ruins/maze_smallMaze1_closed_100.schematic diff --git a/schematics/renamedDungeons/maze_smallMultilevelMaze_closed_100.schematic b/schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/maze_smallMultilevelMaze_closed_100.schematic rename to schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_collapsedSingleTunnel1_closed_100.schematic b/schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_collapsedSingleTunnel1_closed_100.schematic rename to schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_simpleDropHall_closed_100.schematic b/schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_simpleDropHall_closed_100.schematic rename to schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_simpleSmallT1_closed_100.schematic b/schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_simpleSmallT1_closed_100.schematic rename to schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_simpleStairsDown_closed_100.schematic b/schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_simpleStairsDown_closed_100.schematic rename to schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_simpleStairsUp_closed_100.schematic b/schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_simpleStairsUp_closed_100.schematic rename to schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_singleStraightHall1_closed_100.schematic b/schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_singleStraightHall1_closed_100.schematic rename to schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_smallSimpleLeft_closed_100.schematic b/schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_smallSimpleLeft_closed_100.schematic rename to schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic diff --git a/schematics/renamedDungeons/simpleHall_smallSimpleRight_closed_100.schematic b/schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/simpleHall_smallSimpleRight_closed_100.schematic rename to schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic diff --git a/schematics/renamedDungeons/trap_fakeTNTTrap_closed_100.schematic b/schematics/ruins/trap_fakeTNTTrap_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/trap_fakeTNTTrap_closed_100.schematic rename to schematics/ruins/trap_fakeTNTTrap_closed_100.schematic diff --git a/schematics/renamedDungeons/trap_hallwayPitFallTrap_closed_200.schematic b/schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic similarity index 100% rename from schematics/renamedDungeons/trap_hallwayPitFallTrap_closed_200.schematic rename to schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic diff --git a/schematics/renamedDungeons/trap_lavaPyramid_open_100.schematic b/schematics/ruins/trap_lavaPyramid_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/trap_lavaPyramid_open_100.schematic rename to schematics/ruins/trap_lavaPyramid_open_100.schematic diff --git a/schematics/renamedDungeons/trap_pistonFallRuins_open_100.schematic b/schematics/ruins/trap_pistonFallRuins_open_100.schematic similarity index 100% rename from schematics/renamedDungeons/trap_pistonFallRuins_open_100.schematic rename to schematics/ruins/trap_pistonFallRuins_open_100.schematic diff --git a/schematics/renamedDungeons/trap_pistonFloorHall_closed_150.schematic b/schematics/ruins/trap_pistonFloorHall_closed_150.schematic similarity index 100% rename from schematics/renamedDungeons/trap_pistonFloorHall_closed_150.schematic rename to schematics/ruins/trap_pistonFloorHall_closed_150.schematic diff --git a/schematics/trap_pistonFloorPlatform2_closed_100.schematic b/schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic similarity index 100% rename from schematics/trap_pistonFloorPlatform2_closed_100.schematic rename to schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic diff --git a/schematics/trap_pistonFloorPlatform_closed_100.schematic b/schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic similarity index 100% rename from schematics/trap_pistonFloorPlatform_closed_100.schematic rename to schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic diff --git a/schematics/pistonHallway.schematic b/schematics/ruins/trap_pistonHallway_closed_100.schematic similarity index 100% rename from schematics/pistonHallway.schematic rename to schematics/ruins/trap_pistonHallway_closed_100.schematic diff --git a/schematics/renamedDungeons/trap_pistonSmasherHall_closed_100.schematic b/schematics/ruins/trap_pistonSmasherHall_closed_100.schematic similarity index 100% rename from schematics/renamedDungeons/trap_pistonSmasherHall_closed_100.schematic rename to schematics/ruins/trap_pistonSmasherHall_closed_100.schematic diff --git a/schematics/renamedDungeons/trap_raceTheTNTHall_closed_50.schematic b/schematics/ruins/trap_raceTheTNTHall_closed_50.schematic similarity index 100% rename from schematics/renamedDungeons/trap_raceTheTNTHall_closed_50.schematic rename to schematics/ruins/trap_raceTheTNTHall_closed_50.schematic diff --git a/schematics/renamedDungeons/trap_wallFallcomboPistonHall_closed_200.schematic b/schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic similarity index 100% rename from schematics/renamedDungeons/trap_wallFallcomboPistonHall_closed_200.schematic rename to schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic diff --git a/schematics/ruinsO.schematic b/schematics/ruinsO.schematic deleted file mode 100644 index d5ad209..0000000 Binary files a/schematics/ruinsO.schematic and /dev/null differ diff --git a/schematics/schematics.txt b/schematics/schematics.txt new file mode 100644 index 0000000..ed5e30d --- /dev/null +++ b/schematics/schematics.txt @@ -0,0 +1,67 @@ +/schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic +/schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic +/schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic +/schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic +/schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic +/schematics/ruins/complexHall_pitStairs_open_100.schematic +/schematics/ruins/complexHall_ruinsO_open_100.schematic +/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic +/schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic +/schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic +/schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic +/schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic +/schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic +/schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic +/schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic +/schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic +/schematics/ruins/deadEnd_fallingTrapO_open_100.schematic +/schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic +/schematics/ruins/deadEnd_lavaTrapO_open_100.schematic +/schematics/ruins/deadend_randomTree_open_75.schematic +/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic +/schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic +/schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic +/schematics/ruins/deadEnd_smallDesert_open_75.schematic +/schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic +/schematics/ruins/deadEnd_smallPond_open_75.schematic +/schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic +/schematics/ruins/deadEnd_tntTrapO_open_100.schematic +/schematics/ruins/exit_exitCube_open_100.schematic +/schematics/ruins/exit_lockingExitHall_closed_100.schematic +/schematics/ruins/exit_smallExitPrison_open_100.schematic +/schematics/ruins/hub_4WayBasicHall_closed_200.schematic +/schematics/ruins/hub_4WayHallExit_closed_200.schematic +/schematics/ruins/hub_doorTotemRuins_open_100.schematic +/schematics/ruins/hub_fortRuins_open_100.schematic +/schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic +/schematics/ruins/hub_longDoorHallway_closed_100.schematic +/schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic +/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic +/schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic +/schematics/ruins/maze_smallMaze1_closed_100.schematic +/schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic +/schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic +/schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic +/schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic +/schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic +/schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic +/schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic +/schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic +/schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic +/schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic +/schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic +/schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic +/schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic +/schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic +/schematics/ruins/trap_fakeTNTTrap_closed_100.schematic +/schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic +/schematics/ruins/trap_lavaPyramid_open_100.schematic +/schematics/ruins/trap_pistonFallRuins_open_100.schematic +/schematics/ruins/trap_pistonFloorHall_closed_150.schematic +/schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic +/schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic +/schematics/ruins/trap_pistonHallway_closed_100.schematic +/schematics/ruins/trap_pistonSmasherHall_closed_100.schematic +/schematics/ruins/trap_raceTheTNTHall_closed_50.schematic +/schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic +/schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic diff --git a/schematics/simpleDropHall.schematic b/schematics/simpleDropHall.schematic deleted file mode 100644 index 70fa765..0000000 Binary files a/schematics/simpleDropHall.schematic and /dev/null differ diff --git a/schematics/simpleSmallT1.schematic b/schematics/simpleSmallT1.schematic deleted file mode 100644 index a8bc35e..0000000 Binary files a/schematics/simpleSmallT1.schematic and /dev/null differ diff --git a/schematics/singleStraightHall1.schematic b/schematics/singleStraightHall1.schematic deleted file mode 100644 index 7f9f11c..0000000 Binary files a/schematics/singleStraightHall1.schematic and /dev/null differ diff --git a/schematics/smallBranchWithExit.schematic b/schematics/smallBranchWithExit.schematic deleted file mode 100644 index acc9cd4..0000000 Binary files a/schematics/smallBranchWithExit.schematic and /dev/null differ diff --git a/schematics/smallDesert.schematic b/schematics/smallDesert.schematic deleted file mode 100644 index 6fded48..0000000 Binary files a/schematics/smallDesert.schematic and /dev/null differ diff --git a/schematics/smallExitPrison.schematic b/schematics/smallExitPrison.schematic deleted file mode 100644 index bb7a7ef..0000000 Binary files a/schematics/smallExitPrison.schematic and /dev/null differ diff --git a/schematics/smallHiddenTowerO.schematic b/schematics/smallHiddenTowerO.schematic deleted file mode 100644 index e75cc10..0000000 Binary files a/schematics/smallHiddenTowerO.schematic and /dev/null differ diff --git a/schematics/smallMaze1.schematic b/schematics/smallMaze1.schematic deleted file mode 100644 index c32d95f..0000000 Binary files a/schematics/smallMaze1.schematic and /dev/null differ diff --git a/schematics/smallMultilevelMaze.schematic b/schematics/smallMultilevelMaze.schematic deleted file mode 100644 index 5866b05..0000000 Binary files a/schematics/smallMultilevelMaze.schematic and /dev/null differ diff --git a/schematics/smallPond.schematic b/schematics/smallPond.schematic deleted file mode 100644 index ccb790a..0000000 Binary files a/schematics/smallPond.schematic and /dev/null differ diff --git a/schematics/smallRotundaWithExit.schematic b/schematics/smallRotundaWithExit.schematic deleted file mode 100644 index 56deba2..0000000 Binary files a/schematics/smallRotundaWithExit.schematic and /dev/null differ diff --git a/schematics/smallSilverfishRoom.schematic b/schematics/smallSilverfishRoom.schematic deleted file mode 100644 index 46ddfda..0000000 Binary files a/schematics/smallSilverfishRoom.schematic and /dev/null differ diff --git a/schematics/smallSimpleLeft.schematic b/schematics/smallSimpleLeft.schematic deleted file mode 100644 index 5a9d50a..0000000 Binary files a/schematics/smallSimpleLeft.schematic and /dev/null differ diff --git a/schematics/smallSimpleRight.schematic b/schematics/smallSimpleRight.schematic deleted file mode 100644 index 3aedb16..0000000 Binary files a/schematics/smallSimpleRight.schematic and /dev/null differ diff --git a/schematics/somethingBroke.schematic b/schematics/somethingBroke.schematic deleted file mode 100644 index 1bd78ea..0000000 Binary files a/schematics/somethingBroke.schematic and /dev/null differ diff --git a/schematics/tntPuzzleTrap.schematic b/schematics/tntPuzzleTrap.schematic deleted file mode 100644 index 8d6898e..0000000 Binary files a/schematics/tntPuzzleTrap.schematic and /dev/null differ diff --git a/schematics/tntTrapO.schematic b/schematics/tntTrapO.schematic deleted file mode 100644 index 5d0d424..0000000 Binary files a/schematics/tntTrapO.schematic and /dev/null differ diff --git a/schematics/wallFallcomboPistonHall.schematic b/schematics/wallFallcomboPistonHall.schematic deleted file mode 100644 index d2d9453..0000000 Binary files a/schematics/wallFallcomboPistonHall.schematic and /dev/null differ