From a3d9272552907286f0b9d1305b2d809c05113fe4 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sat, 14 Mar 2026 20:27:00 +0100 Subject: [PATCH] Update Effect --- .../Model/Cards/Building/BuildingEffect.java | 4 ++- .../Model/Cards/Building/Effects/Effect0.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect1.java | 10 ++++-- .../Cards/Building/Effects/Effect10.java | 10 ++++-- .../Cards/Building/Effects/Effect11.java | 10 ++++-- .../Cards/Building/Effects/Effect12.java | 10 ++++-- .../Cards/Building/Effects/Effect13.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect2.java | 31 ++++++++++++++++++- .../Model/Cards/Building/Effects/Effect3.java | 8 +++-- .../Model/Cards/Building/Effects/Effect4.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect5.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect6.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect7.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect8.java | 10 ++++-- .../Model/Cards/Building/Effects/Effect9.java | 10 ++++-- 15 files changed, 123 insertions(+), 40 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/BuildingEffect.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/BuildingEffect.java index 35dcec0..a8581df 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/BuildingEffect.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/BuildingEffect.java @@ -2,6 +2,8 @@ package it.polimi.ingsw.gc14.Model.Cards.Building; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public abstract class BuildingEffect { private int effectId; public int getEffectId(){ @@ -17,5 +19,5 @@ public abstract class BuildingEffect { this.effectType = effectType; } //TO DO - public abstract void applyEffect(Player player); + public abstract void applyEffect(ArrayList players); } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect0.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect0.java index e45625d..b326914 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect0.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect0.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect0 extends BuildingEffect { public Effect0() { - super(EffectType.FINAL,0); + super(EffectType.CARDSET,0); } @Override - public void applyEffect(Player player) { - + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect1.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect1.java index 08b9c59..9337832 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect1.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect1.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect1 extends BuildingEffect { public Effect1() { - super(EffectType.FINAL,0); + super(EffectType.ON_EVENT,0); } @Override - public void applyEffect(Player player) { - + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect10.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect10.java index 32d8d20..41d205b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect10.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect10.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect10 extends BuildingEffect { public Effect10() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect11.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect11.java index d027a53..76108d6 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect11.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect11.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect11 extends BuildingEffect { public Effect11() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect12.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect12.java index b12c9d9..28f58bd 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect12.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect12.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect12 extends BuildingEffect { public Effect12() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect13.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect13.java index d16bcb3..5cb90f2 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect13.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect13.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect13 extends BuildingEffect { public Effect13() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect2.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect2.java index c8d0219..c4f765b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect2.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect2.java @@ -2,15 +2,44 @@ package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.TribeCard; +import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.Shaman; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect2 extends BuildingEffect { public Effect2() { super(EffectType.FINAL,0); } @Override - public void applyEffect(Player player) { + public void applyEffect(ArrayList players) { + int max=0,temp; + for (Player p : players) { + temp=0; + for(TribeCard t : p.getTribeCards()) + { + if(t instanceof Shaman) + { + temp=((Shaman) t).getIcon(); + if(temp>=max) + max=temp; + } + } + } + for (Player p : players) { + for(TribeCard t : p.getTribeCards()) + { + if(t instanceof Shaman) + { + if(((Shaman) t).getIcon() players) { + for (Player p : players) { + p.addFood(3); + } }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect4.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect4.java index 80103ed..444cb5e 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect4.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect4.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect4 extends BuildingEffect { public Effect4() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect5.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect5.java index a6f277a..9493e7c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect5.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect5.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect5 extends BuildingEffect { public Effect5() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect6.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect6.java index 49e0fd4..37f8736 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect6.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect6.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect6 extends BuildingEffect { public Effect6() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect7.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect7.java index 53d3b91..0613f94 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect7.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect7.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect7 extends BuildingEffect { public Effect7() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect8.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect8.java index 173bb5d..08c9f1a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect8.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect8.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect8 extends BuildingEffect { public Effect8() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect9.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect9.java index 6d0a15a..c95ea73 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect9.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Effect9.java @@ -4,13 +4,17 @@ import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Player; +import java.util.ArrayList; + public class Effect9 extends BuildingEffect { public Effect9() { super(EffectType.FINAL, 0); } @Override - public void applyEffect(Player player) { - - } + public void applyEffect(ArrayList players) { + for (Player p : players) { + p.addFood(3); + } + }; }