diff --git a/code/ressources/image/terrain/herbe2.png b/code/ressources/image/terrain/herbe2.png new file mode 100644 index 0000000..f70f1ca Binary files /dev/null and b/code/ressources/image/terrain/herbe2.png differ diff --git a/code/ressources/image/terrain/pierre1.png b/code/ressources/image/terrain/pierre1.png new file mode 100644 index 0000000..08509df Binary files /dev/null and b/code/ressources/image/terrain/pierre1.png differ diff --git a/code/ressources/image/terrain/pierre2.png b/code/ressources/image/terrain/pierre2.png new file mode 100644 index 0000000..0beeeb0 Binary files /dev/null and b/code/ressources/image/terrain/pierre2.png differ diff --git a/code/ressources/image/terrain/puit1bd.png b/code/ressources/image/terrain/puit1bd.png new file mode 100644 index 0000000..243cfbf Binary files /dev/null and b/code/ressources/image/terrain/puit1bd.png differ diff --git a/code/ressources/image/terrain/puit1bg.png b/code/ressources/image/terrain/puit1bg.png new file mode 100644 index 0000000..ffbf539 Binary files /dev/null and b/code/ressources/image/terrain/puit1bg.png differ diff --git a/code/ressources/image/terrain/puit1hd.png b/code/ressources/image/terrain/puit1hd.png new file mode 100644 index 0000000..68d4338 Binary files /dev/null and b/code/ressources/image/terrain/puit1hd.png differ diff --git a/code/ressources/image/terrain/puit1hg.png b/code/ressources/image/terrain/puit1hg.png new file mode 100644 index 0000000..2f0164c Binary files /dev/null and b/code/ressources/image/terrain/puit1hg.png differ diff --git a/code/ressources/image/terrain/statue1b.png b/code/ressources/image/terrain/statue1b.png new file mode 100644 index 0000000..d5b1660 Binary files /dev/null and b/code/ressources/image/terrain/statue1b.png differ diff --git a/code/ressources/image/terrain/statue1h.png b/code/ressources/image/terrain/statue1h.png new file mode 100644 index 0000000..54e6bfb Binary files /dev/null and b/code/ressources/image/terrain/statue1h.png differ diff --git a/code/ressources/image/terrain/tombe1.png b/code/ressources/image/terrain/tombe1.png new file mode 100644 index 0000000..9158980 Binary files /dev/null and b/code/ressources/image/terrain/tombe1.png differ diff --git a/code/ressources/image/terrain/tronc3b.png b/code/ressources/image/terrain/tronc3b.png new file mode 100644 index 0000000..552d542 Binary files /dev/null and b/code/ressources/image/terrain/tronc3b.png differ diff --git a/code/ressources/image/terrain/tronc3h.png b/code/ressources/image/terrain/tronc3h.png new file mode 100644 index 0000000..9184411 Binary files /dev/null and b/code/ressources/image/terrain/tronc3h.png differ diff --git a/code/src/controller/MapController.java b/code/src/controller/MapController.java index bc8101c..d8ecf37 100644 --- a/code/src/controller/MapController.java +++ b/code/src/controller/MapController.java @@ -39,6 +39,19 @@ public class MapController implements Initializable { 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 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"); + private final Image ad = new Image("/image/terrain/statue1h.png"); + private final Image ae = new Image("/image/terrain/statue1b.png"); + private final Image af = new Image("/image/terrain/tronc3h.png"); + private final Image ag = new Image("/image/terrain/tronc3b.png"); + private final Image ah = new Image("/image/terrain/souche2.png"); + private final Image ai = new Image("/image/terrain/herbe2.png"); + private final Image aj = new Image("/image/terrain/puit1hg.png"); + private final Image ak = new Image("/image/terrain/puit1hd.png"); + private final Image al = new Image("/image/terrain/puit1bg.png"); + private final Image am = new Image("/image/terrain/puit1bd.png"); private final int[][] coordFirstDifficultyMap = {{0,24},{1,24},{2,24},{3,24},{4,24},{5,24},{5,23},{5,22},{5,21},{5,20},{5,19},{5,18},{6,18},{7,18},{8,18},{9,18},{10,18},{11,18},{12,18},{12,17},{12,16},{12,15},{12,14},{12,13},{12,12},{11,12},{10,12},{9,12},{8,12},{7,12},{6,12},{5,12},{4,12},{3,12},{3,11},{3,10},{3,9},{3,8},{3,7},{3,6},{3,5},{3,4},{3,3},{4,3},{5,3},{6,3},{7,3},{8,3},{9,3},{10,3},{11,3},{12,3},{13,3},{14,3},{15,3},{16,3},{17,3},{18,3},{19,3},{19,4},{19,5},{19,6},{19,7},{19,8},{19,9},{19,10},{20,10},{21,10},{22,10},{23,10},{24,10},{24,11},{24,12},{24,13},{24,14},{24,15},{24,16},{24,17},{24,18},{24,19},{24,20},{24,21},{24,22},{24,23},{24,24},{25,24},{26,24},{27,24},{28,24},{29,24}}; //private final int[][] coordFirstDifficultyMap = {{0,24},{1,24},{2,24},{3,24},{4,24},{5,24},{5,23},{5,22},{5,21}}; @@ -194,39 +207,72 @@ public class MapController implements Initializable { else if(difficulty == 2){ Image[][] grid = { - {w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,w,w,w,w,w,w,w,w,w,w,w,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, - {b,b,b,b,b,b,b,b,b,b,b,w,w,w,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b} + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,b,b,b,b,b,b,b,b,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,b,b,b,b,b,b,b,b,b,b,b,b,b,b,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,b,a,a,a,a}, + {a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,b,a,a,a,a,b,b,b,b,b,b,a,a,a,a}, + {a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,b,b,b,b,b,b,a,a,a,a,a,a,a,a,a}, + {a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,b,b,b,b,b,b,b,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a}, + {a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a,a} }; + Image[][] grid2 = { + {o,o,o,aa,o,o,o,o,o,e,f,o,o,o,o,o,o,o,o,o,p,o,o,o,o,o,o,o,o,o}, + {o,ah,o,o,ah,o,o,ah,o,n,o,o,o,n,o,ai,o,o,o,o,q,o,o,o,ab,o,n,p,o,o}, + {o,o,o,o,o,o,o,m,o,o,o,o,o,o,o,o,o,o,o,o,o,n,o,o,o,o,o,q,o,n}, + {af,o,o,o,r,s,o,o,o,n,af,o,n,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}, + {ag,o,ah,o,o,o,ah,o,o,o,ag,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,p,o,o}, + {o,o,o,o,o,o,o,o,o,o,o,o,aa,o,o,o,ai,o,o,o,o,o,o,o,o,o,o,q,o,o}, + {o,ah,o,m,o,v,o,af,o,o,o,c,d,o,o,aa,o,n,o,o,o,ab,o,o,o,o,o,o,o,o}, + {o,o,o,o,o,n,o,ag,o,o,o,e,f,o,o,o,o,o,aj,ak,o,o,o,o,o,o,o,o,n,p}, + {o,o,n,o,o,o,o,o,ai,o,o,o,o,ai,o,o,o,o,al,am,ai,o,o,o,o,o,o,ai,o,q}, + {o,ab,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,n,o,o,o,ai,o,o,o,o,o,o}, + {d,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,c,d,o,o,o,o,p,o,o}, + {f,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,ab,o,o,o,e,f,o,o,o,o,q,ai,o}, + {o,o,o,o,o,o,n,o,ai,o,o,p,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}, + {o,o,o,o,o,o,p,o,o,ab,o,q,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,n,o,o}, + {o,o,o,o,o,o,q,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,c}, + {ai,o,o,o,o,o,o,o,o,o,n,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,p,n,e}, + {o,o,o,o,o,o,o,o,o,o,o,c,d,o,o,o,o,o,o,o,o,o,p,o,o,o,o,q,o,o}, + {o,o,o,o,o,o,o,o,o,o,o,e,f,o,n,o,p,o,o,o,o,o,q,o,o,o,o,o,o,o}, + {o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,q,o,o,p,o,n,o,o,p,o,aa,o,ab,o}, + {aa,o,o,o,ad,o,o,o,o,o,o,ai,o,p,o,o,o,o,o,q,o,o,o,o,q,o,n,o,o,o}, + {o,o,ac,o,ae,o,ac,o,o,o,o,o,o,q,o,o,ab,o,o,o,o,o,o,ai,o,o,o,o,c,d}, + {o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,p,o,o,o,c,d,o,o,o,o,ai,o,e,f}, + {o,o,ac,o,ac,o,ac,o,o,o,o,o,n,o,o,o,q,o,o,o,e,f,o,n,o,o,o,o,o,o}, + {u,o,o,o,o,o,o,o,o,o,o,ai,o,o,ab,o,o,ai,o,o,o,o,o,o,o,o,o,o,o,o}, + {c,d,c,d,c,d,o,aa,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}, + {x,y,x,y,x,y,d,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}, + {y,x,y,x,y,x,y,d,c,d,c,d,c,d,c,d,c,d,c,d,c,d,c,d,c,d,c,d,c,d}, + {x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y}, + {y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x}, + {x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y,x,y} + }; + GridPane gridPane = new GridPane(); // for visualizing the different squares: @@ -242,8 +288,35 @@ public class MapController implements Initializable { } } + for (int y = 0 ; y < grid2.length ; y++) { + for (int x = 0 ; x < grid2[y].length ; x++) { + if(grid2[y][x] == o) continue; + ImageView imageView = new ImageView(grid2[y][x]); + imageView.setFitWidth(tileSize); + imageView.setFitHeight(tileSize); + gridPane.add(imageView, x, y); + } + } + + createMap(difficulty); + ArrayList array = map.getMap(); + + for (int y = 0 ; y < grid.length ; y++) { + 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); + imageView.setFitWidth(tileSize); + imageView.setFitHeight(tileSize); + gridPane.add(imageView, x, y); + } + } + } + } + AnchorPane FirstAnchor = new AnchorPane(); - FirstAnchor.getChildren().add(gridPane); + FirstAnchor.getChildren().addAll(gridPane); return FirstAnchor; }