From dd549d01eec9f9ce98097068562078a5ae522a8f Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Thu, 19 Mar 2026 18:21:27 +0100 Subject: [PATCH] Fixed: Character NMin --- .../it/polimi/ingsw/gc14/Model/Cards/TribeCard.java | 9 +++++++++ .../gc14/Model/Cards/TribeCards/Character.java | 4 ++++ .../Model/Cards/TribeCards/Characters/Artist.java | 3 +++ .../Model/Cards/TribeCards/Characters/Builder.java | 13 +++++++++++++ .../Cards/TribeCards/Characters/Gatherers.java | 3 +++ .../Model/Cards/TribeCards/Characters/Hunter.java | 4 ++++ .../Model/Cards/TribeCards/Characters/Inventor.java | 6 ++++++ .../Model/Cards/TribeCards/Characters/Shaman.java | 4 ++++ 8 files changed, 46 insertions(+) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCard.java index eb41dfb..d8576c6 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCard.java @@ -7,7 +7,16 @@ public abstract class TribeCard extends PlayableCard { public boolean IsEventCard() { return isEventCard; } + + private int nMin=0; + public int getNMin() { + return nMin; + } public TribeCard(int Era,boolean IsEventCard) { super(Era); } + public TribeCard(int Era,boolean IsEventCard,int nMin) { + super(Era); + this.nMin=nMin; + } } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java index a02a098..9717f5b 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Character.java @@ -14,6 +14,10 @@ public abstract class Character extends TribeCard implements Cloneable { super(Era,false ); this.type = type; } + public Character(int Era, CharacterType type,int nMin){ + super(Era,false ,nMin); + this.type = type; + } @Override public String toString() { diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java index cbbc0b0..b7580ad 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Artist.java @@ -13,6 +13,9 @@ public class Artist extends Character { public Artist(int Era) { super(Era, CharacterType.ARTIST); } + public Artist(int Era,int nMin) { + super(Era, CharacterType.ARTIST,nMin); + } public Artist(Artist copy){ this(copy.getEra()); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java index b556169..2698409 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java @@ -31,6 +31,19 @@ public class Builder extends Character } this.prestigeValue = prestigeValue; } + + public Builder(int Era, int reductionValue, int prestigeValue,int nMin) throws IllegalArgumentException { + super(Era,CharacterType.BUILDER,nMin); + if(reductionValue < 0) { + throw new IllegalArgumentException(); + } + this.reductionValue = reductionValue; + + if(prestigeValue < 0) { + throw new IllegalArgumentException(); + } + this.prestigeValue = prestigeValue; + } public Builder(Builder copy) { this(copy.getEra(),copy.getReductionValue(), copy.getPrestigeValue()); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java index c1a4400..475d2b2 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java @@ -13,6 +13,9 @@ public class Gatherers extends Character { public Gatherers(int Era) { super(Era, CharacterType.GATHERERS); } + public Gatherers(int Era,int nMin) { + super(Era, CharacterType.GATHERERS,nMin); + } @Override public String toString() { return super.toString(); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java index 69a65f0..9c39406 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java @@ -24,6 +24,10 @@ public class Hunter extends Character { super(Era, CharacterType.HUNTER); this.icon = icon; } + public Hunter(int Era, boolean icon, int nMin) { + super(Era, CharacterType.HUNTER,nMin); + this.icon = icon; + } @Override public String toString() { 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 f86678d..7a09298 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 @@ -26,6 +26,12 @@ public class Inventor extends Character { throw new IllegalArgumentException(); this.icon = icon; } + public Inventor(int Era,int icon,int nMin) throws IllegalArgumentException { + super(Era, CharacterType.INVENTOR,nMin); + if(icon<0 || icon>9) + throw new IllegalArgumentException(); + this.icon = icon; + } @Override public String toString() { return super.toString() + " Symbol:" + String.valueOf(icon); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java index 9c66b32..3df07f8 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java @@ -26,6 +26,10 @@ public class Shaman extends Character { super(Era, CharacterType.SHAMAN); this.icon = icon; } + public Shaman(int Era, int icon, int nMin) { + super(Era, CharacterType.SHAMAN,nMin); + this.icon = icon; + } @Override public String toString() { return super.toString() + "icon: " + String.valueOf(icon);