From 6c0d570c05e3a97bbb944aab8df6767fc5334e72 Mon Sep 17 00:00:00 2001 From: fdai7222 Date: Wed, 18 May 2022 16:23:25 +0200 Subject: [PATCH] =?UTF-8?q?aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spaceinvaders/GameProject/bin/.gitignore | 1 - .../bin/base/MovingObjectsGame.class | Bin 0 -> 741 bytes .../bin/collider/package-info.class | Bin 0 -> 114 bytes .../CollisionAwareEgoController.class | Bin 2468 -> 2468 bytes .../bin/controller/EgoController.class | Bin 5021 -> 5021 bytes .../bin/controller/ObjectController.class | Bin 2575 -> 2577 bytes .../bin/gameobjects/package-info.class | Bin 0 -> 117 bytes spaceinvaders/GameProject/bin/log4j2.xml | 2 +- .../bin/playground/LevelMovingObjects.class | Bin 0 -> 443 bytes .../bin/playground/SpaceInvadersLevel.class | Bin 16477 -> 16477 bytes .../playground/SpaceInvadersLevelAua.class | Bin 0 -> 690 bytes .../playground/SpaceInvadersLevelTest.class | Bin 3372 -> 1566 bytes .../bin/playground/package-info.class | Bin 0 -> 116 bytes spaceinvaders/GameProject/log/log4j.log | 14 +++ .../playground/SpaceInvadersLevelTest.java | 81 ------------------ 15 files changed, 15 insertions(+), 83 deletions(-) delete mode 100644 spaceinvaders/GameProject/bin/.gitignore create mode 100644 spaceinvaders/GameProject/bin/base/MovingObjectsGame.class create mode 100644 spaceinvaders/GameProject/bin/collider/package-info.class create mode 100644 spaceinvaders/GameProject/bin/gameobjects/package-info.class create mode 100644 spaceinvaders/GameProject/bin/playground/LevelMovingObjects.class create mode 100644 spaceinvaders/GameProject/bin/playground/SpaceInvadersLevelAua.class create mode 100644 spaceinvaders/GameProject/bin/playground/package-info.class delete mode 100644 spaceinvaders/GameProject/src/playground/SpaceInvadersLevelTest.java diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore deleted file mode 100644 index 61c497a..0000000 --- a/spaceinvaders/GameProject/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/playground/ diff --git a/spaceinvaders/GameProject/bin/base/MovingObjectsGame.class b/spaceinvaders/GameProject/bin/base/MovingObjectsGame.class new file mode 100644 index 0000000000000000000000000000000000000000..078d123a3770ae3286f7a059fe88b248196eba96 GIT binary patch literal 741 zcmZvZT~8B16o%hv3)?PBTPduFLPh+jHF0me!+4=lqgllSLSnp{c85A-yVLA$8~It@ zKq84hz#nCNXBR6NZqCg4dd_=he*OOO6Tma{98?7Sfy`9!!OV0r+8Z3JVV=E}W96VG zuw3M<8yYhaSbVM%oxc#M_8uP!)LxlLxu~MyVF8N*txzZG<8(Yw>46-?N?;{4Lm3~+ zR9pWdSj)faOkh2{e)KNMW2qBr>wO82#Oh&Jqko$S8;HdK>bnldf}zsPjgJU z_r95?L-j`6xAm_ut<0zP8L&-ol|KwxVLyh}p%?HJJQw$c&UdLYGO3=E76%s|sYfRTX}NHQ_70RV28 B9DM)) literal 0 HcmV?d00001 diff --git a/spaceinvaders/GameProject/bin/controller/CollisionAwareEgoController.class b/spaceinvaders/GameProject/bin/controller/CollisionAwareEgoController.class index b172cc2e64c8317f7d3bfe3970d4f78f300130d4..703a19eb6edaad359071384632a6674fd6cf51d5 100644 GIT binary patch delta 127 zcmZ1?yhM0IKD(d}0|$dHg8+jbg9L*EXPX5PU ztn0$S%HYPp#o)mp#Nfps#^B8$#o!Cn=?7Hj&tT6Gz~Bhvdou(Bc_EYMajX}N2I`0b Ss*VMk6~`dYkT^Mx(+vPJB^3Ms delta 127 zcmZ1?yhM0IKD(eM0|$c^g8+jzg9L*Pg93x@ znJ1S8Y%F4Di2{}>Wkp`C;$WRBHY8+#CblHjwuA{Wz>b*iia}U{?J>mxvm6S2#2UwJ taw^+1_BrQ-3#pe}bHyz;+?$B-BE}!w@x=q*Jo3X6f4mytO}!_D{{h}^U7r8| delta 349 zcmW-bODKe47=<52A^*6396ZH&!+gUe<0F+3(itO@ zadHHmOseh_`Ak#Bj84s}j-NUfXl7A?%L-f3(N#uSlY3o`4HesBo*kChl_SU|`|NSZ qk=_|6Tyn|{=R9yhh%270T=S~ncW(LQjxX-{7XIZi3_|8x!tozr2v`3A diff --git a/spaceinvaders/GameProject/bin/controller/ObjectController.class b/spaceinvaders/GameProject/bin/controller/ObjectController.class index dce7b55fedc7e380f0e7aed0696106416c09e3a1..8d0d429be1bb509038e87f4c53d92b5498368421 100644 GIT binary patch delta 418 zcmXYsO)mpc6o%hB9cHFRY$g@yLfS}C&oD$I_YVcAo2ZE; zO1CF*PT3wjZbi7Q+WUezxasX{}5u8i9rmOQLxY)UrhZN(d94_TW(4NoOw zNMf8^At=I&2%;2qOyUT~pc9ZrhIEwZJb4(!5&H#U4<`dl>oD!#Rp5*I1Uu)Cdcvs6 z&YI6I_z$s$WKEy7__~pZwk1npMQ)g-C^qPF1LsC8Oh1z46dfSWG(>sYLx+DFi7^*9 Lep{C+3U2=Z;4)59 delta 327 zcmbOz(l5ew>ff$?3=9k=4CNcSJ~6XJF~qPlL{FAsk&NSEh-C<3WMC;yEs11gU@9qQ zWMFjRVu)gJ01;jwA_PSEf{1Vs5dc(C$;iM8)Dac|63FCXNC%n0R8|2Mjsywk@-Spi zu46Idh+-(>VaR7F*u013Dx*pk13LpV&@Eb8+ZgP(F*tjG7@k1vqn@3-jlo}Q3xo9J zO>7#nnhZ7!;y{IB3``*942ld&K$-(c#xcZC{>~=Hn6O!ly@-)Lo&o40hSDc*Uq^#8Bl4AXW#N_P6^i&UdLYGO3=E76%s>l3fRTX}NHQ_70RZ!P B9ku`f literal 0 HcmV?d00001 diff --git a/spaceinvaders/GameProject/bin/log4j2.xml b/spaceinvaders/GameProject/bin/log4j2.xml index 87ecf74..21a7607 100644 --- a/spaceinvaders/GameProject/bin/log4j2.xml +++ b/spaceinvaders/GameProject/bin/log4j2.xml @@ -7,7 +7,7 @@ - + diff --git a/spaceinvaders/GameProject/bin/playground/LevelMovingObjects.class b/spaceinvaders/GameProject/bin/playground/LevelMovingObjects.class new file mode 100644 index 0000000000000000000000000000000000000000..f9b49b2afba6cf15f6d32c8c438fe2dc5b17d536 GIT binary patch literal 443 zcmaJ-O-sW-5PjREO^wysSn(vbw^q?HJ3)Ujkg$46B#m{*t zZqkZJLKO|4p?4uusV^Cf*?h%dUS*N6VPI>3E_w_@Pp0Cwd<=xT=RqPE94`xbvf@hC zb=x%cgDe=1y?-xSFpOfMea)3F^Q9;X9@ED0Z0@aj#odIbvFmF^9u|F!7!EduCat4M zbM%zK_Onuj;#$@R9sad`R~*Ak7CeB& zLqC9zs+e^ucmZDKK4;F%JpOz53*Z}e9OM|PgOHDUu})RjYYliHnrg_qB2IiU6k#Lf z4)P3Z?^ZEPok%6kcZP}DZkr*0s=K0y2~4|~#1uoxmrDFjqmGC#c_$PM6<-HDZ1Y%J z|9>!V`Z8hI^4}dtr0N8~10%I+{`sLqG-@Vi(l8v?{2q^l?p%w&B;GHw&ojIJR(!W@ zdCt0+L1`LuSa2}UP`>6v?uA_Syw)f&B69HwpJ_dv(v$^1OH1ut#8R1-i3N}91uQWX z8dr_Y>e1oXB37{GV3lF+m0}m`*kEu5wm(z^SsP=HM;Z$E>h_Y1PPOn; z(rFxspVD4-`PDZbS{B#@?LglLa%9nKNIK+sq#5bSy?YdHvUHK8O@kKsK++u-kp4&> z?7b*ro39Acf|mC75AIREMWwQMhvgTTnJm3da2wQC&ETrzmS?yU#VtF6!4_GT-xu<7 G*nR>*FP&om literal 0 HcmV?d00001 diff --git a/spaceinvaders/GameProject/bin/playground/SpaceInvadersLevelTest.class b/spaceinvaders/GameProject/bin/playground/SpaceInvadersLevelTest.class index d406089a2f70db734e5bbebc243300f6436a2632..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 3372 zcmb7G>r)d~6#rck*d?wC0V5Q}C{;kvfREZ5AB2}gA|Q__PHS0`OIQrM>Fx%l@78u| z-_M!O^i#j}bM1^Ub*9sgo&G)jTzl@_kOT=-H`(mH_uP9Pzwc+ez>ho}K27tH94tx1_J=k*scJBIEN*JmoSd%d2t^ z!=c2EN}>!k7Yx&IFERK!I+G0k0V~Y|@L`t*1uDbdgkkcr{PH}vr}gGr4}gVA*^it2=ZsFmx})bFN{Tj)De;hEh~T2}AQ_ z-gJ#+o-`bTY{yK~a&>u#;7V9_CbE>LXy`X*xZIBDIV0kkiDk1<1^XEe?g&T#A?&IJ z!wVX!QKRAjgUT~j!dT%>0IdisIK)t2@-A+=Ji~1bhjE0EU(vI9KEA*Z>WFtHwrq%UDc3g4Otfsp%WkwYsiK4Oma`1gbyOT@s9iKN zi%yErr0lp{w+F4eW^92FD4-kO1{=9YKtq7Ll$!xPn;J6t^6FHM^Yl%I1KS*wiB!?U z5GmUqHk`2Tgbg#im9OD6Umzx>1pucsoW>dA7V&7aJtE;?P2U(*0bK#SjPnX!A;OeW z8*?0PyBeanK&&C|&}`byQ{%1UFR*n2cgV}^8RHk0*O1+>cvUtp_(8I#%9 zhNkTtqI#6uq*Y2_QMYU}3f_H+2_=B&#j%N`8OsAsx-NUK=x8DnA87bcWWqN&G^pSs zB5gV3LmLNc`Wihx1#lk^1T8*g=zUIFcv<^g!xtiJp<>oHj7aZPeC6dpx+zj%^K?GN z)8YBmux0YFu|QtQtsW$D-v-*M2Uy0U0wcJjOrk|tPFZ<7#fJ^?&TZM+P(=$qDQW~^ zdSCe{Tsk9OS~ODWrnfh()Y2$IPe#w`<7)`~N`oqB^jjkro3NY4nzsRau$N{k>ge{N zp2mKX1R>BA`}fgPsJulw#C7~JLbGdV`VGy&7Ihs5*U=ViuV?=hhMn~d54>T?Zit)& z(J_ESXdvfX>DAeZBhn9{RYlh}*1Jh6tRJRZT&$$j3#PrO1UNxTs)~-Er0wG992pl_ zGzB9M(fkO#jX3+`Pf+~7!0%hfIib-f;R(nPyRaYKWe_zLAi7BV8c{`!^U@Ovo8-hEx*Bndz7O&08s@J_34cnGA;}o6bw9!q zJx&xJG&MI=p7#gsX8$9&U3Ayuuepkm9h13_((eVd;Uax5VGx%wO1YXsjQUDH?qWbj zea7>-5OpmqlH4Qw+AxDvyh*IMNPj-wqLGizwcu@%`e_X~i>fDZP)%G=(5m1a`E3<5 zNs=vs4Z^%v5x!snJ|oz&6MXM`@ZFycmf-t%4WE<&*G8BjgZp zh431oxZ^m7tAyAnhLOMo{nuE;co|kk5vw_TUBGI%fYmvi!Z#AD2{hx|%~++M8!LwI J$gwJX{~z!}33~tl diff --git a/spaceinvaders/GameProject/bin/playground/package-info.class b/spaceinvaders/GameProject/bin/playground/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..e81f00aed3df44d47fb35f094319870f84a23de5 GIT binary patch literal 116 zcmX^0Z`VEs1_l!bc6J6PMh5YMoW#oXqWsdl6#at4 - *
  • calcEnemySpeedX() returns the same value as constant SpaceInvadersLevel.ENEMYSPEEDX - *
  • calcEnemySpeedY() returns the same value as constant SpaceInvadersLevel.ENEMYSPEEDY - *
  • calcNrEnemies() returns the same value as constant SpaceInvadersLevel.NR_ENEMIES - *
  • actionIfEnemyIsHit() adds 200 points to score - *
  • actionIfEgoObjectIsHit() reduces number of lives (egoLives) - * - * @author jkonert - * - */ -class SpaceInvadersLevelTest { - - private static SpaceInvadersLevel myLevel; - - @BeforeAll - static void setUpBeforeClass() throws Exception { - myLevel = new SpaceInvadersLevel(); - SpaceInvadersLevel.setGlobalFlag("egoLives", 5); - SpaceInvadersLevel.setGlobalFlag("points", 500); - SpaceInvadersLevel.setGlobalFlag("highscore", 5000); - } - - @AfterAll - static void tearDownAfterClass() throws Exception { - // nothing - } - - @Test - void testCalcEnemySpeedX() { - assertTrue("EnemySpeedX is as in SpaceInvadersLevel defined", myLevel.calcEnemySpeedX() == SpaceInvadersLevel.ENEMYSPEEDX); - } - - @Test - void testCalcEnemySpeedY() { - assertTrue("EnemySpeedY is as in SpaceInvadersLevel defined", myLevel.calcEnemySpeedY() == SpaceInvadersLevel.ENEMYSPEEDY); - } - - @Test - void testCalcNrEnemies() { - assertTrue("NrOfEnemies is as in SpaceInvadersLevel defined", myLevel.calcNrEnemies() == SpaceInvadersLevel.NR_ENEMIES); - } - - - @Test - void testActionIfEnemyIsHitPointsUp() { - Integer numPointsBefore = (Integer)Playground.getGlobalFlag("points"); - GameObject dummyShot = new RectObject("shot1", myLevel, 0,0,0,0, 12, 12, Color.WHITE); - GameObject dummyEnemy = new RectObject("ego1", myLevel, 0,0,0,0, 12, 12, Color.BLACK); - myLevel.addObject(dummyShot); - myLevel.addObject(dummyEnemy); - myLevel.actionIfEnemyIsHit(dummyEnemy, dummyShot);; // this is the call under test - Integer numPointsAfter = (Integer)Playground.getGlobalFlag("points"); // changed? - assertTrue("numPoints is up +200 after EnemyIsHit", numPointsAfter == numPointsBefore + 200); // points are set +200 , check. - } - - @Test - void testActionIfEgoObjectIsHitLivesDown() { - Integer numLivesBefore = (Integer)Playground.getGlobalFlag("egoLives"); - GameObject dummyShot = new RectObject("shot1", myLevel, 0,0,0,0, 12, 12, Color.RED); - GameObject dummyEgo = new EgoObject("ego1", myLevel, 0,0,0,0, 5); - myLevel.addObject(dummyShot); - myLevel.actionIfEgoObjectIsHit(dummyShot, dummyEgo); // this is the call under test - Integer numLivesAfter = (Integer)Playground.getGlobalFlag("egoLives"); // changed? - assertTrue("numLives is reduced by one ifEgoIsHit", numLivesAfter == numLivesBefore - 1); // lives is reduced by one - - } - -}