From 90566787eb0d775bc5ae2079f80dc1b52ea7d3a1 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sun, 15 Mar 2026 17:55:24 +0100 Subject: [PATCH] Fix->Building --- .../Model/Cards/Building/Effects/Building0.java | 16 +++++++++------- .../ingsw/gc14/Model/Cards/BuildingCard.java | 12 ++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0.java index bb3b869..61671f8 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0.java @@ -13,8 +13,13 @@ public class Building0 extends BuildingCard { boolean purchased ; int numSet; - public Building0(int era,int price,EffectType effectType) { - super(era,price,0,EffectType.CARDSET); + + + + public Building0(int era,int price) { + super(era,price); + effectType=EffectType.CARDSET; + effectId=0; purchased = false; numSet = 0; } @@ -29,18 +34,15 @@ public class Building0 extends BuildingCard { HashMap map = new HashMap(); for(CharacterType type : CharacterType.values()) { - map.put(type,0); + map.merge(type, 1, Integer::sum); } - for(Character c : player.getCharacterCards()) - { - } purchased = true; } @Override public BuildingCard clone() { - return new Building0(getEra(),getPrice(),getEffectType()); + return new Building0(getEra(),getPrice()); } @Override public void applyEffect(ArrayList players) { diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java index 200b3c9..bde9def 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java @@ -12,19 +12,19 @@ public abstract class BuildingCard extends PlayableCard implements Cloneable { return price; } - private int effectId; - public int getEffectId(){ + protected EffectType effectType; + protected int effectId; + + public int getEffectId() { return effectId; } - private EffectType effectType; public EffectType getEffectType() { return effectType; } - public BuildingCard(int era,int price,int effectId,EffectType effectType) { + + public BuildingCard(int era,int price) { super(era); this.price = price; - this.effectId=effectId; - this.effectType = effectType; } @Override