From 05887965ba1e8042b5468bd5f878c7cb650730bf Mon Sep 17 00:00:00 2001 From: HydroFlo <HydroGamer@outlook.fr> Date: Tue, 9 Jan 2024 14:50:14 +0100 Subject: [PATCH] avance de plus de 1 par 1 --- S1.02/Jeu/classes/Labyrinthe.class | Bin 15021 -> 15337 bytes S1.02/Jeu/ressources/score.csv | 2 +- S1.02/Jeu/src/Labyrinthe.java | 28 ++++++++++++++++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class index 33e5e6c5e85ba5083e895e3fd7e21a16b54cce28..26158dd663517dd6b8b92c5ae903a149878cafd2 100644 GIT binary patch delta 3299 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 delta 2964 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 diff --git a/S1.02/Jeu/ressources/score.csv b/S1.02/Jeu/ressources/score.csv index 94a0561..66c06e6 100644 --- a/S1.02/Jeu/ressources/score.csv +++ b/S1.02/Jeu/ressources/score.csv @@ -3,5 +3,5 @@ Hydro,38 Alex,37 Bob,37 Testeur,34 +Test,32 Cheh,31 -Lose,30 diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java index bfcc457..e6dbea6 100644 --- a/S1.02/Jeu/src/Labyrinthe.java +++ b/S1.02/Jeu/src/Labyrinthe.java @@ -80,12 +80,12 @@ class Labyrinthe extends Program{ return res; } - char controleSaisie(){ // verifie que l'utilisateur saisisse bien 1 caractere + String controleSaisie(){ // verifie que l'utilisateur saisisse bien 1 caractere String choix; do{ choix = toLowerCase(readString()); - }while(length(choix)!= 1); - return charAt(choix, 0); + }while(length(choix) != 1 && length(choix) != 2); + return choix; } char[][] genererSalle(String cheminFichier){ // génère une grille d'une du labyrinthe d'après un fichier (taille 72x19) @@ -444,14 +444,14 @@ class Labyrinthe extends Program{ boolean fait = false; newFile[0][0] = file[0][0]; newFile[0][1] = file[0][1]; - for(int i1 = 1; i1 < length(file, 1); i1 ++){ //copie le fichier de base - if(score >= stringToInt(file[i1][1]) && !fait){ //ajoute le score du joueur a la place qu'il mérite (en cas d'égalité remplace l'ancien ;) ) + for(int i1 = 1; i1 < length(newFile, 1); i1 ++){ //copie le fichier de base + if(score >= stringToInt(file[i][1]) && !fait){ //ajoute le score du joueur a la place qu'il mérite (en cas d'égalité remplace l'ancien ;) ) newFile[i1][0] = pseudo; newFile[i1][1] = "" + score; fait = true; } else{ //sinon remet les ancienne ligne for(int j1 = 0; j1 < length(file, 2); j1 ++){ - newFile[i][j1] = file[i][j1]; + newFile[i1][j1] = file[i][j1]; } i = i + 1; //incrémente i pour savoir quelle ligne de l'ancien fichier ont été mise dans le nouveau } @@ -675,8 +675,18 @@ class Labyrinthe extends Program{ afficheLab(salle); println("" + joueur.pseudo + " / Score : " + joueur.score + " / PV : " + joueur.vie ); int[] indiceP = indiceDe('P', salle); - char choix = controleSaisie(); - indiceP = deplacement(salle, choix, indiceP[0], indiceP[1], joueur, lQuestion, lQuestionBoss, indiceSalle); + String choix = controleSaisie(); + int nbMove = 1; + if(length(choix) == 2){ + nbMove = charToInt(charAt(choix,1)); + } + for(int i = 0; i < nbMove; i ++){ + indiceP = deplacement(salle, charAt(choix,0), indiceP[0], indiceP[1], joueur, lQuestion, lQuestionBoss, indiceSalle); + delay(100); + println(nbMove); + println(i); + afficheLab(salle); + } if(!equals(indiceSalleActu, indiceSalle)){ salle = genererSalle("ressources/Lab/Salle"+lab[indiceSalle[0]][indiceSalle[1]].numero); salle[indiceP[0]][indiceP[1]] = 'P'; @@ -689,8 +699,6 @@ class Labyrinthe extends Program{ rando = (int) (random() * 3) + 1; } } - - } if(joueur.bossVaincu){ print(readFile("ressources/img/Win.txt", true)); -- GitLab