diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index b34ee7826be3bd890408787da18b921d001d5a2c..457349a7616f8fe65c1e9a758583523db4ab9872 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -94,6 +94,7 @@ public class Jeu implements Game{
+
try {
helpReader = new BufferedReader(new FileReader(source));
String line;
@@ -119,7 +120,8 @@ public class Jeu implements Game{
obstacleTable= levelManager.getListeObstacle();
obstacleTable.add(sol);
- monsterList= levelManager.getListeMonster();
+
+
/*obstacleTable.add(new Obstacle(new HitBox(new Coordonnees(300,550),32,128)));
@@ -130,17 +132,19 @@ public class Jeu implements Game{
coffreTable.add(new Coffre(new HitBox(new Coordonnees(900, 685),30,30))); //table des coffres
//on met des monstres, faut supp la pour table monstres
- monsterList.add(new Monster(new Coordonnees(1000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
+ /*monsterList.add(new Monster(new Coordonnees(1000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Monster(new Coordonnees(500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Monster(new Coordonnees(100, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Monster(new Coordonnees(320, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Bat(new Coordonnees(1500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1, 3));
- monsterList.add(new Boss(new Coordonnees(3000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 500, 90, 180, 3, 50));
-
+ monsterList.add(new Boss(new Coordonnees(3000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 500, 90, 180, 3, 50));*/
+ System.out.println(monsterList);
//on charge le perso (a la fin du constructeur, cest important par rapport a obstacleTable, sinon y'a des pbs de "causalite")
gameCharacterLoader = new CharacterLoader(characterSkinPath,new ShootingCharacter(new Coordonnees(xdebut, zdebut), 1500, 1,600000));
gameCharacter = new ShootingCharacter(new Coordonnees(xdebut, zdebut), 1500, 1,600000);
+ levelManager.generateMonsterTable();
+ monsterList= levelManager.getListeMonster();
//on remplit la map des frames
Map<String,Integer> tempMap = gameCharacterLoader.getPathTable();
diff --git a/MAVENProject/src/main/java/map/LevelManager.java b/MAVENProject/src/main/java/map/LevelManager.java
index 46c084ea1281a5395864f2b1fe64a7ed82870f7f..b00bb00133b0865c979ff98acfa745205d18c6b9 100644
--- a/MAVENProject/src/main/java/map/LevelManager.java
+++ b/MAVENProject/src/main/java/map/LevelManager.java
@@ -47,7 +47,6 @@ public class LevelManager {
}
public void generateObstacleTable() {
-
for (int j = 0; j < Jeu.TILES_IN_HEIGHT; j++)
for (int i = 0; i < Jeu.TILES_IN_WIDTH; i++) {
int index = levelOne.getSpriteIndex(i, j);
@@ -83,19 +82,25 @@ public class LevelManager {
listeObstacle.add(new Obstacle(new HitBox(new Coordonnees(Jeu.TILES_SIZE * i+7*Jeu.TILES_SIZE/2, Jeu.TILES_SIZE * j-Jeu.TILES_SIZE/2), 1*Jeu.TILES_SIZE, 7*Jeu.TILES_SIZE)));
}
- //Monstres à pied
- /*if (index==13) {
- listeMonster.add(new Monster(new Coordonnees(Jeu.TILES_SIZE * i+30/2, Jeu.TILES_SIZE * j-62/2), 1000, 30, 60, 1,5));
+
+ }
+ }
+ public void generateMonsterTable() {
+ for (int j = 0; j < Jeu.TILES_IN_HEIGHT; j++)
+ for (int i = 0; i < Jeu.TILES_IN_WIDTH; i++) {
+ int index = levelOne.getSpriteIndex(i, j);
+
+ if (index == 13) {
+ listeMonster.add(new Monster(new Coordonnees(32 * i + 30 / 2, 32 * j - 62 / 2), 1000, 30, 60, 1, 5));
}
//chauve-souris
- if (index==14) {
- listeMonster.add(new Bat(new Coordonnees(Jeu.TILES_SIZE * i+20/2, Jeu.TILES_SIZE * j-32/2), 1, 3));
+ if (index == 14) {
+ listeMonster.add(new Bat(new Coordonnees(32 * i + 20 / 2, 32 * j - 30 / 2), 1, 3));
- }*/
+ }
}
}
-
public List<Obstacle> getListeObstacle() {
return listeObstacle;
}
diff --git a/MAVENProject/src/main/resources/Obstacles/level_one_monster.png b/MAVENProject/src/main/resources/Obstacles/level_one_monster.png
index dbf6127863a90ac8f334fa6d15705d3b9f97528e..05eafc53611fc5e234a4395e7dc9a753183df2db 100644
Binary files a/MAVENProject/src/main/resources/Obstacles/level_one_monster.png and b/MAVENProject/src/main/resources/Obstacles/level_one_monster.png differ