diff --git a/spaceinvaders/GameProject/.project b/spaceinvaders/GameProject/.project index 46662e1..0a0a9e3 100644 --- a/spaceinvaders/GameProject/.project +++ b/spaceinvaders/GameProject/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1654173149171 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore index aa21310..61c497a 100644 --- a/spaceinvaders/GameProject/bin/.gitignore +++ b/spaceinvaders/GameProject/bin/.gitignore @@ -1,8 +1 @@ -/base/ -/collider/ -/controller/ -/gameobjects/ -/log4j2.xml /playground/ -/rendering/ -/ui/ diff --git a/spaceinvaders/GameProject/bin/base/BreakoutGame.class b/spaceinvaders/GameProject/bin/base/BreakoutGame.class index 1c7d8e6..e810237 100644 Binary files a/spaceinvaders/GameProject/bin/base/BreakoutGame.class and b/spaceinvaders/GameProject/bin/base/BreakoutGame.class differ diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log index 8a903c5..57f6892 100644 --- a/spaceinvaders/GameProject/log/log4j.log +++ b/spaceinvaders/GameProject/log/log4j.log @@ -1410,3 +1410,33 @@ 2022-06-02 09:09:43,428 INFO playground.Animation - img added ./video/heart0.png 2022-06-02 09:09:43,430 INFO playground.Animation - img added ./video/heart1.png 2022-06-02 09:09:43,441 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-06-02 13:57:54,470 INFO playground.SpaceInvadersLevel - PREPARE +2022-06-02 13:57:54,535 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-06-02 13:57:54,544 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-06-02 13:57:54,547 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-06-02 13:57:54,551 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-06-02 13:57:54,555 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-06-02 13:57:54,559 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-06-02 13:57:54,563 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-06-02 13:57:54,566 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-06-02 13:57:54,584 INFO playground.Animation - img added .\video/heart0.png +2022-06-02 13:57:54,588 INFO playground.Animation - img added .\video/heart1.png +2022-06-02 13:57:54,593 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-06-02 13:59:07,039 INFO playground.SpaceInvadersLevel - PREPARE +2022-06-02 13:59:07,098 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-06-02 13:59:07,107 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-06-02 13:59:07,110 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-06-02 13:59:07,114 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-06-02 13:59:07,119 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-06-02 13:59:07,123 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-06-02 13:59:07,126 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-06-02 13:59:07,129 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-06-02 13:59:07,138 INFO playground.Animation - img added .\video/heart0.png +2022-06-02 13:59:07,141 INFO playground.Animation - img added .\video/heart1.png +2022-06-02 13:59:07,145 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-06-02 13:59:10,663 INFO playground.LevelMovingObjects - ego hit a letal RectObject. Game ends NOW +2022-06-02 15:09:10,214 INFO playground.BreakoutLevel1 - ball created. +2022-06-02 15:11:50,649 INFO playground.BreakoutLevel1 - ball created. +2022-06-02 15:12:28,062 INFO playground.BreakoutLevel1 - ball created. +2022-06-02 15:14:46,362 INFO playground.BreakoutLevel1 - ego created. +2022-06-02 15:14:46,369 INFO playground.BreakoutLevel1 - ball created. diff --git a/spaceinvaders/GameProject/src/base/BreakoutGame.java b/spaceinvaders/GameProject/src/base/BreakoutGame.java index 2c636ff..8f45895 100644 --- a/spaceinvaders/GameProject/src/base/BreakoutGame.java +++ b/spaceinvaders/GameProject/src/base/BreakoutGame.java @@ -19,7 +19,7 @@ public class BreakoutGame extends GameLoop { @Override public void defineLevels() { this.resetLevels(); // removes Level1 added by superclass constructor - // this.addLevel(new BreakoutLevel1()); // FIXME add this as soon as your level exists + this.addLevel(new BreakoutLevel1()); // FIXME add this as soon as your level exists } /** diff --git a/spaceinvaders/GameProject/src/playground/BreakoutLevel1.java b/spaceinvaders/GameProject/src/playground/BreakoutLevel1.java index c495703..ca3ad60 100644 --- a/spaceinvaders/GameProject/src/playground/BreakoutLevel1.java +++ b/spaceinvaders/GameProject/src/playground/BreakoutLevel1.java @@ -45,13 +45,24 @@ public class BreakoutLevel1 extends BreakoutLevelBase { @Override protected GameObject createBrick(int row, int column) { + RectObject brick = new RectObject("brick"+row+column, this, 900, 900, 0, 0, 40, 40, Color.GREEN); + // TODO Auto-generated method stub - return null; + return brick; } @Override public void prepareLevel(String level) { + GameObject ego1 = this.createEgoObject(); + this.ego = ego1; + this.addObject(ego1); + + + GameObject ball1 = this.createBall(); + this.ball = ball1; + this.addObject(ball1); + // TODO Auto-generated method stub }