From 39c86365b0b41b8edf7b4e543959c59e024f0487 Mon Sep 17 00:00:00 2001
From: Louis MALTERRE <malterre.louis@laposte.net>
Date: Tue, 3 Jan 2023 19:17:47 +0100
Subject: [PATCH] indexBoss LM
---
MAVENProject/src/main/java/entity/Monster.java | 6 ++++--
MAVENProject/src/main/java/jeu/Jeu.java | 5 +++++
MAVENProject/src/main/java/map/LevelManager.java | 6 ++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/MAVENProject/src/main/java/entity/Monster.java b/MAVENProject/src/main/java/entity/Monster.java
index dcd6a90..96fb390 100644
--- a/MAVENProject/src/main/java/entity/Monster.java
+++ b/MAVENProject/src/main/java/entity/Monster.java
@@ -110,7 +110,7 @@ public class Monster extends Entity{
public void attaque(){//isAttacking > 0 pour dire que si il est entrain d'attaquer, il finit son attaque
if ((Math.abs(this.coord.getX()-getGameCharacter().coord.getX()) <= 2+entityWIDTH/2+getGameCharacter().entityWIDTH/2 && Math.abs(this.coord.getZ()-getGameCharacter().coord.getZ()) <= entityHEIGHT && characInFrontOf()) || isAttacking > 0){ //n'attaque que si perso pas invincible
//si il n'est pas immobile il s'arrete
- if (isAttacking < 50){
+ if (isAttacking >= 50){
isAttacking++;
}
//sinon on cree l'attaque
@@ -178,7 +178,9 @@ public class Monster extends Entity{
//on supprime tous les monstres morts
int i = 0;
while (i < liste.size()){
- if (liste.get(i).death())liste.remove(i);
+ if (liste.get(i).death() && !(liste.get(i) instanceof Boss)){
+ liste.remove(i);
+ }
else i++;
}
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 061bded..6556ea5 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -9,6 +9,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import entity.Boss;
import entity.Character;
import entity.Hearth;
import entity.Kunai;
@@ -197,6 +198,10 @@ public class Jeu implements Game{
//monstres evoluent dans le jeu
Monster.evolveAllMonsters(monsterList);
+ //on recupere l index du boss
+ for (Monster monster : monsterList){
+ if (monster instanceof Boss) {levelManager.setIndexBoss(monsterList.indexOf(monster));break;}
+ }
//perso evolue dans le jeu (en actualisant ses coordonnees)
gameCharacter.evolveCharacter();
diff --git a/MAVENProject/src/main/java/map/LevelManager.java b/MAVENProject/src/main/java/map/LevelManager.java
index c0b06a1..f21ba17 100644
--- a/MAVENProject/src/main/java/map/LevelManager.java
+++ b/MAVENProject/src/main/java/map/LevelManager.java
@@ -239,4 +239,10 @@ public class LevelManager {
public int getIndexPorte() {
return indexPorte;
}
+
+ public void setIndexBoss(int indexBoss) {
+ this.indexBoss = indexBoss;
+ }
+
+
}
--
GitLab