diff --git a/lib/javafx-swt.jar b/lib/javafx-swt.jar deleted file mode 100644 index ec237d4..0000000 Binary files a/lib/javafx-swt.jar and /dev/null differ diff --git a/lib/javafx.base.jar b/lib/javafx.base.jar deleted file mode 100644 index 017cdc7..0000000 Binary files a/lib/javafx.base.jar and /dev/null differ diff --git a/lib/javafx.controls.jar b/lib/javafx.controls.jar deleted file mode 100644 index e427125..0000000 Binary files a/lib/javafx.controls.jar and /dev/null differ diff --git a/lib/javafx.fxml.jar b/lib/javafx.fxml.jar deleted file mode 100644 index 94934ae..0000000 Binary files a/lib/javafx.fxml.jar and /dev/null differ diff --git a/lib/javafx.graphics.jar b/lib/javafx.graphics.jar deleted file mode 100644 index f9d8f3a..0000000 Binary files a/lib/javafx.graphics.jar and /dev/null differ diff --git a/lib/javafx.media.jar b/lib/javafx.media.jar deleted file mode 100644 index 7e4bdd7..0000000 Binary files a/lib/javafx.media.jar and /dev/null differ diff --git a/lib/javafx.properties b/lib/javafx.properties deleted file mode 100644 index efec880..0000000 --- a/lib/javafx.properties +++ /dev/null @@ -1,3 +0,0 @@ -javafx.version=11.0.2 -javafx.runtime.version=11.0.2+1 -javafx.runtime.build=1 diff --git a/lib/javafx.swing.jar b/lib/javafx.swing.jar deleted file mode 100644 index 2900148..0000000 Binary files a/lib/javafx.swing.jar and /dev/null differ diff --git a/lib/javafx.web.jar b/lib/javafx.web.jar deleted file mode 100644 index d75a805..0000000 Binary files a/lib/javafx.web.jar and /dev/null differ diff --git a/src/carte/Carte.java b/src/carte/Carte.java new file mode 100644 index 0000000..6a06989 --- /dev/null +++ b/src/carte/Carte.java @@ -0,0 +1,12 @@ +package carte; + +public class Carte { + + private String nom; + private String description; + + private void utiliser(Joueur j) { + + } + +} diff --git a/src/carte/CarteCondition.java b/src/carte/CarteCondition.java new file mode 100644 index 0000000..9b81b01 --- /dev/null +++ b/src/carte/CarteCondition.java @@ -0,0 +1,8 @@ +package carte; + +public abstract class CarteCondition extends CarteEffet{ + + private Condition condition; + + +} diff --git a/src/carte/CarteEffet.java b/src/carte/CarteEffet.java new file mode 100644 index 0000000..efab50b --- /dev/null +++ b/src/carte/CarteEffet.java @@ -0,0 +1,9 @@ +package carte; + +public abstract class CarteEffet extends Carte{ + + public void utiliser(Joueur j) { + + } + +} diff --git a/src/carte/CarteLieu.java b/src/carte/CarteLieu.java new file mode 100644 index 0000000..99fc71a --- /dev/null +++ b/src/carte/CarteLieu.java @@ -0,0 +1,17 @@ +package carte; + +import java.util.List; + +public class CarteLieu extends CarteEffet{ + + private Type field; + + // Liste des joueurs actuellement présent sur le lieu + private List listeJoueur; + + + public void utiliser(Joueur j) { + + } + +} diff --git a/src/carte/CarteLieuType.java b/src/carte/CarteLieuType.java new file mode 100644 index 0000000..6cfac2d --- /dev/null +++ b/src/carte/CarteLieuType.java @@ -0,0 +1,9 @@ +package carte; + +public class CarteLieuType extends CarteLieu{ + + public void utiliser(Joueur j) { + + } + +} diff --git a/src/carte/CartePersonnage.java b/src/carte/CartePersonnage.java new file mode 100644 index 0000000..17669c5 --- /dev/null +++ b/src/carte/CartePersonnage.java @@ -0,0 +1,52 @@ +package carte; + +public class CartePersonnage extends CarteCondition{ + + private String NOM; + private int HP; + private Joueur joueur; + + public void tour() { + + } + + /* + * @param j + * + */ + public void utiliser(Joueur j) { + + } + + /* + * @param j + * Le joueur que l'on souhaite attaquer + */ + public void attaquer(Joueur j) { + + } + + public boolean victoire() { + return true; + } + + + public Joueur getJoueur() { + return joueur; + } + + + /* + * @param j + * + */ + public Joueur setJoueur(Joueur j) { + this.joueur = j; + return joueur; + } + + public void deplacer() { + + } + +} diff --git a/src/carte/CartePiochable.java b/src/carte/CartePiochable.java new file mode 100644 index 0000000..8b63a93 --- /dev/null +++ b/src/carte/CartePiochable.java @@ -0,0 +1,5 @@ +package carte; + +public class CartePiochable { + +} diff --git a/src/carte/Condition.java b/src/carte/Condition.java new file mode 100644 index 0000000..6bc5534 --- /dev/null +++ b/src/carte/Condition.java @@ -0,0 +1,7 @@ +package carte; + +public class Condition { + + + +} diff --git a/src/carte/Equipement.java b/src/carte/Equipement.java new file mode 100644 index 0000000..2a29b71 --- /dev/null +++ b/src/carte/Equipement.java @@ -0,0 +1,5 @@ +package carte; + +public class Equipement { + +} diff --git a/src/carte/Joueur.java b/src/carte/Joueur.java new file mode 100644 index 0000000..e40b288 --- /dev/null +++ b/src/carte/Joueur.java @@ -0,0 +1,9 @@ +package carte; + +public class Joueur { + + + public void utiliser() { + + } +} diff --git a/src/carte/Type.java b/src/carte/Type.java new file mode 100644 index 0000000..fd145e6 --- /dev/null +++ b/src/carte/Type.java @@ -0,0 +1,7 @@ +package carte; + +public interface Type { + + + +} diff --git a/src/ihm/controller/MenuController.java b/src/ihm/controller/MenuController.java index dcd78e7..c225b95 100644 --- a/src/ihm/controller/MenuController.java +++ b/src/ihm/controller/MenuController.java @@ -8,11 +8,19 @@ public class MenuController { @FXML private Label label; +<<<<<<< HEAD + public void commencerPartie(MouseEvent mouseEvent) { + System.out.println("Bonjouuuuur!"); + } + + public void afficherRegle(MouseEvent mouseEvent) { +======= public void afficheBonjour(MouseEvent mouseEvent) { System.out.println("Bonjouuuuur!"); } public void changerNom(MouseEvent mouseEvent) { +>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56 System.out.println("clik"); } } diff --git a/src/ihm/ressources/ChoixJoueur.fxml b/src/ihm/ressources/ChoixJoueur.fxml deleted file mode 100644 index e69de29..0000000 diff --git a/src/ihm/ressources/EffetCarte.XML.fxml b/src/ihm/ressources/EffetCarte.XML.fxml deleted file mode 100644 index a80d953..0000000 --- a/src/ihm/ressources/EffetCarte.XML.fxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - +<<<<<<< HEAD + - - - - diff --git a/src/ihm/ressources/Soigner.fxml b/src/ihm/ressources/Soigner.fxml deleted file mode 100644 index 4d4a838..0000000 --- a/src/ihm/ressources/Soigner.fxml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - -