From 660a38a0f560aeae3d09fbaacfa085e1f77d51a6 Mon Sep 17 00:00:00 2001 From: Chiara Date: Thu, 30 Apr 2020 13:53:58 +0200 Subject: [PATCH 1/2] changement plateau --- .../Jouer_tour(2a)voler_equipement.fxml | 23 +- .../Jouer_tour(2b)piocher_carte.fxml | 17 +- ...ouer_tour(2ba)piocher_lumiere_tenebre.fxml | 53 +- .../Jouer_tour(2bb1)piocher_vision.fxml | 39 +- .../Jouer_tour(2bb2)donne_carte_vision.fxml | 47 +- .../Jouer_tour(2bb3)recevoir_vision.fxml | 40 +- .../Jouer_tour(2c)attaquer_soigner.fxml | 22 +- src/ihm/ressources/Plateau.fxml | 1192 ++++++++--------- src/ihm/ressources/PlateauTest.fxml | 298 +++-- 9 files changed, 850 insertions(+), 881 deletions(-) diff --git a/src/ihm/ressources/Jouer_tour(2a)voler_equipement.fxml b/src/ihm/ressources/Jouer_tour(2a)voler_equipement.fxml index a1c9fc9..0140036 100644 --- a/src/ihm/ressources/Jouer_tour(2a)voler_equipement.fxml +++ b/src/ihm/ressources/Jouer_tour(2a)voler_equipement.fxml @@ -1,20 +1,17 @@ + - - + + - - + + + + - + diff --git a/src/ihm/ressources/Jouer_tour(2b)piocher_carte.fxml b/src/ihm/ressources/Jouer_tour(2b)piocher_carte.fxml index d76dbca..f626870 100644 --- a/src/ihm/ressources/Jouer_tour(2b)piocher_carte.fxml +++ b/src/ihm/ressources/Jouer_tour(2b)piocher_carte.fxml @@ -1,15 +1,16 @@ + - - + + - + + + + - + diff --git a/src/ihm/ressources/Jouer_tour(2ba)piocher_lumiere_tenebre.fxml b/src/ihm/ressources/Jouer_tour(2ba)piocher_lumiere_tenebre.fxml index 15f0861..fe808d0 100644 --- a/src/ihm/ressources/Jouer_tour(2ba)piocher_lumiere_tenebre.fxml +++ b/src/ihm/ressources/Jouer_tour(2ba)piocher_lumiere_tenebre.fxml @@ -2,45 +2,34 @@ + - - + + - + - + - - + + + + + + + + + - - - - - - - - + - + - + diff --git a/src/ihm/ressources/Jouer_tour(2bb1)piocher_vision.fxml b/src/ihm/ressources/Jouer_tour(2bb1)piocher_vision.fxml index 9075f98..dc7f7db 100644 --- a/src/ihm/ressources/Jouer_tour(2bb1)piocher_vision.fxml +++ b/src/ihm/ressources/Jouer_tour(2bb1)piocher_vision.fxml @@ -4,31 +4,28 @@ + - - + + - + - - - - + + + + - + - + diff --git a/src/ihm/ressources/Jouer_tour(2bb2)donne_carte_vision.fxml b/src/ihm/ressources/Jouer_tour(2bb2)donne_carte_vision.fxml index 52fa407..6a517d7 100644 --- a/src/ihm/ressources/Jouer_tour(2bb2)donne_carte_vision.fxml +++ b/src/ihm/ressources/Jouer_tour(2bb2)donne_carte_vision.fxml @@ -2,48 +2,41 @@ + - - + + - + - + - + - - + - + - - + - + - + - + - + diff --git a/src/ihm/ressources/Jouer_tour(2bb3)recevoir_vision.fxml b/src/ihm/ressources/Jouer_tour(2bb3)recevoir_vision.fxml index 268f940..880164c 100644 --- a/src/ihm/ressources/Jouer_tour(2bb3)recevoir_vision.fxml +++ b/src/ihm/ressources/Jouer_tour(2bb3)recevoir_vision.fxml @@ -2,33 +2,27 @@ + - - + + - - + - - + - + - + diff --git a/src/ihm/ressources/Jouer_tour(2c)attaquer_soigner.fxml b/src/ihm/ressources/Jouer_tour(2c)attaquer_soigner.fxml index c521f3d..a8800d1 100644 --- a/src/ihm/ressources/Jouer_tour(2c)attaquer_soigner.fxml +++ b/src/ihm/ressources/Jouer_tour(2c)attaquer_soigner.fxml @@ -2,19 +2,17 @@ + - - + + - - + + +