From ac6c8611e7e21ce71324905e31bdf722311fe810 Mon Sep 17 00:00:00 2001 From: Debucquoy Anthony Date: Wed, 17 May 2023 23:42:44 +0200 Subject: [PATCH] Adding all levels + linking buttons to create new level just do `gradle -q --console plain -PmainClass=school_project.Parsers.FileParserFactory run` Co-authored-by: Anthony Debucquoy Reviewed-on: https://git.herisson.ovh/undefined_name/School_Project/pulls/56 Reviewed-by: Mat_02 --- app/build.gradle | 6 +++- .../java/school_project/Menu/MenuLevel.java | 31 +++++++++++++----- .../school_project/levels/level1.level | 1 + .../school_project/levels/level10.level | 1 + .../school_project/{ => levels}/level11.level | 0 .../school_project/levels/level12.level | 1 + .../school_project/levels/level13.level | 1 + .../school_project/levels/level14.level | 1 + .../school_project/levels/level15.level | 1 + .../school_project/levels/level16.level | 1 + .../school_project/levels/level17.level | 1 + .../school_project/levels/level18.level | Bin 0 -> 39 bytes .../school_project/levels/level19.level | 1 + .../school_project/levels/level2.level | 1 + .../school_project/levels/level20.level | 1 + .../school_project/levels/level21.level | Bin 0 -> 25 bytes .../school_project/levels/level22.level | 1 + .../school_project/levels/level23.level | 1 + .../school_project/levels/level24.level | 1 + .../school_project/levels/level25.level | 1 + .../school_project/levels/level26.level | Bin 0 -> 29 bytes .../school_project/levels/level27.level | 1 + .../school_project/levels/level28.level | 1 + .../school_project/levels/level29.level | 1 + .../school_project/levels/level3.level | 1 + .../school_project/levels/level30.level | 1 + .../school_project/levels/level4.level | 1 + .../school_project/levels/level5.level | 1 + .../school_project/levels/level6.level | 1 + .../school_project/levels/level7.level | 1 + .../school_project/levels/level8.level | 1 + .../school_project/levels/level9.level | 1 + 32 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 app/src/main/resources/school_project/levels/level1.level create mode 100644 app/src/main/resources/school_project/levels/level10.level rename app/src/main/resources/school_project/{ => levels}/level11.level (100%) create mode 100644 app/src/main/resources/school_project/levels/level12.level create mode 100644 app/src/main/resources/school_project/levels/level13.level create mode 100644 app/src/main/resources/school_project/levels/level14.level create mode 100644 app/src/main/resources/school_project/levels/level15.level create mode 100644 app/src/main/resources/school_project/levels/level16.level create mode 100644 app/src/main/resources/school_project/levels/level17.level create mode 100644 app/src/main/resources/school_project/levels/level18.level create mode 100644 app/src/main/resources/school_project/levels/level19.level create mode 100644 app/src/main/resources/school_project/levels/level2.level create mode 100644 app/src/main/resources/school_project/levels/level20.level create mode 100644 app/src/main/resources/school_project/levels/level21.level create mode 100644 app/src/main/resources/school_project/levels/level22.level create mode 100644 app/src/main/resources/school_project/levels/level23.level create mode 100644 app/src/main/resources/school_project/levels/level24.level create mode 100644 app/src/main/resources/school_project/levels/level25.level create mode 100644 app/src/main/resources/school_project/levels/level26.level create mode 100644 app/src/main/resources/school_project/levels/level27.level create mode 100644 app/src/main/resources/school_project/levels/level28.level create mode 100644 app/src/main/resources/school_project/levels/level29.level create mode 100644 app/src/main/resources/school_project/levels/level3.level create mode 100644 app/src/main/resources/school_project/levels/level30.level create mode 100644 app/src/main/resources/school_project/levels/level4.level create mode 100644 app/src/main/resources/school_project/levels/level5.level create mode 100644 app/src/main/resources/school_project/levels/level6.level create mode 100644 app/src/main/resources/school_project/levels/level7.level create mode 100644 app/src/main/resources/school_project/levels/level8.level create mode 100644 app/src/main/resources/school_project/levels/level9.level diff --git a/app/build.gradle b/app/build.gradle index b253582..ee76748 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,7 @@ dependencies { application { // Define the main class for the application. - mainClass = 'school_project.Controller' + mainClass = project.hasProperty("mainClass") ? project.getProperty("mainClass") : 'school_project.Controller' } javafx { @@ -41,3 +41,7 @@ tasks.named('test') { // Use JUnit Platform for unit tests. useJUnitPlatform() } + +run{ +standardInput = System.in +} diff --git a/app/src/main/java/school_project/Menu/MenuLevel.java b/app/src/main/java/school_project/Menu/MenuLevel.java index aff5f6d..6987f63 100644 --- a/app/src/main/java/school_project/Menu/MenuLevel.java +++ b/app/src/main/java/school_project/Menu/MenuLevel.java @@ -7,6 +7,11 @@ import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.RowConstraints; import school_project.Controller; +import school_project.GameUI; +import school_project.Parsers.FileParserFactory; + +import java.io.File; +import java.io.IOException; public class MenuLevel extends GridPane { private int StartLevel; @@ -60,30 +65,38 @@ public class MenuLevel extends GridPane { //It's here that I put all buttons where I need (base on column not row) for (int i = 0; i < 3; i++) { for (int j = 1; j < 5; j++) { + Button levelButton = new Button("level "+(StartLevel)); + levelButton.setOnAction(event -> { + try { + String levelName = ((Button)event.getSource()).getText().replace(" ", "") + ".level"; + System.out.println(levelName); + GameUI level = new GameUI(FileParserFactory.loadMapFromFile(new File(Controller.class.getResource("levels/" + levelName).getFile()))); + Controller.switchRoot(level); + } catch (IOException e) { + System.out.println("Le niveau " + StartLevel + "n'existe pas."); + } + }); if(i==0){ - Button Level = new Button("level "+(StartLevel)); StartLevel+=3; - add(Level,i,j); - setHalignment(Level,HPos.CENTER); + add(levelButton,i,j); + setHalignment(levelButton,HPos.CENTER); if(j==4){ StartLevel-=11; } } else if(i==1&&j!=4) { - Button Level = new Button("level "+(StartLevel)); StartLevel += 3; - add(Level, i, j); - setHalignment(Level,HPos.CENTER); + add(levelButton, i, j); + setHalignment(levelButton,HPos.CENTER); if (j == 3) { StartLevel -=8; } } else if(i==2&&j!=4){ - Button Level = new Button("level "+(StartLevel)); StartLevel+=3; - add(Level,i,j); - setHalignment(Level,HPos.CENTER); + add(levelButton,i,j); + setHalignment(levelButton,HPos.CENTER); } } } diff --git a/app/src/main/resources/school_project/levels/level1.level b/app/src/main/resources/school_project/levels/level1.level new file mode 100644 index 0000000..a3cdeb3 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level1.level @@ -0,0 +1 @@ +SMSààSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level10.level b/app/src/main/resources/school_project/levels/level10.level new file mode 100644 index 0000000..793e499 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level10.level @@ -0,0 +1 @@ +SMSêÿ"ð"°"p1àSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/level11.level b/app/src/main/resources/school_project/levels/level11.level similarity index 100% rename from app/src/main/resources/school_project/level11.level rename to app/src/main/resources/school_project/levels/level11.level diff --git a/app/src/main/resources/school_project/levels/level12.level b/app/src/main/resources/school_project/levels/level12.level new file mode 100644 index 0000000..64d2c52 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level12.level @@ -0,0 +1 @@ +SMSÿÿÿ€"°1àà2ü"p3í€SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level13.level b/app/src/main/resources/school_project/levels/level13.level new file mode 100644 index 0000000..b4a7301 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level13.level @@ -0,0 +1 @@ +SMS?ÿÿýðà"°3í€à"ð2ü3í€SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level14.level b/app/src/main/resources/school_project/levels/level14.level new file mode 100644 index 0000000..f209ed5 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level14.level @@ -0,0 +1 @@ +SMSfÿÿŸ< 1à"°"p€&ÿð"ð"ð"°àSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level15.level b/app/src/main/resources/school_project/levels/level15.level new file mode 100644 index 0000000..ec54527 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level15.level @@ -0,0 +1 @@ +SMSÿÿð"°1à€"p#üÀ!ÀSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level16.level b/app/src/main/resources/school_project/levels/level16.level new file mode 100644 index 0000000..71222e8 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level16.level @@ -0,0 +1 @@ +SMSÿÿÿ€"ðà€"p3í€3o€SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level17.level b/app/src/main/resources/school_project/levels/level17.level new file mode 100644 index 0000000..c2808d1 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level17.level @@ -0,0 +1 @@ +SMSÿÿÿÿð3ÿ€3í€1à1à#ü#üSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level18.level b/app/src/main/resources/school_project/levels/level18.level new file mode 100644 index 0000000000000000000000000000000000000000..fdb44617673f547ef3f0f25fa5c5ae4c7afdcb29 GIT binary patch literal 39 qcmWIc4Q6Nm4+agK#=jYq3XI=27~3}}Jpj^*2NVyO)PD%}bp-%~)Dpu0 literal 0 HcmV?d00001 diff --git a/app/src/main/resources/school_project/levels/level19.level b/app/src/main/resources/school_project/levels/level19.level new file mode 100644 index 0000000..bccddfc --- /dev/null +++ b/app/src/main/resources/school_project/levels/level19.level @@ -0,0 +1 @@ +SMSóÿÿóàà3ü€3o€4ð"°SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level2.level b/app/src/main/resources/school_project/levels/level2.level new file mode 100644 index 0000000..f37c5bd --- /dev/null +++ b/app/src/main/resources/school_project/levels/level2.level @@ -0,0 +1 @@ +SMSà1àSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level20.level b/app/src/main/resources/school_project/levels/level20.level new file mode 100644 index 0000000..62732e5 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level20.level @@ -0,0 +1 @@ +SMSÿÿÿ€À3í€"ð2ø3ü€SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level21.level b/app/src/main/resources/school_project/levels/level21.level new file mode 100644 index 0000000000000000000000000000000000000000..43446e8d3aec9b52dbc850c25fbb2e2c973e5760 GIT binary patch literal 25 hcmWIc4Q6Hi|NlD!o6!%&1BMTjHYnF9*97~z0sw_u3JL%K literal 0 HcmV?d00001 diff --git a/app/src/main/resources/school_project/levels/level22.level b/app/src/main/resources/school_project/levels/level22.level new file mode 100644 index 0000000..40da38f --- /dev/null +++ b/app/src/main/resources/school_project/levels/level22.level @@ -0,0 +1 @@ +SMSÿÿÿ€"pàÀ"°#ü#è#èSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level23.level b/app/src/main/resources/school_project/levels/level23.level new file mode 100644 index 0000000..c5c94f1 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level23.level @@ -0,0 +1 @@ +SMSÿÿÿ€2Üà"Ð#è#¼BSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level24.level b/app/src/main/resources/school_project/levels/level24.level new file mode 100644 index 0000000..2bc28e5 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level24.level @@ -0,0 +1 @@ +SMSvÿÿ€#쀀#ì#¼BSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level25.level b/app/src/main/resources/school_project/levels/level25.level new file mode 100644 index 0000000..bc3e531 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level25.level @@ -0,0 +1 @@ +SMSÿÿÿÿð#¼#|!À#\#ü2ô2äBSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level26.level b/app/src/main/resources/school_project/levels/level26.level new file mode 100644 index 0000000000000000000000000000000000000000..e4355f0e50194d137e8a07b127cf0364eb357bd2 GIT binary patch literal 29 lcmWIc4Q6LI`279*^EL)HqY9%6r433CjJ~M-{}Al!3IMfN49)-m literal 0 HcmV?d00001 diff --git a/app/src/main/resources/school_project/levels/level27.level b/app/src/main/resources/school_project/levels/level27.level new file mode 100644 index 0000000..032baad --- /dev/null +++ b/app/src/main/resources/school_project/levels/level27.level @@ -0,0 +1 @@ +SMSÿÿÿÿð#ø#´!À!À#¼4ð3o€SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level28.level b/app/src/main/resources/school_project/levels/level28.level new file mode 100644 index 0000000..e6e3b4b --- /dev/null +++ b/app/src/main/resources/school_project/levels/level28.level @@ -0,0 +1 @@ +SMSÿÿÿÿÿÿ€2ôB#|3?€3ÿ€#ü&ÿðSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level29.level b/app/src/main/resources/school_project/levels/level29.level new file mode 100644 index 0000000..37f4982 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level29.level @@ -0,0 +1 @@ +SMSyïÿyàBø!ÀBø$ÿ#´#èSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level3.level b/app/src/main/resources/school_project/levels/level3.level new file mode 100644 index 0000000..e3c2d52 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level3.level @@ -0,0 +1 @@ +SMSÿ€#üàSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level30.level b/app/src/main/resources/school_project/levels/level30.level new file mode 100644 index 0000000..8024650 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level30.level @@ -0,0 +1 @@ +SMSý÷ß}÷߀ $«3Û€2ø€€"°2x"p2ì"ð2äSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level4.level b/app/src/main/resources/school_project/levels/level4.level new file mode 100644 index 0000000..e7cebe7 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level4.level @@ -0,0 +1 @@ +SMSÿÿ#ü#ü€1àSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level5.level b/app/src/main/resources/school_project/levels/level5.level new file mode 100644 index 0000000..d3adad1 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level5.level @@ -0,0 +1 @@ +SMS÷p€€1à#ü#üSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level6.level b/app/src/main/resources/school_project/levels/level6.level new file mode 100644 index 0000000..b6466fa --- /dev/null +++ b/app/src/main/resources/school_project/levels/level6.level @@ -0,0 +1 @@ +SMSÿ3ÿ€à1àSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level7.level b/app/src/main/resources/school_project/levels/level7.level new file mode 100644 index 0000000..165247f --- /dev/null +++ b/app/src/main/resources/school_project/levels/level7.level @@ -0,0 +1 @@ +SMS3ÿ2üà"°SME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level8.level b/app/src/main/resources/school_project/levels/level8.level new file mode 100644 index 0000000..56abddb --- /dev/null +++ b/app/src/main/resources/school_project/levels/level8.level @@ -0,0 +1 @@ +SMSÿÿÿ€2ü"°"°"p1à€1à"pSME \ No newline at end of file diff --git a/app/src/main/resources/school_project/levels/level9.level b/app/src/main/resources/school_project/levels/level9.level new file mode 100644 index 0000000..d636478 --- /dev/null +++ b/app/src/main/resources/school_project/levels/level9.level @@ -0,0 +1 @@ +SMSÿÿ߀1à1à3ÿ€#ü"°SME \ No newline at end of file