diff --git a/hero.png b/hero.png index 12990ad227f0fd39c4bc50aa1c3894a6b106a6c0..09b9f906e358f7a2df581e3a83e69c9e6a142321 100644 Binary files a/hero.png and b/hero.png differ diff --git a/monstre.png b/monstre.png new file mode 100644 index 0000000000000000000000000000000000000000..3e787d2dc5d80b0dad921927808119de45e20595 Binary files /dev/null and b/monstre.png differ diff --git a/src/afficheur/Sprites.java b/src/afficheur/Sprites.java index 70c25496307756bf37aa77f7c52550b02bff2c33..1613d39da9d70ff2c04d136c8f9856f90af926f2 100644 --- a/src/afficheur/Sprites.java +++ b/src/afficheur/Sprites.java @@ -71,7 +71,8 @@ public abstract class Sprites { */ public void affiche(int x,int y,Graphics g) { - Sprite s=sprites.get(chaine()); + //Sprite s=sprites.get(chaine()); + Sprite s=sprites.get("fixe"); if (s==null) s=sprites.get("erreur"); g.drawImage(im, x, y, x+s.tx, y+s.ty, s.xmin, s.ymin, s.xmax, s.ymax,null); } diff --git a/src/afficheur/SpritesHeros.java b/src/afficheur/SpritesHeros.java index 62a47245aff519ab9c0aa02a330385d07e570013..34e8ebd9dd86f8ed02ee8703b58f91bb35f90dcf 100644 --- a/src/afficheur/SpritesHeros.java +++ b/src/afficheur/SpritesHeros.java @@ -47,7 +47,7 @@ public class SpritesHeros extends Sprites { im = ImageIO.read(new File(imageFile)); activite = "fixe"; sprites = new HashMap<String, Sprite>(); - sprites.put("fixe", new Sprite(0, 0, 35, 37)); + sprites.put("fixe", new Sprite(0, 0, im.getWidth(), im.getHeight())); } diff --git a/src/afficheur/SpritesMonstre.java b/src/afficheur/SpritesMonstre.java index 837b5bee6c361190a66f829550425a9d8c5c2238..8c9db8ae103b7a2f1c7e6129d80ae6dfd6997462 100644 --- a/src/afficheur/SpritesMonstre.java +++ b/src/afficheur/SpritesMonstre.java @@ -27,7 +27,7 @@ import javax.imageio.ImageIO; */ public class SpritesMonstre extends Sprites { - + String imageFile="monstre.png"; // constructeur de table de sprites @@ -37,47 +37,13 @@ public class SpritesMonstre extends Sprites { */ public SpritesMonstre() throws IOException { - im=ImageIO.read(new File("koopa.png")); - activite="courseGauche"; + im=ImageIO.read(new File(imageFile)); + activite="fixe"; sprites=new HashMap<String, Sprite>(); - sprites.put("courseGauche7",new Sprite(46,39,70,69)); - sprites.put("courseGauche6",new Sprite(87,39,109,69)); - sprites.put("courseGauche5",new Sprite(127,38,149,70)); - sprites.put("courseGauche4",new Sprite(166,38,189,71)); - sprites.put("courseGauche3",new Sprite(46,79,69,110)); - sprites.put("courseGauche2",new Sprite(87,79,109,109)); - sprites.put("courseGauche1",new Sprite(127,78,149,110)); - sprites.put("courseGauche0",new Sprite(167,78,189,111)); - + sprites.put("fixe",new Sprite(0,0, im.getWidth(), im.getHeight())); - sprites.put("courseDroite7",new Sprite(206,38,229,71)); - sprites.put("courseDroite6",new Sprite(246,38,268,70)); - sprites.put("courseDroite5",new Sprite(286,39,308,69)); - sprites.put("courseDroite4",new Sprite(325,39,349,69)); - sprites.put("courseDroite3",new Sprite(206,78,228,111)); - sprites.put("courseDroite2",new Sprite(246,78,268,110)); - sprites.put("courseDroite1",new Sprite(286,79,308,109)); - sprites.put("courseDroite0",new Sprite(326,79,349,110)); - - sprites.put("volg0",new Sprite(0,164,35,204)); - sprites.put("volg1",new Sprite(38,168,77,200)); - sprites.put("volg2",new Sprite(78,169,117,199)); - sprites.put("volg3",new Sprite(119,166,156,203)); - sprites.put("volg4",new Sprite(162,161,193,208)); - sprites.put("volg5",new Sprite(41,214,75,255)); - - sprites.put("vold0",new Sprite(202,161,233,208)); - sprites.put("vold1",new Sprite(239,166,276,203)); - sprites.put("vold2",new Sprite(278,169,317,199)); - sprites.put("vold3",new Sprite(318,168,357,200)); - sprites.put("vold4",new Sprite(360,164,395,204)); - sprites.put("vold5",new Sprite(320,214,354,255)); - - - - sprites.put("erreur",new Sprite(255,18,286,53)); }