From 68e1f52f5875184ebcd6777fcdbcb56b2677b635 Mon Sep 17 00:00:00 2001 From: HydroFlo <HydroGamer@outlook.fr> Date: Tue, 9 Jan 2024 13:08:45 +0100 Subject: [PATCH] taille variable de labyrinthe --- S1.02/Jeu/classes/Labyrinthe.class | Bin 14520 -> 14733 bytes S1.02/Jeu/src/Labyrinthe.java | 35 +++++++++++++++++------------ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class index 3213c314115800597a45cd8414591322450880e8..e65d80cfec48525c09812fb8aeba771d8a6c1ab2 100644 GIT binary patch delta 3084 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 delta 2882 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 diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java index 52c51a0..5cd2da9 100644 --- a/S1.02/Jeu/src/Labyrinthe.java +++ b/S1.02/Jeu/src/Labyrinthe.java @@ -590,26 +590,33 @@ class Labyrinthe extends Program{ assertFalse(estInt(mot4)); } + int nbFromString(int minimum){ //Demande un nombre à l'utilisateur tant qu'il rentre autre chose qu'un nombre ou un nombre inférieur à la limite + int nbAjout = 0; + while(nbAjout < minimum){ + String nb = readString(); + while(!estInt(nb)){ + print("Veuillez entrer un nombre valide : "); + nb = readString(); + } + nbAjout = stringToInt(nb); + if(nbAjout < minimum ){ + print("Veuillez choisir un nombre supérieur ou égale à "+ minimum +" : "); + } + + } + return nbAjout; + } + void algorithm(){ - Salle[][] lab = genererLab(3); //genere le Layrinthe + println("Quel taille voulez vous pour le labyrinthe (la taille sera en : N x N ) ?"); + int tailleLab = nbFromString(3); + Salle[][] lab = genererLab(tailleLab); //genere le Layrinthe String[][] questionTemp = load("ressources/ListeQuestion.csv"); print("Voulez vous ajouter des question ? oui (o), non (autre) : "); boolean ques = equals(toLowerCase(readString()), "o"); if(ques){ print("Combien voulez vous en ajouter ? : "); - int nbAjout = 0; - while(nbAjout <= 0){ - String nb = readString(); - while(!estInt(nb)){ - print("Veuillez entrer un nombre valide : "); - nb = readString(); - } - nbAjout = stringToInt(nb); - if(nbAjout <= 0 ){ - print("Veuillez choisir un nombre positif non nul : "); - } - - } + int nbAjout = nbFromString(0); ajoutQuestion(questionTemp, nbAjout); questionTemp = load("ressources/ListeQuestion.csv"); afficheStringTab(questionTemp); -- GitLab