From da03e24f87cd0373d3fcda199e2dfdddbbc3e875 Mon Sep 17 00:00:00 2001
From: fdai7222 <janosch.bisiorek@informatik.hs-fulda.de>
Date: Thu, 19 May 2022 14:07:29 +0200
Subject: [PATCH] =?UTF-8?q?gr=C3=BCne=20box=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spaceinvaders/GameProject/bin/.gitignore      |   2 +-
 .../bin/playground/LevelMovingObjects.class   | Bin 1151 -> 1319 bytes
 spaceinvaders/GameProject/log/log4j.log       |  45 ++++++++++++++++++
 .../src/controller/ReboundController.java     |   1 -
 .../src/playground/LevelMovingObjects.java    |   6 ++-
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore
index c230a76..a740527 100644
--- a/spaceinvaders/GameProject/bin/.gitignore
+++ b/spaceinvaders/GameProject/bin/.gitignore
@@ -1,2 +1,2 @@
-/playground/
 /controller/
+/playground/
diff --git a/spaceinvaders/GameProject/bin/playground/LevelMovingObjects.class b/spaceinvaders/GameProject/bin/playground/LevelMovingObjects.class
index 690324e2cc4a62402dc37dafef55b880783ebff9..f91b8d44ba2d05c7d9db788aa3757e3b8f11a313 100644
GIT binary patch
delta 371
zcmXYr%Syvw5QV?oY8oSIjGBPpqKZ(di&&)ATWzhiATHcUR|TPXK^iRuyYnG}&)`b1
zE?ThQ1Nas`f-j(siT?~U^Pib>W`4{k%li0!dk6B=`_{D@n5-+9wN9(mE{DBT=}LO?
zQl)xQq*-LsrbtG?sGU};Cs9`oJ@ew9p<thfy-L{bcEX!x5PhmS<uIDm9@Ae;lM<1;
z=vgZ~jBpxGkafw&zTx7zEQr5S7_wB<v%WrHWyES@NUmu3x^E0vJL`*riX|}{$0-ca
zUB;3B3;`|$W@#`-lX))jxW#8&=693r*i69v-yv+VjUwb@cBHKeeNU`}CITM&g6SfW
orYx8tb%g_&9}{j)vLab?sxOj~i&8O^iMQEFJJ}|6EuK311=@o&!vFvP

delta 203
zcmXYqOA^6Q5Jk_+^Npw?V#2`4Buc4@Uwk)W2PT$a5vgo}sZ0$lz>Z9CB_@5l``o^L
zbw4%t`My7Z8T-sVI?2U3B@;U`o8(~AdP<v;=qh>H_?)S8a8-L$R9lqAhxmkahzN-3
z(hv!YD?FN-bT2x^$Q$U>TqzM%7A&!H#^OdZjHO0u{q;>!JgelZ0sUXHSMYzbVVm1_
EUwS<iQvd(}

diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log
index 7e67825..8af9426 100644
--- a/spaceinvaders/GameProject/log/log4j.log
+++ b/spaceinvaders/GameProject/log/log4j.log
@@ -1181,3 +1181,48 @@
 2022-05-18 17:20:56,882 INFO  playground.SpaceInvadersLevel - no enemies left, level done.
 2022-05-18 17:20:56,883 INFO  base.GameLoop - reached end of levels
 2022-05-18 17:20:56,883 INFO  base.GameLoop - Game ends. Bye.
+2022-05-19 14:01:53,056 INFO  base.GameLoop - GUI starts
+2022-05-19 14:01:55,111 INFO  base.GameLoop - GUI NEW
+2022-05-19 14:01:55,111 INFO  playground.SpaceInvadersLevel - PREPARE
+2022-05-19 14:01:55,171 INFO  playground.Animation - img added .\video/sweetAlien0.png
+2022-05-19 14:01:55,178 INFO  playground.Animation - img added .\video/sweetAlien1.png
+2022-05-19 14:01:55,181 INFO  playground.Animation - img added .\video/sweetAlien2.png
+2022-05-19 14:01:55,185 INFO  playground.Animation - img added .\video/sweetAlien3.png
+2022-05-19 14:01:55,188 INFO  playground.Animation - img added .\video/sweetAlien4.png
+2022-05-19 14:01:55,192 INFO  playground.Animation - img added .\video/sweetAlien5.png
+2022-05-19 14:01:55,195 INFO  playground.Animation - img added .\video/sweetAlien6.png
+2022-05-19 14:01:55,197 INFO  playground.Animation - img added .\video/sweetAlien7.png
+2022-05-19 14:01:55,209 INFO  playground.Animation - img added .\video/heart0.png
+2022-05-19 14:01:55,213 INFO  playground.Animation - img added .\video/heart1.png
+2022-05-19 14:01:55,222 INFO  playground.SpaceInvadersLevel - HIGHSCORE17200
+2022-05-19 14:02:32,554 INFO  base.GameLoop - GUI starts
+2022-05-19 14:02:34,270 INFO  base.GameLoop - GUI NEW
+2022-05-19 14:02:34,270 INFO  playground.SpaceInvadersLevel - PREPARE
+2022-05-19 14:02:34,313 INFO  playground.Animation - img added .\video/sweetAlien0.png
+2022-05-19 14:02:34,320 INFO  playground.Animation - img added .\video/sweetAlien1.png
+2022-05-19 14:02:34,322 INFO  playground.Animation - img added .\video/sweetAlien2.png
+2022-05-19 14:02:34,326 INFO  playground.Animation - img added .\video/sweetAlien3.png
+2022-05-19 14:02:34,329 INFO  playground.Animation - img added .\video/sweetAlien4.png
+2022-05-19 14:02:34,332 INFO  playground.Animation - img added .\video/sweetAlien5.png
+2022-05-19 14:02:34,335 INFO  playground.Animation - img added .\video/sweetAlien6.png
+2022-05-19 14:02:34,337 INFO  playground.Animation - img added .\video/sweetAlien7.png
+2022-05-19 14:02:34,344 INFO  playground.Animation - img added .\video/heart0.png
+2022-05-19 14:02:34,347 INFO  playground.Animation - img added .\video/heart1.png
+2022-05-19 14:02:34,350 INFO  playground.SpaceInvadersLevel - HIGHSCORE17200
+2022-05-19 14:04:25,086 INFO  base.GameLoop - GUI starts
+2022-05-19 14:04:26,763 INFO  base.GameLoop - GUI NEW
+2022-05-19 14:04:26,764 INFO  playground.SpaceInvadersLevel - PREPARE
+2022-05-19 14:04:26,806 INFO  playground.Animation - img added .\video/sweetAlien0.png
+2022-05-19 14:04:26,813 INFO  playground.Animation - img added .\video/sweetAlien1.png
+2022-05-19 14:04:26,815 INFO  playground.Animation - img added .\video/sweetAlien2.png
+2022-05-19 14:04:26,818 INFO  playground.Animation - img added .\video/sweetAlien3.png
+2022-05-19 14:04:26,821 INFO  playground.Animation - img added .\video/sweetAlien4.png
+2022-05-19 14:04:26,825 INFO  playground.Animation - img added .\video/sweetAlien5.png
+2022-05-19 14:04:26,827 INFO  playground.Animation - img added .\video/sweetAlien6.png
+2022-05-19 14:04:26,829 INFO  playground.Animation - img added .\video/sweetAlien7.png
+2022-05-19 14:04:26,836 INFO  playground.Animation - img added .\video/heart0.png
+2022-05-19 14:04:26,838 INFO  playground.Animation - img added .\video/heart1.png
+2022-05-19 14:04:26,841 INFO  playground.SpaceInvadersLevel - HIGHSCORE17200
+2022-05-19 14:04:49,855 INFO  playground.SpaceInvadersLevel - no enemies left, level done.
+2022-05-19 14:04:49,856 INFO  base.GameLoop - reached end of levels
+2022-05-19 14:04:49,856 INFO  base.GameLoop - Game ends. Bye.
diff --git a/spaceinvaders/GameProject/src/controller/ReboundController.java b/spaceinvaders/GameProject/src/controller/ReboundController.java
index 671a489..7db247a 100644
--- a/spaceinvaders/GameProject/src/controller/ReboundController.java
+++ b/spaceinvaders/GameProject/src/controller/ReboundController.java
@@ -1,7 +1,6 @@
 package controller;
 
 public class ReboundController extends ObjectController {
-
 	@Override
 	public void updateObject() {
 		// TODO Auto-generated method stub
diff --git a/spaceinvaders/GameProject/src/playground/LevelMovingObjects.java b/spaceinvaders/GameProject/src/playground/LevelMovingObjects.java
index fc84666..5791c04 100644
--- a/spaceinvaders/GameProject/src/playground/LevelMovingObjects.java
+++ b/spaceinvaders/GameProject/src/playground/LevelMovingObjects.java
@@ -9,7 +9,7 @@ import controller.*;
  */
 public class LevelMovingObjects extends SpaceInvadersLevel {
 
-   // TODO your code here
+   
 	
 	@Override
 	public void prepareLevel(String id) {
@@ -18,6 +18,10 @@ public class LevelMovingObjects extends SpaceInvadersLevel {
 		this.addObject(blueBox);
 		ReboundController boxControl = new ReboundController();
 		blueBox.addController(boxControl);
+		RectObject greenBox = new RectObject("GreenBox", this, 200, 200, 50, 170, 30, 30, Color.GREEN);
+		this.addObject(greenBox);
+		ReboundController boxControl_2 = new ReboundController();
+		greenBox.addController(boxControl_2);
 	}