From f3418b8aeee894700916ee52a1320a4b57860476 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Sun, 15 Mar 2026 19:43:18 +0100 Subject: [PATCH] Fix: EffectType Enum --- .../it/polimi/ingsw/gc14/Model/Cards/Building/EffectType.java | 2 +- .../ingsw/gc14/Model/Cards/Building/Effects/Building0.java | 2 +- .../ingsw/gc14/Model/Cards/Building/Effects/Building3.java | 2 +- .../ingsw/gc14/Model/Cards/Building/Effects/Building4.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 27863d3..8fbe48c 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,5 +1,5 @@ package it.polimi.ingsw.gc14.Model.Cards.Building; public enum EffectType { - FINAL, CARDSET,INVENTORPAIR, ON_EVENT , END_TURN + FINAL, CARD_SET,INVENTOR_PAIR, ON_EVENT , ON_END_TURN, ON_ROUND_END } 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 b7c5fc4..026068e 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 @@ -18,7 +18,7 @@ public class Building0 extends BuildingCard { public Building0(int era,int price) { super(era,price); - effectType=EffectType.CARDSET; + effectType=EffectType.CARD_SET; effectId=0; purchased = false; numSet = 0; diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building3.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building3.java index cc8c021..a4bb09e 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building3.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building3.java @@ -8,7 +8,7 @@ public class Building3 extends BuildingCard { public Building3(int era, int price) { super(era,price); - effectType= EffectType.END_TURN; + effectType= EffectType.ON_END_TURN; effectId=3; } @Override diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building4.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building4.java index bd3ffea..1c27142 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building4.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building4.java @@ -14,7 +14,7 @@ public class Building4 extends BuildingCard { int numPair; public Building4(int era, int price) { super(era,price); - effectType= EffectType.INVENTORPAIR; + effectType= EffectType.INVENTOR_PAIR; effectId=4; }