Maj BoardLoader + makefile

This commit is contained in:
2025-11-27 13:06:14 +01:00
parent 1921b523c6
commit c1e5de9ed2
27 changed files with 61 additions and 21 deletions

View File

@@ -40,6 +40,8 @@ public class AvalamWindow extends JFrame {
// Chargement du plateau initial depuis Plateau.txt
// ----------------------------------------------------------
Tower[][] initialGrid = BoardLoader.loadFromFile("fr/iut_fbleau/Res/Plateau.txt");
// debug TEMP !!!!!!!!!
System.out.println("DEBUG Plateau: Grid[0][0] = " + initialGrid[0][0]);
board = new AvalamBoard(initialGrid); // PLAYER1 commence
// ----------------------------------------------------------
@@ -97,10 +99,10 @@ public class AvalamWindow extends JFrame {
String msg;
switch (res) {
case WIN -> msg = "Le joueur jaune a gagné !";
case LOSS -> msg = "Le joueur rouge a gagné !";
case DRAW -> msg = "Égalité !";
default -> msg = "Fin de partie.";
case WIN : msg = "Le joueur jaune a gagné !";
case LOSS : msg = "Le joueur rouge a gagné !";
case DRAW : msg = "Égalité !";
default : msg = "Fin de partie.";
}
JOptionPane.showMessageDialog(this, msg, "Partie terminée",

View File

@@ -3,39 +3,55 @@ package fr.iut_fbleau.Avalam.logic;
import fr.iut_fbleau.Avalam.Color;
import fr.iut_fbleau.Avalam.Tower;
import java.io.*;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
/**
* Charge un plateau Avalam depuis un fichier texte.
* Format attendu : matrice 9×9 de 0,1,2 séparés par virgule.
*/
public class BoardLoader {
public static Tower[][] loadFromFile(String file) {
public static Tower[][] loadFromFile(String resourcePath) {
Tower[][] grid = new Tower[9][9];
try (BufferedReader br = new BufferedReader(new FileReader(file))) {
InputStream in = BoardLoader.class.getResourceAsStream("/" + resourcePath);
if (in == null) {
System.err.println("❌ Ressource introuvable : /" + resourcePath);
return grid;
}
try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
String line;
int row = 0;
while ((line = br.readLine()) != null && row < 9) {
while ((line = reader.readLine()) != null && row < 9) {
String[] vals = line.split(",");
// 🔥 Accepte SOIT les espaces, SOIT les virgules
line = line.replace(",", " ");
String[] parts = line.trim().split("\\s+");
for (int col = 0; col < 9; col++) {
int v = Integer.parseInt(vals[col].trim());
int value = Integer.parseInt(parts[col]);
switch (v) {
case 1 -> grid[row][col] = new Tower(Color.YELLOW);
case 2 -> grid[row][col] = new Tower(Color.RED);
default -> grid[row][col] = null;
switch (value) {
case 1:
grid[row][col] = new Tower(Color.YELLOW);
break;
case 2:
grid[row][col] = new Tower(Color.RED);
break;
default:
grid[row][col] = null;
break;
}
}
row++;
}
} catch (Exception e) {
} catch (IOException e) {
e.printStackTrace();
}