Commit #55: Improved use of A* to connect caves; turned of dangerous …

…debug code
BlackJar72 · Jul 15, 2015 · 8320b4a · 8320b4a
1 parent 2945c1f
commit 8320b4a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/java/jaredbgreat/dldungeons/planner/astar/DoorChecker.java b/java/jaredbgreat/dldungeons/planner/astar/DoorChecker.java
@@ -248,7 +248,8 @@ public static void processDoors3(Dungeon dungeon, Room room) {
 
 	public static void caveConnector(Dungeon dungeon, Room cave) {
 		for(Doorway door : cave.doors) {
-			new AStar(cave, dungeon, cave.midpoint, dungeon.rooms.get(door.otherside).midpoint).seek();
+			//new AStar(cave, dungeon, cave.midpoint, dungeon.rooms.get(door.otherside).midpoint).seek();
+			new AStar2(dungeon, cave, dungeon.rooms.get(door.otherside)).seek();
 		}
 	}
 }
diff --git a/java/jaredbgreat/dldungeons/planner/mapping/MapMatrix.java b/java/jaredbgreat/dldungeons/planner/mapping/MapMatrix.java
@@ -99,15 +99,15 @@ public void build(Dungeon dungeon) {
 					 //DoomlikeDungeons.profiler.startTask("Building Room " + room[i][j] + " column " + i + ", " +j);
 					 Room theRoom = dungeon.rooms.get(room[i][j]);
 
-					 if(astared[i][j]) {
-						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, lapis);
-					 } else if(isDoor[i][j]) {
-						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, slab);
-					 } else if(isWall[i][j]) {
-						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, glass);
-					 } else {
-						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, glow);
-					 }
+//					 if(astared[i][j]) {
+//						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, lapis);
+//					 } else if(isDoor[i][j]) {
+//						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, slab);
+//					 } else if(isWall[i][j]) {
+//						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, glass);
+//					 } else {
+//						 DBlock.placeBlock(world, shiftX + i, 96, shiftZ +j, glow);
+//					 }
 
 					 // Lower parts of the room
 

diff --git a/resources/jaredbgreat/dldungeons/res/themes/dank.cfg b/resources/jaredbgreat/dldungeons/res/themes/dank.cfg
@@ -4,7 +4,7 @@ Version 1.8
 # (BEACH is consider the same as WATER here.)
 #
 # Biomes types where it should be used
-biomes =  FOREST, SWAMP, WET, JUNGLE
+biomes =  SWAMP, WET, JUNGLE
 # Biome types where it should never appear, even if the biome also fit one of the above types
 NotInBiomes =  NETHER, END, DRY