diff --git a/MAVENProject/src/main/java/entity/Monster.java b/MAVENProject/src/main/java/entity/Monster.java index cac5582dbca701f94e0a0a9cd094c000ad3c9f27..dcd6a9092011b1415b81a0bd30e8ad0dadb94eb6 100644 --- a/MAVENProject/src/main/java/entity/Monster.java +++ b/MAVENProject/src/main/java/entity/Monster.java @@ -110,7 +110,7 @@ public class Monster extends Entity{ public void attaque(){//isAttacking > 0 pour dire que si il est entrain d'attaquer, il finit son attaque if ((Math.abs(this.coord.getX()-getGameCharacter().coord.getX()) <= 2+entityWIDTH/2+getGameCharacter().entityWIDTH/2 && Math.abs(this.coord.getZ()-getGameCharacter().coord.getZ()) <= entityHEIGHT && characInFrontOf()) || isAttacking > 0){ //n'attaque que si perso pas invincible //si il n'est pas immobile il s'arrete - if (isAttacking < 100){ + if (isAttacking < 50){ isAttacking++; } //sinon on cree l'attaque @@ -124,7 +124,7 @@ public class Monster extends Entity{ monsterAttack.dealDamage(getGameCharacter()); } isAttacking++;//il peut rebouger - if (isAttacking > 200)isAttacking = 0; //animation d'attaque finie + if (isAttacking > 100)isAttacking = 0; //animation d'attaque finie } } } diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java index 4038f168cb298c3a4b096462345d90a3595ae6d8..f08823bf000bae75ce75f482f494e55c9145292b 100644 --- a/MAVENProject/src/main/java/jeu/Painter.java +++ b/MAVENProject/src/main/java/jeu/Painter.java @@ -45,6 +45,13 @@ public class Painter implements GamePainter{ Graphics2D crayon = (Graphics2D) im.getGraphics(); crayon.setColor(Color.blue); + String fn = "Obstacles"; + URL url = Painter.class.getClassLoader().getResource(fn); + assert url != null; + int placeX = -10; + String beginPath = url.toString().substring(6)+"/"; + crayon.drawImage(new ImageIcon(beginPath+"background_rdm.png").getImage(), 0-xCam, 0-zCam, null, null); + drawMap(crayon); drawSol(crayon); drawLifePoints(crayon); diff --git a/MAVENProject/src/main/resources/Obstacles/background.png b/MAVENProject/src/main/resources/Obstacles/background.png new file mode 100644 index 0000000000000000000000000000000000000000..719d3d6523c0ddb7cb57e60b3b3dce40cc41a7cc Binary files /dev/null and b/MAVENProject/src/main/resources/Obstacles/background.png differ diff --git a/MAVENProject/src/main/resources/Obstacles/background_rdm.png b/MAVENProject/src/main/resources/Obstacles/background_rdm.png new file mode 100644 index 0000000000000000000000000000000000000000..6acac0bef75b2759600376b9d26297923dba7d25 Binary files /dev/null and b/MAVENProject/src/main/resources/Obstacles/background_rdm.png differ