diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore index 61c497a..f3adfb1 100644 --- a/spaceinvaders/GameProject/bin/.gitignore +++ b/spaceinvaders/GameProject/bin/.gitignore @@ -1 +1,2 @@ -/playground/ +/ui/ +/base/ diff --git a/spaceinvaders/GameProject/bin/base/GameLoop.class b/spaceinvaders/GameProject/bin/base/GameLoop.class index 622e7da..c3db169 100644 Binary files a/spaceinvaders/GameProject/bin/base/GameLoop.class and b/spaceinvaders/GameProject/bin/base/GameLoop.class differ diff --git a/spaceinvaders/GameProject/bin/playground/BreakoutLevel0.class b/spaceinvaders/GameProject/bin/playground/BreakoutLevel0.class new file mode 100644 index 0000000..791fbae Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/BreakoutLevel0.class differ diff --git a/spaceinvaders/GameProject/bin/playground/BreakoutLevel1.class b/spaceinvaders/GameProject/bin/playground/BreakoutLevel1.class new file mode 100644 index 0000000..1a222cc Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/BreakoutLevel1.class differ diff --git a/spaceinvaders/GameProject/bin/playground/BreakoutLevel2.class b/spaceinvaders/GameProject/bin/playground/BreakoutLevel2.class new file mode 100644 index 0000000..be64199 Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/BreakoutLevel2.class differ diff --git a/spaceinvaders/GameProject/bin/playground/BreakoutLevel3.class b/spaceinvaders/GameProject/bin/playground/BreakoutLevel3.class new file mode 100644 index 0000000..e258373 Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/BreakoutLevel3.class differ diff --git a/spaceinvaders/GameProject/bin/playground/BreakoutLevelBase.class b/spaceinvaders/GameProject/bin/playground/BreakoutLevelBase.class new file mode 100644 index 0000000..4b8eb87 Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/BreakoutLevelBase.class differ diff --git a/spaceinvaders/GameProject/bin/playground/BreakoutLevelBaseAdvanced.class b/spaceinvaders/GameProject/bin/playground/BreakoutLevelBaseAdvanced.class new file mode 100644 index 0000000..a0c19be Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/BreakoutLevelBaseAdvanced.class differ diff --git a/spaceinvaders/GameProject/bin/playground/LevelMovingHitObjects.class b/spaceinvaders/GameProject/bin/playground/LevelMovingHitObjects.class new file mode 100644 index 0000000..c629b0b Binary files /dev/null and b/spaceinvaders/GameProject/bin/playground/LevelMovingHitObjects.class differ diff --git a/spaceinvaders/GameProject/bin/ui/GameUI.class b/spaceinvaders/GameProject/bin/ui/GameUI.class index b602fa3..45d93ca 100644 Binary files a/spaceinvaders/GameProject/bin/ui/GameUI.class and b/spaceinvaders/GameProject/bin/ui/GameUI.class differ diff --git a/spaceinvaders/GameProject/log/log4j.log b/spaceinvaders/GameProject/log/log4j.log index 2df72a8..654ffee 100644 --- a/spaceinvaders/GameProject/log/log4j.log +++ b/spaceinvaders/GameProject/log/log4j.log @@ -4996,3 +4996,291 @@ 2022-06-24 11:00:58,522 INFO playground.BreakoutLevel2 - ball created. 2022-06-24 11:00:58,523 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. 2022-06-24 11:01:22,276 INFO base.GameLoop - Game ends. Bye. +2022-06-29 16:38:47,020 INFO base.GameLoop - GUI starts +2022-06-29 16:38:48,896 INFO base.GameLoop - GUI NEW +2022-06-29 16:38:48,906 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,906 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,906 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,907 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,907 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,907 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,907 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,908 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,908 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,908 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,908 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,908 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,908 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,909 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,909 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,909 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,909 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,909 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,909 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,910 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,910 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,910 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,910 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,910 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,911 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:48,912 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 16:38:48,914 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 16:38:48,917 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 16:38:50,837 INFO base.GameLoop - Game ends. Bye. +2022-06-29 16:38:56,501 INFO base.GameLoop - GUI starts +2022-06-29 16:38:59,300 INFO base.GameLoop - GUI NEW +2022-06-29 16:38:59,309 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,309 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,310 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,310 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,310 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,310 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,310 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,311 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,311 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,311 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,311 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,311 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,312 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,313 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,313 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,313 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,313 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,313 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,314 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:38:59,315 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 16:38:59,317 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 16:38:59,319 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 16:39:04,160 INFO base.GameLoop - Game ends. Bye. +2022-06-29 16:39:07,818 INFO base.GameLoop - GUI starts +2022-06-29 16:39:10,877 INFO base.GameLoop - GUI NEW +2022-06-29 16:39:10,886 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,887 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,887 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,887 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,887 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,888 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,888 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,888 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,888 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,889 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,889 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,889 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,889 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,890 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,890 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,890 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,890 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,891 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,891 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,891 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,891 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,892 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,892 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,892 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,892 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 16:39:10,894 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 16:39:10,896 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 16:39:10,899 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 16:39:34,535 INFO base.GameLoop - Game ends. Bye. +2022-06-29 16:40:10,783 INFO base.GameLoop - GUI starts +2022-06-29 16:41:02,721 INFO base.GameLoop - GUI SAVE +2022-06-29 16:41:05,610 INFO base.GameLoop - GUI LOAD +2022-06-29 16:42:45,443 INFO base.GameLoop - GUI starts +2022-06-29 16:43:52,802 INFO base.GameLoop - GUI starts +2022-06-29 16:45:25,383 INFO base.GameLoop - GUI starts +2022-06-29 16:46:07,195 INFO base.GameLoop - GUI starts +2022-06-29 16:46:46,849 INFO base.GameLoop - GUI starts +2022-06-29 16:53:51,907 INFO base.GameLoop - GUI starts +2022-06-29 16:58:49,900 INFO base.GameLoop - GUI starts +2022-06-29 17:06:34,132 INFO base.GameLoop - GUI NEW +2022-06-29 17:06:34,142 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,143 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,143 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,143 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,143 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,143 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,144 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,144 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,144 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,144 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,144 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,144 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,145 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,145 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,145 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,145 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,145 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,145 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,146 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,146 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,146 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,146 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,146 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,146 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,147 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:06:34,148 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 17:06:34,151 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 17:06:34,153 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 17:07:20,577 INFO base.GameLoop - GUI starts +2022-06-29 17:07:33,424 INFO base.GameLoop - GUI starts +2022-06-29 17:11:40,737 INFO base.GameLoop - GUI starts +2022-06-29 17:12:38,820 INFO base.GameLoop - GUI starts +2022-06-29 17:18:30,458 INFO base.GameLoop - GUI starts +2022-06-29 17:18:44,503 INFO base.GameLoop - GUI NEW +2022-06-29 17:18:44,512 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,513 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,513 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,513 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,513 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,513 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,514 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,514 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,514 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,514 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,514 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,515 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,515 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,515 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,515 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,515 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,515 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,516 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,516 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,516 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,516 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,516 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,516 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,517 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,517 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:18:44,519 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 17:18:44,521 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 17:18:44,523 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 17:19:08,768 INFO base.GameLoop - GUI starts +2022-06-29 17:19:19,102 INFO base.GameLoop - GUI NEW +2022-06-29 17:19:19,111 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,111 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,111 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,111 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,112 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,112 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,112 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,112 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,112 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,113 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,113 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,113 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,113 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,114 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,114 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,114 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,114 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,114 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,115 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:19,117 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 17:19:19,119 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 17:19:19,122 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 17:19:20,359 INFO base.GameLoop - GUI NEW +2022-06-29 17:19:20,359 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,360 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,360 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,360 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,360 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,360 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,360 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,361 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,361 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,361 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,361 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,361 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,361 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,362 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 17:19:20,363 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 17:19:20,364 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 17:19:21,488 INFO base.GameLoop - GUI PAUSE +2022-06-29 17:20:54,340 INFO base.GameLoop - GUI starts +2022-06-29 17:21:00,555 INFO base.GameLoop - GUI NEW +2022-06-29 17:21:00,564 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,564 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,565 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,565 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,565 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,565 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,565 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,566 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,566 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,566 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,566 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,566 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,566 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,567 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,567 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,567 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,567 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,567 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,567 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,568 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,568 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,568 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,568 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,568 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,569 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:21:00,570 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 17:21:00,572 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 17:21:00,575 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 17:21:04,957 INFO base.GameLoop - GUI PAUSE +2022-06-29 17:25:19,630 INFO base.GameLoop - GUI starts +2022-06-29 17:25:24,382 INFO base.GameLoop - GUI NEW +2022-06-29 17:25:24,391 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,392 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,392 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,392 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,392 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,393 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,393 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,393 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,393 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,393 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,394 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,394 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,394 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,394 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,394 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,394 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,395 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,395 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,395 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,395 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,395 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,395 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,396 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,396 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,396 INFO playground.BreakoutLevel2 - brick created. +2022-06-29 17:25:24,397 INFO playground.BreakoutLevel2 - ego created. +2022-06-29 17:25:24,400 INFO playground.BreakoutLevel2 - ball created. +2022-06-29 17:25:24,402 INFO playground.BreakoutLevelBaseAdvanced - level preperation succeeded. +2022-06-29 17:25:28,344 INFO base.GameLoop - GUI PAUSE diff --git a/spaceinvaders/GameProject/src/base/GameLoop.java b/spaceinvaders/GameProject/src/base/GameLoop.java index f98bd42..f7da7f4 100644 --- a/spaceinvaders/GameProject/src/base/GameLoop.java +++ b/spaceinvaders/GameProject/src/base/GameLoop.java @@ -9,7 +9,8 @@ import org.apache.logging.log4j.Logger; import gameobjects.GameObject; import playground.Level1; import playground.Playground; -import ui.GameUI; +import ui.*; + /** @@ -86,7 +87,7 @@ public class GameLoop { public void runGame(String[] args) throws IOException { logger.info("GUI starts"); - GameUI gameUI = new GameUI(SIZEX, SIZEY); // probably change to your new GUI class + GameUIWithLogin gameUI = new GameUIWithLogin(SIZEX, SIZEY); // probably change to your new GUI class double gameTime = -1; Playground currentPlayground = null; diff --git a/spaceinvaders/GameProject/src/ui/GameUI.java b/spaceinvaders/GameProject/src/ui/GameUI.java index ff19226..d600563 100644 --- a/spaceinvaders/GameProject/src/ui/GameUI.java +++ b/spaceinvaders/GameProject/src/ui/GameUI.java @@ -47,6 +47,8 @@ public class GameUI implements ActionListener { protected JMenuItem saveItem; protected JMenuItem quitItem; protected JMenuItem aboutItem; + //protected JMenuItem loginItem; + protected JMenu gameMenu; protected JMenu helpMenu; protected JButton button; @@ -106,6 +108,7 @@ public class GameUI implements ActionListener { this.loadItem = new JMenuItem("Restore game"); this.saveItem = new JMenuItem("Save game"); this.quitItem = new JMenuItem("Exit game"); + //this.loginItem = new JMenuItem("Login... P E N I S"); this.playItem.addActionListener(this); this.loadItem.addActionListener(this); @@ -113,6 +116,7 @@ public class GameUI implements ActionListener { this.quitItem.addActionListener(this); this.gameMenu = new JMenu("Game"); + //this.gameMenu.add(loginItem); this.gameMenu.add(playItem); this.gameMenu.add(loadItem); this.gameMenu.add(saveItem); diff --git a/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java b/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java new file mode 100644 index 0000000..387e4f4 --- /dev/null +++ b/spaceinvaders/GameProject/src/ui/GameUIWithLogin.java @@ -0,0 +1,44 @@ +package ui; + +//einfach erstmal alle Imports der Elternklassse mitgenommen... +import java.util.*; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.WindowConstants; +import playground.Playground; + +import java.awt.event.*; + +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; + + +public class GameUIWithLogin extends GameUI { + + protected JMenuItem loginItem; + + public GameUIWithLogin(int sizeX, int sizeY) { + super(sizeX, sizeY); + this.loginItem = new JMenuItem("Login... P E N I S"); // legt den button an (mit String name) + this.playItem.addActionListener(this); //added den listener + this.gameMenu.add(loginItem); // added den Button zum Menue + + } + + @Override + public void actionPerformed(ActionEvent ae) { + if(ae.getSource() == this.loginItem) { + System.out.println("testbutton gedrueckt!!!"); + } + super.actionPerformed(ae); + + + + } + +}