restore commit ok

This commit is contained in:
JunkJumper
2020-04-24 18:18:48 +02:00
parent 76c1652fd9
commit 3b590540ac
27 changed files with 649 additions and 642 deletions

View File

@ -13,9 +13,9 @@
<Font size="18.0" />
</font>
</Button>
<Button layoutX="387.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="195.0" text="%reveler.et.soigner" />
<Button layoutX="628.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="171.0" text="%rien.faire" />
<Label layoutX="414.0" layoutY="147.0" prefHeight="89.0" prefWidth="249.0" text="%effet.carte">
<Button layoutX="387.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="195.0" text="Se révéler et soigner mes lessures" />
<Button layoutX="628.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="171.0" text="Ne rien faire" />
<Label layoutX="414.0" layoutY="147.0" prefHeight="89.0" prefWidth="249.0" text="Effet carte">
<font>
<Font size="52.0" />
</font>

View File

@ -13,9 +13,9 @@
<Font size="18.0" />
</font>
</Button>
<Button layoutX="387.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="195.0" text="%reveler.et.soigner" />
<Button layoutX="628.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="171.0" text="%rien.faire" />
<Label layoutX="414.0" layoutY="147.0" prefHeight="89.0" prefWidth="249.0" text="%effet.carte">
<Button layoutX="387.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="195.0" text="Se révéler et soigner mes lessures" />
<Button layoutX="628.0" layoutY="302.0" mnemonicParsing="false" prefHeight="155.0" prefWidth="171.0" text="Ne rien faire" />
<Label layoutX="414.0" layoutY="147.0" prefHeight="89.0" prefWidth="249.0" text="Effet carte">
<font>
<Font size="52.0" />
</font>

View File

@ -21,12 +21,12 @@
<Font size="23.0" />
</font>
</Button>
<Label layoutX="524.0" layoutY="134.0" prefHeight="105.0" prefWidth="254.0" text="%effet.carte">
<Label layoutX="524.0" layoutY="134.0" prefHeight="105.0" prefWidth="254.0" text="Effet carte">
<font>
<Font size="37.0" />
</font>
</Label>
<Label layoutX="438.0" layoutY="306.0" prefHeight="115.0" prefWidth="385.0" text="%choisir.joueur.soigner" wrapText="true">
<Label layoutX="438.0" layoutY="306.0" prefHeight="115.0" prefWidth="385.0" text="Choisissez un joueur que vous voulez soigner" wrapText="true">
<font>
<Font size="35.0" />
</font>

View File

@ -8,7 +8,7 @@
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label layoutX="137.0" layoutY="100.0" prefHeight="46.0" prefWidth="362.0" text="%joueur1.soigne.joueur2">
<Label layoutX="137.0" layoutY="100.0" prefHeight="46.0" prefWidth="362.0" text="Joueur 1 soigne Joueur 2">
<font>
<Font size="29.0" />
</font>
@ -18,6 +18,6 @@
<Font size="47.0" />
</font>
</Button>
<Button layoutX="243.0" layoutY="313.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="116.0" text="%lancer.de.des" />
<Button layoutX="243.0" layoutY="313.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="116.0" text="Lancer les dès" />
</children>
</Pane>

View File

@ -20,12 +20,12 @@
<Font size="23.0" />
</font>
</Button>
<Label layoutX="524.0" layoutY="134.0" prefHeight="105.0" prefWidth="254.0" text="%effet.carte">
<Label layoutX="524.0" layoutY="134.0" prefHeight="105.0" prefWidth="254.0" text="Effet carte">
<font>
<Font size="37.0" />
</font>
</Label>
<Label layoutX="438.0" layoutY="306.0" prefHeight="115.0" prefWidth="385.0" text="%choisr.joueur" wrapText="true">
<Label layoutX="438.0" layoutY="306.0" prefHeight="115.0" prefWidth="385.0" text="Choisissez un joueur" wrapText="true">
<font>
<Font size="35.0" />
</font>

View File

@ -45,7 +45,7 @@
</Rectangle>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="148.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%effet.carte" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Effet de la carte" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="55.0" />
</VBox.margin>
@ -53,7 +53,7 @@
<Font size="18.0" />
</font>
</Text>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%choisir.joueur.infliger.blessures" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Choisissez un joueur à qui infliger 2 blessures" textAlignment="CENTER">
<font>
<Font size="18.0" />
</font>

View File

@ -45,7 +45,7 @@
</Rectangle>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="148.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%effet.carte" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Effet de la carte" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="55.0" />
</VBox.margin>
@ -53,7 +53,7 @@
<Font size="18.0" />
</font>
</Text>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%choisir.joueur.infliger.blessures" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Choisissez un joueur à qui infliger 2 blessures" textAlignment="CENTER">
<font>
<Font size="18.0" />
</font>

View File

@ -44,7 +44,7 @@
</Polygon>
</children>
</HBox>
<Button mnemonicParsing="false" prefHeight="45.0" prefWidth="135.0" text="%lancer.de.des">
<Button mnemonicParsing="false" prefHeight="45.0" prefWidth="135.0" text="Lancer les dés">
<font>
<Font size="18.0" />
</font>

View File

@ -47,7 +47,7 @@
</Rectangle>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="148.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%effet.carte" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Effet de la carte" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="30.0" top="50.0" />
</VBox.margin>
@ -55,7 +55,7 @@
<Font size="18.0" />
</font>
</Text>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement.a.donner" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Choisissez la carte équipement que vous allez donner" textAlignment="CENTER">
<font>
<Font size="18.0" />
</font>
@ -75,7 +75,7 @@
<Insets bottom="55.0" />
</VBox.margin>
</HBox>
<Text layoutX="10.0" layoutY="187.0" strokeType="OUTSIDE" strokeWidth="0.0" text="%joueur.a.qui.donner.carte.equipement" textAlignment="CENTER">
<Text layoutX="10.0" layoutY="187.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Choisissez un joueur à qui donner cette carte équipement" textAlignment="CENTER">
<font>
<Font size="18.0" />
</font>

View File

@ -14,7 +14,7 @@
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#c6c6c6" height="298.0" stroke="BLACK" strokeType="INSIDE" width="188.0" />
<VBox alignment="CENTER" prefHeight="351.0" prefWidth="293.0">
<children>
<Label text="%effet.carte">
<Label text="Effet de la carte">
<font>
<Font size="18.0" />
</font>
@ -31,7 +31,7 @@
</Rectangle>
</children>
</HBox>
<Button mnemonicParsing="false" prefHeight="45.0" prefWidth="135.0" text="%lancer.de.des">
<Button mnemonicParsing="false" prefHeight="45.0" prefWidth="135.0" text="Lancer les dés">
<font>
<Font size="18.0" />
</font>

View File

@ -18,7 +18,7 @@
</Rectangle>
<VBox alignment="CENTER" prefHeight="533.0" prefWidth="753.0">
<children>
<Label text="%effet.carte">
<Label text="Effet de la carte">
<font>
<Font size="18.0" />
</font>
@ -28,12 +28,12 @@
</Label>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="338.0">
<children>
<Button mnemonicParsing="false" prefHeight="48.0" prefWidth="333.0" text="%reveler.et.soigner">
<Button mnemonicParsing="false" prefHeight="48.0" prefWidth="333.0" text="Se révéler et soigner ses blessures">
<font>
<Font size="18.0" />
</font>
</Button>
<Button layoutX="89.0" layoutY="38.0" mnemonicParsing="false" prefHeight="45.0" prefWidth="289.0" text="%rien.faire">
<Button layoutX="89.0" layoutY="38.0" mnemonicParsing="false" prefHeight="45.0" prefWidth="289.0" text="Ne rien faire">
<font>
<Font size="18.0" />
</font>

View File

@ -32,7 +32,7 @@
</Rectangle>
</children>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -53,7 +53,7 @@
</Rectangle>
</children>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -80,7 +80,7 @@
<Insets right="20.0" />
</VBox.margin>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -97,7 +97,7 @@
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#d8dbdd" height="80.0" layoutX="126.0" layoutY="10.0" stroke="BLACK" strokeType="INSIDE" width="58.0" />
</children>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -115,7 +115,7 @@
</Rectangle>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="148.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%effet.carte" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Effet de la carte" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="55.0" />
</VBox.margin>
@ -123,7 +123,7 @@
<Font size="18.0" />
</font>
</Text>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%choisir.equipement.a.voler" textAlignment="CENTER">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Choisissez un équipement à voler" textAlignment="CENTER">
<font>
<Font size="18.0" />
</font>
@ -152,7 +152,7 @@
</Rectangle>
</children>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -173,7 +173,7 @@
</Rectangle>
</children>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -197,7 +197,7 @@
<Insets right="20.0" />
</VBox.margin>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>
@ -214,7 +214,7 @@
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#d8dbdd" height="80.0" layoutX="126.0" layoutY="10.0" stroke="BLACK" strokeType="INSIDE" width="58.0" />
</children>
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="%carte.equipement">
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Cartes équipements">
<font>
<Font size="13.0" />
</font>

View File

@ -282,4 +282,4 @@
</bottom>
</BorderPane>
</children>
</AnchorPane>
</AnchorPane>

View File

@ -16,7 +16,7 @@
<Insets top="-250.0" />
</VBox.margin>
</ImageView>
<Button mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="51.0" prefWidth="102.0" styleClass="bouton" text="%jouer">
<Button mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="51.0" prefWidth="102.0" styleClass="bouton" text="Jouer">
<font>
<Font size="24.0" />
</font>
@ -24,7 +24,7 @@
<Insets top="150.0" />
</VBox.margin>
</Button>
<Button mnemonicParsing="false" onMouseClicked="#afficherRegle" prefHeight="59.0" prefWidth="106.0" styleClass="bouton" text="%regles">
<Button mnemonicParsing="false" onMouseClicked="#afficherRegle" prefHeight="59.0" prefWidth="106.0" styleClass="bouton" text="Regles">
<font>
<Font size="24.0" />
</font>

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="640.0" stylesheets="@style/popUp.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.RevelationController">
<children>
<Pane layoutX="33.0" layoutY="41.0" prefHeight="325.0" prefWidth="561.0" style="-fx-border-color: blue;">
<HBox alignment="CENTER" prefHeight="480.0" prefWidth="640.0">
<children>
<VBox alignment="CENTER" layoutX="199.0" layoutY="101.0" prefHeight="151.0" prefWidth="333.0" spacing="5.0" style="-fx-background-color: blue;">
<ImageView fitHeight="326.0" fitWidth="233.5" pickOnBounds="true" preserveRatio="true">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</ImageView>
<VBox alignment="CENTER" prefHeight="151.0" prefWidth="333.0" spacing="5.0">
<children>
<HBox prefHeight="36.0" prefWidth="334.0">
<children>
<Label prefHeight="35.0" prefWidth="75.0" text="Joueur x " textFill="WHITE">
<Label fx:id="nomJoueur" prefHeight="35.0" prefWidth="75.0" text="Joueur x " textFill="WHITE">
<font>
<Font size="18.0" />
</font>
</Label>
<Label prefHeight="34.0" prefWidth="154.0" text="%reveler.identite" textFill="WHITE">
<Label prefHeight="34.0" prefWidth="154.0" text="révèle son identité!" textFill="WHITE">
<font>
<Font size="18.0" />
</font>
@ -29,12 +35,12 @@
</HBox>
<HBox prefHeight="36.0" prefWidth="334.0">
<children>
<Label prefHeight="35.0" prefWidth="55.0" text="%c.est" textFill="WHITE">
<Label prefHeight="35.0" prefWidth="55.0" text="C'est" textFill="WHITE">
<font>
<Font size="18.0" />
</font>
</Label>
<Label prefHeight="34.0" prefWidth="182.0" text="*nom de personnage*" textFill="WHITE">
<Label fx:id="nomPerso" prefHeight="34.0" prefWidth="182.0" text="*nom de personnage*" textFill="WHITE">
<font>
<Font size="18.0" />
</font>
@ -43,12 +49,12 @@
</HBox>
<HBox prefHeight="36.0" prefWidth="334.0">
<children>
<Label prefHeight="35.0" prefWidth="75.0" text="%faction" textFill="WHITE">
<Label prefHeight="35.0" prefWidth="75.0" text="Faction : " textFill="WHITE">
<font>
<Font size="18.0" />
</font>
</Label>
<Label prefHeight="34.0" prefWidth="233.0" text="*insérer le nom de la faction*" textFill="WHITE">
<Label fx:id="factionPerso" prefHeight="34.0" prefWidth="233.0" text="*insérer le nom de la faction*" textFill="WHITE">
<font>
<Font size="18.0" />
</font>
@ -57,8 +63,7 @@
</HBox>
</children>
</VBox>
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE" height="205.0" layoutX="35.0" layoutY="60.0" stroke="BLACK" strokeType="INSIDE" width="130.0" />
</children>
</Pane>
</HBox>
</children>
</Pane>

View File

@ -25,7 +25,7 @@
<Font size="18.0" />
</font>
</Label>
<Label text="%utiliser.capacite">
<Label text="utilise sa capacité.">
<font>
<Font size="18.0" />
</font>
@ -34,7 +34,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="54.0" prefWidth="331.0">
<children>
<Label prefHeight="27.0" prefWidth="76.0" text="%effet">
<Label prefHeight="27.0" prefWidth="76.0" text="Effet :">
<font>
<Font size="18.0" />
</font>