From 70dee10354103cb6243bfc53a619d96ade72c2dc Mon Sep 17 00:00:00 2001
From: Brugneaux Louis <louis.brugneaux3@etu.univ-lorraine.fr>
Date: Tue, 13 Dec 2022 18:57:32 +0100
Subject: [PATCH] =?UTF-8?q?Nouvelle=20map=20avec=20obstacles=20bien=20cr?=
=?UTF-8?q?=C3=A9=C3=A9s=20mais=20il=20reste=20=C3=A0=20bien=20les=20place?=
=?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
MAVENProject/src/main/java/jeu/Jeu.java | 2 +-
.../src/main/java/loaders/LoadSave.java | 18 ++++++++++++++++--
.../main/resources/Obstacles/level_one.png | Bin 1164 -> 865 bytes
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index af69626..fec86ac 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 1c56d0c..ad63e2a 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
GIT binary patch
delta 830
zcmeC-e8@Jzpq^RU)5S3)!o4@bI`6iFfb6uQ*%FoxA{=3>u9Urduwz3J!*8~UiSrLQ
zzL36At6=_3cFh#WRR$by?l^1>F;duhY2U*=H<xNP-MN2e&-Z6*yG~#Aj1^G|;{L<6
za_O{pwH0~$+ZrF%TA!@ud;HicrFL^#dC%L*Th9%2_g#OUdHuLyeOi3&vqxE_m(H#@
zoMzGJ(<gnv>Fkc!Lwi^f4@gMJd9cfTe#pKu{O&cD<F8G-BNB@OChz>fwA!oe$f~^6
zU$Qn$TmO9jlbX64i`3Fi9N;#;xmIqq?=vN#v*~;7LL$<oHs3z{`<=tGTP%W4Pp8k^
z|68uv#Y9!}aWK!yloiumR(CYjo8&c09zCG3WP5?y%x8Blf9Yi8xhTlX5L`Jqz<0i0
zf(XA7gW6)x73K2tml^+zxLf{cx@3M!S3sLMgYffir63+AHLgrEwO76hDO%4Qr)%>C
z*7@)4oKY#t=Nc+wmNYphTx#0Y(^1PF2j;|{{Py7BrSSJNq!%6NSm2}mHbhF%x8CJ)
zut)#xW#9S4v|J{fFJ8hR9`66sH7EL$!Ya*6#wv2tzf>oybd=3tFcNV6wP)U%r@Jz1
z<M|$LvFh}bKj*xzD(>{biu~utDqf#@;j~FMyFDc)w%^GAa<JvET6q?ubQ_)}rYdbW
zc0K()Qzo=KZojOW*3VT{%TAc<&U?zj_j^OVNs^ZflXi~KloI=2%GX(wEDuY{otjy*
zD??~4>v?0>ZT!jFN`D-;`W)&>(LA5nq|;=#MlSF2n*FnKQvSb>OONdo^jckVX<4SB
zL&Pz$sfKJPPc3i#@G&|#(!|UzNT7Dz#{&$L@=kt<zT{WXv#@#o6g%H(YpbIVh!)*w
zWxu^@Z@t{CRarSoI@{xSb(tAt)kP^<vYwdL>hX2Y#O9A4_YY4Nxg5H8cjT$aYU#sz
zi;v&9EhO{n{Qh2_`+YfX?GA<~>zxXc{3cE3I-GmS%X3qR{4w4gm(o_X7YZCSNUX|e
z+R1e+?zc%<P`JeU2}l1uo&AevuIDATW6JhZmKWLd_s&~wzUaUI(PYcXkGos%OtXLT
v>Ra=gs8rcBUBkRO+b7fKygupwlixFY<A>QtlG7O&7#KWV{an^LB{Ts5)o_gs
delta 1131
zcmaFJ*26i$pq|Ce)5S3)!o4;k+ArFX=c~umRUbS~gqsV*-T(VW&%x^y(=O%}yV@?v
zmN1&cdjHRCRBiB@#3bsp>uS&2j~m}F`Kd5{_D<t(8*BS&FaP+q;&q38XUC7IbstXO
z*UA<uy>ioeQ}_Kfe{||kRmHTPH(Pg6&Sv%YD}0XXPi|RH+;sS6z5Q3KtL>ZpV|UDF
z^qdkDKH=oC+f~iFyO(}HUCQjTC-j@(2IHQecY1{0>$5vr6x4G17g+ob`X<=$vxYCF
zbca>Iw2wu-+oi-E1CLvA8q4cAoDk$X_4%H%ZB50(k2eG6BnG^iSGt$!)XxRk7Z}g3
z`*W8$<W2hbFX60nHyu8H)a8BslB7d{*~(cfPj`HBzixD(GtB&bX7%?&b9jzE?mbpC
zLDukAfKZR_bkX#T$5uB&a<uuTU)jpO<Hekx_i}9xgs-zn4cw%2Fhe1tVx7J)8~=l2
zJY3hW)}8QXUFxvdW>ays&ecmBWCD*&IehDdAe;PVn>iOh6vbuFyBzmeQ}k-Vf|h!2
z%SFpF9yA3Q8G1}R6SQ0Eic{3Wx*h8#%u(T5mnNVfzjxNPTpsP<?6cqJ<P<q7oQ})f
zvU4$$plsS7lP?!9HB>pXg_-+r*=t?Ua>OTl;>Q)*#@aIiTpY`_G#5=~oN_|8uVA%x
zXOQPhHbaG}v(Hp0ge;n{CE)Phg&rRB=7iL3sOOvLsAQSw`)KpOeXQpr7Mu{;Y|?Py
zLWJ!-<1)sjO0rK_w62+0a&@XN`R^HGxpU?AEayefC$m@8{B~M=IWYCT#^g1J_sMKE
z{d8`DipnDU>;79TB^`nj4I{5tY*Aim!z0w8*&8J8;F22o&Oh__^Y62)w8HnT(OCW^
zFu0{kG5&b{ib=BF&62%!XR8w=6|1)C{P)z%Y*V}$>i6>MT8T|=vcC>~4hqlSajI?0
z<Z0{naUSHY<yGD&xq2~QcGNL7#_aPeR$tr|rmj0%?0K-%+|-|wpQ*3uOnIY}lMv-s
zx#S{;@;nbeG0h&fQ*7T(+9j<myL5~H{^yqql3g!eOn5)>UtE2z+0}(9SI^B|vc=28
zpLws_f-Mr0tA!4f1t}j}_9;%T^i4%&X@F|C+?5ZXKKHoEKi?B&5@y_LyyC3pgAK0v
zbI<(XJn6pM+|qQ*uBnb!*G!v!wVExp)L?O<s+y{0wnstz>@5>SHtXD#Jvl*Yg`rGZ
zZ{iFmp^LA6wQN%pKO1=QN&S&@MyVx{0Y=H6)><BqVs38Sn5N18^55x6$Ce*9Q1?vZ
zbo`bbA#;|^Hpc$qwUou%9<Pee<C)^P==##5H~Ehp^DtODbLaiok2UW~w;sHq5i9q2
zkwR$u>xu~WcVUKGqh0^ErOXxdC<<FWZvsp1i$7uQ!BTN)wO0)dHf=OjF^f%1X-?UB
za({i*<=*r696OnFKXkKK&s}`Q--TP1moxn5t61)}U)i3ybnn&dUH7b{e&3RV*TcX3
z$~xTE^=w{e(DC(Cd^Dt=q@+Ar&Z+ck@Bik1jHdqto!5zX<TEfZFnGH9xvX<aXaWFo
C@+R;A
--
GitLab