diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cf40a8c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/spaceinvaders/.metadata/ diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore index aa21310..b37a95c 100644 --- a/spaceinvaders/GameProject/bin/.gitignore +++ b/spaceinvaders/GameProject/bin/.gitignore @@ -1,8 +1,2 @@ -/base/ -/collider/ -/controller/ -/gameobjects/ -/log4j2.xml /playground/ -/rendering/ -/ui/ +/base/ diff --git a/spaceinvaders/GameProject/bin/playground/Level5.class b/spaceinvaders/GameProject/bin/playground/Level5.class index 98f4c37..6568ac5 100644 Binary files a/spaceinvaders/GameProject/bin/playground/Level5.class and b/spaceinvaders/GameProject/bin/playground/Level5.class differ diff --git a/spaceinvaders/GameProject/bin/playground/Level6.class b/spaceinvaders/GameProject/bin/playground/Level6.class index 8ad7413..eac510d 100644 Binary files a/spaceinvaders/GameProject/bin/playground/Level6.class and b/spaceinvaders/GameProject/bin/playground/Level6.class differ diff --git a/spaceinvaders/GameProject/bin/playground/Level7.class b/spaceinvaders/GameProject/bin/playground/Level7.class index 3605297..b9f232a 100644 Binary files a/spaceinvaders/GameProject/bin/playground/Level7.class and b/spaceinvaders/GameProject/bin/playground/Level7.class differ diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log index 1f5c0de..86c5e05 100644 --- a/spaceinvaders/GameProject/log/log4j.log +++ b/spaceinvaders/GameProject/log/log4j.log @@ -827,3 +827,72 @@ 2022-05-11 19:07:43,043 INFO playground.Animation - img added .\video/heart0.png 2022-05-11 19:07:43,055 INFO playground.Animation - img added .\video/heart1.png 2022-05-11 19:07:43,073 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:12:25,968 INFO base.GameLoop - GUI starts +2022-05-11 22:12:28,134 INFO base.GameLoop - GUI NEW +2022-05-11 22:12:28,135 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:12:28,188 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:12:28,196 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:12:28,198 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:12:28,202 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:12:28,207 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:12:28,211 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:12:28,214 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:12:28,216 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:12:28,223 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:12:28,226 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:12:28,230 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:13:43,461 INFO base.GameLoop - Game ends. Bye. +2022-05-11 22:18:52,369 INFO base.GameLoop - GUI starts +2022-05-11 22:18:54,350 INFO base.GameLoop - GUI NEW +2022-05-11 22:18:54,351 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:18:54,404 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:18:54,412 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:18:54,415 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:18:54,419 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:18:54,423 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:18:54,427 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:18:54,430 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:18:54,433 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:18:54,440 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:18:54,443 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:18:54,447 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:19:04,222 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-05-11 22:19:04,223 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:19:04,229 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:19:04,231 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:19:04,233 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:19:04,235 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:19:04,237 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:19:04,239 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:19:04,241 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:19:04,243 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:19:04,247 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:19:04,249 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:19:04,251 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:24:39,428 INFO base.GameLoop - GUI starts +2022-05-11 22:24:41,201 INFO base.GameLoop - GUI NEW +2022-05-11 22:24:41,202 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:24:41,255 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:24:41,263 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:24:41,266 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:24:41,270 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:24:41,274 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:24:41,278 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:24:41,281 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:24:41,283 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:24:41,291 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:24:41,293 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:24:41,298 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 +2022-05-11 22:24:46,500 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-05-11 22:24:46,500 INFO playground.SpaceInvadersLevel - PREPARE +2022-05-11 22:24:46,506 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-05-11 22:24:46,509 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-05-11 22:24:46,511 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-05-11 22:24:46,513 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-05-11 22:24:46,515 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-05-11 22:24:46,517 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-05-11 22:24:46,519 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-05-11 22:24:46,521 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-05-11 22:24:46,526 INFO playground.Animation - img added .\video/heart0.png +2022-05-11 22:24:46,528 INFO playground.Animation - img added .\video/heart1.png +2022-05-11 22:24:46,530 INFO playground.SpaceInvadersLevel - HIGHSCORE17200 diff --git a/spaceinvaders/GameProject/src/playground/Level5.java b/spaceinvaders/GameProject/src/playground/Level5.java index befa201..423850e 100644 --- a/spaceinvaders/GameProject/src/playground/Level5.java +++ b/spaceinvaders/GameProject/src/playground/Level5.java @@ -24,18 +24,13 @@ import gameobjects.TextObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -public class Level5 extends SpaceInvadersLevel { +public class Level5 extends SpaceInvadersLevelAua { protected static final double ENEMYSPEEDX = 160; protected static final double ENEMYSPEEDY = 80; protected static final int NR_ENEMIES = 5; - @Override - void actionIfEnemyIsHit(GameObject e, GameObject shot) { - super.actionIfEnemyIsHit(e, shot); - System.out.println("AUA!"); - } @Override protected String getStartupMessage() { diff --git a/spaceinvaders/GameProject/src/playground/Level6.java b/spaceinvaders/GameProject/src/playground/Level6.java index 08f93bc..2be8257 100644 --- a/spaceinvaders/GameProject/src/playground/Level6.java +++ b/spaceinvaders/GameProject/src/playground/Level6.java @@ -24,17 +24,12 @@ import gameobjects.TextObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -public class Level6 extends SpaceInvadersLevel { +public class Level6 extends SpaceInvadersLevelAua { protected static final double ENEMYSPEEDX = 480; protected static final double ENEMYSPEEDY = 80; protected static final int NR_ENEMIES = 12; - @Override - void actionIfEnemyIsHit(GameObject e, GameObject shot) { - super.actionIfEnemyIsHit(e, shot); - System.out.println("AUA!"); - } @Override protected String getStartupMessage() { diff --git a/spaceinvaders/GameProject/src/playground/Level7.java b/spaceinvaders/GameProject/src/playground/Level7.java index b77dfcc..694563b 100644 --- a/spaceinvaders/GameProject/src/playground/Level7.java +++ b/spaceinvaders/GameProject/src/playground/Level7.java @@ -24,16 +24,11 @@ import gameobjects.TextObject; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -public class Level7 extends SpaceInvadersLevel { +public class Level7 extends SpaceInvadersLevelAua { protected static final double ENEMYSPEEDX = 800; protected static final double ENEMYSPEEDY = 140; protected static final int NR_ENEMIES = 21; - @Override - void actionIfEnemyIsHit(GameObject e, GameObject shot) { - super.actionIfEnemyIsHit(e, shot); - System.out.println("AUA!"); - } @Override protected String getStartupMessage() { diff --git a/spaceinvaders/GameProject/src/playground/SpaceInvadersLevelAua.java b/spaceinvaders/GameProject/src/playground/SpaceInvadersLevelAua.java new file mode 100644 index 0000000..f5e5d34 --- /dev/null +++ b/spaceinvaders/GameProject/src/playground/SpaceInvadersLevelAua.java @@ -0,0 +1,33 @@ +package playground; + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.Polygon; +import java.awt.RenderingHints; +import java.awt.font.TextAttribute; +import java.awt.image.BufferedImage; +import java.io.*; +import java.text.AttributedString; +import java.util.LinkedList; +import controller.EnemyController; +import controller.FallingStarController; +import controller.LimitedTimeController; +import controller.ObjectController; +import controller.EgoController; +import controller.CollisionAwareEgoController; +import gameobjects.AnimatedGameobject; +import gameobjects.FallingStar; +import gameobjects.GameObject; +import gameobjects.EgoObject; +import gameobjects.TextObject; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + +public class SpaceInvadersLevelAua extends SpaceInvadersLevel { + @Override + void actionIfEnemyIsHit(GameObject e, GameObject shot) { + super.actionIfEnemyIsHit(e, shot); + System.out.println("AUA! 2.0"); + } +}