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

state: Cleaned up isPhaseOver

Browse Source
This commit is contained in:
Nathan Woodburn
2023-04-26 18:06:37 +10:00
parent 8db5652ec6
commit 1ad2f6d3f3
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/comp1110/ass2/State.java
View File

@@ -396,20 +396,10 @@ public class State {
/** /**
* is the phase over? * is the phase over?
* Defaults to simple mode
*/ */
public boolean isPhaseOver() { public boolean isPhaseOver() {
return isPhaseOver(true);
boolean resourcesLeft = false;
for (Resource r : resources) {
if (!r.isClaimed() && r.getType() != 'S') resourcesLeft = true;
}
boolean moveLeft = false;
for (Player player : players) {
if (player.canPlay(this)) moveLeft = true;
}
return !resourcesLeft || !moveLeft;
} }
/** /**
@@ -423,7 +413,15 @@ public class State {
} }
boolean moveLeft = false; boolean moveLeft = false;
if (getCurrentPlayer().canPlay(this)) moveLeft = true; if (simple) {
if (getCurrentPlayer().canPlay(this)) moveLeft = true;
}
else
{
for (Player player : players) {
if (player.canPlay(this)) moveLeft = true;
}
}
return !resourcesLeft || !moveLeft; return !resourcesLeft || !moveLeft;