Commit 54209823 authored by Erwan BOISTEAU-DESDEVISES's avatar Erwan BOISTEAU-DESDEVISES
Browse files

Merge branch 'main' into 'RegionNode'

# Conflicts:
#   src/project/Bot.java
#   src/project/Case.java
#   src/project/Joueur.java
#   src/project/Main.java
#   src/project/Menu.java
#   src/project/Partie.java
#   src/project/PetiteRegion.java
#   src/project/Plateau.java
#   src/project/Quadtree.java
#   src/project/Region.java
parents a0d3e87e e156a317
......@@ -144,4 +144,5 @@ public class Menu {
}
}
......@@ -502,6 +502,7 @@ public class Plateau{
if (c.getPregion().estAcquise()) {
RemplirRegion(c.getPregion(), joueur.couleur);
}
c.colorierBrave(couleur);
}
/**
......
......@@ -2,6 +2,7 @@ package project;
public class Temeraire implements Regle{
@Override
public int regleId() {
return 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment