diff --git a/pom.xml b/pom.xml index e22f05c..bbeec85 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ default-cli - it.polimi.ingsw.gc14/it.polimi.ingsw.gc14.HelloApplication + it.polimi.ingsw.gc14.HelloApplication app app app diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building2.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building2.java new file mode 100644 index 0000000..353ef84 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building2.java @@ -0,0 +1,23 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; +import it.polimi.ingsw.gc14.Model.Player; + +public class Building2 extends BuildingCard { + + public Building2(int era, int price) { + super(era,price); + effectType= EffectType.ON_EVENT; + effectId=2; + } + @Override + public BuildingCard clone() { + return new Building2(getEra(),getPrice()); + } + @Override + public void applyEffect(Player player) { + }; + +} \ No newline at end of file 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 new file mode 100644 index 0000000..cc8c021 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building3.java @@ -0,0 +1,22 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Player; + +public class Building3 extends BuildingCard { + + public Building3(int era, int price) { + super(era,price); + effectType= EffectType.END_TURN; + effectId=3; + } + @Override + public BuildingCard clone() { + return new Building3(getEra(),getPrice()); + } + @Override + public void applyEffect(Player player) { + }; + +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building5.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building5.java new file mode 100644 index 0000000..9c0ca54 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building5.java @@ -0,0 +1,22 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Player; + +public class Building5 extends BuildingCard { + + public Building5(int era, int price) { + super(era,price); + effectType= EffectType.ON_EVENT; + effectId=5; + } + @Override + public BuildingCard clone() { + return new Building5(getEra(),getPrice()); + } + @Override + public void applyEffect(Player player) { + }; + +} diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building6.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building6.java new file mode 100644 index 0000000..05082a8 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building6.java @@ -0,0 +1,22 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Player; + +public class Building6 extends BuildingCard { + + public Building6(int era, int price) { + super(era,price); + effectType= EffectType.ON_EVENT; + effectId=6; + } + @Override + public BuildingCard clone() { + return new Building6(getEra(),getPrice()); + } + @Override + public void applyEffect(Player player) { + }; + +} \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building7.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building7.java new file mode 100644 index 0000000..bbbbb70 --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building7.java @@ -0,0 +1,22 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; +import it.polimi.ingsw.gc14.Model.Player; + +public class Building7 extends BuildingCard { + + public Building7(int era, int price) { + super(era,price); + effectType= EffectType.ON_EVENT; + effectId=7; + } + @Override + public BuildingCard clone() { + return new Building7(getEra(),getPrice()); + } + @Override + public void applyEffect(Player player) { + }; + +} diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 99faaf9..af19c11 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -5,7 +5,6 @@ module it.polimi.ingsw.gc14 { requires org.controlsfx.controls; requires java.rmi; requires java.smartcardio; - requires it.polimi.ingsw.gc14; opens it.polimi.ingsw.gc14 to javafx.fxml; exports it.polimi.ingsw.gc14;