From 11594eb3d790a6c88592bb5699e8b7431fbddc14 Mon Sep 17 00:00:00 2001
From: Villard PierreFrederic <pierre-frederic.villard@univ-lorraine.fr>
Date: Mon, 13 Sep 2021 15:15:37 +0200
Subject: [PATCH] Add image for a monster
---
hero.png | Bin 793 -> 1369 bytes
monstre.png | Bin 0 -> 1099 bytes
src/afficheur/Sprites.java | 3 ++-
src/afficheur/SpritesHeros.java | 2 +-
src/afficheur/SpritesMonstre.java | 42 +++---------------------------
5 files changed, 7 insertions(+), 40 deletions(-)
create mode 100644 monstre.png
diff --git a/hero.png b/hero.png
index 12990ad227f0fd39c4bc50aa1c3894a6b106a6c0..09b9f906e358f7a2df581e3a83e69c9e6a142321 100644
GIT binary patch
delta 1247
zcmbQqc9To7Gr-TCmrII^fq{Y7)59f*fq_Acfq_AngN=cKVHM}>(20unlV>vq)-!l8
zFfcGOFhFVM1&j>LU=c<Jh6PLvEMPVRgV+LQI9r#2fq}vD)%9}>3=EtF9+AZi4BWyX
z%*Zfnjsyb(V`OGXL`j6Nk5zJhu3lnFep0GlMQ#B|7lTcORYh(=ZfZ%QLPc&)UU9uu
zg{=};iB(>)6-ZoPNdc^;B->Ug!Z$#{Ilm}X!A#FU&p^qJOF==wrYI%ND#*nRqTi}0
zCCyeTqokz3N?*Ucyj-u`STDaQUEk2s(o)~RNZ-gvw<sk|x41H|B(Xv_uUHvk2+SOp
z`qbj&qRfJl%=|nBkim&b`K2YcN=hJ`6kq`CQmc~8G=x=o#ZZqW=jZB!Wb_U74D{iK
zgUknsTKN}crskC-g3Pxwv;nI`5vzw<WTOwV-38$qh+n~?K`w4~TsHdPPyvOI9hYR>
zLv{uRrdysajv*erYp3nc7IhRjuC6$tL13eYV&I>z>^E$f%9=8Bo~T~qJmR#WB0+JI
zy<&?<qjrn>jfkZeI@WS5<MNRD&tO{bcv(Y<%SlJ&UU|{|)VzE5-aY*&HtFWg*+0*`
zIdex<N%#8I({q#mY%!U>agJi*^<~She0h9v;wk^%)t>i1%1E65KJWf??dShaT)Uh)
z)BeA|KnvsSKa&F=@^CE3e$Aiq^`r35Kc9PEO*pYn^RteGB$H6I<_DKE2j>ai+W+^g
z-08J%>t7zrNu0rYxZ}d+?*0Yy*1WYV51g4Rw|oIx@1j@jo&{?R_s8XVq_3Q>!|bGT
za7Nd?J4+0r9g4T6-n+Q+LC?O}AHKU4;$_cyeEhfm)kf)y1q?hI4QGVfPF&Gv%V@fO
zpy82jc9a<d({eB2tTR5Gt&>?F&e^^}$Ts2S3vS5+0WTQp71qs)w%f4vy7-ZFZsyzz
zcX~=rE9^0o<#hS*?oIi`OY0__+qky;#ErDm6PaYrF?_Uqc)?PZ>v^*mn?VT!M{6I?
z3!b?JUUN34?7L=az|$UU_qwo8;&oY+!D&|eGxq9Brft-1=6}E({Qc>o_|@mtm|khw
zPyIeE{7K|bL7|oBw1VnqOz`q=DqJgF9=GD<b^g{<=GOL49xa`{>wnP)zoluhebMEP
zEWSrxWNKFEZteP0bz}Ba?(5YLJMXq1E^5w96c#=6apTeD%nM?~GQQUwoS+c7u+m0B
zMJ<po?!NtVo6p~bSNNxUuKHhasb0ah$0|D}gtv9w*~4vaQ??b(KDtm&xjx#2Z|3cw
z2Mg0%f&?;_uGL@Obbjx-;!`R!+$QYXW|y4ZT`SgO^k(0_=-pX-vsjsLm88nA2|bn}
zGy93`0&~{Q+inIe*tYMn*o7_Un_ixX4mf}ES^~G!s><bO&#-Ozz0l~KFAI~(!NX>G
z3^uEbcp3@~R+)ZS-YMI^m!;;}e(8-VhFSByryP?0_|(Jpv)u*f&q;lT?A6mgaVESr
b==xhP;F)`I>l4nSprXUm)z4*}Q$iB}mz?#6
delta 639
zcmcb~HIq%TGr-TCmrII^fq{Y7)59f*fq_Apfq_AlgN1>CA*pl5`H715^-M|L?k)`f
z+xyS#XJBC9EbxddX5e7a0%68udd{8<3=Hfgp1!W^PdRycnasbJoO{f`z`&Sa<QKwt
zeo^@>1_p*Vo-U3d9>>p4J;-~=fXDT(^1)8V9n9(yO?Pj!M4KmZnmKT>Yh+%kIo`*0
zXs^r0&pF5YxG$>Kg<Uw4;8bst+dSiG(Th&Csx`6~GY%OVpWmJBAGA(8?DULAEADr@
zl4c0L;@lzdMdVJ$D^Cl72V1$7lwJoPWe5!r{QGTQ#ToYZvweiaE2cF1?S1)ndgfu5
zPB-Ie7ZlfiRJ+bF?YKbv@BQ-8v;K%bJMDbs^R7Fdfj^u+tC=V+yZ0@8l~iW-FDu8p
zOD`IHc1x;#Ywqnc`)B}v`mKaEo$rUfr$3wWS8_&rlBrv<aohbB5kB_|mD6q)zUCCa
zVfk_L!#_7B#)fd2D1ZWkfx$#!;%=FGCY=S$44}YeWME(lWME)m`0&i!5ESGkt`Q|E
zi6yC4$wjG&C8-QX21bUu29~;p#vz7AR;GqlMuyr3237_JZ+Ppkp=ij>PsvQHMAu+o
zWn>J|@RWCNEdv9CV2Nu)eMxFXW}20AeolT-a6w{nDuW^aY$i|)3W4kgOS)EMrunC(
z6{nUkSQ<q3+?&n7z#sva4alrW&53Zy%uUTJ&dkqaFf}#1s=xCfrkY43HI~Lx{y#PW
PB_0M(S3j3^P6<r_FJ9*f
diff --git a/monstre.png b/monstre.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e787d2dc5d80b0dad921927808119de45e20595
GIT binary patch
literal 1099
zcmeAS@N?(olHy`uVBq!ia0y~yU=U|uV36ftV_;x3+jcyFfq{XsILO_JVcj{ImkbOH
z3dtTpz6=aiY77hwEes657#J8DUNA6}8Za=tN?>5Hn!&&zUNC1@pbY~9LrZFeXPU1s
zgBAk=0|x^uqYwi#$T$W@1_nkc239befx(MW8qN-4)PSmCVqj>`WMF}+iDG~N4=5i(
zGcRC-s%B(hSil5VExv#m&Xxsfl+Rtl&A`CGS>O>_%)r1c48n{Iv*t)JFfc}DhD4M^
z`1)8S=jZArrsOB3>Q&?xfOIj~R9IEy7UZUuBq~(o=HwMyRoE(lRaoT}TY-f2l@!2A
zO0sR0B76fBob!uP70mPu^bC~jxD*r=Y>HCStb$zJpxTR4(rlG7N=gc>^!3Zj%k|2Q
z_413-^$jg8E%gnI^o@*ki&D~bi!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybe
zT4JlD1hPm01|aS%$xK7olvfP(R&su>K1fF2P|rXgZZ^nxkf@b^QD$mhNg~L6J3||=
zN)$1uJvRCv%aI%d@hMm|$i>Z$%SIm@CZO=K<C2Vf$j-pPc;3^+F~oy+Z3tuEAp@Rh
z!Sha!9QU-dD<0hK_V(z(yN7y(Lw0#zvM8H1&3E!zw)%J8)h`Q_jUJ~7@7o%;&VeP<
z(N@e)_`BIGEz47i8=IzzE`6i5_QEZupcgwu-dDX%5LIfN%P%+czFB8RbX50?r$r}u
zyP7X&JkawM?G)8>HfybZ@Z)0TR)>oH_g7B4B<mq%qHSM!_@T{%@CJ*gyV@qZiu<s5
ztjhk-wDGRamc0jEy$`$b2RvCkr}i3?wL|sNqs$t@SJmF%dlLAvKC=1e;=;pec?EL)
z?8$SBwlfF^N;6MpH`{vtR=~$+h1!8P7x$l2(at#?Uzt++fNM{U!4bW*BkxuR`ONR}
zGwtr>y8Hi`;$PF=5LwOmiT7H|t`+V}KFR%K>)CC|P5Xr&aDKYucrI^s_R2oRm?sBX
z{Y4L7ez~PaP<dzd+{WtcFPE7L<Fjl&3P_0UQ?5R3I9JpC^_vGCQ}gFYgx4|EyRBKK
zu;E{#miubHDu<8ehLa-2C62t=^X67Z2uE9DkM+kX?_+qZzg>OAF=fN2Ezat7dp3Ui
zFX;E~$vKBq@y(G!<#zKk^S95wep3Ctby347y{@0e_wSpZTz6gjP220mGmmqc_zV5o
cFL3k8{H_077%!=FnS!#3r>mdKI;Vst0GBp*OaK4?
literal 0
HcmV?d00001
diff --git a/src/afficheur/Sprites.java b/src/afficheur/Sprites.java
index 70c2549..1613d39 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 62a4724..34e8ebd 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 837b5be..8c9db8a 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));
}
--
GitLab