From 0d3597ce0939634c3a7411621af616c2e2695578 Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 18 May 2023 19:27:03 +0200 Subject: [PATCH 1/2] Make a retry level button --- app/src/main/java/school_project/GameUI.java | 2 +- .../Menu/ScreenLevelFinish.java | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/school_project/GameUI.java b/app/src/main/java/school_project/GameUI.java index d83ef99..b06f966 100644 --- a/app/src/main/java/school_project/GameUI.java +++ b/app/src/main/java/school_project/GameUI.java @@ -77,7 +77,7 @@ public class GameUI extends Group{ _piece.setLayoutY(grid.getLayoutY() + p.getPosition().x * (SEGMENT_SIZE+SPACE_SIZE)); } if(level.gameDone()){ - Controller.switchRoot(new ScreenLevelFinish()); + Controller.switchRoot(new ScreenLevelFinish(level)); } } }); diff --git a/app/src/main/java/school_project/Menu/ScreenLevelFinish.java b/app/src/main/java/school_project/Menu/ScreenLevelFinish.java index fc4e7ee..ce1ed7d 100644 --- a/app/src/main/java/school_project/Menu/ScreenLevelFinish.java +++ b/app/src/main/java/school_project/Menu/ScreenLevelFinish.java @@ -9,11 +9,18 @@ import javafx.scene.control.Label; import javafx.scene.layout.StackPane; import javafx.scene.text.Font; import school_project.Controller; +import school_project.GameUI; +import school_project.Map; +import school_project.MapGenerator; + +import java.io.File; +import java.io.FileNotFoundException; public class ScreenLevelFinish extends StackPane { - public ScreenLevelFinish(){ + public ScreenLevelFinish(Map lastlevel){ super(); + Button retry = new Button("Retry Level"); Label CongraMess = new Label(" LEVEL DONE GREAT JOB "); CongraMess.setFont(Font.font(40)); Button BckMenu = new Button("Back to Menu"); @@ -23,14 +30,23 @@ public class ScreenLevelFinish extends StackPane { BckMenu.setOnAction(event -> Controller.switchRoot(new MenuAccueil())); ChooseLvl.setOnAction(event -> Controller.switchRoot(new MenuLevel(1))); + retry.setOnAction(event -> { + try { + Controller.switchRoot(new GameUI(lastlevel)); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } + }); - getChildren().addAll(BckMenu,ChooseLvl,CongraMess); + getChildren().addAll(BckMenu,ChooseLvl,CongraMess,retry); + setAlignment(retry,Pos.BOTTOM_CENTER); setAlignment(BckMenu, Pos.CENTER_RIGHT); setAlignment(ChooseLvl, Pos.CENTER_LEFT); setAlignment(CongraMess, Pos.TOP_CENTER); setMargin(BckMenu, new Insets(0,300,0,0 )); setMargin(ChooseLvl,new Insets(0,0,0,300)); setMargin(CongraMess,new Insets(300,0,0,0)); + setMargin(retry,new Insets(0,0,300,0)); getStyleClass().add("StackPane"); getStylesheets().add(String.valueOf(getClass().getResource("StyleMenuAcceuil.css"))); -- 2.46.0 From 047cfecd98a2b7a405afa78fed7a5eddc3344115 Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 18 May 2023 19:28:34 +0200 Subject: [PATCH 2/2] Delete useless import --- app/src/main/java/school_project/Menu/ScreenLevelFinish.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/school_project/Menu/ScreenLevelFinish.java b/app/src/main/java/school_project/Menu/ScreenLevelFinish.java index ce1ed7d..5b4fab1 100644 --- a/app/src/main/java/school_project/Menu/ScreenLevelFinish.java +++ b/app/src/main/java/school_project/Menu/ScreenLevelFinish.java @@ -11,9 +11,6 @@ import javafx.scene.text.Font; import school_project.Controller; import school_project.GameUI; import school_project.Map; -import school_project.MapGenerator; - -import java.io.File; import java.io.FileNotFoundException; public class ScreenLevelFinish extends StackPane { -- 2.46.0