Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
No results found
Select Git revision
Show changes
Showing
with 31 additions and 3 deletions
MAVENProject/bin/src/main/resources/Frames_perso/character_idle2.png

3.19 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_idle3.png

3.18 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_idle4.png

3.18 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_jump1.png

2.97 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_run1.png

3.2 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_run2.png

3.07 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_run3.png

3.13 KiB

MAVENProject/bin/src/main/resources/Frames_perso/character_run4.png

3.02 KiB

MAVENProject/bin/src/main/resources/Obstacles/Obstacle1.png

5.94 KiB

MAVENProject/bin/src/main/resources/Obstacles/Obstacle2.png

11.2 KiB

MAVENProject/bin/src/main/resources/Obstacles/Plateforme.png

6.07 KiB

MAVENProject/bin/src/main/resources/Obstacles/Terre.png

5.82 KiB

......@@ -108,7 +108,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 >= 50){
if (isAttacking <= 50){
isAttacking++;
}
//sinon on cree l'attaque
......@@ -142,8 +142,7 @@ public class Monster extends Entity{
}
private void updateNbFrameInvincible(){
nbFramesInvincible = Math.max(0, nbFramesInvincible-1);
private void updateNbFrameInvincible(){nbFramesInvincible = Math.max(0, nbFramesInvincible-1);
}
private Boolean characInFrontOf(){
......
package loaders;
import map.Coffre;
import javax.swing.*;
import java.awt.*;
import java.net.URL;
public class CoffreLoader {
private Image imageCoffre;
private Coffre coffre;
public Image getImageCoffre() {
return imageCoffre;
}
public Coffre getCoffre() {
return coffre;
}
public CoffreLoader(Coffre obs, String nom){
String fn = "Coffre/";
URL url = CoffreLoader.class.getClassLoader().getResource(fn);
assert url != null;
String path = url.toString().substring(6)+"/"+nom;
coffre = obs;
imageCoffre = new ImageIcon(path).getImage();
}
}