Cleaned up and tweaked DungeonHelper
Cleaned up the indentation and empty lines in DungeonHelper. Set metadataFlipList and metadataNextList to have generic type Integer, since they're used to store block IDs. Whenever possible, we should always be using parameterized collections instead of leaving their types unspecified. I'd like to fix up the schematic HashMap in the future - unless it's necessary, we shouldn't be storing values of various types in that collection. Strongly typed variables or a class with the appropriate fields would be much cleaner.
This commit is contained in:
SenseiKiwi
parent
4e8b8deab7
commit
172e3e3af1
1 changed files with 374 additions and 483 deletions
|
|
@ -4,14 +4,10 @@ import java.io.File;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockContainer;
|
import net.minecraft.block.BlockContainer;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import StevenDimDoors.mod_pocketDim.DDProperties;
|
import StevenDimDoors.mod_pocketDim.DDProperties;
|
||||||
import StevenDimDoors.mod_pocketDim.DungeonGenerator;
|
import StevenDimDoors.mod_pocketDim.DungeonGenerator;
|
||||||
|
|
@ -19,164 +15,119 @@ import StevenDimDoors.mod_pocketDim.LinkData;
|
||||||
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
|
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ByteArrayTag;
|
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ByteArrayTag;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.CompoundTag;
|
import StevenDimDoors.mod_pocketDim.helpers.jnbt.CompoundTag;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.IntTag;
|
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ListTag;
|
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ListTag;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.NBTOutputStream;
|
import StevenDimDoors.mod_pocketDim.helpers.jnbt.NBTOutputStream;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ShortTag;
|
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ShortTag;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.StringTag;
|
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.jnbt.Tag;
|
import StevenDimDoors.mod_pocketDim.helpers.jnbt.Tag;
|
||||||
|
|
||||||
/**
|
|
||||||
|
|
||||||
* @Return
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public class DungeonHelper
|
public class DungeonHelper
|
||||||
{
|
{
|
||||||
|
|
||||||
public DungeonHelper()
|
|
||||||
{
|
|
||||||
if (properties == null)
|
|
||||||
properties = DDProperties.instance();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static DDProperties properties = null;
|
private static DDProperties properties = null;
|
||||||
|
|
||||||
private Random rand = new Random();
|
private Random rand = new Random();
|
||||||
|
|
||||||
public HashMap<Integer, LinkData> customDungeonStatus = new HashMap<Integer, LinkData>();
|
public HashMap<Integer, LinkData> customDungeonStatus = new HashMap<Integer, LinkData>();
|
||||||
|
|
||||||
public ArrayList<DungeonGenerator> customDungeons = new ArrayList<DungeonGenerator>();
|
public ArrayList<DungeonGenerator> customDungeons = new ArrayList<DungeonGenerator>();
|
||||||
|
public ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>();
|
||||||
public ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>();
|
public ArrayList<DungeonGenerator> weightedDungeonGenList = new ArrayList<DungeonGenerator>();
|
||||||
|
public ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>();
|
||||||
public ArrayList<DungeonGenerator> weightedDungeonGenList = new ArrayList<DungeonGenerator>();
|
public ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>();
|
||||||
|
public ArrayList<DungeonGenerator> deadEnds = new ArrayList<DungeonGenerator>();
|
||||||
|
public ArrayList<DungeonGenerator> hubs = new ArrayList<DungeonGenerator>();
|
||||||
public ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>();
|
public ArrayList<DungeonGenerator> mazes = new ArrayList<DungeonGenerator>();
|
||||||
|
public ArrayList<DungeonGenerator> pistonTraps = new ArrayList<DungeonGenerator>();
|
||||||
|
public ArrayList<DungeonGenerator> exits = new ArrayList<DungeonGenerator>();
|
||||||
public ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>();
|
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<DungeonGenerator> deadEnds = new ArrayList<DungeonGenerator>();
|
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<DungeonGenerator> hubs = new ArrayList<DungeonGenerator>();
|
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<DungeonGenerator> mazes = new ArrayList<DungeonGenerator>();
|
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<DungeonGenerator> pistonTraps = new ArrayList<DungeonGenerator>();
|
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<DungeonGenerator> exits = new ArrayList<DungeonGenerator>();
|
|
||||||
|
|
||||||
public ArrayList<String> tagList = new ArrayList<String>();
|
public ArrayList<String> tagList = new ArrayList<String>();
|
||||||
|
|
||||||
|
public ArrayList<Integer> metadataFlipList = new ArrayList<Integer>();
|
||||||
|
public ArrayList<Integer> metadataNextList = new ArrayList<Integer>();
|
||||||
|
|
||||||
|
public DungeonGenerator defaultUp = new DungeonGenerator(0, "/schematic/simpleStairsUp.schematic", true);
|
||||||
public ArrayList metadataFlipList = new ArrayList();
|
|
||||||
|
|
||||||
public ArrayList metadataNextList = new ArrayList();
|
|
||||||
|
|
||||||
public DungeonGenerator defaultUp = new DungeonGenerator(0, "/schematic/simpleStairsUp.schematic", true);
|
|
||||||
|
|
||||||
public void registerCustomDungeon(File schematicFile)
|
public void registerCustomDungeon(File schematicFile)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
|
||||||
|
|
||||||
if(schematicFile.getName().contains(".schematic"))
|
|
||||||
{
|
{
|
||||||
String[] name = schematicFile.getName().split("_");
|
if(schematicFile.getName().contains(".schematic"))
|
||||||
|
|
||||||
if(name.length<4)
|
|
||||||
{
|
{
|
||||||
System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
|
String[] name = schematicFile.getName().split("_");
|
||||||
this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
|
|
||||||
System.out.println("Imported "+schematicFile.getName());
|
|
||||||
|
|
||||||
|
if(name.length<4)
|
||||||
}
|
|
||||||
else if(!(name[2].equals("open")||name[2].equals("closed"))||!this.tagList.contains(name[0]))
|
|
||||||
{
|
|
||||||
System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
|
|
||||||
this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
|
|
||||||
System.out.println("Imported "+schematicFile.getName());
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int count=0;
|
|
||||||
|
|
||||||
boolean open= name[2].equals("open");
|
|
||||||
|
|
||||||
int weight = Integer.parseInt(name[3].replace(".schematic", ""));
|
|
||||||
|
|
||||||
String path = schematicFile.getAbsolutePath();
|
|
||||||
|
|
||||||
while(count<weight)
|
|
||||||
{
|
{
|
||||||
if(name[0].equals("hub"))
|
System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
|
||||||
{
|
this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
|
||||||
this.hubs.add(new DungeonGenerator(weight,path,open));
|
System.out.println("Imported "+schematicFile.getName());
|
||||||
}
|
|
||||||
else if(name[0].equals("simpleHall"))
|
|
||||||
{
|
|
||||||
this.simpleHalls.add(new DungeonGenerator(weight,path,open));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(name[0].equals("complexHall"))
|
|
||||||
{
|
|
||||||
this.complexHalls.add(new DungeonGenerator(weight,path,open));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(name[0].equals("trap"))
|
|
||||||
{
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(weight,path,open));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(name[0].equals("deadEnd"))
|
|
||||||
{
|
|
||||||
this.deadEnds.add(new DungeonGenerator(weight,path,open));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(name[0].equals("exit"))
|
|
||||||
{
|
|
||||||
this.exits.add(new DungeonGenerator(weight,path,open));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(name[0].equals("maze"))
|
|
||||||
{
|
|
||||||
this.mazes.add(new DungeonGenerator(weight,path,open));
|
|
||||||
|
|
||||||
}
|
|
||||||
count++;
|
|
||||||
this.weightedDungeonGenList.add(new DungeonGenerator(weight,path,open));
|
|
||||||
}
|
}
|
||||||
|
else if(!(name[2].equals("open")||name[2].equals("closed"))||!this.tagList.contains(name[0]))
|
||||||
|
{
|
||||||
|
System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
|
||||||
|
this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
|
||||||
|
System.out.println("Imported "+schematicFile.getName());
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int count=0;
|
||||||
|
|
||||||
this.registeredDungeons.add(new DungeonGenerator(weight,path,open));
|
boolean open= name[2].equals("open");
|
||||||
System.out.println("Imported "+schematicFile.getName());
|
|
||||||
|
int weight = Integer.parseInt(name[3].replace(".schematic", ""));
|
||||||
|
|
||||||
|
String path = schematicFile.getAbsolutePath();
|
||||||
|
|
||||||
|
while(count<weight)
|
||||||
|
{
|
||||||
|
if(name[0].equals("hub"))
|
||||||
|
{
|
||||||
|
this.hubs.add(new DungeonGenerator(weight,path,open));
|
||||||
|
}
|
||||||
|
else if(name[0].equals("simpleHall"))
|
||||||
|
{
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(weight,path,open));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(name[0].equals("complexHall"))
|
||||||
|
{
|
||||||
|
this.complexHalls.add(new DungeonGenerator(weight,path,open));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(name[0].equals("trap"))
|
||||||
|
{
|
||||||
|
this.pistonTraps.add(new DungeonGenerator(weight,path,open));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(name[0].equals("deadEnd"))
|
||||||
|
{
|
||||||
|
this.deadEnds.add(new DungeonGenerator(weight,path,open));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(name[0].equals("exit"))
|
||||||
|
{
|
||||||
|
this.exits.add(new DungeonGenerator(weight,path,open));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(name[0].equals("maze"))
|
||||||
|
{
|
||||||
|
this.mazes.add(new DungeonGenerator(weight,path,open));
|
||||||
|
|
||||||
|
}
|
||||||
|
count++;
|
||||||
|
this.weightedDungeonGenList.add(new DungeonGenerator(weight,path,open));
|
||||||
|
}
|
||||||
|
this.registeredDungeons.add(new DungeonGenerator(weight,path,open));
|
||||||
|
System.out.println("Imported "+schematicFile.getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
catch(Exception e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
System.out.println("Importing custom dungeon failed");
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
System.out.println("Importing custom dungeon failed");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void importCustomDungeons(String dir)
|
public void importCustomDungeons(String dir)
|
||||||
|
|
@ -184,26 +135,15 @@ public class DungeonHelper
|
||||||
File file = new File(dir);
|
File file = new File(dir);
|
||||||
File[] schematicNames=file.listFiles();
|
File[] schematicNames=file.listFiles();
|
||||||
|
|
||||||
if(schematicNames!=null)
|
if(schematicNames!=null)
|
||||||
{
|
{
|
||||||
|
for(File schematicFile: schematicNames)
|
||||||
|
{
|
||||||
for(File schematicFile: schematicNames)
|
this.registerCustomDungeon(schematicFile);
|
||||||
{
|
}
|
||||||
|
}
|
||||||
this.registerCustomDungeon(schematicFile);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void registerFlipBlocks()
|
public void registerFlipBlocks()
|
||||||
{
|
{
|
||||||
this.metadataFlipList.add(Block.dispenser.blockID);
|
this.metadataFlipList.add(Block.dispenser.blockID);
|
||||||
|
|
@ -220,10 +160,7 @@ public class DungeonHelper
|
||||||
this.metadataFlipList.add(Block.doorWood.blockID);
|
this.metadataFlipList.add(Block.doorWood.blockID);
|
||||||
this.metadataFlipList.add(Block.pistonBase.blockID);
|
this.metadataFlipList.add(Block.pistonBase.blockID);
|
||||||
this.metadataFlipList.add(Block.pistonStickyBase.blockID);
|
this.metadataFlipList.add(Block.pistonStickyBase.blockID);
|
||||||
|
|
||||||
this.metadataFlipList.add(Block.pistonExtension.blockID);
|
this.metadataFlipList.add(Block.pistonExtension.blockID);
|
||||||
|
|
||||||
|
|
||||||
this.metadataFlipList.add(Block.redstoneComparatorIdle.blockID);
|
this.metadataFlipList.add(Block.redstoneComparatorIdle.blockID);
|
||||||
this.metadataFlipList.add(Block.redstoneComparatorActive.blockID);
|
this.metadataFlipList.add(Block.redstoneComparatorActive.blockID);
|
||||||
this.metadataFlipList.add(Block.signPost.blockID);
|
this.metadataFlipList.add(Block.signPost.blockID);
|
||||||
|
|
@ -235,18 +172,16 @@ public class DungeonHelper
|
||||||
this.metadataFlipList.add(Block.chest.blockID);
|
this.metadataFlipList.add(Block.chest.blockID);
|
||||||
this.metadataFlipList.add(Block.chestTrapped.blockID);
|
this.metadataFlipList.add(Block.chestTrapped.blockID);
|
||||||
this.metadataFlipList.add(Block.hopperBlock.blockID);
|
this.metadataFlipList.add(Block.hopperBlock.blockID);
|
||||||
|
|
||||||
this.metadataFlipList.add(Block.stairsNetherBrick.blockID);
|
this.metadataFlipList.add(Block.stairsNetherBrick.blockID);
|
||||||
this.metadataFlipList.add(Block.stairsCobblestone.blockID);
|
this.metadataFlipList.add(Block.stairsCobblestone.blockID);
|
||||||
this.metadataFlipList.add(Block.stairsNetherBrick.blockID);
|
this.metadataFlipList.add(Block.stairsNetherBrick.blockID);
|
||||||
this.metadataFlipList.add(Block.stairsNetherQuartz.blockID);
|
this.metadataFlipList.add(Block.stairsNetherQuartz.blockID);
|
||||||
this.metadataFlipList.add(Block.stairsSandStone.blockID);
|
this.metadataFlipList.add(Block.stairsSandStone.blockID);
|
||||||
|
|
||||||
|
|
||||||
this.metadataNextList.add(Block.redstoneRepeaterIdle.blockID);
|
this.metadataNextList.add(Block.redstoneRepeaterIdle.blockID);
|
||||||
this.metadataNextList.add(Block.redstoneRepeaterActive.blockID);
|
this.metadataNextList.add(Block.redstoneRepeaterActive.blockID);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerDungeonTypeTags()
|
public void registerDungeonTypeTags()
|
||||||
{
|
{
|
||||||
tagList.add("hub");
|
tagList.add("hub");
|
||||||
|
|
@ -257,104 +192,89 @@ public class DungeonHelper
|
||||||
tagList.add("deadEnd");
|
tagList.add("deadEnd");
|
||||||
tagList.add("maze");
|
tagList.add("maze");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerBaseDungeons()
|
public void registerBaseDungeons()
|
||||||
{
|
{
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/doorTotemRuins.schematic", true));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/doorTotemRuins.schematic", true));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/hallwayTrapRooms1.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/hallwayTrapRooms1.schematic", false));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/longDoorHallway.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/longDoorHallway.schematic", false));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/smallRotundaWithExit.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/smallRotundaWithExit.schematic", false));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/fortRuins.schematic", true));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/fortRuins.schematic", true));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
|
||||||
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
|
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
|
||||||
|
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/collapsedSingleTunnel1.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/singleStraightHall1.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallBranchWithExit.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleLeft.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleRight.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsUp.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsDown.schematic", false));
|
||||||
|
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleSmallT1.schematic", false));
|
||||||
|
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/collapsedSingleTunnel1.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/tntPuzzleTrap.schematic", false));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/singleStraightHall1.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/brokenPillarsO.schematic", true));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallBranchWithExit.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/buggyTopEntry1.schematic", true));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleLeft.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/exitRuinsWithHiddenDoor.schematic", true));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleRight.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/hallwayHiddenTreasure.schematic", false));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsUp.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/mediumPillarStairs.schematic", true));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsDown.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/ruinsO.schematic", true));
|
||||||
this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleSmallT1.schematic", false));
|
this.complexHalls.add(new DungeonGenerator(0, "/schematics/pitStairs.schematic", true));
|
||||||
|
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/azersDungeonO.schematic", false));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/diamondTowerTemple1.schematic", true));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/fallingTrapO.schematic", false));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/hiddenStaircaseO.schematic", true));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/lavaTrapO.schematic", true));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/randomTree.schematic", true));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallHiddenTowerO.schematic", true));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallSilverfishRoom.schematic", false));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/tntTrapO.schematic", false));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallDesert.schematic", true));
|
||||||
|
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallPond.schematic", true));
|
||||||
|
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/tntPuzzleTrap.schematic", false));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fakeTNTTrap.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/brokenPillarsO.schematic", true));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/buggyTopEntry1.schematic", true));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/exitRuinsWithHiddenDoor.schematic", true));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFallRuins.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/hallwayHiddenTreasure.schematic", false));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/mediumPillarStairs.schematic", true));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/ruinsO.schematic", true));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonSmasherHall.schematic", false));
|
||||||
this.complexHalls.add(new DungeonGenerator(0, "/schematics/pitStairs.schematic", true));
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/simpleDropHall.schematic", false));
|
||||||
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
|
||||||
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
|
||||||
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fallingTNThall.schematic", false));
|
||||||
|
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/lavaPyramid.schematic", true));
|
||||||
|
|
||||||
|
this.mazes.add(new DungeonGenerator(0, "/schematics/smallMaze1.schematic", false));
|
||||||
|
this.mazes.add(new DungeonGenerator(0, "/schematics/smallMultilevelMaze.schematic", false));
|
||||||
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/azersDungeonO.schematic", false));
|
this.exits.add(new DungeonGenerator(0, "/schematics/exitCube.schematic", true));
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/diamondTowerTemple1.schematic", true));
|
this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/fallingTrapO.schematic", false));
|
this.exits.add(new DungeonGenerator(0, "/schematics/smallExitPrison.schematic", true));
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/hiddenStaircaseO.schematic", true));
|
this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/lavaTrapO.schematic", true));
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/randomTree.schematic", true));
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallHiddenTowerO.schematic", true));
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallSilverfishRoom.schematic", false));
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/tntTrapO.schematic", false));
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallDesert.schematic", true));
|
|
||||||
this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallPond.schematic", true));
|
|
||||||
|
|
||||||
|
this.weightedDungeonGenList.addAll(this.simpleHalls);
|
||||||
|
this.weightedDungeonGenList.addAll(this.exits);
|
||||||
|
this.weightedDungeonGenList.addAll(this.pistonTraps);
|
||||||
|
this.weightedDungeonGenList.addAll(this.mazes);
|
||||||
|
this.weightedDungeonGenList.addAll(this.deadEnds);
|
||||||
|
this.weightedDungeonGenList.addAll(this.complexHalls);
|
||||||
|
this.weightedDungeonGenList.addAll(this.hubs);
|
||||||
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fakeTNTTrap.schematic", false));
|
for(DungeonGenerator data : this.weightedDungeonGenList)
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
|
{
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
|
if(!this.registeredDungeons.contains(data))
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFallRuins.schematic", false));
|
{
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
|
this.registeredDungeons.add(data);
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
|
}
|
||||||
// this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonHallway.schematic", null));
|
}
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonSmasherHall.schematic", false));
|
|
||||||
// this.pistonTraps.add(new DungeonGenerator(0, "/schematics/raceTheTNTHall.schematic", false));
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/simpleDropHall.schematic", false));
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fallingTNThall.schematic", false));
|
|
||||||
this.pistonTraps.add(new DungeonGenerator(0, "/schematics/lavaPyramid.schematic", true));
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.mazes.add(new DungeonGenerator(0, "/schematics/smallMaze1.schematic", false));
|
|
||||||
this.mazes.add(new DungeonGenerator(0, "/schematics/smallMultilevelMaze.schematic", false));
|
|
||||||
|
|
||||||
|
|
||||||
this.exits.add(new DungeonGenerator(0, "/schematics/exitCube.schematic", true));
|
|
||||||
this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
|
|
||||||
this.exits.add(new DungeonGenerator(0, "/schematics/smallExitPrison.schematic", true));
|
|
||||||
this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.weightedDungeonGenList.addAll(this.simpleHalls);
|
|
||||||
this.weightedDungeonGenList.addAll(this.exits);
|
|
||||||
this.weightedDungeonGenList.addAll(this.pistonTraps);
|
|
||||||
this.weightedDungeonGenList.addAll(this.mazes);
|
|
||||||
this.weightedDungeonGenList.addAll(this.deadEnds);
|
|
||||||
this.weightedDungeonGenList.addAll(this.complexHalls);
|
|
||||||
this.weightedDungeonGenList.addAll(this.hubs);
|
|
||||||
|
|
||||||
for(DungeonGenerator data : this.weightedDungeonGenList)
|
|
||||||
{
|
|
||||||
if(!this.registeredDungeons.contains(data))
|
|
||||||
{
|
|
||||||
this.registeredDungeons.add(data);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DungeonGenerator exportDungeon(World world, int xI, int yI, int zI, String file)
|
public DungeonGenerator exportDungeon(World world, int xI, int yI, int zI, String file)
|
||||||
{
|
{
|
||||||
|
|
||||||
int xMin;
|
int xMin;
|
||||||
int yMin;
|
int yMin;
|
||||||
int zMin;
|
int zMin;
|
||||||
|
|
@ -400,54 +320,52 @@ public class DungeonHelper
|
||||||
short height= (short) (yMax-yMin);
|
short height= (short) (yMax-yMin);
|
||||||
short length= (short) (zMax-zMin);
|
short length= (short) (zMax-zMin);
|
||||||
|
|
||||||
//ArrayList<NBTTagCompound> tileEntities = new ArrayList<NBTTagCompound>();
|
//ArrayList<NBTTagCompound> tileEntities = new ArrayList<NBTTagCompound>();
|
||||||
|
ArrayList<Tag> tileEntites = new ArrayList<Tag>();
|
||||||
|
byte[] blocks = new byte[width * height * length];
|
||||||
|
byte[] addBlocks = null;
|
||||||
|
byte[] blockData = new byte[width * height * length];
|
||||||
|
|
||||||
|
for (int x = 0; x < width; ++x)
|
||||||
|
{
|
||||||
|
for (int y = 0; y < height; ++y)
|
||||||
|
{
|
||||||
|
for (int z = 0; z < length; ++z)
|
||||||
|
{
|
||||||
|
int index = y * width * length + z * width + x;
|
||||||
|
int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin);
|
||||||
|
int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin);
|
||||||
|
|
||||||
ArrayList<Tag> tileEntites= new ArrayList<Tag>();
|
if(blockID==properties.DimensionalDoorID)
|
||||||
byte[] blocks = new byte[width * height * length];
|
{
|
||||||
byte[] addBlocks = null;
|
blockID=Block.doorIron.blockID;
|
||||||
byte[] blockData = new byte[width * height * length];
|
}
|
||||||
|
if(blockID==properties.WarpDoorID)
|
||||||
|
{
|
||||||
|
blockID=Block.doorWood.blockID;
|
||||||
|
|
||||||
for (int x = 0; x < width; ++x)
|
}
|
||||||
{
|
|
||||||
for (int y = 0; y < height; ++y)
|
|
||||||
{
|
|
||||||
for (int z = 0; z < length; ++z)
|
|
||||||
{
|
|
||||||
int index = y * width * length + z * width + x;
|
|
||||||
int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin);
|
|
||||||
int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin);
|
|
||||||
|
|
||||||
if(blockID==properties.DimensionalDoorID)
|
// Save 4096 IDs in an AddBlocks section
|
||||||
{
|
if (blockID > 255)
|
||||||
blockID=Block.doorIron.blockID;
|
{
|
||||||
}
|
if (addBlocks == null)
|
||||||
if(blockID==properties.WarpDoorID)
|
{ // Lazily create section
|
||||||
{
|
addBlocks = new byte[(blocks.length >> 1) + 1];
|
||||||
blockID=Block.doorWood.blockID;
|
}
|
||||||
|
|
||||||
}
|
addBlocks[index >> 1] = (byte) (((index & 1) == 0) ?
|
||||||
|
addBlocks[index >> 1] & 0xF0 | (blockID >> 8) & 0xF
|
||||||
|
: addBlocks[index >> 1] & 0xF | ((blockID >> 8) & 0xF) << 4);
|
||||||
|
}
|
||||||
|
|
||||||
// Save 4096 IDs in an AddBlocks section
|
blocks[index] = (byte) blockID;
|
||||||
if (blockID > 255)
|
blockData[index] = (byte) meta;
|
||||||
{
|
|
||||||
if (addBlocks == null)
|
|
||||||
{ // Lazily create section
|
|
||||||
addBlocks = new byte[(blocks.length >> 1) + 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
addBlocks[index >> 1] = (byte) (((index & 1) == 0) ?
|
if (Block.blocksList[blockID] instanceof BlockContainer)
|
||||||
addBlocks[index >> 1] & 0xF0 | (blockID >> 8) & 0xF
|
{
|
||||||
: addBlocks[index >> 1] & 0xF | ((blockID >> 8) & 0xF) << 4);
|
//TODO fix this
|
||||||
}
|
/**
|
||||||
|
|
||||||
blocks[index] = (byte) blockID;
|
|
||||||
blockData[index] = (byte) meta;
|
|
||||||
|
|
||||||
if (Block.blocksList[blockID] instanceof BlockContainer)
|
|
||||||
{
|
|
||||||
//TODO fix this
|
|
||||||
/**
|
|
||||||
TileEntity tileEntityBlock = world.getBlockTileEntity(x+xMin, y+yMin, z+zMin);
|
TileEntity tileEntityBlock = world.getBlockTileEntity(x+xMin, y+yMin, z+zMin);
|
||||||
NBTTagCompound tag = new NBTTagCompound();
|
NBTTagCompound tag = new NBTTagCompound();
|
||||||
tileEntityBlock.writeToNBT(tag);
|
tileEntityBlock.writeToNBT(tag);
|
||||||
|
|
@ -462,55 +380,51 @@ public class DungeonHelper
|
||||||
{
|
{
|
||||||
tileEntites.add(tagC);
|
tileEntites.add(tagC);
|
||||||
}
|
}
|
||||||
**/
|
**/
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
/**
|
||||||
}
|
*
|
||||||
/**
|
* this.nbtdata.setShort("Width", width);
|
||||||
*
|
|
||||||
* this.nbtdata.setShort("Width", width);
|
|
||||||
this.nbtdata.setShort("Height", height);
|
this.nbtdata.setShort("Height", height);
|
||||||
this.nbtdata.setShort("Length", length);
|
this.nbtdata.setShort("Length", length);
|
||||||
|
|
||||||
this.nbtdata.setByteArray("Blocks", blocks);
|
this.nbtdata.setByteArray("Blocks", blocks);
|
||||||
this.nbtdata.setByteArray("Data", blockData);
|
this.nbtdata.setByteArray("Data", blockData);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
HashMap schematic = new HashMap();
|
HashMap schematic = new HashMap();
|
||||||
schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
|
schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
|
||||||
schematic.put("Data", new ByteArrayTag("Data", blockData));
|
schematic.put("Data", new ByteArrayTag("Data", blockData));
|
||||||
|
|
||||||
schematic.put("Width", new ShortTag("Width", (short) width));
|
schematic.put("Width", new ShortTag("Width", (short) width));
|
||||||
schematic.put("Length", new ShortTag("Length", (short) length));
|
schematic.put("Length", new ShortTag("Length", (short) length));
|
||||||
schematic.put("Height", new ShortTag("Height", (short) height));
|
schematic.put("Height", new ShortTag("Height", (short) height));
|
||||||
schematic.put("TileEntites", new ListTag("TileEntities",CompoundTag.class,tileEntites));
|
schematic.put("TileEntites", new ListTag("TileEntities",CompoundTag.class,tileEntites));
|
||||||
if (addBlocks != null) {
|
if (addBlocks != null) {
|
||||||
schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks));
|
schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks));
|
||||||
}
|
}
|
||||||
|
|
||||||
CompoundTag schematicTag = new CompoundTag("Schematic", schematic);
|
CompoundTag schematicTag = new CompoundTag("Schematic", schematic);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(file));
|
NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(file));
|
||||||
stream.writeTag(schematicTag);
|
stream.writeTag(schematicTag);
|
||||||
stream.close();
|
stream.close();
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
this.registerCustomDungeon(new File(file));
|
this.registerCustomDungeon(new File(file));
|
||||||
|
|
||||||
return new DungeonGenerator(0,file,true);
|
return new DungeonGenerator(0, file, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void generateDungeonlink(LinkData incoming)
|
public void generateDungeonlink(LinkData incoming)
|
||||||
{
|
{
|
||||||
//DungeonGenerator dungeon = mod_pocketDim.registeredDungeons.get(new Random().nextInt(mod_pocketDim.registeredDungeons.size()));
|
//DungeonGenerator dungeon = mod_pocketDim.registeredDungeons.get(new Random().nextInt(mod_pocketDim.registeredDungeons.size()));
|
||||||
|
|
@ -520,150 +434,143 @@ public class DungeonHelper
|
||||||
int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2;
|
int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2;
|
||||||
|
|
||||||
depth=depth-2;
|
depth=depth-2;
|
||||||
// DungeonGenerator
|
// DungeonGenerator
|
||||||
boolean flag = true;
|
boolean flag = true;
|
||||||
int count=10;
|
int count=10;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
if(dimHelper.dimList.get(incoming.destDimID)!=null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null)
|
if(dimHelper.dimList.get(incoming.destDimID)!=null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null)
|
||||||
{
|
{
|
||||||
mod_pocketDim.loader.init(incoming);
|
mod_pocketDim.loader.init(incoming);
|
||||||
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator;
|
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(incoming.destYCoord>15)
|
if(incoming.destYCoord>15)
|
||||||
{
|
|
||||||
do
|
|
||||||
{
|
|
||||||
count--;
|
|
||||||
flag = true;
|
|
||||||
dungeon = this.weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
|
|
||||||
|
|
||||||
if(depth<=1)
|
|
||||||
{
|
{
|
||||||
if(rand.nextBoolean())
|
do
|
||||||
{
|
{
|
||||||
dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
|
count--;
|
||||||
|
flag = true;
|
||||||
|
dungeon = this.weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
|
||||||
|
|
||||||
}
|
if(depth<=1)
|
||||||
else if(rand.nextBoolean())
|
{
|
||||||
{
|
if(rand.nextBoolean())
|
||||||
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(deadEnds.contains(dungeon)||exits.contains(dungeon))
|
|
||||||
{
|
{
|
||||||
flag=false;
|
dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
||||||
|
|
||||||
|
}
|
||||||
}
|
else if(deadEnds.contains(dungeon)||exits.contains(dungeon))
|
||||||
else if(depth<=3&&(deadEnds.contains(dungeon)||exits.contains(dungeon)||rand.nextBoolean()))
|
{
|
||||||
{
|
flag=false;
|
||||||
if(rand.nextBoolean())
|
}
|
||||||
{
|
|
||||||
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = mazes.get(rand.nextInt(mazes.size()));
|
|
||||||
}
|
|
||||||
else if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
flag=false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(rand.nextInt(3)==0&&!complexHalls.contains(dungeon))
|
|
||||||
{
|
|
||||||
if(rand.nextInt(3)==0)
|
|
||||||
{
|
|
||||||
dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
|
|
||||||
}
|
|
||||||
else if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(depth<4)
|
|
||||||
{
|
|
||||||
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
else if(depthWeight-depthWeight/2>depth-4&&(deadEnds.contains(dungeon)||exits.contains(dungeon)))
|
|
||||||
{
|
|
||||||
if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
|
|
||||||
}
|
|
||||||
else if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
|
|
||||||
}
|
|
||||||
else if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
flag=false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if(depthWeight>7&&hubs.contains(dungeon))
|
|
||||||
{
|
|
||||||
if(rand.nextInt(12)+5<depthWeight)
|
|
||||||
{
|
|
||||||
if(rand.nextBoolean())
|
|
||||||
{
|
|
||||||
dungeon = exits.get(rand.nextInt(exits.size()));
|
|
||||||
}
|
}
|
||||||
else if(rand.nextBoolean())
|
else if (depth<=3&&(deadEnds.contains(dungeon)||exits.contains(dungeon)||rand.nextBoolean()))
|
||||||
{
|
{
|
||||||
dungeon = deadEnds.get(rand.nextInt(deadEnds.size()));
|
if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = mazes.get(rand.nextInt(mazes.size()));
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
flag=false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else if(rand.nextInt(3)==0&&!complexHalls.contains(dungeon))
|
||||||
{
|
{
|
||||||
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
if(rand.nextInt(3)==0)
|
||||||
|
{
|
||||||
|
dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if(depth<4)
|
||||||
|
{
|
||||||
|
dungeon = hubs.get(rand.nextInt(hubs.size()));
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else if(depthWeight-depthWeight/2>depth-4&&(deadEnds.contains(dungeon)||exits.contains(dungeon)))
|
||||||
|
{
|
||||||
|
if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
flag=false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(depthWeight>7&&hubs.contains(dungeon))
|
||||||
|
{
|
||||||
|
if(rand.nextInt(12)+5<depthWeight)
|
||||||
|
{
|
||||||
|
if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = exits.get(rand.nextInt(exits.size()));
|
||||||
|
}
|
||||||
|
else if(rand.nextBoolean())
|
||||||
|
{
|
||||||
|
dungeon = deadEnds.get(rand.nextInt(deadEnds.size()));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
flag = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(depth>10&&hubs.contains(dungeon))
|
||||||
|
{
|
||||||
|
flag = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
while (!flag && count > 0);
|
||||||
{
|
|
||||||
flag = false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if(depth>10&&hubs.contains(dungeon))
|
else
|
||||||
{
|
{
|
||||||
flag = false;
|
dungeon = defaultUp;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
while(!flag&&count>0);
|
catch (Exception e)
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
dungeon= defaultUp;
|
if (weightedDungeonGenList.size() > 0)
|
||||||
}
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
if(weightedDungeonGenList.size()>0)
|
|
||||||
{
|
{
|
||||||
dungeon = weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
|
dungeon = weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
|
||||||
}
|
}
|
||||||
|
|
@ -673,22 +580,6 @@ public class DungeonHelper
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator = dungeon;
|
||||||
|
|
||||||
|
|
||||||
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dungeon;
|
|
||||||
//loader.generateSchematic(incoming,0,0,0);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in a new issue