nathanwoodburn/comp1110-ass2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Task 7 Progress so far

Browse Source 
Signed-off-by: Immanuel Alvaro Bhirawa <u7280427@anu.edu.au>
This commit is contained in:
Immanuel Alvaro Bhirawa
2023-04-12 23:32:30 +10:00
parent 0da848fdf2
commit cc951302f6
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/comp1110/ass2/BlueLagoon.java
View File

@@ -321,9 +321,11 @@ public class BlueLagoon {
// If the moveCoords is on island pos, return false // If the moveCoords is on island pos, return false
// if(coordsContainer.contains(moveCoords)) return false; // if(coordsContainer.contains(moveCoords)) return false;
if(coordsContainer.contains(moveCoords)) { // if(coordsContainer.contains(moveCoords)) {
//
} // }
if(!isAdjacent(moveCoords, settlerCoords) ||
!isAdjacent(moveCoords, villageCoords)) return false;
break; break;
case "S": case "S":
@@ -331,15 +333,24 @@ public class BlueLagoon {
return true; return true;
} }
boolean isAdjacent (String centerCoords, ArrayList<String> coords) { private static boolean isAdjacent(String centerCoords, ArrayList<String> coordsContainer) {
int[] leftTop = new int[2]; String[] coordsSplit = centerCoords.split(",");
int[] rightTop = new int[2]; int mainX = Integer.parseInt(coordsSplit[0]);
int[] rightCenter = new int[2]; int mainY = Integer.parseInt(coordsSplit[1]);
int[] leftCenter = new int[2];
int[] rightBot = new int[2];
int[] leftBot = new int[2];
return true; int[][] adjacentModifiers = {
{0 + mainX % 2 * -1, -1},
{1 + mainX % 2 * -1, -1},
{-1, 0}, {1, 0},
{0 + mainX % 2 * -1, 1},
{1 + mainX % 2 * -1, 1},
};
for (int[] mod : adjacentModifiers)
if (coordsContainer.contains(String.format("%s,%s", mainX + mod[0], mainY + mod[1])))
return true;
return false;
} }
// if(parseSplit[i].equals("T")){ // if(parseSplit[i].equals("T")){
// villageCounter++; // villageCounter++;