From 96956141a0f1880bc4d175e25269964feee0a95b Mon Sep 17 00:00:00 2001 From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com> Date: Sun, 15 Mar 2026 22:42:15 +0100 Subject: [PATCH] Building9, Building11 added and Sustenence fix --- .../Cards/Building/Effects/Building1.java | 6 ++-- .../Cards/Building/Effects/Building11.java | 34 +++++++++++++++++++ .../Cards/Building/Effects/Building9.java | 21 ++++++++++++ .../Cards/TribeCards/Events/Sustenance.java | 5 ++- 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java create mode 100644 src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building9.java diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java index 4eddc47..533a850 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java @@ -14,9 +14,9 @@ public class Building1 extends BuildingCard { public Building1(int era, int price, CharacterType icon) { super(era,price); - effectType= EffectType.ON_EVENT; - effectId=1; - this.icon=icon; + effectType = EffectType.ON_EVENT; + effectId = 1; + this.icon = icon; } @Override public BuildingCard clone() { diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java new file mode 100644 index 0000000..3e74e19 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java @@ -0,0 +1,34 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; +import it.polimi.ingsw.gc14.Model.Player; + +import java.util.ArrayList; + +public class Building11 extends BuildingCard { + private CharacterType icon ; + public CharacterType getIcon() {return icon;} + private int PrestigeMul; + public int getPrestigeMul() {return PrestigeMul;} + + + public Building11(int era, int price, CharacterType icon, int prestigeMul) { + super(era,price); + effectType = EffectType.FINAL; + effectId = 11; + this.icon = icon; + this.PrestigeMul = prestigeMul; + } + @Override + public BuildingCard clone() { + return new Building11(getEra(),getPrice(), getIcon(), getPrestigeMul()); + } + @Override + public void applyEffect(Player player) { + int Count = (int) player.getCharacterCards().stream() + .filter(x -> x.getType().equals(this.getIcon())).count(); + player.addPrestige(Count * this.getPrestigeMul()); + } +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building9.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building9.java new file mode 100644 index 0000000..0a4da1e --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building9.java @@ -0,0 +1,21 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Player; + +public class Building9 extends BuildingCard{ + + public Building9(int era, int price) { + super(era,price); + effectType = EffectType.ON_EVENT; + effectId=9; + } + @Override + public BuildingCard clone() { + return new Building9(getEra(),getPrice()); + } + @Override + public void applyEffect(Player player) { + }; +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java index 9dc9747..57aa8fa 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java @@ -11,7 +11,10 @@ import java.util.ArrayList; import java.util.stream.Collectors; public class Sustenance extends EventCard { - int PrestigeDebt; + private int PrestigeDebt; + public int getPrestigeDebt() { + return PrestigeDebt; + } public Sustenance(int Era, int PrestigeDebt) { super(Era, EventType.SUSTENANCE);