diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index b37a95c..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/playground/ -/base/ diff --git a/bin/base/GameLoop.class b/bin/base/GameLoop.class index f7e05ed..622e7da 100644 Binary files a/bin/base/GameLoop.class and b/bin/base/GameLoop.class differ diff --git a/bin/base/MultiLevelGame.class b/bin/base/MultiLevelGame.class index 7323e32..002eaca 100644 Binary files a/bin/base/MultiLevelGame.class and b/bin/base/MultiLevelGame.class differ diff --git a/bin/collider/CircleCollider.class b/bin/collider/CircleCollider.class index cbceffb..52d2604 100644 Binary files a/bin/collider/CircleCollider.class and b/bin/collider/CircleCollider.class differ diff --git a/bin/collider/Collider.class b/bin/collider/Collider.class index e4dc350..93bfda2 100644 Binary files a/bin/collider/Collider.class and b/bin/collider/Collider.class differ diff --git a/bin/collider/RectCollider.class b/bin/collider/RectCollider.class index 4b96688..3153b9d 100644 Binary files a/bin/collider/RectCollider.class and b/bin/collider/RectCollider.class differ diff --git a/bin/controller/CollisionAwareEgoController.class b/bin/controller/CollisionAwareEgoController.class index 9239e51..b172cc2 100644 Binary files a/bin/controller/CollisionAwareEgoController.class and b/bin/controller/CollisionAwareEgoController.class differ diff --git a/bin/controller/EgoController.class b/bin/controller/EgoController.class index 07437bf..b6d0899 100644 Binary files a/bin/controller/EgoController.class and b/bin/controller/EgoController.class differ diff --git a/bin/controller/EnemyController.class b/bin/controller/EnemyController.class index 2db22f2..054502e 100644 Binary files a/bin/controller/EnemyController.class and b/bin/controller/EnemyController.class differ diff --git a/bin/controller/FallingStarController.class b/bin/controller/FallingStarController.class index 382398e..0a00913 100644 Binary files a/bin/controller/FallingStarController.class and b/bin/controller/FallingStarController.class differ diff --git a/bin/controller/LimitedTimeController.class b/bin/controller/LimitedTimeController.class index 5fe4657..d0ce258 100644 Binary files a/bin/controller/LimitedTimeController.class and b/bin/controller/LimitedTimeController.class differ diff --git a/bin/controller/MineController.class b/bin/controller/MineController.class index 2b5c829..3b397b2 100644 Binary files a/bin/controller/MineController.class and b/bin/controller/MineController.class differ diff --git a/bin/controller/ObjectController.class b/bin/controller/ObjectController.class index 64bc00b..dce7b55 100644 Binary files a/bin/controller/ObjectController.class and b/bin/controller/ObjectController.class differ diff --git a/bin/controller/SimpleShotController.class b/bin/controller/SimpleShotController.class index aa56f80..98bca0d 100644 Binary files a/bin/controller/SimpleShotController.class and b/bin/controller/SimpleShotController.class differ diff --git a/bin/controller/ZickZackController.class b/bin/controller/ZickZackController.class index 824b238..1f2afd5 100644 Binary files a/bin/controller/ZickZackController.class and b/bin/controller/ZickZackController.class differ diff --git a/bin/controller/package-info.class b/bin/controller/package-info.class index 7e34aca..b216583 100644 Binary files a/bin/controller/package-info.class and b/bin/controller/package-info.class differ diff --git a/bin/gameobjects/AnimatedGameobject.class b/bin/gameobjects/AnimatedGameobject.class index 6abe7a0..eb63ccf 100644 Binary files a/bin/gameobjects/AnimatedGameobject.class and b/bin/gameobjects/AnimatedGameobject.class differ diff --git a/bin/gameobjects/EgoObject.class b/bin/gameobjects/EgoObject.class index 6c1322b..247a11d 100644 Binary files a/bin/gameobjects/EgoObject.class and b/bin/gameobjects/EgoObject.class differ diff --git a/bin/gameobjects/FallingStar.class b/bin/gameobjects/FallingStar.class index 9a859e3..68ec9b4 100644 Binary files a/bin/gameobjects/FallingStar.class and b/bin/gameobjects/FallingStar.class differ diff --git a/bin/gameobjects/GameObject.class b/bin/gameobjects/GameObject.class index 8bfaf09..539067b 100644 Binary files a/bin/gameobjects/GameObject.class and b/bin/gameobjects/GameObject.class differ diff --git a/bin/gameobjects/RectObject.class b/bin/gameobjects/RectObject.class index d6cb125..d79244d 100644 Binary files a/bin/gameobjects/RectObject.class and b/bin/gameobjects/RectObject.class differ diff --git a/bin/gameobjects/TextObject.class b/bin/gameobjects/TextObject.class index c3d0dca..9d49ab2 100644 Binary files a/bin/gameobjects/TextObject.class and b/bin/gameobjects/TextObject.class differ diff --git a/bin/playground/.gitignore b/bin/playground/.gitignore new file mode 100644 index 0000000..b8eedc7 --- /dev/null +++ b/bin/playground/.gitignore @@ -0,0 +1,4 @@ +/Level5.class +/Level6.class +/Level7.class +/SpaceInvadersLevelAua.class diff --git a/bin/playground/Animation.class b/bin/playground/Animation.class index 4d28b93..fbeadbd 100644 Binary files a/bin/playground/Animation.class and b/bin/playground/Animation.class differ diff --git a/bin/playground/HighscoreManager.class b/bin/playground/HighscoreManager.class index 32159f9..b197dfd 100644 Binary files a/bin/playground/HighscoreManager.class and b/bin/playground/HighscoreManager.class differ diff --git a/bin/playground/Level1.class b/bin/playground/Level1.class index 59679d9..f91dbbd 100644 Binary files a/bin/playground/Level1.class and b/bin/playground/Level1.class differ diff --git a/bin/playground/Level2.class b/bin/playground/Level2.class index 4a41574..e94cc19 100644 Binary files a/bin/playground/Level2.class and b/bin/playground/Level2.class differ diff --git a/bin/playground/Level3.class b/bin/playground/Level3.class index 7e21add..b5b8d67 100644 Binary files a/bin/playground/Level3.class and b/bin/playground/Level3.class differ diff --git a/bin/playground/Level4.class b/bin/playground/Level4.class index b0262d6..ffdd295 100644 Binary files a/bin/playground/Level4.class and b/bin/playground/Level4.class differ diff --git a/bin/playground/LevelBoss.class b/bin/playground/LevelBoss.class index 1c11386..ac769e0 100644 Binary files a/bin/playground/LevelBoss.class and b/bin/playground/LevelBoss.class differ diff --git a/bin/playground/LevelHitTwice.class b/bin/playground/LevelHitTwice.class index f1669cc..1f37637 100644 Binary files a/bin/playground/LevelHitTwice.class and b/bin/playground/LevelHitTwice.class differ diff --git a/bin/playground/Music$1.class b/bin/playground/Music$1.class index 5034f85..55c56c5 100644 Binary files a/bin/playground/Music$1.class and b/bin/playground/Music$1.class differ diff --git a/bin/playground/Music.class b/bin/playground/Music.class index ffe6333..0fe9a07 100644 Binary files a/bin/playground/Music.class and b/bin/playground/Music.class differ diff --git a/bin/playground/Playground.class b/bin/playground/Playground.class index 2ae9b31..2ba95eb 100644 Binary files a/bin/playground/Playground.class and b/bin/playground/Playground.class differ diff --git a/bin/playground/SaveGame.class b/bin/playground/SaveGame.class index 851d3ad..ba44192 100644 Binary files a/bin/playground/SaveGame.class and b/bin/playground/SaveGame.class differ diff --git a/bin/playground/SpaceInvadersLevel.class b/bin/playground/SpaceInvadersLevel.class index 23150e2..430ce8e 100644 Binary files a/bin/playground/SpaceInvadersLevel.class and b/bin/playground/SpaceInvadersLevel.class differ diff --git a/bin/playground/SpaceInvadersLevelTest.class b/bin/playground/SpaceInvadersLevelTest.class index 697e34f..2ec45de 100644 Binary files a/bin/playground/SpaceInvadersLevelTest.class and b/bin/playground/SpaceInvadersLevelTest.class differ diff --git a/bin/rendering/AnimationArtist.class b/bin/rendering/AnimationArtist.class index ee871e6..8a9383d 100644 Binary files a/bin/rendering/AnimationArtist.class and b/bin/rendering/AnimationArtist.class differ diff --git a/bin/rendering/Artist.class b/bin/rendering/Artist.class index 923c0b4..f705209 100644 Binary files a/bin/rendering/Artist.class and b/bin/rendering/Artist.class differ diff --git a/bin/rendering/CircleArtist.class b/bin/rendering/CircleArtist.class index f2bd313..0542963 100644 Binary files a/bin/rendering/CircleArtist.class and b/bin/rendering/CircleArtist.class differ diff --git a/bin/rendering/RectArtist.class b/bin/rendering/RectArtist.class index 492f6ac..ecaf1b7 100644 Binary files a/bin/rendering/RectArtist.class and b/bin/rendering/RectArtist.class differ diff --git a/bin/rendering/TextArtist.class b/bin/rendering/TextArtist.class index 2552d89..44036e8 100644 Binary files a/bin/rendering/TextArtist.class and b/bin/rendering/TextArtist.class differ diff --git a/bin/ui/AboutFrame$1.class b/bin/ui/AboutFrame$1.class index 9708508..044a2a4 100644 Binary files a/bin/ui/AboutFrame$1.class and b/bin/ui/AboutFrame$1.class differ diff --git a/bin/ui/AboutFrame.class b/bin/ui/AboutFrame.class index e6d6169..1637879 100644 Binary files a/bin/ui/AboutFrame.class and b/bin/ui/AboutFrame.class differ diff --git a/bin/ui/GamePanel.class b/bin/ui/GamePanel.class index 0cacf59..0a86284 100644 Binary files a/bin/ui/GamePanel.class and b/bin/ui/GamePanel.class differ diff --git a/bin/ui/GameUI.class b/bin/ui/GameUI.class index 3d403d3..bf31ff8 100644 Binary files a/bin/ui/GameUI.class and b/bin/ui/GameUI.class differ diff --git a/log/log4j.log b/log/log4j.log index 0d32094..c9e9f19 100644 --- a/log/log4j.log +++ b/log/log4j.log @@ -183,3 +183,98 @@ 2022-04-24 15:33:34,404 INFO playground.SpaceInvadersLevel - no enemies left, level done. 2022-04-24 15:33:34,404 INFO base.GameLoop - reached end of levels 2022-04-24 15:33:34,404 INFO base.GameLoop - Game ends. Bye. +2022-04-28 09:01:52,704 INFO base.GameLoop - GUI starts +2022-04-28 09:01:56,523 INFO base.GameLoop - GUI NEW +2022-04-28 09:01:56,524 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:01:56,540 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:01:56,542 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:01:56,543 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:01:56,544 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:01:56,546 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:01:56,547 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:01:56,548 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:01:56,549 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:01:56,551 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:01:56,552 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:01:56,553 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:02:23,786 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:02:23,786 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:02:23,788 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:02:23,789 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:02:23,790 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:02:23,791 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:02:23,791 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:02:23,792 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:02:23,793 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:02:23,794 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:02:23,795 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:02:23,796 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:02:23,797 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:02:45,225 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:02:45,225 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:02:45,226 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:02:45,227 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:02:45,228 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:02:45,229 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:02:45,229 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:02:45,230 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:02:45,231 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:02:45,231 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:02:45,233 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:02:45,233 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:02:45,234 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:03:02,925 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:03:02,925 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:03:02,927 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:03:02,928 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:03:02,928 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:03:02,929 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:03:02,930 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:03:02,930 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:03:02,931 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:03:02,932 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:03:02,933 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:03:02,934 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:03:02,934 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:03:07,243 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:03:07,243 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:03:07,244 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:03:07,245 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:03:07,246 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:03:07,246 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:03:07,247 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:03:07,248 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:03:07,248 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:03:07,249 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:03:07,250 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:03:07,251 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:03:07,251 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:03:12,373 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:03:12,373 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:03:12,374 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:03:12,375 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:03:12,376 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:03:12,376 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:03:12,377 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:03:12,378 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:03:12,378 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:03:12,379 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:03:12,380 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:03:12,381 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:03:12,381 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:03:19,579 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:03:19,579 INFO playground.SpaceInvadersLevel - PREPARE +2022-04-28 09:03:19,580 INFO playground.Animation - img added .\video/sweetAlien0.png +2022-04-28 09:03:19,581 INFO playground.Animation - img added .\video/sweetAlien1.png +2022-04-28 09:03:19,582 INFO playground.Animation - img added .\video/sweetAlien2.png +2022-04-28 09:03:19,583 INFO playground.Animation - img added .\video/sweetAlien3.png +2022-04-28 09:03:19,583 INFO playground.Animation - img added .\video/sweetAlien4.png +2022-04-28 09:03:19,584 INFO playground.Animation - img added .\video/sweetAlien5.png +2022-04-28 09:03:19,585 INFO playground.Animation - img added .\video/sweetAlien6.png +2022-04-28 09:03:19,585 INFO playground.Animation - img added .\video/sweetAlien7.png +2022-04-28 09:03:19,586 INFO playground.Animation - img added .\video/heart0.png +2022-04-28 09:03:19,587 INFO playground.Animation - img added .\video/heart1.png +2022-04-28 09:03:19,588 INFO playground.SpaceInvadersLevel - HIGHSCORE22500 +2022-04-28 09:03:32,372 INFO playground.SpaceInvadersLevel - no enemies left, level done. +2022-04-28 09:03:32,372 INFO base.GameLoop - reached end of levels +2022-04-28 09:03:32,372 INFO base.GameLoop - Game ends. Bye. diff --git a/src/playground/Level5.java b/src/playground/Level5.java index 4b838de..8a82893 100644 --- a/src/playground/Level5.java +++ b/src/playground/Level5.java @@ -1,3 +1,4 @@ +//neues Level von Coding Team 66 package playground; @@ -11,14 +12,19 @@ public class Level5 extends SpaceInvadersLevelAua { return "Level5, get ready!"; } + //number of Enemys @Override protected int calcNrEnemies() { return 5; } + + //speed of Enemys in X-Direction @Override protected double calcEnemySpeedX() { return 160; } + + //speed of Enemys in Y-Direction @Override protected double calcEnemySpeedY() { return 80; diff --git a/src/playground/Level6.java b/src/playground/Level6.java index e97acb1..cf38c86 100644 --- a/src/playground/Level6.java +++ b/src/playground/Level6.java @@ -1,3 +1,4 @@ +//neues Level von Team 66 package playground; @@ -11,14 +12,19 @@ public class Level6 extends SpaceInvadersLevelAua { return "Level6, get ready!"; } + // number of Enemys @Override protected int calcNrEnemies() { return 12; } + + //speed of Enemys in X-Direction @Override protected double calcEnemySpeedX() { return 480; } + + //speed of Enemys in Y-Direction @Override protected double calcEnemySpeedY() { return 80; diff --git a/src/playground/Level7.java b/src/playground/Level7.java index d10d894..9e7e1fc 100644 --- a/src/playground/Level7.java +++ b/src/playground/Level7.java @@ -1,3 +1,4 @@ +//neues Level von Team 66 package playground; @@ -10,14 +11,20 @@ public class Level7 extends SpaceInvadersLevelAua { protected String getStartupMessage() { return "Level7, get ready!"; } + + //number of Enemys @Override protected int calcNrEnemies() { return 21; } + + //speed of Enemys in X-Direction @Override protected double calcEnemySpeedX() { return 800; } + + //speed of Enemys in Y-Direction @Override protected double calcEnemySpeedY() { return 140; diff --git a/src/playground/SpaceInvadersLevelAua.java b/src/playground/SpaceInvadersLevelAua.java index 8087f58..8830dc5 100644 --- a/src/playground/SpaceInvadersLevelAua.java +++ b/src/playground/SpaceInvadersLevelAua.java @@ -1,3 +1,4 @@ +//neue Unterklasse von SpaceInvadersLevel von Teamm 66 package playground; // import utilities.* ; @@ -48,6 +49,8 @@ public class SpaceInvadersLevelAua extends SpaceInvadersLevel { * @param e enemy which was hit * @param shot the shot object that hit the enemy */ + //überschreibt Ausgabe auf Konsole: "AUA!!" + @Override void actionIfEnemyIsHit(GameObject e, GameObject shot) { double gameTime = this.getGameTime();