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

game: Squashed various bugs

Browse Source
This commit is contained in:
Nathan Woodburn 2023-05-11 12:36:08 +10:00
parent a19f6e371c
commit 7c8dac2aff
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/comp1110/ass2/gui/Game.java
View File

@ -169,6 +169,9 @@ public class Game extends Application {
sendMessage("You have placed all your villages"); sendMessage("You have placed all your villages");
return; return;
} }
} else if (currentGame.getCurrentPlayer().getSettlers().length >= (40-(currentGame.getNumPlayers()*5))){
sendMessage("You have placed all your settlers");
return;
} }
// If the move is valid, do it // If the move is valid, do it
@ -232,24 +235,27 @@ public class Game extends Application {
String message = ""; String message = "";
if (!currentGame.isPhaseOver()){ if (!currentGame.isPhaseOver()){
Player player = currentGame.getCurrentPlayer(); Player player = currentGame.getCurrentPlayer();
player.doAIMove(currentGame); if (player.doAIMove(currentGame)) {
if (currentGame.isPhaseOver()){ if (currentGame.isPhaseOver()) {
message = "Starting next phase"; message = "Starting next phase";
} }
if (!player.getLastMove().equals(new Coord(-1,-1))){ if (!player.getLastMove().equals(new Coord(-1, -1))) {
Coord lastMove = player.getLastMove(); Coord lastMove = player.getLastMove();
if (currentGame.isStone(lastMove)){ if (currentGame.isStone(lastMove)) {
for (Resource resource : currentGame.getResources()) { for (Resource resource : currentGame.getResources()) {
if (resource.getCoord().equals(lastMove) ) { if (resource.getCoord().equals(lastMove)) {
message = "AI "+ player.getPlayerID() + " picked up " + resource.getTypeString().toLowerCase(); message = "AI " + player.getPlayerID() + " picked up " + resource.getTypeString().toLowerCase();
} }
} }
} } else {
else {
message = "AI " + player.getPlayerID() + " placed at " + lastMove.toString(); message = "AI " + player.getPlayerID() + " placed at " + lastMove.toString();
} }
} }
} else {
message += "AI " + player.getPlayerID() + " passed";
currentGame.nextPlayer();
}
} }
if (currentGame.isPhaseOver()){ if (currentGame.isPhaseOver()){
currentGame.scorePhase(); currentGame.scorePhase();
@ -607,6 +613,7 @@ public class Game extends Application {
hb.setSpacing(10); hb.setSpacing(10);
hb.setLayoutX(50); hb.setLayoutX(50);
hb.setLayoutY(WINDOW_HEIGHT - 50); hb.setLayoutY(WINDOW_HEIGHT - 50);
controls.getChildren().clear();
controls.getChildren().add(hb); controls.getChildren().add(hb);
} }