From 5d4b57cf71a6fcd40d75f9a1ec1081078791da8e Mon Sep 17 00:00:00 2001 From: lauraF Date: Thu, 28 Apr 2022 09:08:56 +0200 Subject: [PATCH] added comments for HA03 --- bin/.gitignore | 2 - bin/base/GameLoop.class | Bin 4418 -> 4418 bytes bin/base/MultiLevelGame.class | Bin 966 -> 966 bytes bin/collider/CircleCollider.class | Bin 2477 -> 2477 bytes bin/collider/Collider.class | Bin 1775 -> 1775 bytes bin/collider/RectCollider.class | Bin 3112 -> 3112 bytes .../CollisionAwareEgoController.class | Bin 2468 -> 2468 bytes bin/controller/EgoController.class | Bin 5021 -> 5021 bytes bin/controller/EnemyController.class | Bin 1928 -> 1928 bytes bin/controller/FallingStarController.class | Bin 1419 -> 1419 bytes bin/controller/LimitedTimeController.class | Bin 1131 -> 1131 bytes bin/controller/MineController.class | Bin 1771 -> 1771 bytes bin/controller/ObjectController.class | Bin 2575 -> 2575 bytes bin/controller/SimpleShotController.class | Bin 807 -> 807 bytes bin/controller/ZickZackController.class | Bin 1485 -> 1485 bytes bin/controller/package-info.class | Bin 116 -> 116 bytes bin/gameobjects/AnimatedGameobject.class | Bin 2086 -> 2086 bytes bin/gameobjects/EgoObject.class | Bin 1110 -> 1110 bytes bin/gameobjects/FallingStar.class | Bin 1337 -> 1337 bytes bin/gameobjects/GameObject.class | Bin 7275 -> 7275 bytes bin/gameobjects/RectObject.class | Bin 1620 -> 1620 bytes bin/gameobjects/TextObject.class | Bin 1763 -> 1763 bytes bin/playground/.gitignore | 4 + bin/playground/Animation.class | Bin 3319 -> 3319 bytes bin/playground/HighscoreManager.class | Bin 2480 -> 2480 bytes bin/playground/Level1.class | Bin 415 -> 415 bytes bin/playground/Level2.class | Bin 408 -> 408 bytes bin/playground/Level3.class | Bin 1923 -> 1923 bytes bin/playground/Level4.class | Bin 2797 -> 2797 bytes bin/playground/LevelBoss.class | Bin 4169 -> 4169 bytes bin/playground/LevelHitTwice.class | Bin 2029 -> 2029 bytes bin/playground/Music$1.class | Bin 1821 -> 1802 bytes bin/playground/Music.class | Bin 641 -> 617 bytes bin/playground/Playground.class | Bin 8509 -> 8509 bytes bin/playground/SaveGame.class | Bin 2601 -> 2601 bytes bin/playground/SpaceInvadersLevel.class | Bin 16528 -> 16528 bytes bin/playground/SpaceInvadersLevelTest.class | Bin 3345 -> 1566 bytes bin/rendering/AnimationArtist.class | Bin 3515 -> 3515 bytes bin/rendering/Artist.class | Bin 849 -> 849 bytes bin/rendering/CircleArtist.class | Bin 1058 -> 1058 bytes bin/rendering/RectArtist.class | Bin 950 -> 950 bytes bin/rendering/TextArtist.class | Bin 2679 -> 2679 bytes bin/ui/AboutFrame$1.class | Bin 735 -> 736 bytes bin/ui/AboutFrame.class | Bin 1889 -> 1967 bytes bin/ui/GamePanel.class | Bin 4343 -> 4343 bytes bin/ui/GameUI.class | Bin 5217 -> 5217 bytes log/log4j.log | 95 ++++++++++++++++++ src/playground/Level5.java | 6 ++ src/playground/Level6.java | 6 ++ src/playground/Level7.java | 7 ++ src/playground/SpaceInvadersLevelAua.java | 3 + 51 files changed, 121 insertions(+), 2 deletions(-) delete mode 100644 bin/.gitignore create mode 100644 bin/playground/.gitignore 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 f7e05edad55adc1683a5d8eafe21f22ecb497db7..622e7da1cfdfb1b9fb1d1124d2ffab76b58a28b9 100644 GIT binary patch delta 17 ZcmX@4bV!Ng)W2Q(7#J8#HgZ@A0sup921x(_ delta 17 ZcmX@4bV!Ng)W2Q(7#J8VHgZ@A0supT22B6} diff --git a/bin/base/MultiLevelGame.class b/bin/base/MultiLevelGame.class index 7323e320ca3fc4b2fab4edd942e01f7170a9ea8f..002eaca91a92b1451aacf5eedc9fe28a82d7ae0e 100644 GIT binary patch delta 17 ZcmX@cevF;t)W2Q(7#J8#HgfD^1^_|629W>& delta 17 ZcmX@cevF;t)W2Q(7#J8VHgfD^1^_|Q29*E+ diff --git a/bin/collider/CircleCollider.class b/bin/collider/CircleCollider.class index cbceffb59b31f0042107f306ff80f0803e327286..52d2604198ece3ad9d2c66adbb181045e31e138b 100644 GIT binary patch delta 17 ZcmZ20yjGaw)W2Q(7#J8#HgYWG1OPwU24nyL delta 17 ZcmZ20yjGaw)W2Q(7#J8VHgYWG1OPwo250~P diff --git a/bin/collider/Collider.class b/bin/collider/Collider.class index e4dc350a9b110cbbd4384dd1b39b100d1663afbf..93bfda29827819e4e024a37c0848af963bbeb013 100644 GIT binary patch delta 17 ZcmaFQ`<|EM)W2Q(7#J8#HgY^?0{}u|k65)W2Q(7#J8#HgYKN002J81>yhz delta 17 ZcmZ1>u|k65)W2Q(7#J8VHgYKN002JS1?B(% diff --git a/bin/controller/CollisionAwareEgoController.class b/bin/controller/CollisionAwareEgoController.class index 9239e5101c66173b65d8b26a34938de5c1fdc40f..b172cc2e64c8317f7d3bfe3970d4f78f300130d4 100644 GIT binary patch delta 17 ZcmZ1?yhNDe)W2Q(7#J8#Hge421OPs$21x(_ delta 17 ZcmZ1?yhNDe)W2Q(7#J8VHge421OPs~22B6} diff --git a/bin/controller/EgoController.class b/bin/controller/EgoController.class index 07437bfe40a716e22c558fd2e7c7dd2c761f4276..b6d08993f92189d18d2aa94ff491501f031a88c5 100644 GIT binary patch delta 17 ZcmbQMK3ARN)W2Q(7#J8#HgZfA1^_@D24(;N delta 17 ZcmbQMK3ARN)W2Q(7#J8VHgZfA1^_@X25JBR diff --git a/bin/controller/EnemyController.class b/bin/controller/EnemyController.class index 2db22f2710ddc260dfff186be6535db84f13d137..054502eb1b7f53c6f9d47feacfbc5eaa33f7b0b2 100644 GIT binary patch delta 17 YcmeC+@8IV+^>5cc1_lO`jT{Z^06KOB>i_@% delta 17 YcmeC+@8IV+^>5cc1_lO;jT{Z^06K~V?*IS* diff --git a/bin/controller/FallingStarController.class b/bin/controller/FallingStarController.class index 382398e84e23889e868d0a92e139c73505a2ceb2..0a009133c1bac787ca080a2e468766264b16455a 100644 GIT binary patch delta 17 YcmeC??&jt=^>5cc1_lO`jU3Ia06Jm?>Hq)$ delta 17 YcmeC??&jt=^>5cc1_lO;jU3Ia06KOB?f?J) diff --git a/bin/controller/LimitedTimeController.class b/bin/controller/LimitedTimeController.class index 5fe46574f458b7eb1cc973b95d20f7136cdd7ab3..d0ce258944f350fbf22e2154b006058109cf1c5a 100644 GIT binary patch delta 17 ZcmaFO@tT9<)W2Q(7#J8#HgY7h002eD27>?q delta 17 ZcmaFO@tT9<)W2Q(7#J8VHgY7h002eX28RFu diff --git a/bin/controller/MineController.class b/bin/controller/MineController.class index 2b5c829417fac1ee4c771198fc7802ecabbad49f..3b397b27fa3d8cce71657e379c223c7fb602fb05 100644 GIT binary patch delta 17 ZcmaFO`I)W2Q(7#J8#HgY^>0{}-~2M+)M delta 17 ZcmaFO`I)W2Q(7#J8VHgY^>0{};J2NM7Q diff --git a/bin/controller/ObjectController.class b/bin/controller/ObjectController.class index 64bc00b2709dc1f1a33ceba83cb8f9b0f838794b..dce7b55fedc7e380f0e7aed0696106416c09e3a1 100644 GIT binary patch delta 17 YcmeAd=@;QR^>5cc1_lO`jU4P;06P5zjQ{`u delta 17 YcmeAd=@;QR^>5cc1_lO;jU4P;06P%{kpKVy diff --git a/bin/controller/SimpleShotController.class b/bin/controller/SimpleShotController.class index aa56f80df3a7ce4915d3dca63d01249058e40cec..98bca0d5021ee8402adf9961640eb8967a356c78 100644 GIT binary patch delta 17 ZcmZ3^ww#UQ)W2Q(7#J8#Hgd=_0{}dN1+oAD delta 17 ZcmZ3^ww#UQ)W2Q(7#J8VHgd=_0{}dh1-1YH diff --git a/bin/controller/ZickZackController.class b/bin/controller/ZickZackController.class index 824b2381023d1313db206f5ffa3400fea6f7fc2a..1f2afd592391ffa7c8253f673a9c8dfd53d6b90b 100644 GIT binary patch delta 17 ZcmX@heU_W!)W2Q(7#J8#HgX(g1pq@P2Cx7C delta 17 ZcmX@heU_W!)W2Q(7#J8VHgX(g1pq@j2DAVG diff --git a/bin/controller/package-info.class b/bin/controller/package-info.class index 7e34acaa666086697b3f0eec27cae49b58e53b7a..b2165830d939939cf759b93ae1b26ddebc3f10c9 100644 GIT binary patch delta 14 VcmXRZ;W+hg*FFXY29t>#IRGxb1!@2Q delta 14 VcmXRZ;W+hg*FFXY28)RtIRGxr1#SQU diff --git a/bin/gameobjects/AnimatedGameobject.class b/bin/gameobjects/AnimatedGameobject.class index 6abe7a0c99f109967907a1088b3af69f89927f91..eb63ccf22227ff89f6f90ec0ad6c8275394e7886 100644 GIT binary patch delta 17 ZcmZ1`uuOpC)W2Q(7#J8#Hgd>u002Fa1;_vZ delta 17 ZcmZ1`uuOpC)W2Q(7#J8VHgd>u002Fu13yECm&=K-Kc8F0sxVO2oC@N delta 29 lcmcb{ag9UZ)W2Q(7#J8V7_8VCm>3yECm&=K-Kc8F0sxW72onGR diff --git a/bin/gameobjects/FallingStar.class b/bin/gameobjects/FallingStar.class index 9a859e3b8e6c929a42a38a6f6a867ab07af92695..68ec9b4f75a8a0ac6deb99e0fb605b82512ef2f5 100644 GIT binary patch delta 17 ZcmdnVwUdkE)W2Q(7#J8#HgXuU0suc?1@Zs@ delta 17 ZcmdnVwUdkE)W2Q(7#J8VHgXuU0sudB1@-^{ diff --git a/bin/gameobjects/GameObject.class b/bin/gameobjects/GameObject.class index 8bfaf096a5bd40ccf14fce7b2b54a2ed87c0caab..539067b044955baee4d433caa136de132ad37cd2 100644 GIT binary patch delta 17 ZcmaED@!Epp)W2Q(7#J8#HgY7(002vW2KxX2 delta 17 ZcmaED@!Epp)W2Q(7#J8VHgY7(002vq2LAv6 diff --git a/bin/gameobjects/RectObject.class b/bin/gameobjects/RectObject.class index d6cb125185333073da709e12421c8eb52a55896f..d79244d2d647db13ce98b3b3a9443aa6da568a46 100644 GIT binary patch delta 17 Zcmcb@bA^ZF)W2Q(7#J8#Hgfo|0RTfY21oz^ delta 17 Zcmcb@bA^ZF)W2Q(7#J8VHgfo|0RTfs2220| diff --git a/bin/gameobjects/TextObject.class b/bin/gameobjects/TextObject.class index c3d0dca38160e0a277f53730a854b328151db0aa..9d49ab2731e50902bab62253ae87d15c19b7d820 100644 GIT binary patch delta 29 lcmaFN`3zvCMzl2uJ_` delta 29 lcmaFN`3zvCMz5cc1_lO`jU3hN06EMB+yDRo delta 17 YcmZqXZ|3JX^>5cc1_lO;jU3hN06E|V-~a#s diff --git a/bin/playground/Level4.class b/bin/playground/Level4.class index b0262d6d6bc3075387e9badaca4f20c809e04ba4..ffdd295eca7adc9a4f3dd340bdb6a24c1d73937c 100644 GIT binary patch delta 17 ZcmaDW`c{2Q2^q diff --git a/bin/playground/LevelBoss.class b/bin/playground/LevelBoss.class index 1c11386502e4803ec9e18a2cd915987a8751a1d7..ac769e04c773a63281c497e4ee5d3d1fb16caadb 100644 GIT binary patch delta 17 ZcmX@9a8iNe)W2Q(7#J8#HgY%$002ZE23Y_A delta 17 ZcmX@9a8iNe)W2Q(7#J8VHgY%$002ZY23-IE diff --git a/bin/playground/LevelHitTwice.class b/bin/playground/LevelHitTwice.class index f1669cc3cd34414d330dfecb8ea11e5c89bcb3d3..1f37637c608301373ae6326ae8c42092430d3869 100644 GIT binary patch delta 17 ZcmaFM|CXQQ)W2Q(7#J8#HgY^=2LMOl2O0nX delta 17 ZcmaFM|CXQQ)W2Q(7#J8VHgY^=2LMO(2Oaff$?3=9k=44E6b3RpL{vc@tpGEaWYW&{ADnhB@? delta 51 zcmeC;o6E;_>ff$?3=9kw3|Skw3Rt-r894k>i%UH6i%T|FvBokovP{0gX2ije2~@+x G5Dx&EYz?*m diff --git a/bin/playground/Music.class b/bin/playground/Music.class index ffe633364d39e57629eeb15162a74d352907222c..0fe9a0746b653e5bf783820b5292bd636d1bba1e 100644 GIT binary patch delta 29 lcmZoff$?3=9k=3~C#>IvFP~WZcWhG&!D00sx&830?pI delta 54 zcmaFK(#Xnn>ff$?3=9kw4C))XIvIHx8MysYi%Wb{bCXhwCQoAA$H+W6kV%4zK@F&g Jg@KVl3;@bt4W0l1 diff --git a/bin/playground/Playground.class b/bin/playground/Playground.class index 2ae9b311fb3aa414e305adcd889ab53f49f3068a..2ba95ebab5da81e98499d8bdd22625f29b232378 100644 GIT binary patch delta 17 Zcmdn%wAYE_)W2Q(7#J8#HgcFM0suyo28sXx delta 17 Zcmdn%wAYE_)W2Q(7#J8VHgcFM0suy+295v# diff --git a/bin/playground/SaveGame.class b/bin/playground/SaveGame.class index 851d3ad26e51c56f120efcda8d6b2ebf05d202cf..ba44192059144f5e06ff15d92d2a0b1b7326b50c 100644 GIT binary patch delta 17 ZcmZ1}vQmWO)W2Q(7#J8#HgYI(0RTR61=|1s delta 17 ZcmZ1}vQmWO)W2Q(7#J8VHgYI(0RTRQ1>XPw diff --git a/bin/playground/SpaceInvadersLevel.class b/bin/playground/SpaceInvadersLevel.class index 23150e24b92c7ed43a217d785b9929156ee1b700..430ce8e0411b2eefdbdcae3c538f53039de36ddf 100644 GIT binary patch delta 19 bcmbQx$T*>qk>k|AUHcdq7)&;DbT|M2Om7Dw delta 19 bcmbQx$T*>qk>k|AUHcdq7%Vn&bT|M2OoIm| diff --git a/bin/playground/SpaceInvadersLevelTest.class b/bin/playground/SpaceInvadersLevelTest.class index 697e34f5c20aaccdb8ce14b2647005ef72a0be9e..2ec45de2b6301d2f6a635da8d9e68fcf674e59f9 100644 GIT binary patch literal 1566 zcmbW0Ur!T35Wr_kp~ry&MGysL5!4n9eUKN$m{i2jC=k7tR-Ld>sz$=cO4t<* z)Uk(M3~Csg9Ap{HpNp<21tM&f-qp|1Hw<#^UZTTb-5UwnV=(nnhSI!ZFi|L;Fv#w! z2D&f-GqaEbhrygDLp!@p@9w39fr+g8d2rcb>Ak3OG88g@%?au~HKIdaJ$I)wS zDvkSrh{@1B`0Qh3qzdC4EHYTU%4+zB!Rm)jXk^<~LdKH3m%~sQk(e=<@%qSe5bWjP zHpPAoqP5Zv++k2T4mHLq=wgHWsvXH7vFDLi1Z=G&cOB`B7#uo literal 3345 zcmb7GTUQfT6#fng%n(O~fDwvflqw)-z)Nk77s5><5s(0it(GAC1W~tDBj~`1}%2xeQ8fManQ7 zO6;g4%20E`Fb($-gRi4=hQU8zrFj58?9!k>W!RfAOg>h~&2xK7pU-lJV8Tl2*%{q7 z#JsrZcNYzZp>1b-!fCQu=WusA-_I8;n-64lhYkjY?x%R(H7wIn(7@2J5mjl2p?R`k zx<-!A7>+@t2?uNX#;6MD3Q#GWSMVAUW+SyR z$KkfCA&Lvc8sZMkrtAVm9;yJ}Ey3yCNmozZy{6|SR~1~|R5TvY6#} zG0ijdSMaU8`%IL&XLL|r&ngpzl%|eH<=rbhTF{V@*83B&fl&dApD^>9p!%?%4^AaXFQOJk8PWAMJby4DB zS%5O7qCq(tT)_pEy2FfUMpR~{!(J~Wu9vlyVgsWVP@68~sPrjS3{BfPL`5gXq*Y2_ zNw@4J3f_H&2^#>>+hG$EGnNOObX_)B(Y8b;KG5)?$b@flXi&jN4ExF z6!jpHa_eZT9$*>LznkEadlD_eGHDg;6dyLki?wBI*A#vBq^J>u>80eOaOsSAGto$; zn_khhQcI%87YeZF2!KJ4(WD04mqKVMm_dk|n((*tf zhIg{uLza7A(DFz{%XcUu;a4aamzGECT7TX?;$Hb;EDQpDqx?6RXoAd%|( z!S*#w{E61Y6HLtpXUK^?bT#58eIMc0D(0@qozycsoOZ@&t@|++>2ad?plNnp<#~TF z-|T-3yNm96{54lGvSTv$QTn}rHe967B@E&+Mk!ZG#Bdw^xQ785^%>9SV$`*;P{1(0Mb%R{s3tBbXjSlz{I-gjB*~VIb;7(?5x!s% zJ|oz&6MXM`@I9CfZov2PDn2O#uA7j1xUPi|`?7?XKV1>8BjgZph431oxZ^m7tAyAn xhLOMo{h?UIco|kk39C7LUBqg*h}Aiq!Z#AD2{hx|%~+*h7%PVF$gwJX{~rY}|6>3E diff --git a/bin/rendering/AnimationArtist.class b/bin/rendering/AnimationArtist.class index ee871e6920d8535dc05ed0e7fb186553f244da7f..8a9383dbc9689f8c65cfa77e7997bfc3475c7339 100644 GIT binary patch delta 17 Zcmdljy<3{&)W2Q(7#J8#Hgas{1pq>-2BH7} delta 17 Zcmdljy<3{&)W2Q(7#J8VHgas{1pq?62BrW2 diff --git a/bin/rendering/Artist.class b/bin/rendering/Artist.class index 923c0b449f0671646cdd5058934ad7dc6167033d..f7052094f3742886319ffecfaf1807273cd0c1e6 100644 GIT binary patch delta 17 Zcmcb}c9D(a)W2Q(7#J8#Hgb3}0{}u61~32s delta 17 Zcmcb}c9D(a)W2Q(7#J8VHgb3}0{}uQ1~dQw diff --git a/bin/rendering/CircleArtist.class b/bin/rendering/CircleArtist.class index f2bd313a4c9398f67bb0f5607691c1c0c4672564..0542963772266f4cc784da3b42b10ae640799a17 100644 GIT binary patch delta 28 kcmZ3)v4}(9)W2Q(7#J8#7_8VCm>3zvCO#C~sP=~$0D3zvCO#C~sP=~$0D>h($ diff --git a/bin/rendering/RectArtist.class b/bin/rendering/RectArtist.class index 492f6ac144c2d27b85f0502cb217ba3b500859b3..ecaf1b7750bdba34d7606f742db1c247cd4f0733 100644 GIT binary patch delta 17 ZcmdnSzKxyZ)W2Q(7#J8#Hgc?E1^_>v24MgI delta 17 ZcmdnSzKxyZ)W2Q(7#J8VHgc?E1^_>@24w&M diff --git a/bin/rendering/TextArtist.class b/bin/rendering/TextArtist.class index 2552d891e50ce63ff1ebd0c181c9ded75a0ef982..44036e85e850bb799419fdc9c02daa9455e648b6 100644 GIT binary patch delta 17 Zcmew^@?C`E)W2Q(7#J8#Hge>10RTwN2E_mX delta 17 Zcmew^@?C`E)W2Q(7#J8VHge>10RTwh2FU;b diff --git a/bin/ui/AboutFrame$1.class b/bin/ui/AboutFrame$1.class index 9708508456bd04316aea2d948b61c8acc9f46037..044a2a41b5ecca9e12ba557d07052dc6f0842c42 100644 GIT binary patch delta 75 zcmV-R0JQ(#1>gk=%Ko~(0000q04cEw9svOglPLin9SC7#V`X!5BrpL0B`8dFX)i%y hZ*_D=a$#*{J1LV;0j`q?0&)SklY9a=0Rxk@0wPs_79jut delta 76 zcmaFBdY_f+)W2Q(7#J8V7_>HW$uTl=PS#|U<77=MO3Y1VWDuF0!nlr`k%7Z6wYbD1 gzqn+w5K|H3mdUM57K|*D_c1APFlYibGcia207M59IsgCw diff --git a/bin/ui/AboutFrame.class b/bin/ui/AboutFrame.class index e6d61690ab2a14b4bb9b49a0054e219fc2eb725a..1637879e5febae9697ca1dcececcfb6440605a33 100644 GIT binary patch delta 160 zcmaFJx1OKt)W2Q(7#J8#7;-mq1+mI^YqJ0|6qmbeuq=B8R} zPP7x79K)(3!l1yw$iNKL#mK~p5C8z+Kp8Ip delta 100 zcmZ3_|B#RC)W2Q(7#J8V7;-jp1+h-N delta 17 Zcmeya_+63X)W2Q(7#J8VHgdcd002vE2WbER diff --git a/bin/ui/GameUI.class b/bin/ui/GameUI.class index 3d403d33de9f5218ddf954d6b6d229cfe29aeb3e..bf31ff8c4ceea457daefda14ae05fc5a2ad43524 100644 GIT binary patch delta 17 ZcmaE;@lb=~)W2Q(7#J8#HgZIY002ls2DJbH delta 17 ZcmaE;@lb=~)W2Q(7#J8VHgZIY002l=2DtzL 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();