School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development

Browse Source
This commit is contained in:
Paul Gross
2020-04-17 12:28:03 +02:00
parent dda437e265 e5cf88b1a5
commit e8cc92e1db
28 changed files with 170 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/carte/Carte.java Normal file
View File

@ -0,0 +1,12 @@
package carte;
public class Carte {
private String nom;
private String description;
private void utiliser(Joueur j) {
}
}

8
src/carte/CarteCondition.java Normal file
View File

@ -0,0 +1,8 @@
package carte;
public abstract class CarteCondition extends CarteEffet{
private Condition condition;
}

9
src/carte/CarteEffet.java Normal file
View File

@ -0,0 +1,9 @@
package carte;
public abstract class CarteEffet extends Carte{
public void utiliser(Joueur j) {
}
}

17
src/carte/CarteLieu.java Normal file
View File

@ -0,0 +1,17 @@
package carte;
import java.util.List;
public class CarteLieu extends CarteEffet{
private Type field;
// Liste des joueurs actuellement pr<70>sent sur le lieu
private List<Joueur> listeJoueur;
public void utiliser(Joueur j) {
}
}

9
src/carte/CarteLieuType.java Normal file
View File

@ -0,0 +1,9 @@
package carte;
public class CarteLieuType extends CarteLieu{
public void utiliser(Joueur j) {
}
}

52
src/carte/CartePersonnage.java Normal file
View File

@ -0,0 +1,52 @@
package carte;
public class CartePersonnage extends CarteCondition{
private String NOM;
private int HP;
private Joueur joueur;
public void tour() {
}
/*
* @param j
*
*/
public void utiliser(Joueur j) {
}
/*
* @param j
* Le joueur que l'on souhaite attaquer
*/
public void attaquer(Joueur j) {
}
public boolean victoire() {
return true;
}
public Joueur getJoueur() {
return joueur;
}
/*
* @param j
*
*/
public Joueur setJoueur(Joueur j) {
this.joueur = j;
return joueur;
}
public void deplacer() {
}
}

5
src/carte/CartePiochable.java Normal file
View File

@ -0,0 +1,5 @@
package carte;
public class CartePiochable {
}

7
src/carte/Condition.java Normal file
View File

@ -0,0 +1,7 @@
package carte;
public class Condition {
}

5
src/carte/Equipement.java Normal file
View File

@ -0,0 +1,5 @@
package carte;
public class Equipement {
}

9
src/carte/Joueur.java Normal file
View File

@ -0,0 +1,9 @@
package carte;
public class Joueur {
public void utiliser() {
}
}

7
src/carte/Type.java Normal file
View File

@ -0,0 +1,7 @@
package carte;
public interface Type {
}

8
src/ihm/controller/MenuController.java
View File

@ -8,11 +8,19 @@ public class MenuController {
@FXML
private Label label;
<<<<<<< HEAD
public void commencerPartie(MouseEvent mouseEvent) {
System.out.println("Bonjouuuuur!");
}
public void afficherRegle(MouseEvent mouseEvent) {
=======
public void afficheBonjour(MouseEvent mouseEvent) {
System.out.println("Bonjouuuuur!");
}
public void changerNom(MouseEvent mouseEvent) {
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
System.out.println("clik");
}
}

0
src/ihm/ressources/ChoixJoueur.fxml
View File

24
src/ihm/ressources/EffetCarte.XML.fxml
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="625.0" prefWidth="947.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Button layoutX="156.0" layoutY="180.0" lineSpacing="2.0" mnemonicParsing="false" prefHeight="277.0" prefWidth="184.0" text="Avènement suprême Barre de chocolat" wrapText="true">
<font>
<Font size="18.0" />
</font>
</Button>
<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>
</Label>
</children>
</Pane>

23
src/ihm/ressources/LancerDeDes.fxml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<?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">
<children>
<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>
</Label>
<Button layoutX="246.0" layoutY="175.0" mnemonicParsing="false" prefHeight="100.0" prefWidth="109.0" text="6">
<font>
<Font size="47.0" />
</font>
</Button>
<Button layoutX="243.0" layoutY="313.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="116.0" text="Lancer les dès" />
</children>
</Pane>

8
src/ihm/ressources/Menu.fxml
View File

@ -7,12 +7,20 @@
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" onMouseClicked="#afficheBonjour" prefHeight="400.0" prefWidth="600.0" styleClass="background" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.MenuController">
<children>
<<<<<<< HEAD
<Button layoutX="231.0" layoutY="161.0" mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="39.0" prefWidth="139.0" styleClass="bouton" stylesheets="@style/menu.css" text="Jouer">
=======
<Button layoutX="231.0" layoutY="161.0" mnemonicParsing="false" onMouseClicked="#changerNom" prefHeight="39.0" prefWidth="139.0" styleClass="bouton" stylesheets="@style/menu.css" text="Jouer">
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
<font>
<Font size="18.0" />
</font>
</Button>
<<<<<<< HEAD
<Button layoutX="230.0" layoutY="244.0" mnemonicParsing="false" onMouseClicked="#afficherRegle" styleClass="bouton" stylesheets="@style/menu.css" text="Règles du jeux">
=======
<Button layoutX="230.0" layoutY="244.0" mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="Règles du jeux">
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
<font>
<Font size="18.0" />
</font>

14
src/ihm/ressources/Plateau.fxml
View File

@ -180,10 +180,17 @@
<children>
<VBox alignment="CENTER" prefHeight="136.0" prefWidth="17.0">
<children>
<<<<<<< HEAD
<Circle fill="#ff1f1f" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#fccb0a" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#f1ff1f" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#1fff35" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
=======
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
</children>
</VBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
@ -206,10 +213,17 @@
</HBox>
<VBox alignment="CENTER" prefHeight="136.0" prefWidth="19.0">
<children>
<<<<<<< HEAD
<Circle fill="#21e9ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#4421ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#ff21d8" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="#d521ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
=======
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
<Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
>>>>>>> 88af99848491a78118cac6121fa65e6c2ffd3f56
</children>
</VBox>
</children>

34
src/ihm/ressources/PremierSecours.fxml
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="638.0" prefWidth="951.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Button layoutX="73.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 1" />
<Button layoutX="298.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 2" />
<Button layoutX="515.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 3" />
<Button layoutX="745.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 4" />
<Button layoutX="73.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 5" />
<Button layoutX="298.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 6" />
<Button layoutX="515.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 7" />
<Button layoutX="745.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 8" />
<Button layoutX="177.0" layoutY="134.0" mnemonicParsing="false" prefHeight="327.0" prefWidth="194.0" text="Premier secours">
<font>
<Font size="23.0" />
</font>
</Button>
<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="Choisissez un joueur" wrapText="true">
<font>
<Font size="35.0" />
</font>
</Label>
</children>
</Pane>

35
src/ihm/ressources/Soigner.fxml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="638.0" prefWidth="951.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Button layoutX="73.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 1" />
<Button layoutX="298.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 2" />
<Button layoutX="515.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 3" />
<Button layoutX="745.0" layoutY="33.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 4" />
<Button layoutX="73.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 5" />
<Button layoutX="298.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 6" />
<Button layoutX="515.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 7" />
<Button layoutX="745.0" layoutY="510.0" mnemonicParsing="false" prefHeight="55.0" prefWidth="156.0" text="Joueur 8" />
<Button layoutX="177.0" layoutY="134.0" mnemonicParsing="false" prefHeight="327.0" prefWidth="173.0" text="Bénediction">
<font>
<Font size="23.0" />
</font>
</Button>
<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="Choisissez un joueur que vous voulez soigner" wrapText="true">
<font>
<Font size="35.0" />
</font>
</Label>
</children>
</Pane>