diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index 1c4ee7e08f35856311f2f9373835f445d8e1d28a..4ff2ff65d720d7a0542c9f5b4f919c6d6f40574b 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -66,7 +66,7 @@ public class Character extends Entity{
direction = (int) Math.signum(vitesseActuX);
}
- vitesseActuZ = vitesseActuZ + 7*((1-alpha)*Physique.g - tableCommande.get("CommandZ"))*delta;
+ vitesseActuZ = vitesseActuZ + 8*((1-alpha)*Physique.g - tableCommande.get("CommandZ"))*delta;
}
public void collisionGestion(){
@@ -134,7 +134,7 @@ public class Character extends Entity{
@Override
public void attaque(){
Coordonnees attackCenter = new Coordonnees(coord.getX() + direction*entityWIDTH/2, coord.getZ());
- Attack characterAttack = new Attack(attackStat, attackCenter, new HitBox(attackCenter,entityHEIGHT,entityWIDTH));
+ Attack characterAttack = new Attack(attackStat, attackCenter, new HitBox(attackCenter,entityHEIGHT,entityWIDTH+20));
for (Monster monster : Jeu.getMonsterList()){
if (HitBox.collision(characterAttack.getHitBox(), monster.getHitBox())){
//le Math.max est la juste pour que la vie du perso ne tombe pas en-dessous de zero
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 1d7dfd5f7610fefdef39078306730744f33f2840..e39366e83ab1c3f53c5cc37bcc415f645103dc0b 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -95,24 +95,24 @@ public class Jeu implements Game{
directionJeu.put("Attack",false);
-
+ //faut supp la pour table obstacles
obstacleTable.add(sol);
obstacleTable.add(new Obstacle(new HitBox(new Coordonnees(300,550),32,128)));
obstacleTable.add(new Obstacle(new HitBox(new Coordonnees(800, 625),150,50)));
obstacleTable.add(new Obstacle(new HitBox(new Coordonnees(600, 662.5),75,50)));
obstacleTable.add(new Obstacle(new HitBox(new Coordonnees(450, 400),32,128)));
- //coffreTable.add(new Coffre(new HitBox(new Coordonnees(900, 685),30,30)));
+ //coffreTable.add(new Coffre(new HitBox(new Coordonnees(900, 685),30,30))); //table des coffres
- //on met des monstres
- monsterList.add(new Monster(new Coordonnees(1000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,10));
- monsterList.add(new Monster(new Coordonnees(500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,10));
- monsterList.add(new Monster(new Coordonnees(100, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,10));
- monsterList.add(new Monster(new Coordonnees(300, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,10));
+ //on met des monstres, faut supp la pour table monstres
+ monsterList.add(new Monster(new Coordonnees(1000, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,1));
+ monsterList.add(new Monster(new Coordonnees(500, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,1));
+ monsterList.add(new Monster(new Coordonnees(100, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,1));
+ monsterList.add(new Monster(new Coordonnees(300, sol.getHitbox().getExtremites().get("HautGauche").getZ()-500), 1000, 30, 60, 1,1));
//on charge le perso (a la fin du constructeur, cest important par rapport a obstacleTable, sinon y'a des pbs de "causalite")
- gameCharacterLoader = new CharacterLoader(characterSkinPath,new Character(new Coordonnees(300, 300), 2000, 1,600000));
- gameCharacter = new Character(new Coordonnees(xdebut, zdebut), 2000, 1,600000);
+ gameCharacterLoader = new CharacterLoader(characterSkinPath,new Character(new Coordonnees(300, 300), 1500, 1,600000));
+ gameCharacter = new Character(new Coordonnees(xdebut, zdebut), 1500, 1,600000);
//on remplit la map des frames
Map<String,Integer> tempMap = gameCharacterLoader.getPathTable();
@@ -122,6 +122,10 @@ public class Jeu implements Game{
tempMap.put("character_attack",3);
tempMap.put("character_run", 4);
tempMap.put("character_jump",1);
+ tempMap.put("character_jump_L",1);
+ tempMap.put("character_run_L",4);
+ tempMap.put("character_attack_L",3);
+ tempMap.put("character_idle_L",4);
gameCharacterLoader.setPathTable(tempMap);
}
@@ -160,6 +164,7 @@ public class Jeu implements Game{
private void animation(Boolean Attack,Boolean Right,Boolean Left){
if (Attack && !characterAttacking) {
movement = "character_attack";
+ if (gameCharacter.getDirection() == -1)movement += "_L";
characterAttacking = true;
}
@@ -175,7 +180,10 @@ public class Jeu implements Game{
movement = "character_idle"; //ca changera quand j'aurai les nouvelles frames
}
}
+ if (gameCharacter.getDirection() == -1)movement += "_L";
}
+
+
//si on a change de mouvement, le jeu doit redemarrer a la premiere frame correspondante
//System.out.println(numberOfMovement);
@@ -183,7 +191,7 @@ public class Jeu implements Game{
if (numberOfMovement == gameCharacterLoader.getPathTable().get(movement)){
//System.out.println(movement);
//characterNotMoving = true;
- if (movement.equals("character_attack")){
+ if (movement.equals("character_attack") || movement.equals("character_attack_L")){
characterAttacking = false;
}
}
diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java
index 4cdfb9634934e76b913ba61f852329404a9ab03f..325a2989fcad17c7e2204ca25019ae0578462dbe 100644
--- a/MAVENProject/src/main/java/jeu/Painter.java
+++ b/MAVENProject/src/main/java/jeu/Painter.java
@@ -54,8 +54,12 @@ public class Painter implements GamePainter{
private void drawCharacter(Graphics2D crayon,Image imageCharac){
crayon.fillRect(WIDTH/2-(int) gameCharacter.getEntityWIDTH()/2,WIDTH/2-(int) gameCharacter.getEntityHEIGHT()/2, (int) gameCharacter.getEntityWIDTH(),(int) gameCharacter.getEntityHEIGHT());
crayon.drawRect(WIDTH/2-500,WIDTH/2-500, 1000,1000);
- crayon.drawImage(imageCharac, WIDTH/2- (int) gameCharacter.getEntityWIDTH()/2-10, HEIGHT/2 - (int) gameCharacter.getEntityHEIGHT()/2-3, null, null);
-
+ if (gameCharacter.getDirection() == 1){
+ crayon.drawImage(imageCharac, WIDTH/2- (int) gameCharacter.getEntityWIDTH()/2-10, HEIGHT/2 - (int) gameCharacter.getEntityHEIGHT()/2-3, null, null);
+ }
+ else{
+ crayon.drawImage(imageCharac, WIDTH/2- (int) gameCharacter.getEntityWIDTH()/2-10-20, HEIGHT/2 - (int) gameCharacter.getEntityHEIGHT()/2-3, null, null);
+ }
}
private void drawLifePoints(Graphics2D crayon){
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_attack1_L.png b/MAVENProject/src/main/resources/Frames_perso/character_attack_L1.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_attack1_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_attack_L1.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_attack2_L.png b/MAVENProject/src/main/resources/Frames_perso/character_attack_L2.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_attack2_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_attack_L2.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_attack_L3.png b/MAVENProject/src/main/resources/Frames_perso/character_attack_L3.png
new file mode 100644
index 0000000000000000000000000000000000000000..72046758ec4a15e5f3efaf261397a47683eba0e7
Binary files /dev/null and b/MAVENProject/src/main/resources/Frames_perso/character_attack_L3.png differ
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_idle1_L.png b/MAVENProject/src/main/resources/Frames_perso/character_idle_L1.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_idle1_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_idle_L1.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_idle_L2.png b/MAVENProject/src/main/resources/Frames_perso/character_idle_L2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b158570b88211f0189a8f57a0583186a9de2b558
Binary files /dev/null and b/MAVENProject/src/main/resources/Frames_perso/character_idle_L2.png differ
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_idle2_L.png b/MAVENProject/src/main/resources/Frames_perso/character_idle_L3.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_idle2_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_idle_L3.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_idle_L4.png b/MAVENProject/src/main/resources/Frames_perso/character_idle_L4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a43223d5d94b99717f474a76a2764b2e2a77df4
Binary files /dev/null and b/MAVENProject/src/main/resources/Frames_perso/character_idle_L4.png differ
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_jump_L.png b/MAVENProject/src/main/resources/Frames_perso/character_jump_L1.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_jump_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_jump_L1.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_run1_L.png b/MAVENProject/src/main/resources/Frames_perso/character_run_L1.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_run1_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_run_L1.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_run2_L.png b/MAVENProject/src/main/resources/Frames_perso/character_run_L2.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_run2_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_run_L2.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_run3_L.png b/MAVENProject/src/main/resources/Frames_perso/character_run_L3.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_run3_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_run_L3.png
diff --git a/MAVENProject/src/main/resources/Frames_perso/character_run4_L.png b/MAVENProject/src/main/resources/Frames_perso/character_run_L4.png
similarity index 100%
rename from MAVENProject/src/main/resources/Frames_perso/character_run4_L.png
rename to MAVENProject/src/main/resources/Frames_perso/character_run_L4.png