diff --git a/code/.idea/runConfigurations.xml b/code/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/code/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/code/.idea/workspace.xml b/code/.idea/workspace.xml
index 17aa281..bb05afd 100644
--- a/code/.idea/workspace.xml
+++ b/code/.idea/workspace.xml
@@ -2,13 +2,16 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -74,6 +77,14 @@
+
+
+
+
+
+
+
+
@@ -174,6 +185,17 @@
+
+
+
+
+
+
+
@@ -208,17 +230,6 @@
-
-
-
-
-
-
-
@@ -262,7 +273,11 @@
-
+
+
+
+
+
diff --git a/code/out/production/code/launcher/Main.class b/code/out/production/code/launcher/Main.class
index 2e9196d..df8a330 100644
Binary files a/code/out/production/code/launcher/Main.class and b/code/out/production/code/launcher/Main.class differ
diff --git a/code/out/production/code/model/Avatar.class b/code/out/production/code/model/Avatar.class
new file mode 100644
index 0000000..90bbd07
Binary files /dev/null and b/code/out/production/code/model/Avatar.class differ
diff --git a/code/out/production/code/model/Case.class b/code/out/production/code/model/Case.class
new file mode 100644
index 0000000..3591b68
Binary files /dev/null and b/code/out/production/code/model/Case.class differ
diff --git a/code/out/production/code/model/CaseChance.class b/code/out/production/code/model/CaseChance.class
new file mode 100644
index 0000000..820ca97
Binary files /dev/null and b/code/out/production/code/model/CaseChance.class differ
diff --git a/code/out/production/code/model/CaseEvenement.class b/code/out/production/code/model/CaseEvenement.class
new file mode 100644
index 0000000..4b4a2c5
Binary files /dev/null and b/code/out/production/code/model/CaseEvenement.class differ
diff --git a/code/out/production/code/model/CaseMalchance.class b/code/out/production/code/model/CaseMalchance.class
new file mode 100644
index 0000000..e13abf1
Binary files /dev/null and b/code/out/production/code/model/CaseMalchance.class differ
diff --git a/code/out/production/code/model/Joueur.class b/code/out/production/code/model/Joueur.class
index 637fda3..9c9fc1d 100644
Binary files a/code/out/production/code/model/Joueur.class and b/code/out/production/code/model/Joueur.class differ
diff --git a/code/out/production/code/model/Plateau.class b/code/out/production/code/model/Plateau.class
new file mode 100644
index 0000000..48afd8a
Binary files /dev/null and b/code/out/production/code/model/Plateau.class differ
diff --git a/code/ressources/image/personnage/Perso1.1.png b/code/ressources/image/personnage/Perso1.1.png
new file mode 100644
index 0000000..cce8c50
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.1.png differ
diff --git a/code/ressources/image/personnage/Perso1.2.png b/code/ressources/image/personnage/Perso1.2.png
new file mode 100644
index 0000000..ad14e8a
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.2.png differ
diff --git a/code/ressources/image/personnage/Perso1.3.png b/code/ressources/image/personnage/Perso1.3.png
new file mode 100644
index 0000000..018e4d6
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.3.png differ
diff --git a/code/ressources/image/personnage/Perso1.4.png b/code/ressources/image/personnage/Perso1.4.png
new file mode 100644
index 0000000..4edc99d
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.4.png differ
diff --git a/code/ressources/image/personnage/Perso1.5.png b/code/ressources/image/personnage/Perso1.5.png
new file mode 100644
index 0000000..7b9328f
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.5.png differ
diff --git a/code/ressources/image/personnage/Perso1.6.png b/code/ressources/image/personnage/Perso1.6.png
new file mode 100644
index 0000000..bd7f8e7
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.6.png differ
diff --git a/code/ressources/image/personnage/Perso1.7.png b/code/ressources/image/personnage/Perso1.7.png
new file mode 100644
index 0000000..b16ec3d
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.7.png differ
diff --git a/code/ressources/image/personnage/Perso1.8.png b/code/ressources/image/personnage/Perso1.8.png
new file mode 100644
index 0000000..7e1550b
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.8.png differ
diff --git a/code/ressources/image/personnage/Perso1.9.png b/code/ressources/image/personnage/Perso1.9.png
new file mode 100644
index 0000000..04af49a
Binary files /dev/null and b/code/ressources/image/personnage/Perso1.9.png differ
diff --git a/code/ressources/test.txt b/code/ressources/test.txt
new file mode 100644
index 0000000..e69de29
diff --git a/code/src/launcher/Main.java b/code/src/launcher/Main.java
index c14124d..622c334 100644
--- a/code/src/launcher/Main.java
+++ b/code/src/launcher/Main.java
@@ -1,4 +1,21 @@
package launcher;
+import model.Avatar;
+import model.Case;
+
public class Main {
+ public static void Main (String[] args) {
+ Case depart = new Case(1,10,10,true,false);
+ Avatar avatar1 = new Avatar(1,"Perso1.1.png",0,0);
+ int xdepart = depart.getCoordX();
+ avatar1.setCoordX(xdepart);
+ int ydepart = depart.getCoordY();
+ avatar1.setCoordY(ydepart);
+ int xavatar1 = avatar1.getCoordX();
+ int yavatar1 = avatar1.getCoordY();
+ System.out.println("xavatar1 = " + xavatar1);
+ System.out.println("yavatar1 = " + yavatar1);
+ System.out.println("xdepart = " + xdepart);
+ System.out.println("ydepart = " + ydepart);
+ }
}
diff --git a/code/src/model/Avatar.java b/code/src/model/Avatar.java
index 0ec5b66..06b3c3f 100644
--- a/code/src/model/Avatar.java
+++ b/code/src/model/Avatar.java
@@ -2,9 +2,18 @@ package model;
public class Avatar {
int idAvatar;
- char image;
+ String image;
+ int coordX;
+ int coordY;
- public Avatar(int idAvatar, char image) {
+ public Avatar(int idAvatar, String image, int coordX, int coordY) {
+ this.idAvatar = idAvatar;
+ this.image = image;
+ this.coordX = coordX;
+ this.coordY = coordY;
+ }
+
+ public Avatar(int idAvatar, String image) {
this.idAvatar = idAvatar;
this.image = image;
}
@@ -13,15 +22,31 @@ public class Avatar {
return idAvatar;
}
- public char getImage() {
+ public String getImage() {
return image;
}
+ public int getCoordX() {
+ return coordX;
+ }
+
+ public int getCoordY() {
+ return coordY;
+ }
+
public void setIdAvatar(int idAvatar) {
this.idAvatar = idAvatar;
}
- public void setImage(char image) {
+ public void setImage(String image) {
this.image = image;
}
+
+ public void setCoordX(int coordX) {
+ this.coordX = coordX;
+ }
+
+ public void setCoordY(int coordY) {
+ this.coordY = coordY;
+ }
}
diff --git a/code/src/model/CaseChance.java b/code/src/model/CaseChance.java
index 5d832f6..0dc26d1 100644
--- a/code/src/model/CaseChance.java
+++ b/code/src/model/CaseChance.java
@@ -1,18 +1,18 @@
package model;
public class CaseChance extends Case{
- char bonus;
+ String bonus;
- public CaseChance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, char bonus) {
+ public CaseChance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, String bonus) {
super(idCase, coordX, coordY, isStart, isEnd);
this.bonus = bonus;
}
- public char getBonus() {
+ public String getBonus() {
return bonus;
}
- public void setBonus(char bonus) {
+ public void setBonus(String bonus) {
this.bonus = bonus;
}
}
diff --git a/code/src/model/CaseEvenement.java b/code/src/model/CaseEvenement.java
index 2959059..62a6986 100644
--- a/code/src/model/CaseEvenement.java
+++ b/code/src/model/CaseEvenement.java
@@ -1,18 +1,18 @@
package model;
public class CaseEvenement extends Case{
- char evenement;
+ String evenement;
- public CaseEvenement(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, char evenement) {
+ public CaseEvenement(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, String evenement) {
super(idCase, coordX, coordY, isStart, isEnd);
this.evenement = evenement;
}
- public char getEvenement() {
+ public String getEvenement() {
return evenement;
}
- public void setEvenement(char evenement) {
+ public void setEvenement(String evenement) {
this.evenement = evenement;
}
}
diff --git a/code/src/model/CaseMalchance.java b/code/src/model/CaseMalchance.java
index 893956f..6f9d650 100644
--- a/code/src/model/CaseMalchance.java
+++ b/code/src/model/CaseMalchance.java
@@ -1,18 +1,18 @@
package model;
-public class CaseMalchance extends Case{
- char malus;
+public class CaseMalchance extends Case {
+ String malus;
- public CaseMalchance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, char malus) {
+ public CaseMalchance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, String malus) {
super(idCase, coordX, coordY, isStart, isEnd);
this.malus = malus;
}
- public char getMalus() {
+ public String getMalus() {
return malus;
}
- public void setMalus(char malus) {
+ public void setMalus(String malus) {
this.malus = malus;
}
}
diff --git a/code/src/model/Joueur.java b/code/src/model/Joueur.java
index 4974c20..ce53fd5 100644
--- a/code/src/model/Joueur.java
+++ b/code/src/model/Joueur.java
@@ -2,10 +2,10 @@ package model;
public class Joueur {
int idJoueur;
- char pseudonyme;
+ String pseudonyme;
int scoreMax;
- public Joueur(int idJoueur, char pseudonyme, int scoreMax) {
+ public Joueur(int idJoueur, String pseudonyme, int scoreMax) {
this.idJoueur = idJoueur;
this.pseudonyme = pseudonyme;
this.scoreMax = scoreMax;
@@ -15,7 +15,7 @@ public class Joueur {
return idJoueur;
}
- public char getPseudonyme() {
+ public String getPseudonyme() {
return pseudonyme;
}
@@ -27,7 +27,7 @@ public class Joueur {
this.idJoueur = idJoueur;
}
- public void setPseudonyme(char pseudonyme) {
+ public void setPseudonyme(String pseudonyme) {
this.pseudonyme = pseudonyme;
}
diff --git a/documentation/people12.png b/documentation/people12.png
new file mode 100644
index 0000000..a43fa80
Binary files /dev/null and b/documentation/people12.png differ
diff --git a/documentation/perso.cmd b/documentation/perso.cmd
new file mode 100644
index 0000000..70043ec
--- /dev/null
+++ b/documentation/perso.cmd
@@ -0,0 +1,6 @@
+for x in {1..12} do
+ for y in {1..8} do
+ xd=x*48;
+ yd=y*48;
+ convert -extract 48x48+xd+yd D:\Documents\GitHub\projetJavaFX_Gitlab\documentation\people12.png D:\Documents\GitHub\projetJavaFX_Gitlab\documentation\perso.png
+
diff --git a/documentation/personnage.tsx b/documentation/personnage.tsx
new file mode 100644
index 0000000..aab823d
--- /dev/null
+++ b/documentation/personnage.tsx
@@ -0,0 +1,4 @@
+
+
+
+