90% completed

2110215-ProgMeth · May 20, 2023 · 279b537 · 279b537
1 parent 1a07332
commit 279b537
Show file tree

Hide file tree

Showing 73 changed files with 614 additions and 304 deletions.
diff --git a/bin/MainMenu/GameOverButton.class b/bin/MainMenu/GameOverButton.class
diff --git a/bin/Chicknight/ChicknightLeftWalk2.png → bin/MoleDerKaiser/moleDerKaiser1.png b/bin/Chicknight/ChicknightLeftWalk2.png → bin/MoleDerKaiser/moleDerKaiser1.png
diff --git a/res/Chicknight/ChicknightLeftWalk2.png → bin/MoleDerKaiser/normalMole1.png b/res/Chicknight/ChicknightLeftWalk2.png → bin/MoleDerKaiser/normalMole1.png
diff --git a/bin/Object/Ball.class b/bin/Object/Ball.class
diff --git a/bin/Object/Projectile.class b/bin/Object/Projectile.class
diff --git a/bin/Object/SwordBeam.class b/bin/Object/SwordBeam.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/darkSoul4.png b/bin/darkSoul4.png
diff --git a/bin/llaristicKnight/llaristicKnightLeft1.png b/bin/llaristicKnight/llaristicKnightLeft1.png
diff --git a/bin/llaristicKnight/llaristicKnightLeft2.png b/bin/llaristicKnight/llaristicKnightLeft2.png
diff --git a/bin/llaristicKnight/llaristicKnightLeftAtk.png b/bin/llaristicKnight/llaristicKnightLeftAtk.png
diff --git a/bin/llaristicKnight/llaristicKnightRight1.png b/bin/llaristicKnight/llaristicKnightRight1.png
diff --git a/bin/llaristicKnight/llaristicKnightRight2.png b/bin/llaristicKnight/llaristicKnightRight2.png
diff --git a/bin/llaristicKnight/llaristicKnightRightAtk.png b/bin/llaristicKnight/llaristicKnightRightAtk.png
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/Entity.class b/bin/logic/entity/Entity.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/LlaristicKnight.class b/bin/logic/entity/LlaristicKnight.class
diff --git a/bin/logic/entity/MagicalTortoise.class b/bin/logic/entity/MagicalTortoise.class
diff --git a/bin/logic/entity/Mole.class b/bin/logic/entity/Mole.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/pause/Victory.png b/bin/pause/Victory.png
diff --git a/bin/sharedObject/RenderableHolder.class b/bin/sharedObject/RenderableHolder.class
diff --git a/bin/sound/monsterdie.wav b/bin/sound/monsterdie.wav
diff --git a/bin/sound/skill1.wav b/bin/sound/skill1.wav
diff --git a/bin/swordBeam/beamBottom.png b/bin/swordBeam/beamBottom.png
diff --git a/bin/swordBeam/beamLeft.png b/bin/swordBeam/beamLeft.png
diff --git a/bin/swordBeam/beamRight.png b/bin/swordBeam/beamRight.png
diff --git a/bin/swordBeam/beamtop.png b/bin/swordBeam/beamtop.png
diff --git a/bin/Chicknight/ChicknightRightWalk2.png → bin/test1.png b/bin/Chicknight/ChicknightRightWalk2.png → bin/test1.png
diff --git a/res/Chicknight/ChicknightRightWalk2.png → bin/test2.png b/res/Chicknight/ChicknightRightWalk2.png → bin/test2.png
diff --git a/bin/test3.png b/bin/test3.png
diff --git a/res/MoleDerKaiser/moleDerKaiser1.png b/res/MoleDerKaiser/moleDerKaiser1.png
diff --git a/res/MoleDerKaiser/normalMole1.png b/res/MoleDerKaiser/normalMole1.png
diff --git a/res/darkSoul4.png b/res/darkSoul4.png
diff --git a/res/llaristicKnight/llaristicKnightLeft1.png b/res/llaristicKnight/llaristicKnightLeft1.png
diff --git a/res/llaristicKnight/llaristicKnightLeft2.png b/res/llaristicKnight/llaristicKnightLeft2.png
diff --git a/res/llaristicKnight/llaristicKnightLeftAtk.png b/res/llaristicKnight/llaristicKnightLeftAtk.png
diff --git a/res/llaristicKnight/llaristicKnightRight1.png b/res/llaristicKnight/llaristicKnightRight1.png
diff --git a/res/llaristicKnight/llaristicKnightRight2.png b/res/llaristicKnight/llaristicKnightRight2.png
diff --git a/res/llaristicKnight/llaristicKnightRightAtk.png b/res/llaristicKnight/llaristicKnightRightAtk.png
diff --git a/res/pause/Victory.png b/res/pause/Victory.png
diff --git a/res/sound/monsterdie.wav b/res/sound/monsterdie.wav
diff --git a/res/sound/skill1.wav b/res/sound/skill1.wav
diff --git a/res/swordBeam/beamBottom.png b/res/swordBeam/beamBottom.png
diff --git a/res/swordBeam/beamLeft.png b/res/swordBeam/beamLeft.png
diff --git a/res/swordBeam/beamRight.png b/res/swordBeam/beamRight.png
diff --git a/res/swordBeam/beamtop.png b/res/swordBeam/beamtop.png
diff --git a/res/test1.png b/res/test1.png
diff --git a/res/test2.png b/res/test2.png
diff --git a/res/test3.png b/res/test3.png
diff --git a/src/MainMenu/GameOverButton.java b/src/MainMenu/GameOverButton.java
@@ -24,11 +24,12 @@ public GameOverButton(int x, int y, int width, int height,String text) {
 
 	}
 
-	public void draw(GraphicsContext gc) {
+	public void draw(GraphicsContext gc,Color colorStrokeRect,Color colorFillText) {
 		//(1280/2.5,720/1.5,200,40)
 		gc.strokeRect(x,y,width,height);
-		gc.setFill(Color.BLACK);
+		gc.setFill(colorStrokeRect);
 		gc.setFont(Font.font("Times New Roman", FontWeight.BOLD, 32));
+		gc.setFill(colorFillText);
 		gc.fillText(text.getText(), (x+width/2-75), (y+height/1.3));
 	}
 

diff --git a/src/Object/Ball.java b/src/Object/Ball.java
@@ -0,0 +1,29 @@
+package Object;
+
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.shape.Rectangle;
+import logic.game.GameLogic;
+import sharedObject.RenderableHolder;
+
+public class Ball extends Projectile{
+
+    public Ball(double worldX, double worldY, double angle, GameLogic gameLogic) {
+        super(worldX, worldY, angle, gameLogic);
+        speed = 3;
+        xspeed = Math.cos(angle) * speed;
+        yspeed = Math.sin(angle) * speed;
+        dmg = 10;
+        solidArea = new Rectangle(0, 0, 8, 8);
+        solidScreen = new Rectangle(screenX+solidArea.getX(),screenY+solidArea.getY(),solidArea.getWidth(),solidArea.getHeight());
+        RenderableHolder.shootSound.play(0.1);
+        image = RenderableHolder.ball;
+    }
+
+    @Override
+    public void draw(GraphicsContext gc) {
+        // TODO Auto-generated method stub
+        gc.drawImage(image, screenX, screenY);
+//        drawHitbox(gc);
+    }
+
+}
diff --git a/src/Object/Projectile.java b/src/Object/Projectile.java
@@ -1,54 +1,46 @@
 package Object;
 
 import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import logic.entity.Player;
 import logic.game.GameLogic;
 import sharedObject.IRenderable;
 import sharedObject.RenderableHolder;
 
-public class Projectile implements IRenderable {
-
+public abstract class Projectile implements IRenderable {
+	protected Image image;
 	protected double worldX, worldY;
 	public double screenX, screenY;
-	private Rectangle solidArea,solidScreen;
-	private double angle;
-	private int dmg, speed;
+	protected Rectangle solidArea,solidScreen;
+	protected double angle;
+	protected int dmg, speed;
 	protected int z, radius;
 	protected boolean visible, destroyed;
 	public GameLogic gameLogic;
-	private double xspeed, yspeed;
+	protected double xspeed, yspeed;
 
 	public Projectile(double worldX, double worldY, double angle, GameLogic gameLogic) {
 		this.worldX = worldX;
 		this.worldY = worldY;
 		this.gameLogic = gameLogic;
 		this.angle = angle;
-		this.speed = 3;
 		this.z = 10;
 		this.visible = true;
 		this.destroyed = false;
-		this.xspeed = Math.cos(angle) * speed;
-		this.yspeed = Math.sin(angle) * speed;
-		this.dmg = 10;
-		solidArea = new Rectangle(0, 0, 8, 8);
-		solidScreen = new Rectangle(screenX,screenY,8,8);
-		RenderableHolder.shootSound.play(0.1);
 	}
 
 	public void update() {
 		worldX += xspeed;
 		worldY += yspeed;
 		screenX = worldX - gameLogic.getPlayer().getWorldX() + gameLogic.getPlayer().screenX;
 		screenY = worldY - gameLogic.getPlayer().getWorldY() + gameLogic.getPlayer().screenY;
-		solidArea.setX(screenX);
-		solidArea.setY(screenY);
-//		System.out.println("X =" + xspeed + " Y = " + yspeed);
 		boolean isOut = screenX < 0 || screenX > 1280 || screenY < 0 || screenY > 720;
 		if (isOut) {
 			destroyed = true;
 		}
+		solidScreen = new Rectangle(screenX+solidArea.getX(),screenY+solidArea.getY(),solidArea.getWidth(),solidArea.getHeight());
 		checkEnemyHit();
 	}
 
@@ -58,15 +50,10 @@ public void checkEnemyHit() {
 		int y = (int) p.getScreenY();
 		int width = (int) p.getSolidArea().getWidth();
 		int height = (int) p.getSolidArea().getHeight();
-		boolean overlap = solidArea.intersects(x,y,width,height);
-//		System.out.println("Overlap = " + overlap);
-//		System.out.println("X = " + x + " Y = " + y);
-		if (overlap) {
+		if (solidScreen.intersects(x,y,width,height)) {
 			p.changeHealthTo(p.getCurrentHealth() - dmg);
 			destroyed = true;
 		}
-		solidArea.setX(screenX);
-		solidArea.setY(screenY);
 	}
 
 	public Rectangle getSolidArea() {
@@ -79,13 +66,7 @@ public int getZ() {
 		return 0;
 	}
 
-	@Override
-	public void draw(GraphicsContext gc) {
-		// TODO Auto-generated method stub
-		gc.drawImage(RenderableHolder.ball, screenX, screenY);
-		drawHitbox(gc);
-	}
-
+	public abstract void draw(GraphicsContext gc);
 	@Override
 	public boolean isDestroyed() {
 		// TODO Auto-generated method stub
@@ -103,7 +84,7 @@ public boolean isVisible() {
 	public void drawHitbox(GraphicsContext gc) {
 		gc.setLineWidth(2);
 		gc.setFill(Color.RED);
-		gc.strokeRect(solidArea.getX(), solidArea.getY(), solidArea.getWidth(),
-				solidArea.getHeight());
+		gc.strokeRect(solidScreen.getX(), solidScreen.getY(), solidScreen.getWidth(),
+				solidScreen.getHeight());
 	}
-}
+}
diff --git a/src/Object/SwordBeam.java b/src/Object/SwordBeam.java
@@ -0,0 +1,43 @@
+package Object;
+
+import javafx.scene.SnapshotParameters;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.image.ImageView;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import logic.game.GameLogic;
+import sharedObject.RenderableHolder;
+
+public class SwordBeam extends Projectile{
+	ImageView rotatedImage;
+	SnapshotParameters params;
+    public SwordBeam(double worldX, double worldY, double angle, GameLogic gameLogic) {
+        super(worldX, worldY, angle, gameLogic);
+        speed = 5;
+        xspeed = Math.cos(angle) * speed;
+        yspeed = Math.sin(angle) * speed;
+        dmg = 20;
+        image = RenderableHolder.beamRight;
+    	rotatedImage = new ImageView(image);
+    	rotatedImage.setRotate(angle*180/Math.PI);
+    	params = new SnapshotParameters();
+    	params.setFill(Color.TRANSPARENT);
+        if(Math.abs(xspeed)>Math.abs(yspeed)) {
+            solidArea = new Rectangle(0, -32, 32, 128);
+        }
+        else {
+            solidArea = new Rectangle(-32,0,128,32);
+        }
+        solidScreen = new Rectangle(screenX+solidArea.getX(),screenY+solidArea.getY(),solidArea.getWidth(),solidArea.getHeight());
+        RenderableHolder.shootSound.play(0.1);
+    }
+
+    @Override
+    public void draw(GraphicsContext gc) {
+        // TODO Auto-generated method stub
+    	gc.drawImage(rotatedImage.snapshot(params, null), screenX, screenY);
+
+//        drawHitbox(gc);
+    }
+
+}
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -26,6 +26,9 @@ public static void main(String[] args) {
 		Application.launch(args);
 	}
 
+	public static int second;
+	public static long lastTimeTriggered = -1;
+
 	public static boolean isStart = false;
 	private static GameMenu gameMenu;
 	public static Stage stage;
@@ -56,31 +59,40 @@ public static void GameStart() {
 		gameScreen.requestFocus();
 //		
 //		
-			 animation = new AnimationTimer() {
-				long previousTime = 0;
-				double drawInterval = 1e9 / 60;
-				double delta = 0;
-
-				public void handle(long now) {
-					delta += (now - previousTime) / drawInterval;
-					previousTime = now;
-					logic.checkGameState();
-					if (delta >= 1) {
-						logic.count();
-						logic.update();
-						RenderableHolder.getInstance().update();
-						InputUtility.updateInputState();
-						delta--;
-					}
+		second = 0 ;
+		animation = new AnimationTimer() {
+			long previousTime = 0;
+			double drawInterval = 1e9 / 60;
+			double delta = 0;
+
+			public void handle(long now) {
+				// timer
+				lastTimeTriggered = (lastTimeTriggered < 0 ? now : lastTimeTriggered);
+				if (now - lastTimeTriggered >= 1000000000) {
+					second++;
+					lastTimeTriggered = now;
 				}
-			};
-			animation.start();
-		}
+
+				delta += (now - previousTime) / drawInterval;
+				previousTime = now;
+				logic.checkGameState();
+				if (delta >= 1) {
+					logic.count();
+					logic.update();
+					RenderableHolder.getInstance().update();
+					InputUtility.updateInputState();
+					delta--;
+				}
+//				System.out.println(second);
+			}
+		};
+		animation.start();
+	}
 
 	public static void GoToMenu() {
 		animation.stop();
 		root.getChildren().remove(gameScreen);
-		root.getChildren().addAll(bg,gameMenu);
+		root.getChildren().addAll(bg, gameMenu);
 	}
 
 	@Override
@@ -92,7 +104,7 @@ public void start(Stage stage) {
 
 		gameMenu = new GameMenu();
 
-		Image img = new Image(ClassLoader.getSystemResource("Elysia.jpeg").toString());
+		Image img = new Image(ClassLoader.getSystemResource("darkSoul4.png").toString());
 		bg = new ImageView(img);
 		bg.setFitWidth(width);
 		bg.setFitHeight(height);
@@ -101,16 +113,18 @@ public void start(Stage stage) {
 		gameMenu.setVisible(false);
 
 		Scene scene = new Scene(root);
-
+		if (!gameMenu.isVisible()) {
 		scene.setOnKeyPressed(e -> {
-			if (!gameMenu.isVisible()) {
+			System.out.println("attempt");
+
 				FadeTransition ft = new FadeTransition(Duration.seconds(1), gameMenu);
 				ft.setFromValue(0);
 				ft.setToValue(1);
 				gameMenu.setVisible(true);
 				ft.play();
-			}
+
 		});
+		}
 
 		stage.setTitle("2D Game");
 		stage.setScene(scene);
@@ -120,4 +134,5 @@ public void start(Stage stage) {
 //		
 //		
 	}
+
 }
diff --git a/src/logic/entity/Chicknight.java b/src/logic/entity/Chicknight.java
@@ -17,7 +17,7 @@ public Chicknight(double x, double y, GameLogic gameLogic) {
 		this.dmg = 5;
 		this.z = -100;
 		this.speed = 1;
-		image = RenderableHolder.CKRight;
+		image = RenderableHolder.cKRight;
 	}
 
 	@Override
@@ -27,23 +27,23 @@ public void draw(GraphicsContext gc) {
 		switch (direction) {
 		case "right":
 			if (attackState)
-				image = RenderableHolder.CKRightAtk;
+				image = RenderableHolder.cKRightAtk;
 			else {
-				image = RenderableHolder.CKRight;
+				image = RenderableHolder.cKRight;
 				if (currentState == "attacking") {
 					if (gameLogic.getCounter() / 10 % 2 == 1)
-						image = RenderableHolder.CKRightWalk1;
+						image = RenderableHolder.cKRightWalk1;
 				}
 			}
 			break;
 		case "left":
 			if (attackState)
-				image = RenderableHolder.CKLeftAtk;
+				image = RenderableHolder.cKLeftAtk;
 			else {
-				image = RenderableHolder.CKLeft;
+				image = RenderableHolder.cKLeft;
 				if (currentState == "attacking") {
 					if (gameLogic.getCounter() / 10 % 2 == 1)
-						image = RenderableHolder.CKLeftWalk1;
+						image = RenderableHolder.cKLeftWalk1;
 				}
 			}
 			break;
@@ -52,8 +52,8 @@ public void draw(GraphicsContext gc) {
 
 		gc.drawImage(image, screenX, screenY);
 
-		drawHitbox(gc);
-		drawAttackBlock(gc);
+//		drawHitbox(gc);
+//		drawAttackBlock(gc);
 	}