diff --git a/MAVENProject/PlanUML.puml b/MAVENProject/PlanUML.puml index fbb20775b6e62fd26c5ec3a73dca29c4b4090aaf..ac99dfa02f66502225fec24dc2a17c60255d2faa 100644 --- a/MAVENProject/PlanUML.puml +++ b/MAVENProject/PlanUML.puml @@ -15,6 +15,9 @@ engine.GamePainter <|-- engine.DrawingPanel environment.Coordonnees <|-- entity.Entity entity.Character <|-- environment.Physique entity.Monster <|-- environnement.Physique +entity.ShootingCharacter <|.. entity.Character +entity.Boss <|.. entity.Monster +entity.Bat <|.. entity.Monster loaders.CharacterLoader <|-- jeu.Jeu jeu.Painter <|-- loaders.CharacterLoader @@ -68,7 +71,6 @@ class entity.Character { - double masse - double impulsionSaut - HashMap tableCommand - - double vitesseActuX - double vitesseActuZ + void deplacements() @@ -97,6 +99,22 @@ class entity.Monster{ + 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{ - HitBox hitBox @@ -134,6 +152,26 @@ class entity.Attack(){ + 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{ } diff --git a/MAVENProject/src/main/java/entity/Bat.java b/MAVENProject/src/main/java/entity/Bat.java index fd0a6a0cb4633034db5a37b913695a405ef88e4d..bddaf42fb14ee0d053a5ebb6b581cdaeaafbbdf6 100644 --- a/MAVENProject/src/main/java/entity/Bat.java +++ b/MAVENProject/src/main/java/entity/Bat.java @@ -5,8 +5,8 @@ import environnement.HitBox; import static jeu.Jeu.getGameCharacter; public class Bat extends Monster{ - int directionZ = 1; //meme principe que direction pour x - final double vitesseMaxZ = 1000; + private int directionZ = 1; //meme principe que direction pour x + private final double vitesseMaxZ = 1000; public Bat(Coordonnees c,int atkStt,int nbLP){ super(c, 1000, 20, 30, atkStt, nbLP); diff --git a/MAVENProject/src/main/java/entity/Kunai.java b/MAVENProject/src/main/java/entity/Kunai.java index 05caa7b58764f9cedaa9163e7a7fac594862be92..046bb4838c72b89aa75d8341ebf55e778a2e1305 100644 --- a/MAVENProject/src/main/java/entity/Kunai.java +++ b/MAVENProject/src/main/java/entity/Kunai.java @@ -25,16 +25,16 @@ public class Kunai { hitBox = new HitBox(coord,height,width); } - public void deplacement(){ //deplacement du kunai + private void deplacement(){ //deplacement du kunai double newX = coord.getX() + direction*vitesse; 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); } - public void dealsDamage(Entity entity){ + private void dealsDamage(Entity entity){ if (HitBox.collision(hitBox, entity.getHitBox())){ if (entity.nbFramesInvincible == 0){ entity.setNbLifePoints(Math.max(entity.getNbLifePoints()-damage,0));