diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java index af69626ddd7f0e53b257e5c78c20dc7d49bf354e..fec86acb0fd5514f0b044844a09cd8614edd5eb4 100644 --- a/MAVENProject/src/main/java/jeu/Jeu.java +++ b/MAVENProject/src/main/java/jeu/Jeu.java @@ -61,7 +61,7 @@ public class Jeu implements Game{ private boolean characterAttacking = false; //boolean necessaire pour rendre l'animation d'attaque prioritaire - public static Obstacle sol = new Obstacle(new HitBox(new Coordonnees(200,700),56,1000000)); + public static Obstacle sol = new Obstacle(new HitBox(new Coordonnees(200,850),56,1000000)); public static List<Obstacle> obstacleTable = new ArrayList<>(); private static List<Monster> monsterList = new ArrayList<>(); diff --git a/MAVENProject/src/main/java/loaders/LoadSave.java b/MAVENProject/src/main/java/loaders/LoadSave.java index 1c56d0c167f5dda3ca26d4fd119e0bb6ceb617ab..ad63e2a03e6f4cff86e8e2a0d44d6890f77381d1 100644 --- a/MAVENProject/src/main/java/loaders/LoadSave.java +++ b/MAVENProject/src/main/java/loaders/LoadSave.java @@ -42,8 +42,22 @@ public class LoadSave { for (int i = 0; i < img.getWidth(); i++) { Color color = new Color(img.getRGB(i, j)); int value = color.getRed(); - if (value >= 27) - value = 34; + if (0<=value && value <= 10) + value = 0; + if (11<=value && value <= 30) + value = 1; + if (31<=value && value <= 50) + value = 2; + if (51<=value && value <= 70) + value = 3; + if (71<=value && value <= 90) + value = 5; + if (91<=value && value <= 110) + value = 25; + if (111<=value && value <= 130) + value = 12; + if (131<=value && value <= 150) + value = 11; lvlData[j][i] = value; } return lvlData; diff --git a/MAVENProject/src/main/resources/Obstacles/level_one.png b/MAVENProject/src/main/resources/Obstacles/level_one.png index 84fb147d255a991c1944610cf3c48e57065e35ca..c49e4961d7aa642ae414162ba3970fb29ce2052f 100644 Binary files a/MAVENProject/src/main/resources/Obstacles/level_one.png and b/MAVENProject/src/main/resources/Obstacles/level_one.png differ