Implemented Importing and Exporting Tile Entities; Additional Improvements #41

Merged
SenseiKiwi merged 15 commits from master into master 2013-07-15 22:08:53 +00:00
Showing only changes of commit 90b463b54d - Show all commits

View File

@@ -40,6 +40,9 @@ public class DungeonHelper
public static final int MAX_DUNGEON_WEIGHT = 10000; //Used to prevent overflows and math breaking down public static final int MAX_DUNGEON_WEIGHT = 10000; //Used to prevent overflows and math breaking down
private static final int MAX_EXPORT_RADIUS = 50; private static final int MAX_EXPORT_RADIUS = 50;
public static final int FABRIC_OF_REALITY_EXPORT_ID = 1973;
public static final int PERMAFABRIC_EXPORT_ID = 220;
private static final String HUB_DUNGEON_TYPE = "Hub"; private static final String HUB_DUNGEON_TYPE = "Hub";
private static final String TRAP_DUNGEON_TYPE = "Trap"; private static final String TRAP_DUNGEON_TYPE = "Trap";
private static final String SIMPLE_HALL_DUNGEON_TYPE = "SimpleHall"; private static final String SIMPLE_HALL_DUNGEON_TYPE = "SimpleHall";
@@ -444,14 +447,23 @@ public class DungeonHelper
if (blockID == properties.WarpDoorID) if (blockID == properties.WarpDoorID)
{ {
blockID = Block.doorWood.blockID; blockID = Block.doorWood.blockID;
}
//Map fabric of reality and permafabric blocks to standard export IDs
if (blockID == properties.FabricBlockID)
{
blockID = FABRIC_OF_REALITY_EXPORT_ID;
}
if (blockID == properties.PermaFabricBlockID)
{
blockID = PERMAFABRIC_EXPORT_ID;
} }
// Save 4096 IDs in an AddBlocks section // Save 4096 IDs in an AddBlocks section
if (blockID > 255) if (blockID > 255)
{ {
if (addBlocks == null) if (addBlocks == null)
{ // Lazily create section {
//Lazily create section
addBlocks = new byte[(blocks.length >> 1) + 1]; addBlocks = new byte[(blocks.length >> 1) + 1];
} }