Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: public access now are private with setter/getter

Browse Source
This commit is contained in:
aleandro
2026-06-09 21:06:51 +02:00
parent 3318801913
commit cbf6cb3c5b
43 changed files with 351 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Game.java
+9 -9
View File
@@ -59,7 +59,7 @@ public class Game implements Serializable {
*/
public List<Totems>getAvailableTotems() {
List<Totems> totems=new ArrayList<>(List.of(Totems.values()));
playersList.forEach(player -> {if(player.totem!=null)totems.remove(player.totem);});
playersList.forEach(player -> {if(player.getTotem()!=null)totems.remove(player.getTotem());});
return totems;
}
@@ -92,7 +92,7 @@ public class Game implements Serializable {
{
return false;
}
player.totem=totem;
player.setTotem(totem);
Player nextPlayer= totemChoiceQueue.poll();
if(nextPlayer==null)
@@ -104,7 +104,7 @@ public class Game implements Serializable {
{
while(disconnetedPlayers.containsKey(nextPlayer)&& disconnetedPlayers.get(nextPlayer))
{
nextPlayer.totem=getAvailableTotems().get(new Random().nextInt(0,getAvailableTotems().size()));
nextPlayer.setTotem(getAvailableTotems().get(new Random().nextInt(0,getAvailableTotems().size())));
nextPlayer=totemChoiceQueue.poll();
if(nextPlayer==null)
{
@@ -154,7 +154,7 @@ public class Game implements Serializable {
}
else {
if (totemChoiceQueue.isEmpty()) {
player.totem = getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size()));
player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())));
} else {
totemChoiceQueue.add(player);
}
@@ -807,7 +807,7 @@ public class Game implements Serializable {
OptionalCardQueue = new LinkedList<>();
for (Player p :playersList) {
long count = p.buildingCards.stream().filter(x -> x.getEffectId() == 12).count();
long count = p.getBuildingCards().stream().filter(x -> x.getEffectId() == 12).count();
if (count > 0) {
if(disconnetedPlayers.containsKey(p)&& disconnetedPlayers.get(p))
{
@@ -929,22 +929,22 @@ public class Game implements Serializable {
sustenance.forEach(event->event.activateEvent(playersList));
playersList.forEach(p->{
int temp= p.builders.stream().mapToInt(Builder::getPrestigeValue).sum();
int temp= p.getBuilders().stream().mapToInt(Builder::getPrestigeValue).sum();
p.addPrestige(temp);
});
playersList.forEach(p->{
int temp=(int) p.inventors.stream().mapToInt(Inventor::Icon).distinct().count();
int temp=(int) p.getInventors().stream().mapToInt(Inventor::Icon).distinct().count();
p.addPrestige(temp*p.getNType(CharacterType.INVENTOR));
});
playersList.forEach(p->{
p.addPrestige(10 * (p.getNType(CharacterType.ARTIST)/2));
});
playersList.forEach(p->{
int temp= p.buildingCards.stream().mapToInt(BuildingCard::getPrestigeValue).sum();
int temp= p.getBuildingCards().stream().mapToInt(BuildingCard::getPrestigeValue).sum();
p.addPrestige(temp);
});
playersList.forEach(
p -> p.buildingCards.stream().filter(x -> x.getEffectType() == EffectType.FINAL).
p -> p.getBuildingCards().stream().filter(x -> x.getEffectType() == EffectType.FINAL).
forEach(x -> x.applyEffect(p))
);
currentState.GameStageUpdate(GameStages.ENDED);