added comments for HA03

2 years ago · 5d4b57cf71
51 changed files with 121 additions and 2 deletions
--- a/bin/.gitignore
+++ b/bin/.gitignore
@ -1,2 +0,0 @@
-/playground/
-/base/
--- a/bin/base/GameLoop.class
+++ b/bin/base/GameLoop.class
--- a/bin/base/MultiLevelGame.class
+++ b/bin/base/MultiLevelGame.class
--- a/bin/collider/CircleCollider.class
+++ b/bin/collider/CircleCollider.class
--- a/bin/collider/Collider.class
+++ b/bin/collider/Collider.class
--- a/bin/collider/RectCollider.class
+++ b/bin/collider/RectCollider.class
--- a/bin/controller/CollisionAwareEgoController.class
+++ b/bin/controller/CollisionAwareEgoController.class
--- a/bin/controller/EgoController.class
+++ b/bin/controller/EgoController.class
--- a/bin/controller/EnemyController.class
+++ b/bin/controller/EnemyController.class
--- a/bin/controller/FallingStarController.class
+++ b/bin/controller/FallingStarController.class
--- a/bin/controller/LimitedTimeController.class
+++ b/bin/controller/LimitedTimeController.class
--- a/bin/controller/MineController.class
+++ b/bin/controller/MineController.class
--- a/bin/controller/ObjectController.class
+++ b/bin/controller/ObjectController.class
--- a/bin/controller/SimpleShotController.class
+++ b/bin/controller/SimpleShotController.class
--- a/bin/controller/ZickZackController.class
+++ b/bin/controller/ZickZackController.class
--- a/bin/controller/package-info.class
+++ b/bin/controller/package-info.class
--- a/bin/gameobjects/AnimatedGameobject.class
+++ b/bin/gameobjects/AnimatedGameobject.class
--- a/bin/gameobjects/EgoObject.class
+++ b/bin/gameobjects/EgoObject.class
--- a/bin/gameobjects/FallingStar.class
+++ b/bin/gameobjects/FallingStar.class
--- a/bin/gameobjects/GameObject.class
+++ b/bin/gameobjects/GameObject.class
--- a/bin/gameobjects/RectObject.class
+++ b/bin/gameobjects/RectObject.class
--- a/bin/gameobjects/TextObject.class
+++ b/bin/gameobjects/TextObject.class
--- a/bin/playground/.gitignore
+++ b/bin/playground/.gitignore
@ -0,0 +1,4 @@
+/Level5.class
+/Level6.class
+/Level7.class
+/SpaceInvadersLevelAua.class
--- a/bin/playground/Animation.class
+++ b/bin/playground/Animation.class
--- a/bin/playground/HighscoreManager.class
+++ b/bin/playground/HighscoreManager.class
--- a/bin/playground/Level1.class
+++ b/bin/playground/Level1.class
--- a/bin/playground/Level2.class
+++ b/bin/playground/Level2.class
--- a/bin/playground/Level3.class
+++ b/bin/playground/Level3.class
--- a/bin/playground/Level4.class
+++ b/bin/playground/Level4.class
--- a/bin/playground/LevelBoss.class
+++ b/bin/playground/LevelBoss.class
--- a/bin/playground/LevelHitTwice.class
+++ b/bin/playground/LevelHitTwice.class
--- a/bin/playground/Music$1.class
+++ b/bin/playground/Music$1.class
--- a/bin/playground/Music.class
+++ b/bin/playground/Music.class
--- a/bin/playground/Playground.class
+++ b/bin/playground/Playground.class
--- a/bin/playground/SaveGame.class
+++ b/bin/playground/SaveGame.class
--- a/bin/playground/SpaceInvadersLevel.class
+++ b/bin/playground/SpaceInvadersLevel.class
--- a/bin/playground/SpaceInvadersLevelTest.class
+++ b/bin/playground/SpaceInvadersLevelTest.class
--- a/bin/rendering/AnimationArtist.class
+++ b/bin/rendering/AnimationArtist.class
--- a/bin/rendering/Artist.class
+++ b/bin/rendering/Artist.class
--- a/bin/rendering/CircleArtist.class
+++ b/bin/rendering/CircleArtist.class
--- a/bin/rendering/RectArtist.class
+++ b/bin/rendering/RectArtist.class
--- a/bin/rendering/TextArtist.class
+++ b/bin/rendering/TextArtist.class
--- a/bin/ui/AboutFrame$1.class
+++ b/bin/ui/AboutFrame$1.class
--- a/bin/ui/AboutFrame.class
+++ b/bin/ui/AboutFrame.class
--- a/bin/ui/GamePanel.class
+++ b/bin/ui/GamePanel.class
--- a/bin/ui/GameUI.class
+++ b/bin/ui/GameUI.class
--- 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.
--- 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;
--- 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;
--- 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;
--- 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();