diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java index 900f55b775fbd91753e9d5c2c3a8813431a76905..0f802eef7af1bf80b6f0673374da1b5ab887af76 100644 --- a/MAVENProject/src/main/java/jeu/Jeu.java +++ b/MAVENProject/src/main/java/jeu/Jeu.java @@ -60,7 +60,7 @@ public class Jeu implements Game{ URL url = Jeu.class.getClassLoader().getResource(fn); assert url != null; beginPath = url.toString().substring(6)+"/"; - movement = "Character_idle"; + movement = "character_idle"; previousMovement = movement; numberOfMovement = 1; characterSkinPath = beginPath + movement + numberOfMovement + ".png"; // path premiere frame @@ -91,7 +91,9 @@ public class Jeu implements Game{ tempMap.put(movement,4); - tempMap.put("Character_attack",3); + tempMap.put("character_attack",2); + tempMap.put("character_run", 4); + tempMap.put("character_jump",1); gameCharacterLoader.setPathTable(tempMap); @@ -111,7 +113,7 @@ public class Jeu implements Game{ directionJeu.replace("Left", command.get("Left")); directionJeu.replace("Jump", command.get("Jump")); directionJeu.replace("Attack",command.get("Attack")); - Boolean Right = command.get("Right"); + boolean Right = command.get("Right"); boolean Left = command.get("Left"); boolean Jump = command.get("Jump"); boolean Attack = command.get("Attack"); @@ -123,25 +125,34 @@ public class Jeu implements Game{ //animation du perso dans le jeu (definir la bonne frame a cet instant) if (Attack) { - movement = "Character_attack"; + movement = "character_attack"; characterAttacking = true; } - if (!Right && !Left && (gameCharacter.getAlpha() == 1) && !characterAttacking){ - movement = "Character_idle"; + - } + //characterNotMoving = false; - else{ // squelette pour futures implementations - if (!characterAttacking){ //animation d'attaque prioritaire - movement = "Character_idle"; //ca changera quand j'aurai les nouvelles frames + if (!characterAttacking){ //animation d'attaque prioritaire + if (gameCharacter.getAlpha() == 0) movement = "character_jump"; // pour savoir si il jump ou non + else{ + if (Right && Left)movement = "character_idle"; + else if (Right || Left){ + movement = "character_run"; + } + else if (!Right && !Left){ + + movement = "character_idle"; //ca changera quand j'aurai les nouvelles frames + } } } + //si on a change de mouvement, le jeu doit redemarrer a la premiere frame correspondante + System.out.println(numberOfMovement); if (previousMovement != movement){numberOfMovement = 1;nbBeforeFramechgt = nbIterationPerFrame;} if (numberOfMovement == gameCharacterLoader.getPathTable().get(movement)){ //characterNotMoving = true; diff --git a/MAVENProject/src/main/resources/Frames_perso/character_jump.png b/MAVENProject/src/main/resources/Frames_perso/character_jump1.png similarity index 100% rename from MAVENProject/src/main/resources/Frames_perso/character_jump.png rename to MAVENProject/src/main/resources/Frames_perso/character_jump1.png