School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changement des classes types par des enum

Browse Source
This commit is contained in:
Paul Gross
2020-05-06 16:15:36 +02:00
parent 1b554ad75c
commit 24cc4909bf
14 changed files with 152 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/carte/CartePiochable.java
View File

@@ -4,28 +4,33 @@ import java.io.Serializable;
import condition.Condition;
import effet.Effet;
import effet.EffetChoisirCible;
import effet.EffetSelf;
import main.Joueur;
import main.Type;
public class CartePiochable<T extends Type> extends CarteCondition implements Serializable{
public class CartePiochable extends CarteCondition implements Serializable{
private static final long serialVersionUID = 2391013233873750967L;
private Type type;
public enum Type{
LUMIERE,
TENEBRE,
VISION
}
public CartePiochable(String nom, String description) {
public CartePiochable(Type t, String nom, String description) {
super(nom, description);
}
public CartePiochable(Effet e, Condition c) {
public CartePiochable(Type t, Effet e, Condition c) {
super();
this.setEffet(e);
this.setCondition(c);
}
public CartePiochable(Effet effet) {
public CartePiochable(Type t, Effet effet) {
super();
this.type = t;
this.setEffet(effet);
this.setCondition(new Condition());
}
@@ -37,4 +42,8 @@ public class CartePiochable<T extends Type> extends CarteCondition implements Se
super.utiliser(j);
}
public Type getType() {
return type;
}
}