maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some convenience methods to Cuboid to inset and outset the regions

Browse Source 
Modified plot search algorithm to be more accurate but slower
Added a getRow and getCol to PlayerHome
This commit is contained in:
Tom Hicks
2012-02-18 18:29:02 -08:00
parent 8d4c1623e0
commit 83b84348e7
3 changed files with 65 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/Cuboid.java
View File

@@ -122,6 +122,10 @@ public class Cuboid implements Comparable<Cuboid> {
return compareBlockVectors(v1, v2) < 0;
}
public Cuboid inset(int amount){
return inset(amount, amount, amount);
}
public Cuboid inset(int x, int z){
return inset(x, 0, z);
}
@@ -146,4 +150,16 @@ public class Cuboid implements Comparable<Cuboid> {
public int getMaxZ(){return maxZ;}
public void setMaxZ(int maxZ){this.maxZ = maxZ;}
public Cuboid outset(int amount) {
return outset(amount, amount, amount);
}
public Cuboid outset(int x, int z){
return outset(x, 0, z);
}
private Cuboid outset(int x, int y, int z) {
return new Cuboid(this.minX - x, this.minY - y, this.minZ - z, this.maxX + x, this.maxY + y, this.maxZ + z);
}
}

123
Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/MetropolisPlugin.java
View File

@@ -259,102 +259,57 @@ public class MetropolisPlugin extends JavaPlugin {
}
}
public boolean isBlockOccupied(int row, int col){
for(PlayerHome home : _occupiedHomes){
if(home.getRow(roadWidth, plotSizeZ) == row && home.getCol(roadWidth, plotSizeX) == col){
return true;
}
}
return false;
}
private Cuboid findNextUnownedHomeRegion() {
if(size <= 2){size=3;}
int homeIndex = 0;
int rowMin = -size/2;
int rowMax = size/2;
int colMin = -size/2;
int colMax = size/2;
int row = 0;
int col = 0;
int ring = 0;
boolean done = false;
log.info(String.format("size: %d, rowMin: %d, rowMax: %d, colMin: %d, colMax: %d", size, rowMin, rowMax, colMin, colMax));
while(!done){
row = -ring;
col = -ring;
int row = rowMin;
int col = colMin;
if(_occupiedHomes.size() == 0){return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));}
PlayerHome home = _occupiedHomes.get(homeIndex);
for(col=colMin; col <= colMax; col++){
for(row=rowMin; row<= rowMax; row++){
if(row != 0 || col != 0){
log.info(String.format("row: %d, col: %d", row, col));
if(home == null){
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}
else if(Cuboid.isBlockLessThan(getPlotMin(row, col), home.getPlotMin(roadWidth))){
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}else{
homeIndex++;
if(homeIndex < _occupiedHomes.size()){
home = _occupiedHomes.get(homeIndex);
}else{
home = null;
}
}
for(col = -ring; col <= ring; col++){
if(!isBlockOccupied(row, col)){
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}
}
}
resizeCityRegion();
return new Cuboid(getPlotMin(-size/2, -size/2), getPlotMax(-size/2, -size/2));
/*
log.info(String.valueOf(size));
int homeIndex = 0;
if(_occupiedHomes.size() == 0){
log.info("_occupiedHomes.size is 0");
if(size < 1){
size=1;
}
expandCityRegion();
log.info(String.format("row: %d, col: %d", -1, -1));
return new Cuboid(getPlotMin(-1, -1), getPlotMax(-1, -1));
}
PlayerHome home = _occupiedHomes.get(homeIndex);
int row=0;
int col=0;
log.info(String.format("row-min: %d, row-max: %d, col-min: %d, col-max: %d", -size/2, size/2, -size/2, size/2));
for(row = -size/2; row<=size/2; row++){
for(col = -size/2; col <= size/2; col++){
log.info(String.format(
"checking row: %d, col: %d, homeIndex: %d, home is %s",
row,
col,
homeIndex,
home==null?"null":"not null"));
if(home == null){
log.info("home is null");
expandCityRegion();
log.info(String.format("row: %d, col: %d", row, col));
col = ring;
for(row=-ring + 1; row < ring; row++){
if(!isBlockOccupied(row, col)){
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}else if(Cuboid.isBlockLessThan(getPlotMin(row, col), home.getCuboid().getMin())){
log.info("Cuboid.isBlockLessThan(getPlotMin(row, col), home.getCuboid().getMin())");
log.info(String.format("row: %d, col: %d", row, col));
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}else{
log.info("else");
homeIndex++;
if(homeIndex < _occupiedHomes.size()){
home = _occupiedHomes.get(homeIndex);
}else{
home = null;
}
}
}
row = ring;
for(col = ring; col >= -ring; col--){
if(!isBlockOccupied(row, col)){
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}
}
col = -ring;
for(col = ring; col > -ring; col--){
if(!isBlockOccupied(row, col)){
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
}
}
ring++;
}
size+=2;
log.info(String.format("row: %d, col: %d", row, col));
return new Cuboid(getPlotMin(row, col), getPlotMax(row, col));
//log.info(String.format("row: %d, col: %d", -size/2, -size/2));
//return new Cuboid(getPlotMin(-size/2, -size/2), getPlotMax(-size/2, -size/2));
/**/
}
private void resizeCityRegion() {

9
Metropolis/src/com/majinnaibu/bukkit/plugins/metropolis/PlayerHome.java
View File

@@ -115,4 +115,13 @@ public class PlayerHome implements Comparable<PlayerHome>{
return sb.toString();
}
public int getRow(int roadWidth, int plotSizeZ){
BlockVector min = getPlotMin(roadWidth);
return min.getBlockZ() / plotSizeZ;
}
public int getCol(int roadWidth, int plotSizeX){
return getPlotMin(roadWidth).getBlockX() / plotSizeX;
}
}