diff --git a/ressources/fonts/Contage-Black-Italic-BF63fc29ba63509.ttf b/ressources/fonts/Contage-Black-Italic-BF63fc29ba63509.ttf deleted file mode 100644 index 4f23744..0000000 Binary files a/ressources/fonts/Contage-Black-Italic-BF63fc29ba63509.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Bold-Italic-BF63fc29ba7e1fc.ttf b/ressources/fonts/Contage-Bold-Italic-BF63fc29ba7e1fc.ttf deleted file mode 100644 index 12d8c24..0000000 Binary files a/ressources/fonts/Contage-Bold-Italic-BF63fc29ba7e1fc.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Light-BF63fc29bb66d25.ttf b/ressources/fonts/Contage-Light-BF63fc29bb66d25.ttf deleted file mode 100644 index 3da4da9..0000000 Binary files a/ressources/fonts/Contage-Light-BF63fc29bb66d25.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Light-Italic-BF63fc29ba81b18.ttf b/ressources/fonts/Contage-Light-Italic-BF63fc29ba81b18.ttf deleted file mode 100644 index b6171a2..0000000 Binary files a/ressources/fonts/Contage-Light-Italic-BF63fc29ba81b18.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Medium-BF63fc29bae1bb5.ttf b/ressources/fonts/Contage-Medium-BF63fc29bae1bb5.ttf deleted file mode 100644 index 387468c..0000000 Binary files a/ressources/fonts/Contage-Medium-BF63fc29bae1bb5.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Medium-Italic-BF63fc29b9cd284.ttf b/ressources/fonts/Contage-Medium-Italic-BF63fc29b9cd284.ttf deleted file mode 100644 index e6b5198..0000000 Binary files a/ressources/fonts/Contage-Medium-Italic-BF63fc29b9cd284.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Regular-Italic-BF63fc29b846c83.ttf b/ressources/fonts/Contage-Regular-Italic-BF63fc29b846c83.ttf deleted file mode 100644 index 513d0f4..0000000 Binary files a/ressources/fonts/Contage-Regular-Italic-BF63fc29b846c83.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Semi-Light-BF63fc29ba776e9.ttf b/ressources/fonts/Contage-Semi-Light-BF63fc29ba776e9.ttf deleted file mode 100644 index 1404aed..0000000 Binary files a/ressources/fonts/Contage-Semi-Light-BF63fc29ba776e9.ttf and /dev/null differ diff --git a/ressources/fonts/Contage-Semi-Light-Italic-BF63fc29b8477f8.ttf b/ressources/fonts/Contage-Semi-Light-Italic-BF63fc29b8477f8.ttf deleted file mode 100644 index 7754d50..0000000 Binary files a/ressources/fonts/Contage-Semi-Light-Italic-BF63fc29b8477f8.ttf and /dev/null differ diff --git a/ressources/images/Icone/Pause.png b/ressources/images/Icone/Pause.png deleted file mode 100644 index 971d99d..0000000 Binary files a/ressources/images/Icone/Pause.png and /dev/null differ diff --git a/ressources/images/Readme/tuiles.png b/ressources/images/Readme/tuiles.png deleted file mode 100644 index 584e812..0000000 Binary files a/ressources/images/Readme/tuiles.png and /dev/null differ diff --git a/ressources/images/Recompense/1.png b/ressources/images/Recompense/1.png deleted file mode 100644 index c763054..0000000 Binary files a/ressources/images/Recompense/1.png and /dev/null differ diff --git a/ressources/images/Recompense/2.png b/ressources/images/Recompense/2.png deleted file mode 100644 index e1155f5..0000000 Binary files a/ressources/images/Recompense/2.png and /dev/null differ diff --git a/ressources/images/Recompense/3.png b/ressources/images/Recompense/3.png deleted file mode 100644 index 28d1282..0000000 Binary files a/ressources/images/Recompense/3.png and /dev/null differ diff --git a/ressources/images/Recompense/4.png b/ressources/images/Recompense/4.png deleted file mode 100644 index 86018c1..0000000 Binary files a/ressources/images/Recompense/4.png and /dev/null differ diff --git a/ressources/images/Recompense/5.png b/ressources/images/Recompense/5.png deleted file mode 100644 index aa2e7c7..0000000 Binary files a/ressources/images/Recompense/5.png and /dev/null differ diff --git a/ressources/images/Recompense/6.png b/ressources/images/Recompense/6.png deleted file mode 100644 index 451b070..0000000 Binary files a/ressources/images/Recompense/6.png and /dev/null differ diff --git a/ressources/images/Recompense/7.png b/ressources/images/Recompense/7.png deleted file mode 100644 index f2c43a9..0000000 Binary files a/ressources/images/Recompense/7.png and /dev/null differ diff --git a/ressources/images/Recompense/8.png b/ressources/images/Recompense/8.png deleted file mode 100644 index eb00f56..0000000 Binary files a/ressources/images/Recompense/8.png and /dev/null differ diff --git a/ressources/images/Recompense/9.png b/ressources/images/Recompense/9.png deleted file mode 100644 index e15f353..0000000 Binary files a/ressources/images/Recompense/9.png and /dev/null differ diff --git a/ressources/images/Tutorial/Gif1.gif b/ressources/images/Tutorial/Gif1.gif index a224ec2..e3cbd28 100644 Binary files a/ressources/images/Tutorial/Gif1.gif and b/ressources/images/Tutorial/Gif1.gif differ diff --git a/ressources/images/Tutorial/Gif2.gif b/ressources/images/Tutorial/Gif2.gif index 2e0a081..d71df84 100644 Binary files a/ressources/images/Tutorial/Gif2.gif and b/ressources/images/Tutorial/Gif2.gif differ diff --git a/ressources/images/Tutorial/Gif3.gif b/ressources/images/Tutorial/Gif3.gif index e13adc0..9ff49d4 100644 Binary files a/ressources/images/Tutorial/Gif3.gif and b/ressources/images/Tutorial/Gif3.gif differ diff --git a/ressources/images/Tutorial/Gif4.gif b/ressources/images/Tutorial/Gif4.gif index a7a858f..9439a51 100644 Binary files a/ressources/images/Tutorial/Gif4.gif and b/ressources/images/Tutorial/Gif4.gif differ diff --git a/ressources/images/Tutorial/Gif5.gif b/ressources/images/Tutorial/Gif5.gif new file mode 100644 index 0000000..67c9ffd Binary files /dev/null and b/ressources/images/Tutorial/Gif5.gif differ diff --git a/ressources/images/Tutorial/Gif6.gif b/ressources/images/Tutorial/Gif6.gif new file mode 100644 index 0000000..d347100 Binary files /dev/null and b/ressources/images/Tutorial/Gif6.gif differ diff --git a/src/fr/monkhanny/dorfromantik/controller/TutorialController.java b/src/fr/monkhanny/dorfromantik/controller/TutorialController.java index 4aa3fa1..80e7290 100644 --- a/src/fr/monkhanny/dorfromantik/controller/TutorialController.java +++ b/src/fr/monkhanny/dorfromantik/controller/TutorialController.java @@ -46,10 +46,13 @@ public class TutorialController { // Création des étapes du tutoriel avec leurs titres, descriptions et images List steps = new ArrayList<>(); - steps.add(new Step("Étape n°1", "Explication de la première étape ici.", Images.TUTORIAL_GIF1.getImagePath())); - steps.add(new Step("Étape n°2", "Explication de la deuxième étape ici.", Images.TUTORIAL_GIF2.getImagePath())); - steps.add(new Step("Étape n°3", "Explication de la troisième étape ici.", Images.TUTORIAL_GIF3.getImagePath())); - steps.add(new Step("Étape n°4", "Explication de la quatrième étape ici.", Images.TUTORIAL_GIF4.getImagePath())); + steps.add(new Step("Étape n°1", "Pour prévisualiser le placement d'une tuile, placez votre souris sur l'un des points rouges affichés sur le plateau.", Images.TUTORIAL_GIF1.getImagePath())); + steps.add(new Step("Étape n°2", "Pour effectuer une rotation de la tuile, utilisez la molette de la souris. Cela permet d'orienter la tuile selon votre stratégie.", Images.TUTORIAL_GIF2.getImagePath())); + steps.add(new Step("Étape n°3", "Pour placer une tuile, cliquez sur l'un des points rouges où la prévisualisation est visible.", Images.TUTORIAL_GIF3.getImagePath())); + steps.add(new Step("Étape n°4", "Le nombre de tuiles restantes est affiché dans la section droite de l'écran, pour suivre votre progression dans la partie.", Images.TUTORIAL_GIF4.getImagePath())); + steps.add(new Step("Étape n°5", "Votre score est mis à jour en temps réel et est visible en haut au milieu de l'écran.", Images.TUTORIAL_GIF5.getImagePath())); + steps.add(new Step("Étape n°6", "En cas de besoin, vous pouvez afficher le menu d'aide en appuyant sur la touche 'T'.", Images.TUTORIAL_GIF6.getImagePath())); + // Initialisation du panneau de tutoriel avec les étapes, le menu principal et la fenêtre associée tutorialPanel = new TutorialPanel(steps, this.mainMenu, this.tutorialFrame); diff --git a/src/fr/monkhanny/dorfromantik/enums/Biome.java b/src/fr/monkhanny/dorfromantik/enums/Biome.java index c914dde..0251daf 100644 --- a/src/fr/monkhanny/dorfromantik/enums/Biome.java +++ b/src/fr/monkhanny/dorfromantik/enums/Biome.java @@ -6,7 +6,7 @@ import java.awt.Color; * Enumération des différents biomes possibles pour les tuiles. * * @version 1.0 - * @author Lenny FOULOU + * @author Moncef STITI * @see Color */ public enum Biome { diff --git a/src/fr/monkhanny/dorfromantik/enums/Fonts.java b/src/fr/monkhanny/dorfromantik/enums/Fonts.java index 351408a..12a8c22 100644 --- a/src/fr/monkhanny/dorfromantik/enums/Fonts.java +++ b/src/fr/monkhanny/dorfromantik/enums/Fonts.java @@ -11,7 +11,7 @@ import java.awt.FontFormatException; * Cette classe permet de récupérer le chemin d'accès aux fichiers de police et de charger une police à une taille donnée. * * @version 1.0 - * @author Lenny FOULOU + * @author Khalid CHENOUNA */ public enum Fonts { /** diff --git a/src/fr/monkhanny/dorfromantik/enums/Images.java b/src/fr/monkhanny/dorfromantik/enums/Images.java index a560e7c..359adbd 100644 --- a/src/fr/monkhanny/dorfromantik/enums/Images.java +++ b/src/fr/monkhanny/dorfromantik/enums/Images.java @@ -37,7 +37,19 @@ public enum Images { /** * Gif de la quatrième étape du tutoriel. */ - TUTORIAL_GIF4; + TUTORIAL_GIF4, + + /** + * Gif de la cinquième étape du tutoriel. + */ + TUTORIAL_GIF5, + + /** + * Gif de la sixième étape du tutoriel. + */ + TUTORIAL_GIF6; + + /** * Récupère le chemin du fichier d'image correspondant à l'énumération. @@ -58,6 +70,10 @@ public enum Images { return "./ressources/images/Tutorial/Gif3.gif"; case TUTORIAL_GIF4: return "./ressources/images/Tutorial/Gif4.gif"; + case TUTORIAL_GIF5: + return "./ressources/images/Tutorial/Gif5.gif"; + case TUTORIAL_GIF6: + return "./ressources/images/Tutorial/Gif6.gif"; default: throw new IllegalArgumentException("Unexpected value: " + this); } diff --git a/src/fr/monkhanny/dorfromantik/enums/Musics.java b/src/fr/monkhanny/dorfromantik/enums/Musics.java index 01f74a1..77fe780 100644 --- a/src/fr/monkhanny/dorfromantik/enums/Musics.java +++ b/src/fr/monkhanny/dorfromantik/enums/Musics.java @@ -6,7 +6,7 @@ package fr.monkhanny.dorfromantik.enums; * Cette classe permet de récupérer le chemin d'accès au fichier de musique associé. * * @version 1.0 - * @author Lenny FOULOU + * @author Moncef STITI */ public enum Musics { /** diff --git a/src/fr/monkhanny/dorfromantik/enums/Sounds.java b/src/fr/monkhanny/dorfromantik/enums/Sounds.java index d95e53c..8fcc4c1 100644 --- a/src/fr/monkhanny/dorfromantik/enums/Sounds.java +++ b/src/fr/monkhanny/dorfromantik/enums/Sounds.java @@ -6,7 +6,7 @@ package fr.monkhanny.dorfromantik.enums; * Cette classe permet de récupérer le chemin d'accès au fichier sonore associé. * * @version 1.0 - * @author Lenny FOULOU + * @author Moncef STITI */ public enum Sounds { /** diff --git a/src/fr/monkhanny/dorfromantik/gui/TutorialPanel.java b/src/fr/monkhanny/dorfromantik/gui/TutorialPanel.java index e7cb9b2..023cab4 100644 --- a/src/fr/monkhanny/dorfromantik/gui/TutorialPanel.java +++ b/src/fr/monkhanny/dorfromantik/gui/TutorialPanel.java @@ -120,13 +120,15 @@ public class TutorialPanel extends JPanel { private void updateStepDisplay() { Step currentStep = steps.get(currentStepIndex); - stepText.setText(currentStep.getText()); + String formattedText = addLineBreaks(currentStep.getText(), 10); // Limite à 10 mots par ligne + stepText.setText(formattedText); stepImage.setIcon(new ImageIcon(currentStep.getImagePath())); stepImage.setHorizontalAlignment(JLabel.CENTER); stepImage.setVerticalAlignment(JLabel.CENTER); prevButton.setEnabled(currentStepIndex > 0); nextButton.setEnabled(currentStepIndex < steps.size() - 1); } + private void styleButton(JButton button) { // Police et taille @@ -177,4 +179,22 @@ public class TutorialPanel extends JPanel { return returnButton; } + + private String addLineBreaks(String text, int maxWordsPerLine) { + String[] words = text.split(" "); + StringBuilder formattedText = new StringBuilder(""); + int wordCount = 0; + + for (String word : words) { + formattedText.append(word).append(" "); + wordCount++; + if (wordCount >= maxWordsPerLine) { + formattedText.append("
"); + wordCount = 0; + } + } + formattedText.append(""); + return formattedText.toString(); + } + }