EpicKnarvik97/Rogue101
EpicKnarvik97/Rogue101
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Push to prepare for pull

Browse Source
This commit is contained in:
Kristian Knarvik 2018-03-08 00:44:22 +01:00
parent 29ae17d535
commit eb924c7aff
2 changed files with 134 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/inf101/v18/rogue101/map/GameMap.java
View File

@ -269,27 +269,86 @@ public class GameMap implements IGameMap {
List<ILocation> locations = new ArrayList<>(); List<ILocation> locations = new ArrayList<>();
for (int i = 1; i <= dist; i++) { for (int i = 1; i <= dist; i++) {
ILocation current = loc; ILocation current = loc;
boolean collidedWest = false, collidedEast = false, collidedNorth = false, collidedSouth = false;
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
current = current.go(GridDirection.WEST); if (current.canGo(GridDirection.WEST)) {
current = current.go(GridDirection.NORTH); current = current.go(GridDirection.WEST);
} else {
collidedWest = true;
}
if (current.canGo(GridDirection.NORTH)) {
current = current.go(GridDirection.NORTH);
} else {
collidedNorth = true;
}
} }
for (int j = 0; j < i * 2 + 1; j++) { for (int j = 0; j < i * 2 + 1; j++) {
locations.add(current); if ((collidedNorth && collidedWest) && j < i + 1) {
if (j < i * 2) {
current = current.go(GridDirection.EAST); } else if (collidedNorth && j < i * 2) {
if (current.canGo(GridDirection.EAST)) {
current = current.go(GridDirection.EAST);
} else {
collidedEast = true;
break;
}
} else {
if (collidedWest && !collidedNorth && j < i * 2 + 1 - i || !collidedWest || collidedNorth) {
if (j > 0) {
if (current.canGo(GridDirection.EAST)) {
current = current.go(GridDirection.EAST);
} else {
collidedEast = true;
break;
}
}
locations.add(current);
}
} }
} }
for (int j = 0; j < i * 2; j++) { for (int j = 0; j < i * 2; j++) {
current = current.go(GridDirection.SOUTH); if (collidedNorth && j < i) {
locations.add(current);
} else if (collidedEast && j < i + 1) {
if (current.canGo(GridDirection.SOUTH)) {
current = current.go(GridDirection.SOUTH);
} else {
collidedSouth = true;
break;
}
} else {
if (current.canGo(GridDirection.SOUTH)) {
current = current.go(GridDirection.SOUTH);
locations.add(current);
} else {
collidedSouth = true;
break;
}
}
} }
for (int j = 0; j < i * 2; j++) { for (int j = 0; j < i * 2; j++) {
current = current.go(GridDirection.WEST); if (collidedEast && j < i) {
locations.add(current);
} else if (collidedSouth && j < i) {
if (current.canGo(GridDirection.WEST)) {
current = current.go(GridDirection.WEST);
}
} else {
if (current.canGo(GridDirection.WEST)) {
current = current.go(GridDirection.WEST);
locations.add(current);
}
}
} }
for (int j = 0; j < i * 2 - 1; j++) { for (int j = 0; j < i * 2 - 1; j++) {
current = current.go(GridDirection.NORTH); if (collidedSouth || collidedWest) {
locations.add(current);
} else {
if (current.canGo(GridDirection.NORTH)) {
current = current.go(GridDirection.NORTH);
locations.add(current);
}
}
} }
} }
return locations; return locations;

65
src/inf101/v18/rogue101/tests/GameMapTest.java
View File

@ -28,7 +28,7 @@ public class GameMapTest {
@Test @Test
public void testGetNeighbours() { public void testGetNeighbours() {
GameMap gameMap = new GameMap(20, 20); GameMap gameMap = new GameMap(20, 20);
ILocation location = gameMap.getLocation(0, 0); ILocation location = gameMap.getLocation(10, 10);
List<ILocation> neighbours = gameMap.getNeighbourhood(location, 1); List<ILocation> neighbours = gameMap.getNeighbourhood(location, 1);
for (ILocation neighbour : neighbours) { for (ILocation neighbour : neighbours) {
@ -48,4 +48,67 @@ public class GameMapTest {
} }
assertEquals(48, neighbours.size()); assertEquals(48, neighbours.size());
} }
@Test
public void testNeighboursOutOfBounds() {
GameMap gameMap = new GameMap(20, 20);
ILocation location = gameMap.getLocation(0, 0);
List<ILocation> neighbours = gameMap.getNeighbourhood(location, 3);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(15, neighbours.size());
location = gameMap.getLocation(19, 0);
neighbours = gameMap.getNeighbourhood(location, 3);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(15, neighbours.size());
location = gameMap.getLocation(19, 19);
neighbours = gameMap.getNeighbourhood(location, 3);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(15, neighbours.size());
location = gameMap.getLocation(0, 19);
neighbours = gameMap.getNeighbourhood(location, 3);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(15, neighbours.size());
location = gameMap.getLocation(0, 10);
neighbours = gameMap.getNeighbourhood(location, 3);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(27, neighbours.size());
location = gameMap.getLocation(19, 10);
neighbours = gameMap.getNeighbourhood(location, 3);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(27, neighbours.size());
location = gameMap.getLocation(10, 0);
neighbours = gameMap.getNeighbourhood(location, 3);
System.out.println(neighbours);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(27, neighbours.size());
location = gameMap.getLocation(10, 19);
neighbours = gameMap.getNeighbourhood(location, 3);
System.out.println(neighbours);
for (ILocation neighbour : neighbours) {
assertTrue(location.gridDistanceTo(neighbour) <= 3);
}
assertEquals(27, neighbours.size());
}
} }