From 923ff4e06926de5daad689857327c7661b46765b Mon Sep 17 00:00:00 2001
From: Louis MALTERRE <malterre.louis@laposte.net>
Date: Tue, 3 Jan 2023 22:46:12 +0100
Subject: [PATCH] derniers chgts LM
---
MAVENProject/src/main/java/entity/Character.java | 6 ++++--
MAVENProject/src/main/java/entity/ShootingCharacter.java | 6 ++++--
MAVENProject/src/main/java/jeu/Jeu.java | 2 +-
MAVENProject/src/test/java/entity/CharacterTest.java | 3 +--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index 349c804..961add6 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -32,8 +32,8 @@ public class Character extends Entity{
//private BufferedImage sprite;
- public Character(Coordonnees c, double vitesseMax, double m, double impSaut){
- super(c,vitesseMax,30,60,5); // comme tous les entities ont une hitbox, j'ai factorise
+ public Character(Coordonnees c, double vitesseMax, double m, double impSaut,int atkStt){
+ super(c,vitesseMax,30,60,atkStt); // comme tous les entities ont une hitbox, j'ai factorise
this.masse = m;
this.impulsionSaut = impSaut;
this.tableCommande = new HashMap<>();
@@ -41,6 +41,8 @@ public class Character extends Entity{
tableCommande.put("CommandZ",(double)0);
tableCommande.put("CommandAttack",(double)0); // 1 si attack, 0 sinon
nbMaxFramesInvicible = 500;
+ maxLifePoints = 7;
+ nbLifePoints = maxLifePoints;
}
void deplacements(){ // alpha indique si il est au sol ou non, il vaut 0 (en l'air) ou 1 (au sol) en fonction
diff --git a/MAVENProject/src/main/java/entity/ShootingCharacter.java b/MAVENProject/src/main/java/entity/ShootingCharacter.java
index d4f7a3d..95f239d 100644
--- a/MAVENProject/src/main/java/entity/ShootingCharacter.java
+++ b/MAVENProject/src/main/java/entity/ShootingCharacter.java
@@ -8,11 +8,13 @@ import jeu.Jeu;
public class ShootingCharacter extends Character{
private int hasAttacked = 0; //varialbe disant si il a deja attaque, il ne peut attaque que toutes les deux frames, ainsi il ne peut attaquer que si = 0
- private final int stockMaxKunai = 10;
+ private final int stockMaxKunai = 15;
private int stockKunai = stockMaxKunai;
private int kunaiReloading = 0; //temps de rechargement des kunais
public ShootingCharacter(Coordonnees c, double vitesseMax, double m, double impSaut){
- super(c, vitesseMax, m, impSaut);
+ super(c, vitesseMax, m, impSaut,2);
+ maxLifePoints = 5;
+ nbLifePoints = maxLifePoints;
}
public void attaque(){
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 5279fff..d483ec8 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -149,7 +149,7 @@ public class Jeu implements Game{
}
if (engine.MenuPanel.isNormalCharacter()){
- gameCharacter = new Character(new Coordonnees(xdebut, zdebut), 1500, 1, 600000);
+ gameCharacter = new Character(new Coordonnees(xdebut, zdebut), 1500, 1, 600000,5);
gameCharacterLoader = new CharacterLoader(characterSkinPath, gameCharacter);
}
diff --git a/MAVENProject/src/test/java/entity/CharacterTest.java b/MAVENProject/src/test/java/entity/CharacterTest.java
index 43eb7e1..a5921db 100644
--- a/MAVENProject/src/test/java/entity/CharacterTest.java
+++ b/MAVENProject/src/test/java/entity/CharacterTest.java
@@ -11,7 +11,6 @@ import environnement.Coordonnees;
import environnement.HitBox;
import jeu.Jeu;
import map.Coffre;
-import map.LevelManager;
import map.Obstacle;
public class CharacterTest {
@@ -23,7 +22,7 @@ public class CharacterTest {
@BeforeClass
public static void generateParameters(){
- character = new Character(new Coordonnees(2,3), 100, 1, 50000);
+ character = new Character(new Coordonnees(2,3), 100, 1, 50000,5);
obstacleTest = new Obstacle(new HitBox(new Coordonnees(10, 30),50,60));
monster = new Monster(new Coordonnees(20, 3), 100, 50, 60, 1, 1);
Jeu.getMonsterList().add(monster);
--
GitLab