Skip to content

Commit bcea646

Browse files
committed
dev game v2.3.3 create fonction combat in listEtage
1 parent 7cdfee9 commit bcea646

File tree

2 files changed

+64
-13
lines changed

2 files changed

+64
-13
lines changed

src/main/java/com/societe/projet/donjons/Donjon.java

+64-9
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void interfaceGame() {
238238

239239
this.nbMonstreEtage(menu.menuMonstreEtage(listMonstre.size())); //def : ok
240240
this.initEtageMonstre(); //def : ok
241-
this.affListEtage();
241+
this.affListEtage();
242242
}
243243

244244
/*
@@ -310,21 +310,29 @@ public void game() {
310310
//listHeros.get(0).getRpg().figth(listMonstre.get(0)); //bb//bb
311311
//listMonstre.get(0).getRpg().figth(listHeros.get(0));
312312

313+
//////////////////////////////////
314+
313315
int dieMonstre = listMonstre.size();
314316
int dieHeros = listHeros.size();
315317
int toogle = 0;
316-
boolean win = true;
318+
boolean win = false;
319+
320+
int nextHero = 0;
321+
//////////////////////////////////
317322
nbEtages =1;
323+
nbMonstreEtage = 2;
318324
initEtageMonstre();
325+
//////////////////////////////////
319326

320-
for(ArrayList<Monstre> valeur1 : listEtages) {
327+
System.out.println(listEtages.size());
328+
for(ArrayList<Monstre> lisMonstre : listEtages) {
321329
System.out.println("\n\n\n\n\n\nEtages");
322-
for(Monstre valeur2 : valeur1) {
323-
valeur2.affichePersonnage();
324-
valeur2.getArme().affiArme();
325-
valeur2.getArmure().affiArmure();
330+
for(Monstre mtr : lisMonstre) {
331+
mtr.affichePersonnage();
332+
mtr.getArme().affiArme();
333+
mtr.getArmure().affiArmure();
326334

327-
combatListEtage();
335+
combatListEtage(dieMonstre ,dieHeros,mtr,nextHero);
328336

329337
}
330338
}
@@ -353,9 +361,30 @@ public void game() {
353361
toogle--;
354362
}
355363
}
364+
356365

357366
}
358367

368+
public void eeee() {
369+
370+
System.out.println(listEtages.size());
371+
for(ArrayList<Monstre> valeur1 : listEtages) {
372+
System.out.println("\n\n\n\n\n\nEtages");
373+
for(Monstre valeur2 : valeur1) {
374+
valeur2.affichePersonnage();
375+
valeur2.getArme().affiArme();
376+
valeur2.getArmure().affiArmure();
377+
378+
379+
}
380+
}
381+
}
382+
383+
384+
385+
386+
387+
359388
public boolean verifiedLife(Personnage item) {
360389
boolean response = false;
361390
if(item.getPointVie()<0) {
@@ -365,8 +394,34 @@ public boolean verifiedLife(Personnage item) {
365394
}
366395

367396

368-
public void combatListEtage() {
397+
public void combatListEtage(int dieM,int dieH,Personnage monst,int nHeros) {
398+
399+
int toogle = 0;
400+
boolean win = true;
369401

402+
while((dieM!= 0 || dieH!=0) && !win) {
403+
404+
if(toogle == 0) {
405+
listHeros.get(nHeros).getRpg().figth(monst);
406+
407+
if(verifiedLife(monst)) {
408+
win = true;
409+
dieM--;
410+
System.out.println("winner is Heros");
411+
}
412+
toogle++;
413+
}else {
414+
monst.getRpg().figth(listHeros.get(nHeros));
415+
416+
if(verifiedLife(listHeros.get(nHeros))) {
417+
win = true;
418+
nHeros++;
419+
dieH--;
420+
System.out.println("winner is monstre");
421+
}
422+
toogle--;
423+
}
424+
}
370425

371426
}
372427

src/main/java/com/societe/projet/entities/personnages/Hero.java

-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,4 @@ public void actionDefence(int frag) {
4141
this.getArmure().setDefence(this.getArmure().getDefence()- (frag/2));
4242
}
4343

44-
45-
46-
47-
4844
}

0 commit comments

Comments
 (0)