diff --git a/src/main/java/deliverables/Referat b/src/main/java/deliverables/Referat new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/main/java/inf112/skeleton/app/Enemy.java b/src/main/java/inf112/skeleton/app/Enemy.java index 831417aec65b7ca895bf0ecbbdda89191c9b01a8..035076ddd046757704f5653f8804ef6b7bc25a79 100644 --- a/src/main/java/inf112/skeleton/app/Enemy.java +++ b/src/main/java/inf112/skeleton/app/Enemy.java @@ -4,7 +4,7 @@ import javafx.scene.paint.Paint; public class Enemy implements IGameObject{ int x, y, w, h, distance; - int walkSpeed = 1; + int walkSpeed = 3; int sum = 0; private int gravity = 5; Paint color; diff --git a/src/main/java/inf112/skeleton/app/Game.java b/src/main/java/inf112/skeleton/app/Game.java index 5f7163de008e96b283599a8a13c5b9e9103509ea..34f6526737b1ef28cc6e4e9caf25503ab49a7ae4 100644 --- a/src/main/java/inf112/skeleton/app/Game.java +++ b/src/main/java/inf112/skeleton/app/Game.java @@ -23,6 +23,7 @@ import javafx.scene.text.Font; import javafx.scene.text.FontWeight; import javafx.stage.Stage; +//push test public class Game extends Application { private AnimationTimer timer; private Canvas canvas; @@ -125,15 +126,15 @@ public class Game extends Application { scene.setOnKeyPressed(keyH::keyPressed); scene.setOnKeyReleased(keyH::keyReleased); - ListWalls.add(new Wall(250, 400, 150, 20, Color.DARKGREEN)); - ListWalls.add(new Wall(160, 570, 340, 120, Color.DARKGREEN)); - ListWalls.add(new Wall(820, 570, 300, 120, Color.DARKGREEN)); - ListWalls.add(new Wall(1200, 530, 300, 120, Color.DARKGREEN)); + ListWalls.add(new Wall(250, 400, 150, 20, Color.DIMGRAY)); + ListWalls.add(new Wall(160, 570, 340, 120, Color.DIMGRAY)); + ListWalls.add(new Wall(820, 570, 300, 120, Color.DIMGRAY)); + ListWalls.add(new Wall(1200, 530, 300, 120, Color.DIMGRAY)); ListWaffle.add(new Waffle(300, 350, 50, 50)); ListWaffle.add(new Waffle(1000, 400, 50, 50)); - ListEnemy.add(new Enemy(700, 100, 50, 50, Color.RED, 200)); + ListEnemy.add(new Enemy(700, 300, 50, 50, Color.RED, 200)); } protected void step() { @@ -194,7 +195,7 @@ public class Game extends Application { if (player.invincible) { if (player.invincibleTimer == 0) { player.invincible = false; - player.invincibleTimer = 50; + player.invincibleTimer = 100; } player.invincibleTimer--; }