ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing Method checkResourceToBuild

This commit is contained in:
schrom01 2021-12-07 11:44:51 +01:00
parent da6913d997
commit 4c56518ba0
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ch/zhaw/catan/Player.java
View File

@ -95,10 +95,17 @@ public class Player {
//returns true if player has enough resources else false
private boolean checkRessourceToBuild(List<Config.Resource> liste) {
for (Config.Resource resource : liste) {
int possesion = resources.get(resource);
if (possesion == 0) {
private boolean checkResourceToBuild(List<Config.Resource> list) {
HashMap<Config.Resource, Integer> costs = new HashMap<>();
for(Config.Resource resource : list){
if(costs.containsKey(resource)){
costs.put(resource, costs.get(resource) + 1);
} else {
costs.put(resource, 1);
}
}
for (Config.Resource resource : costs.keySet()) {
if (resources.get(resource) < costs.get(resource)) {
return false;
}
}
@ -106,5 +113,4 @@ public class Player {
}
}

10
src/ch/zhaw/catan/SiedlerGame.java
View File

@ -479,11 +479,11 @@ public class SiedlerGame {
*/
public boolean tradeWithBankFourToOne(Resource offer, Resource want) {
Player player = allPlayers.get(activePlayer);
if(player.getSpecificResource(offer) >= FOUR_TO_ONE_TRADE_OFFER && addResourcesToPlayer(player, want, FOUR_TO_ONE_TRADE_WANT)){
substractResourceFromPlayer(player, offer, FOUR_TO_ONE_TRADE_OFFER);
return true;
}
return false;
if(player.getSpecificResource(offer) >= FOUR_TO_ONE_TRADE_OFFER && addResourcesToPlayer(player, want, FOUR_TO_ONE_TRADE_WANT)){
substractResourceFromPlayer(player, offer, FOUR_TO_ONE_TRADE_OFFER);
return true;
}
return false;
}
/**