From 9d373a69e5af4765bc7f6c038523c43d4fbf033b Mon Sep 17 00:00:00 2001 From: ZartaX0O3 Date: Thu, 20 Jan 2022 12:09:55 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20des=20cases=20bonus=20et=20malus=20ET?= =?UTF-8?q?=20fix=20de=20la=20r=C3=A9cup=C3=A9ration=20de=20la=20case?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/ressources/image/terrain/bonus.png | Bin 0 -> 1293 bytes code/ressources/image/terrain/malus.png | Bin 0 -> 1299 bytes code/src/controller/MapController.java | 33 +++++++++++++++++++----- code/src/model/BonusCase.java | 9 ------- code/src/model/DataTable.java | 22 ++++------------ code/src/model/MalusCase.java | 10 ------- 6 files changed, 31 insertions(+), 43 deletions(-) create mode 100644 code/ressources/image/terrain/bonus.png create mode 100644 code/ressources/image/terrain/malus.png delete mode 100644 code/src/model/BonusCase.java delete mode 100644 code/src/model/MalusCase.java diff --git a/code/ressources/image/terrain/bonus.png b/code/ressources/image/terrain/bonus.png new file mode 100644 index 0000000000000000000000000000000000000000..0f3a67c18199fd5a181ba1314262b0db6f86a51b GIT binary patch literal 1293 zcmeAS@N?(olHy`uVBq!ia0vp^KS7v-4M;xqpF9CbF%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl}2EbxddW?d5LdAiv@J}%lB^M7x{3j4hOOo2-6789N4oKW<8 zBA{N>A#8c1Q|3{edE3uVFUy$KKmC3FHqCy0XAS3{*UxXWTTINiFXO-a*b1b`g|84* z@9jDsrlX=poN5t%-Z+~T!zn=Jl80@wccmD&?98`} z7Cv{sRxICoL(1>JbM}{tN+~gN&zl{MNZQZ^Oq) zzE8gQD$g(Qd;e(%x~CxlcFw$QV@kF6v_fs2d+#>DSPU2e3$*E&fp$;Ky~{7B0a+W8 zI3HgWRfGjQnm0Z*M~X$e@2jv!4Q7aqXlk(QJ&f3bs3-B;rXDf1KD!w= zs~Vrh*rpq_3I4n&Qz`jeMyCI$v;x*J6G#V{yXNb!@AlhwC;$5K`uy#?%;!$qor&U4 zu?Y9wv+G9X&HhMj9Gc-d2&>bv+w)<<{e#^6_b+@n+M)jt=sa;bChT77 zOWV;?E&2RGgw8#MbB}lh!1)!!w%NM(#7@7;J!Hf;&wQ>q|33Z#xt}dRwR4gU!sp^j z!`oyJ>*zdAxZCEvZRK0#`5Ss3uQ7|+kMs{jjcGv=>-}F?hQAxvXVM%xNb!1@J z*w6hZkrl}2EbxddW?IgQC zw`+NfccmD&J?wjCc&5Xa-FUZK-buFKH;N^n7s_JVBW!tuw?9$m<^zjry~k}z+f$me zr6P}2#-KO`s0eOV_x9$Vb0Y7L?Yxzi@=@(m^P8VXYedgoElXS5aAG0E?a0cLXY{&F z&uKF_{cN-8p`X!dAIliLx7|PgGdlevTZham41XK9MQ;2)>FvjgpZ9CL<>fyM)|@rU zn|bs$Tebd8mwh=Vp9IgnH0pm13L<1{z#;dpELp;P+xHa7?Pnh4HmcsP-qZuM5SKNH zPd?3ix2?yxtx>dCV*NTUq`*fpIsVL^8@oOo{Vj+T2)NWD;tyd&{KhYT)7)b=nB&q^ z>>a<%Uw?g9WzyFl@5}D~VXmKRXK%lEd;aDAm%qP!{`s;>u7CRezUW)UycOF&ztP9; zj@?fs(vCznOD4}qU7S4Q;?i4lj~Q(5uDKFEY`WFmr~+b{`JK9iqES)Z$I~lSHSWLJo*uy@H6F)jf>4m{#Z8Q z;?di4Ey8a{?qO7Fw?e3Z#!ycppHaVy^dzC12yhmWD7qiJ2@h z90^Q__gc#Y^lhG$e>im5+~il%5n~JX>yKO8aU|<*$=G9ak6P{!>o)J$T*2(ZSBjc} zA&zJh%imo2)$EWF-!|#F=KVGD4+@?rpNUVDS1!I9D0dy2*-;&QXI=7)nW-{sZWo_4 z%ldx8J>pnlc(vY5H(Z%=c~4^6;?ouymQ@_a*1AOxB(RygCG!_+{d?2rQ|ioS0}C<+ MPgg&ebxsLQ0F>HB0RR91 literal 0 HcmV?d00001 diff --git a/code/src/controller/MapController.java b/code/src/controller/MapController.java index 6c79641..cd9c5e9 100644 --- a/code/src/controller/MapController.java +++ b/code/src/controller/MapController.java @@ -38,7 +38,8 @@ public class MapController implements Initializable { private final Image w = new Image("/image/terrain/chemin.png"); private final Image x = new Image("/image/terrain/multiarbre1.png"); private final Image y = new Image("/image/terrain/multiarbre2.png"); - private final Image z = new Image("/image/terrain/pierre.png"); + private final Image z1 = new Image("/image/terrain/bonus.png"); + private final Image z2 = new Image("/image/terrain/malus" + ".png"); private final Image aa = new Image("/image/terrain/pierre2.png"); private final Image ab = new Image("/image/terrain/pierre1.png"); private final Image ac = new Image("/image/terrain/tombe1.png"); @@ -189,8 +190,14 @@ public class MapController implements Initializable { for (int x = 0 ; x < grid[y].length ; x++) { if(grid[y][x] != b) continue; for(Case c : array) { - if (c.getCoordY() == y && c.getCoordX() == x && (c.isBonus() || c.isMalus())) { - ImageView imageView = new ImageView(z); + if (c.getCoordY() == y && c.getCoordX() == x && c.isBonus()) { + ImageView imageView = new ImageView(z1); + imageView.setFitWidth(tileSize); + imageView.setFitHeight(tileSize); + gridPane.add(imageView, x, y); + } + else if(c.getCoordY() == y && c.getCoordX() == x && c.isMalus()){ + ImageView imageView = new ImageView(z2); imageView.setFitWidth(tileSize); imageView.setFitHeight(tileSize); gridPane.add(imageView, x, y); @@ -305,8 +312,14 @@ public class MapController implements Initializable { for (int x = 0 ; x < grid[y].length ; x++) { if(grid[y][x] != b) continue; for(Case c : array) { - if (c.getCoordY() == y && c.getCoordX() == x && (c.isBonus() || c.isMalus())) { - ImageView imageView = new ImageView(z); + if (c.getCoordY() == y && c.getCoordX() == x && c.isBonus()) { + ImageView imageView = new ImageView(z1); + imageView.setFitWidth(tileSize); + imageView.setFitHeight(tileSize); + gridPane.add(imageView, x, y); + } + else if(c.getCoordY() == y && c.getCoordX() == x && c.isMalus()){ + ImageView imageView = new ImageView(z2); imageView.setFitWidth(tileSize); imageView.setFitHeight(tileSize); gridPane.add(imageView, x, y); @@ -421,8 +434,14 @@ public class MapController implements Initializable { for (int x = 0 ; x < grid[y].length ; x++) { if(grid[y][x] != b) continue; for(Case c : array) { - if (c.getCoordY() == y && c.getCoordX() == x && (c.isBonus() || c.isMalus())) { - ImageView imageView = new ImageView(z); + if (c.getCoordY() == y && c.getCoordX() == x && c.isBonus()) { + ImageView imageView = new ImageView(z1); + imageView.setFitWidth(tileSize); + imageView.setFitHeight(tileSize); + gridPane.add(imageView, x, y); + } + else if(c.getCoordY() == y && c.getCoordX() == x && c.isMalus()){ + ImageView imageView = new ImageView(z2); imageView.setFitWidth(tileSize); imageView.setFitHeight(tileSize); gridPane.add(imageView, x, y); diff --git a/code/src/model/BonusCase.java b/code/src/model/BonusCase.java deleted file mode 100644 index 434c5cd..0000000 --- a/code/src/model/BonusCase.java +++ /dev/null @@ -1,9 +0,0 @@ -package model; - -public class BonusCase extends Case { - - public BonusCase(int idCase, int coordX, int coordY, boolean isStart, boolean isBonus, boolean isMalus, boolean isEnd, Map map, Bonus bonus) { - super(idCase, coordX, coordY, isStart, isBonus, isMalus, isEnd, map); - Bonus bonus1 = bonus.randomGet(); - } -} diff --git a/code/src/model/DataTable.java b/code/src/model/DataTable.java index d608263..9369832 100644 --- a/code/src/model/DataTable.java +++ b/code/src/model/DataTable.java @@ -10,10 +10,9 @@ public class DataTable implements Serializable { private static int id = 0; private int gameId; - private String playerName; private int Maxscore; private int rounds; - private double timeElapsed; + private double timer; public DataTable(int levelNumber) { id++; @@ -24,8 +23,7 @@ public class DataTable implements Serializable { id++; this.gameId = id; this.Maxscore = 0; - this.timeElapsed = 0; - this.playerName = ""; + this.timer = 0; this.rounds = 0; //this.score=score; Calcul du score avec la difficulté ! @@ -34,8 +32,7 @@ public class DataTable implements Serializable { //Function update public void update(int score, String name, double time, int rounds) { this.Maxscore = score; - this.playerName = name; - this.timeElapsed = time; + this.timer = time; this.rounds = rounds; } @@ -49,8 +46,8 @@ public class DataTable implements Serializable { } public double getTimeElapsed() { - System.out.println(this.timeElapsed); - return this.timeElapsed; + System.out.println(this.timer); + return this.timer; } public int maxScore() { @@ -58,11 +55,6 @@ public class DataTable implements Serializable { return this.Maxscore; } - public String playerName() { - System.out.println(this.playerName); - return this.playerName; - } - public int getRounds(){ System.out.println(this.rounds); return this.rounds; @@ -72,8 +64,4 @@ public class DataTable implements Serializable { System.out.println(this.gameId); return this.gameId; } - - public String toString() { - return this.playerName + " : " + this.Maxscore; - } } \ No newline at end of file diff --git a/code/src/model/MalusCase.java b/code/src/model/MalusCase.java deleted file mode 100644 index 43208c5..0000000 --- a/code/src/model/MalusCase.java +++ /dev/null @@ -1,10 +0,0 @@ -package model; - -public class MalusCase extends Case{ - - public MalusCase(int idCase, int coordX, int coordY, boolean isStart, boolean isBonus, boolean isMalus, boolean isEnd, Map map, Malus malus) { - super(idCase, coordX, coordY, isStart, isBonus, isMalus, isEnd, map); - Malus malus1 = malus.randomGet(); - } - -}