diff --git a/S1.02/Jeu/classes/Joueur.class b/S1.02/Jeu/classes/Joueur.class new file mode 100644 index 0000000000000000000000000000000000000000..f76da6881ae60e0e84be392a177166404a307ab5 Binary files /dev/null and b/S1.02/Jeu/classes/Joueur.class differ diff --git a/S1.02/Jeu/classes/Labyrinthe.class b/S1.02/Jeu/classes/Labyrinthe.class new file mode 100644 index 0000000000000000000000000000000000000000..7acca075ce5546f9e073d8fca43f18d640f1553f Binary files /dev/null and b/S1.02/Jeu/classes/Labyrinthe.class differ diff --git a/S1.02/Jeu/classes/Question.class b/S1.02/Jeu/classes/Question.class new file mode 100644 index 0000000000000000000000000000000000000000..dbbca1c65ca1a967037eb94232889a1a1c5980eb Binary files /dev/null and b/S1.02/Jeu/classes/Question.class differ diff --git a/S1.02/Jeu/classes/Salle.class b/S1.02/Jeu/classes/Salle.class new file mode 100644 index 0000000000000000000000000000000000000000..f7671e150729943b6743279e1813ce9a1d977455 Binary files /dev/null and b/S1.02/Jeu/classes/Salle.class differ diff --git a/S1.02/Jeu/ressources/Lab/Salle1 b/S1.02/Jeu/ressources/Lab/Salle1 index a1db14659c5a4eef54df351182eac42ea6ee9cc0..fabdf555b2d162b5735e399d4df855f03168cb12 100644 --- a/S1.02/Jeu/ressources/Lab/Salle1 +++ b/S1.02/Jeu/ressources/Lab/Salle1 @@ -9,7 +9,7 @@ @S....................................................................S@ @S....................................................................S@ @......................................................................@ -@..................................P...................................@ +@......................................................................@ @......................................................................@ @......................................................................@ @......................................................................@ diff --git a/S1.02/Jeu/ressources/Lab/Salle2 b/S1.02/Jeu/ressources/Lab/Salle2 index 3a991f73dee85f06ada648f03083e08ce7fdc7f3..96d005d7b130f7b4eea7480db9eb5aa8c9fc4bfd 100644 --- a/S1.02/Jeu/ressources/Lab/Salle2 +++ b/S1.02/Jeu/ressources/Lab/Salle2 @@ -7,7 +7,7 @@ @......................................................................@ @......................................................................@ @S....................................................................S@ -@S.................................MM.................................S@ +@S..................................M.................................S@ @......................................................................@ @......................................................................@ @......................................................................@ diff --git a/S1.02/Jeu/src/Labyrinthe.java b/S1.02/Jeu/src/Labyrinthe.java index 54454372741d612591a6fd09f6445d1b0c972925..b508aa085f5122c92fd42395cb34ee67e9aa543b 100644 --- a/S1.02/Jeu/src/Labyrinthe.java +++ b/S1.02/Jeu/src/Labyrinthe.java @@ -271,10 +271,10 @@ class Labyrinthe extends Program{ String[][] load(String cheminFichier){ //Charge un fichier csv en un tableau CSVFile file = loadCSV(cheminFichier); - String tab[][] = new String[rowCount(file)][columnCount(file)]; + String tab[][] = new String[rowCount(file)-1][columnCount(file)]; for(int i = 0; i < rowCount(file)-1; i ++){ for(int j = 0; j < columnCount(file); j++){ - tab[i][j] = getCell(file, i, j); + tab[i][j] = getCell(file, i+1, j); } } return tab; @@ -308,7 +308,7 @@ class Labyrinthe extends Program{ boolean questionCorrect(Question q){ //Vérifie si on donne la bonne réponse String res = readString(); - return equals(res, q.reponse); + return equals(toLowerCase(res), toLowerCase(q.reponse)); } void afficheLab(char[][] Lab){ //affiche le Labyrinthe (@ = mur, P = perso, S = sortie, M = monstre, B = boss, 🏠 = shop, . = case vide) @@ -362,10 +362,11 @@ class Labyrinthe extends Program{ println("" + j.pseudo + " / score : " + j.score + " / vie : " + j.vie + " / boss vaincu ? " + j.bossVaincu); char[][] salle1 = genererSalle("ressources/Lab/Salle1"); Question q = newQuestion("Quelle est la capital de la France", "paris"); + salle1[11][35] = 'P'; int[] indiceM = indiceDe('P', salle1); salle1[indiceM[0]-1][indiceM[1]] = 'M'; afficheStringTab(load("ressources/score.csv")); - while(j.vie >= 0 && !j.bossVaincu){ + while(j.vie > 0 && !j.bossVaincu){ afficheLab(salle1); println("" + j.pseudo + " / score : " + j.score + " / vie : " + j.vie + " / boss vaincu ? " + j.bossVaincu); int[] indiceP = indiceDe('P', salle1);