gameMenu

2110215-ProgMeth · May 19, 2023 · 67914a3 · 67914a3
1 parent 43fdd4a
commit 67914a3
Show file tree

Hide file tree

Showing 40 changed files with 389 additions and 266 deletions.
diff --git a/bin/MainMenu/GameMenu.class b/bin/MainMenu/GameMenu.class
diff --git a/bin/MoleDerKaiser/moleDerKaiser.png b/bin/MoleDerKaiser/moleDerKaiser.png
diff --git a/bin/Tiles/pathTile.png → bin/MoleDerKaiser/normalMole.png b/bin/Tiles/pathTile.png → bin/MoleDerKaiser/normalMole.png
diff --git a/bin/Tiles/GrayTile.png b/bin/Tiles/GrayTile.png
diff --git a/bin/Tiles/WhiteTile.png b/bin/Tiles/WhiteTile.png
diff --git a/bin/Tiles/blackStarTile.png b/bin/Tiles/blackStarTile.png
diff --git a/bin/Tiles/blackTile.png b/bin/Tiles/blackTile.png
diff --git a/bin/application/GameStart$1.class b/bin/application/GameStart$1.class
diff --git a/bin/application/GameStart.class b/bin/application/GameStart.class
diff --git a/bin/application/Main$1.class b/bin/application/Main$1.class
diff --git a/bin/application/Main.class b/bin/application/Main.class
diff --git a/bin/logic/entity/Chicknight.class b/bin/logic/entity/Chicknight.class
diff --git a/bin/logic/entity/Enemy.class b/bin/logic/entity/Enemy.class
diff --git a/bin/logic/entity/EyeOfQwifot.class b/bin/logic/entity/EyeOfQwifot.class
diff --git a/bin/logic/entity/GriszlyEye.class b/bin/logic/entity/GriszlyEye.class
diff --git a/bin/logic/entity/Mole.class b/bin/logic/entity/Mole.class
diff --git a/bin/logic/entity/MoleDerKaiser.class b/bin/logic/entity/MoleDerKaiser.class
diff --git a/bin/logic/entity/Player.class b/bin/logic/entity/Player.class
diff --git a/bin/logic/entity/ShadowPot.class b/bin/logic/entity/ShadowPot.class
diff --git a/bin/logic/game/GameLogic.class b/bin/logic/game/GameLogic.class
diff --git a/bin/sharedObject/RenderableHolder.class b/bin/sharedObject/RenderableHolder.class
diff --git a/res/MoleDerKaiser/moleDerKaiser.png b/res/MoleDerKaiser/moleDerKaiser.png
diff --git a/res/Tiles/pathTile.png → res/MoleDerKaiser/normalMole.png b/res/Tiles/pathTile.png → res/MoleDerKaiser/normalMole.png
diff --git a/res/Tiles/GrayTile.png b/res/Tiles/GrayTile.png
diff --git a/res/Tiles/WhiteTile.png b/res/Tiles/WhiteTile.png
diff --git a/res/Tiles/blackStarTile.png b/res/Tiles/blackStarTile.png
diff --git a/res/Tiles/blackTile.png b/res/Tiles/blackTile.png
diff --git a/src/MainMenu/GameMenu.java b/src/MainMenu/GameMenu.java
@@ -1,6 +1,6 @@
 package MainMenu;
 
-import application.GameStart;
+import application.Main;
 import javafx.animation.FadeTransition;
 import javafx.animation.TranslateTransition;
 import javafx.scene.Parent;
@@ -10,95 +10,98 @@
 import javafx.util.Duration;
 
 public class GameMenu extends Parent{
-
-	public GameMenu() {
-		GameMenu gameMenu = this;
-		VBox mainMenu = new VBox(10);
-		VBox playMenu = new VBox(10);
-
-		mainMenu.setTranslateX(1280/2.5);
-		mainMenu.setTranslateY(720*3/4);
-		playMenu.setTranslateX(1280/1.5);
-		playMenu.setTranslateY(720*3/4);
-
-		//Main menu
-		MenuButton startBtn = new MenuButton("START");
-
-		startBtn.setOnMouseClicked(e->{
-			transition(mainMenu,playMenu,-640);
-//			gameMenu.getChildren().remove(mainMenu);
-			gameMenu.getChildren().addAll(playMenu);
-		});
-
-		MenuButton exitBtn = new MenuButton("QUIT");
-
-		exitBtn.setOnMouseClicked(e->{
-			System.exit(0);
-		});
-
-		MenuButton optionBtn = new MenuButton("OPTION");
-
-		optionBtn.setOnMouseClicked(e->{
-			getChildren().add(playMenu);
-			transition(mainMenu,playMenu,-640);
-
-		});
-
-		//PlayMenu
-
-		MenuButton playBtn = new MenuButton("PLAY");
-
-		playBtn.setOnMouseClicked(e->{
-			FadeTransition ft = new FadeTransition(Duration.seconds(0.5),this);
-			ft.setFromValue(1);
-			ft.setToValue(0);
-			ft.setOnFinished(evt-> setVisible(false));
-			ft.play();
-
-			GameStart.start();
-
-		});
-
-		MenuButton ContBtn = new MenuButton("CONTINUE");
-
-		ContBtn.setOnMouseClicked(e->{
-
-		});
-
-		MenuButton backBtn = new MenuButton("BACK");
-
-		backBtn.setOnMouseClicked(e->{
-			gameMenu.getChildren().remove(playMenu);
-			gameMenu.getChildren().addAll(mainMenu);
-			transition(playMenu,mainMenu,640);
-
-		});
-
-
-		Rectangle bg = new Rectangle(1280,720);
-		bg.setOpacity(0.1);
-		bg.setFill(Color.PINK);
-		mainMenu.getChildren().addAll(startBtn,optionBtn,exitBtn);
-		playMenu.getChildren().addAll(playBtn,ContBtn,backBtn);
-
-		getChildren().addAll(bg,mainMenu);
-
-	}
-
-	public void transition(VBox menuToOut,VBox menuToin,int Xtrans) {
-		TranslateTransition ttOut = new TranslateTransition(Duration.seconds(0.5),menuToOut);
-		ttOut.setToX(menuToOut.getTranslateX()+Xtrans);
-
-		TranslateTransition ttIn = new TranslateTransition(Duration.seconds(0.5),menuToin);
-		ttIn.setToX(menuToOut.getTranslateX());
-
-		ttOut.play();
-		ttIn.play();
-
-		ttOut.setOnFinished(evt-> getGameMenu().getChildren().remove(menuToOut));
-	}
-
-	public GameMenu getGameMenu() {
-		return this;
-	}
-}
+
+    public GameMenu() {
+        GameMenu gameMenu = this;
+        VBox mainMenu = new VBox(10);
+        VBox playMenu = new VBox(10);
+
+        mainMenu.setTranslateX(1280/2.5);
+        mainMenu.setTranslateY(7203/4);
+        playMenu.setTranslateX(1280/1.5);
+        playMenu.setTranslateY(7203/4);
+
+        //Main menu
+        MenuButton startBtn = new MenuButton("START");
+
+        startBtn.setOnMouseClicked(e->{
+            transition(mainMenu,playMenu,-640);
+//            gameMenu.getChildren().remove(mainMenu);
+            gameMenu.getChildren().addAll(playMenu);
+        });
+
+        MenuButton exitBtn = new MenuButton("QUIT");
+
+        exitBtn.setOnMouseClicked(e->{
+            System.exit(0);
+        });
+
+        MenuButton optionBtn = new MenuButton("OPTION");
+
+        optionBtn.setOnMouseClicked(e->{
+            getChildren().add(playMenu);
+            transition(mainMenu,playMenu,-640);
+
+        });
+
+        //PlayMenu
+
+        MenuButton playBtn = new MenuButton("PLAY");
+
+        playBtn.setOnMouseClicked(e->{
+            FadeTransition ft = new FadeTransition(Duration.seconds(0.5),this);
+            ft.setFromValue(1);
+            ft.setToValue(0);
+            ft.setOnFinished(evt-> setVisible(false));
+            ft.play();
+            Main.isStart = true;
+            Main.GameStart();
+
+            gameMenu.getChildren().remove(playMenu);
+            gameMenu.getChildren().addAll(mainMenu);
+            transition(playMenu,mainMenu,640);
+        });
+
+        MenuButton ContBtn = new MenuButton("CONTINUE");
+
+        ContBtn.setOnMouseClicked(e->{
+
+        });
+
+        MenuButton backBtn = new MenuButton("BACK");
+
+        backBtn.setOnMouseClicked(e->{
+            gameMenu.getChildren().remove(playMenu);
+            gameMenu.getChildren().addAll(mainMenu);
+            transition(playMenu,mainMenu,640);
+
+        });
+
+
+        Rectangle bg = new Rectangle(1280,720);
+        bg.setOpacity(0.1);
+        bg.setFill(Color.PINK);
+        mainMenu.getChildren().addAll(startBtn,optionBtn,exitBtn);
+        playMenu.getChildren().addAll(playBtn,ContBtn,backBtn);
+
+        getChildren().addAll(bg,mainMenu);
+
+    }
+
+    public void transition(VBox menuToOut,VBox menuToin,int Xtrans) {
+        TranslateTransition ttOut = new TranslateTransition(Duration.seconds(0.5),menuToOut);
+        ttOut.setToX(menuToOut.getTranslateX()+Xtrans);
+
+        TranslateTransition ttIn = new TranslateTransition(Duration.seconds(0.5),menuToin);
+        ttIn.setToX(menuToOut.getTranslateX());
+
+        ttOut.play();
+        ttIn.play();
+
+        ttOut.setOnFinished(evt-> getGameMenu().getChildren().remove(menuToOut));
+    }
+
+    public GameMenu getGameMenu() {
+        return this;
+    }
+}
diff --git a/src/application/GameStart.java b/src/application/GameStart.java