From 5614d800d80ab0174ef87d40a43ada1ecda1793d Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Fri, 13 Mar 2026 20:35:07 +0100 Subject: [PATCH] Fix Buildings --- .../Model/Cards/Building/BuildingEffect.java | 9 +++++++-- .../gc14/Model/Cards/Building/EffectType.java | 2 +- .../ingsw/gc14/Model/Cards/BuildingCard.java | 18 +++++++++++++++++- .../Cards/TribeCards/Characters/Inventor.java | 16 ++++++++-------- 4 files changed, 33 insertions(+), 12 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 2c9b4ad..f268c43 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 @@ -1,12 +1,17 @@ -package it.polimi.ingsw.gc14.Model.Cards.TribeCards.Building; +package it.polimi.ingsw.gc14.Model.Cards.Building; public abstract class BuildingEffect { + private int effectId; + public int getEffectId(){ + return effectId; + } private EffectType effectType; public EffectType getEffectType() { return effectType; } - public BuildingEffect (EffectType effectType) + public BuildingEffect (EffectType effectType,int effectId) { + this.effectId=effectId; this.effectType = effectType; } //TO DO diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/EffectType.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/EffectType.java index a586054..27863d3 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/EffectType.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/EffectType.java @@ -1,4 +1,4 @@ -package it.polimi.ingsw.gc14.Model.Cards.TribeCards.Building; +package it.polimi.ingsw.gc14.Model.Cards.Building; public enum EffectType { FINAL, CARDSET,INVENTORPAIR, ON_EVENT , END_TURN 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 d6ac132..6938a30 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 @@ -1,4 +1,20 @@ package it.polimi.ingsw.gc14.Model.Cards; -public class BuildingCard { +import it.polimi.ingsw.gc14.Model.Cards.Building.BuildingEffect; +import it.polimi.ingsw.gc14.Model.PlayableCard; + +public class BuildingCard extends PlayableCard { + private int price; + public int getPrice() { + return price; + } + private BuildingEffect buildingEffect; + public BuildingEffect getBuildingEffect() { + return buildingEffect; + } + private BuildingCard(int era,int price,BuildingEffect buildingEffect) { + super(era); + this.price = price; + this.buildingEffect = buildingEffect; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java index e83baa1..6dfb865 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Inventor.java @@ -3,30 +3,30 @@ import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Character; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; public class Inventor extends Character { - private int invenctionSymbol; + private int icon; /** * * @return Inventor Specific Symbol */ - public int InvenctionSymbol() { - return invenctionSymbol; + public int Icon() { + return icon; } /** * * @param Era inventor era - * @param invenctionSymbol inventor symbol + * @param icon inventor symbol * @throws IllegalArgumentException */ - public Inventor(int Era,int invenctionSymbol) throws IllegalArgumentException { + public Inventor(int Era,int icon) throws IllegalArgumentException { super(Era, CharacterType.INVENTOR); - if(invenctionSymbol<0 || invenctionSymbol>9) + if(icon<0 || icon>9) throw new IllegalArgumentException(); - this.invenctionSymbol = invenctionSymbol; + this.icon = icon; } @Override public String toString() { - return super.toString() + " Symbol:" + String.valueOf(invenctionSymbol); + return super.toString() + " Symbol:" + String.valueOf(icon); } }