From f221e1a745c6c32a6e6dc7f2a04d39d2a91197e9 Mon Sep 17 00:00:00 2001
From: Brugneaux Louis <louis.brugneaux3@etu.univ-lorraine.fr>
Date: Tue, 13 Dec 2022 22:16:34 +0100
Subject: [PATCH] =?UTF-8?q?Nouvelle=20map=20avec=20obstacles=20et=20monstr?=
=?UTF-8?q?es=20bien=20cr=C3=A9=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
MAVENProject/src/main/java/jeu/Jeu.java | 12 ++++++----
.../src/main/java/map/LevelManager.java | 21 +++++++++++-------
.../resources/Obstacles/level_one_monster.png | Bin 916 -> 935 bytes
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index b34ee78..457349a 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -94,6 +94,7 @@ public class Jeu implements Game{
+
try {
helpReader = new BufferedReader(new FileReader(source));
String line;
@@ -119,7 +120,8 @@ public class Jeu implements Game{
obstacleTable= levelManager.getListeObstacle();
obstacleTable.add(sol);
- monsterList= levelManager.getListeMonster();
+
+
/*obstacleTable.add(new Obstacle(new HitBox(new Coordonnees(300,550),32,128)));
@@ -130,17 +132,19 @@ public class Jeu implements Game{
coffreTable.add(new Coffre(new HitBox(new Coordonnees(900, 685),30,30))); //table des coffres
//on met des monstres, faut supp la pour table monstres
- monsterList.add(new Monster(new Coordonnees(1000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
+ /*monsterList.add(new Monster(new Coordonnees(1000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Monster(new Coordonnees(500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Monster(new Coordonnees(100, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Monster(new Coordonnees(320, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,5));
monsterList.add(new Bat(new Coordonnees(1500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1, 3));
- monsterList.add(new Boss(new Coordonnees(3000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 500, 90, 180, 3, 50));
-
+ monsterList.add(new Boss(new Coordonnees(3000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 500, 90, 180, 3, 50));*/
+ System.out.println(monsterList);
//on charge le perso (a la fin du constructeur, cest important par rapport a obstacleTable, sinon y'a des pbs de "causalite")
gameCharacterLoader = new CharacterLoader(characterSkinPath,new ShootingCharacter(new Coordonnees(xdebut, zdebut), 1500, 1,600000));
gameCharacter = new ShootingCharacter(new Coordonnees(xdebut, zdebut), 1500, 1,600000);
+ levelManager.generateMonsterTable();
+ monsterList= levelManager.getListeMonster();
//on remplit la map des frames
Map<String,Integer> tempMap = gameCharacterLoader.getPathTable();
diff --git a/MAVENProject/src/main/java/map/LevelManager.java b/MAVENProject/src/main/java/map/LevelManager.java
index 46c084e..b00bb00 100644
--- a/MAVENProject/src/main/java/map/LevelManager.java
+++ b/MAVENProject/src/main/java/map/LevelManager.java
@@ -47,7 +47,6 @@ public class LevelManager {
}
public void generateObstacleTable() {
-
for (int j = 0; j < Jeu.TILES_IN_HEIGHT; j++)
for (int i = 0; i < Jeu.TILES_IN_WIDTH; i++) {
int index = levelOne.getSpriteIndex(i, j);
@@ -83,19 +82,25 @@ public class LevelManager {
listeObstacle.add(new Obstacle(new HitBox(new Coordonnees(Jeu.TILES_SIZE * i+7*Jeu.TILES_SIZE/2, Jeu.TILES_SIZE * j-Jeu.TILES_SIZE/2), 1*Jeu.TILES_SIZE, 7*Jeu.TILES_SIZE)));
}
- //Monstres à pied
- /*if (index==13) {
- listeMonster.add(new Monster(new Coordonnees(Jeu.TILES_SIZE * i+30/2, Jeu.TILES_SIZE * j-62/2), 1000, 30, 60, 1,5));
+
+ }
+ }
+ public void generateMonsterTable() {
+ for (int j = 0; j < Jeu.TILES_IN_HEIGHT; j++)
+ for (int i = 0; i < Jeu.TILES_IN_WIDTH; i++) {
+ int index = levelOne.getSpriteIndex(i, j);
+
+ if (index == 13) {
+ listeMonster.add(new Monster(new Coordonnees(32 * i + 30 / 2, 32 * j - 62 / 2), 1000, 30, 60, 1, 5));
}
//chauve-souris
- if (index==14) {
- listeMonster.add(new Bat(new Coordonnees(Jeu.TILES_SIZE * i+20/2, Jeu.TILES_SIZE * j-32/2), 1, 3));
+ if (index == 14) {
+ listeMonster.add(new Bat(new Coordonnees(32 * i + 20 / 2, 32 * j - 30 / 2), 1, 3));
- }*/
+ }
}
}
-
public List<Obstacle> getListeObstacle() {
return listeObstacle;
}
diff --git a/MAVENProject/src/main/resources/Obstacles/level_one_monster.png b/MAVENProject/src/main/resources/Obstacles/level_one_monster.png
index dbf6127863a90ac8f334fa6d15705d3b9f97528e..05eafc53611fc5e234a4395e7dc9a753183df2db 100644
GIT binary patch
delta 899
zcmbQjzMOr6VSS>fi(^QH`_zbydBTnYbG1ERyVNj<iIur$Uz%iQHt8?(40#6kXWShr
z{|>|_sJz*7;n5V0slG~w<Ym^z%H7(#_x8-$=H<_3SxDc1cV>@y{ynvsOAqUKc4&BO
zEbi$#?;`oM|9|pNWu0H8|Nm}yu&?*q!|GLk4`2IucgJoUfg@t~>T~<l&oAlF{W*j0
z^9t>sM`NDKCtt`>o?a8CqObh$<cjlUb%G3WC9DkkyL7x*oR8@Xg=w@hubD3TNyhMB
zp3{}8eal~;l=ZdyqHN8uIm9tEkm2!xof3|Vjs)LYrDVTm;U&XLxd5lz$8Epf^8a&t
z--0apedk`Puk7GXR9^E)Q))_m@GSNe*#m*0_qSKsDM+q9_ta60L)<THp7F&b$$Zas
zrk01a6eL@O)Llz^FD)})_W5m4;gX008QzLdno<I%T$f;0n5nA4%er#Wy&dxzMc0-w
zWE^*RnsDG1?}c?QTs03Uur(UEPpS_O?C7vsp1sSTJ=OnH9BZ!B@#q^ncGkX`S066y
z(m6lYVwyq1{2+VHnHB4r4AZtU@QZx;ZzvULefa7QUk!Qh2BA4=tM2O@KJYTiTI=8b
z9enTq9qr27&)a(Ivsq5*x01i_`qbXveQ}uo^~1J%D@0PiSNrSVQa^am<B4v1*_o=f
z$%pqo3a|fi>`T_}Dd+gN@Eglb+nVE`ykOVM`rbc{mx?~wuB~k_x_-;;^hwi*2LkGg
zO&mJIIXIf1p82t7tH5WG+P#Zzzi(K?;JG^d`e#Ajb<_TNytbb6&0S?q!2d_9-_I4Y
zZEf()%n_1md7E)sGq5y$>0IWywsU5P&#Ths<$LCL!bqji<!0Nw^Tn?>Cvjb#IQ!=e
zw&1*+hDfIRLo0jRP30WoBkMvn_gtN<pfJ@&``0q-WuNbgmu;QQr~m29w$;nLqMte5
z&F{?kUa?@^ZiOpS3=WS^%_%u`KiAr7*YZZ$gf@M<{6o1uv&7<D4BJ<i{Qdge;cog*
z-{ZDRcLx<)#J`xc?uBA)@HhYEPwUF}#@9AfF;Bi+GQI5i-Q_ihFTFLb{&%QC!<}gb
z(-}9(38$Ao*!aV}Y0tio+ziXsePjA1q}081%FU$61m7aF>REf|ep|dIT6y87ee?QX
z7D=)1eI@VUJ@3QW8kgze-ce`FO``WK*&i3_XmrZvM0L^Tz9V)2uKe`;&+sXJ$Cv0=
Tfu9)|7#KWV{an^LB{Ts5(`&k)
delta 880
zcmZ3^K81aPVZEQHi(^QHdvAnc*)0cwxw^jGm6i@3Q#$l?cl6$NU=-&t=cxR~`6sD}
z*)M_1WA3#bK0yb$JByjG2AuL=J+&<Cv%665R|jir>(9^s?>93)siOMZa7vKZF@cG{
z+m3Ahmb`CCMECr=QNPuDlE0swJVE~7zUZ{ayUqU^_n-XCc|Ns%-Q>=@cKi?hU-7>e
zYlt~@wr8P<tLNvfRjNPZ?AWK9oaYtsE@>BcwUOrH)6tR@JG;0c{JQGFi;7l0E_Yw}
z#6REv;&M_(@ssxrRpIv-k21~uUg)qr_S`Y2sMT{UcwTIakS=@np=8mH`o!&zKL~R$
zJ$@`L@UA;iW|8L_UA0qAyXsS?dxbQAZx5HQ`eV5AjJkbF;3F;fjKwSg3wlF!ueVql
zc(h-%F#Hj3@@V2r8=kb1o$>50H)iE9D1Iyy_7GgMTG_C@<S<*!F_VZ}R%Qkp=10d_
z^v;y_;O+_HJv;rwDeE(ew-}@i?e)I@y*!g`y*`VgY5C&0OFqs#ax~YR$*a9y`kAk?
z#KAdIHyb`)yuf%PLRmMCBSxWU(~+-SFXW<RO3lBh&$M7>;A1lhkeD4+DLl*LFu$c?
z(iMTPi-hl<tH1o`vq3*km#D)oF|DaiGXLhjh~3XD)9+UI@Xn`7F;>xJ(Os%b9`b*j
z;`V!MadpGb*nd2iW<{9iJezczH_hbM{rd1Toq6H2d)XsS-;`M3Y{GLQUBP>6U4%iU
z#dE1Muaf#?Tw1vpl9#SL{Qc<^JH1U#pZ$AvD)rai-h1(CTiKxyhV;c}b?qlU=(zAA
zS)aFS^^B!Y&d!Yc^Y+Ov{VzKebQ$@3AKl)e<b2JqsPobizvdM`;>vQW%@=<ZzaDuu
zQ_;h`UYh^pv{eTg)+d!8wO)2~dhFQ>rQ-a$Fz4GHm5s%Yh0#LQW)Ua6o*EtN`z@<*
zZ`Qpewe$K?c70{8qJ3vuqid^mR6UDJKiQq(tN&5I>__OdhV8u-W+iI*?>3knb}((Q
z%&e`~tLn)2{*`v&2>X8qhAQq8&L1QK8rMYZu5g>)o>`q{=45v4?1h7ARoC?|@7z7*
zcYxv&?hMzvy0ViumKxmNt=TL7`qJ5y_j}&vzL?>2${?_R_r?vAZ$G^<>0H*%#j~$g
td-YjPF%;S8%KP|rOu&&ny>*w2#Zz~^-L-St0tN;K22WQ%mvv4FO#t<ZplAR9
--
GitLab