Skip to content
Snippets Groups Projects
Commit 0bdce07f authored by Louis's avatar Louis
Browse files

maj UML LM

parent 1341e0e1
Branches
No related tags found
No related merge requests found
...@@ -15,6 +15,9 @@ engine.GamePainter <|-- engine.DrawingPanel ...@@ -15,6 +15,9 @@ engine.GamePainter <|-- engine.DrawingPanel
environment.Coordonnees <|-- entity.Entity environment.Coordonnees <|-- entity.Entity
entity.Character <|-- environment.Physique entity.Character <|-- environment.Physique
entity.Monster <|-- environnement.Physique entity.Monster <|-- environnement.Physique
entity.ShootingCharacter <|.. entity.Character
entity.Boss <|.. entity.Monster
entity.Bat <|.. entity.Monster
loaders.CharacterLoader <|-- jeu.Jeu loaders.CharacterLoader <|-- jeu.Jeu
jeu.Painter <|-- loaders.CharacterLoader jeu.Painter <|-- loaders.CharacterLoader
...@@ -68,7 +71,6 @@ class entity.Character { ...@@ -68,7 +71,6 @@ class entity.Character {
- double masse - double masse
- double impulsionSaut - double impulsionSaut
- HashMap tableCommand - HashMap tableCommand
- double vitesseActuX - double vitesseActuX
- double vitesseActuZ - double vitesseActuZ
+ void deplacements() + void deplacements()
...@@ -97,6 +99,22 @@ class entity.Monster{ ...@@ -97,6 +99,22 @@ class entity.Monster{
+ void evolveMonster() + void evolveMonster()
} }
class entity.ShootingCharacter(){
- int hasAttacked
+ void attaque()
+ void evolveCharacter()
}
class entity.Bat(){
- int directionZ
- double vitesseMaxZ
+ void deplacements()
+ void attaque()
}
class entity.Boss(){
}
abstract class entity.Entity{ abstract class entity.Entity{
- HitBox hitBox - HitBox hitBox
...@@ -134,6 +152,26 @@ class entity.Attack(){ ...@@ -134,6 +152,26 @@ class entity.Attack(){
+ HitBox getHitBox() + HitBox getHitBox()
} }
class entity.Kunai(){
- int direction
- int damage
- double vitesse
- HitBox hitBox
- Coordonnees coord
- boolean disappear
- static int height
- static int width
- void deplacements()
- void dealsDamage()
- void updateHitBox()
- void evolveKunai()
- static void evolveAllKunais(List<Kunai>)
+ public Coordonnees getcoord()
+ public HitBox getHitBox()
+ public int getWidth()
+ public int getHeight()
}
class environment.Obstacle{ class environment.Obstacle{
} }
......
...@@ -5,8 +5,8 @@ import environnement.HitBox; ...@@ -5,8 +5,8 @@ import environnement.HitBox;
import static jeu.Jeu.getGameCharacter; import static jeu.Jeu.getGameCharacter;
public class Bat extends Monster{ public class Bat extends Monster{
int directionZ = 1; //meme principe que direction pour x private int directionZ = 1; //meme principe que direction pour x
final double vitesseMaxZ = 1000; private final double vitesseMaxZ = 1000;
public Bat(Coordonnees c,int atkStt,int nbLP){ public Bat(Coordonnees c,int atkStt,int nbLP){
super(c, 1000, 20, 30, atkStt, nbLP); super(c, 1000, 20, 30, atkStt, nbLP);
......
...@@ -25,16 +25,16 @@ public class Kunai { ...@@ -25,16 +25,16 @@ public class Kunai {
hitBox = new HitBox(coord,height,width); hitBox = new HitBox(coord,height,width);
} }
public void deplacement(){ //deplacement du kunai private void deplacement(){ //deplacement du kunai
double newX = coord.getX() + direction*vitesse; double newX = coord.getX() + direction*vitesse;
this.coord = new Coordonnees(newX, this.coord.getZ()); this.coord = new Coordonnees(newX, this.coord.getZ());
} }
public void updateHitBox(){ //on update la hitbox du kunai private void updateHitBox(){ //on update la hitbox du kunai
hitBox = new HitBox(coord,height,width); hitBox = new HitBox(coord,height,width);
} }
public void dealsDamage(Entity entity){ private void dealsDamage(Entity entity){
if (HitBox.collision(hitBox, entity.getHitBox())){ if (HitBox.collision(hitBox, entity.getHitBox())){
if (entity.nbFramesInvincible == 0){ if (entity.nbFramesInvincible == 0){
entity.setNbLifePoints(Math.max(entity.getNbLifePoints()-damage,0)); entity.setNbLifePoints(Math.max(entity.getNbLifePoints()-damage,0));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment