From 60d21d5f68abc4690dcb516a40f728cdb4e67bb5 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 15 Sep 2026 19:35:25 +0200 Subject: [PATCH] - Start World to Game World --- fighter/MyWorld.class | Bin 1159 -> 1603 bytes fighter/MyWorld.ctxt | 8 +++++--- fighter/MyWorld.java | 16 ++++++++++++++- fighter/StartWorld.class | Bin 2402 -> 2415 bytes fighter/StartWorld.java | 2 +- fighter/images/fingerprint.jpg | Bin 0 -> 3907 bytes fighter/project.greenfoot | 36 +++++++++------------------------ 7 files changed, 30 insertions(+), 32 deletions(-) create mode 100644 fighter/images/fingerprint.jpg diff --git a/fighter/MyWorld.class b/fighter/MyWorld.class index ceab8cd1427b5dd2441963215e0b0670161f4237..1b7e5482a569432db1d17b957f4c4364ff8cf219 100644 GIT binary patch literal 1603 zcmcIjO>+}R5Pc)bthF9u$;clVLJS5XEw+V(otVfWAqE>IGIp>LHVGtS?IOz-T4h;7 zIOIR%7;>bz=8!5&rl5)&mmG4;56Cfx@B^r#(!IMvDsfJ&G#}kP{oZuH`Qy#A7XU6o z=?EdLAtKR(0|NbJ$Fgd7Y}-xWu$`(YaA2-dtGE|vk<91wsiKZvL^bFVeUJj$(!(H7 zt2^+Ho#02_ETgp*8uH~#`1Vo;F0}_Y2d|3^HlyIf09$HRDM*_pl zN^P+jv2i#aSR`jRhj1U=C)OG1%{G^_H8bfT-(X<1vDIgi;~qb zhG7OcDRBy?-vVUY09gV^ASsc8L4M`Bs5Gh;kx_9|JXPsbQMk3qt zZLl>HrC~qn}@aPr;IRxd9}T=p7SR(Gw-HB-YPou!4> z)?VZVbidMLYY%K43;2q=QeX=2W@UX`#j=JKiLY@@;842-i!Es}H_HuVlj!V{XUnCE zy;y6*F4w5qJ*2)=k*Yjzo3!mORBG1M-MgEXv!*tyWEm*fB~>jdr^5Td7;(2M_qdgT zN^=6TKHsUv&Mh@PtXMe*SGmVasve}#SM6P=WGz$}NCvs4xcWFw+6mE9iqM}FN+VcE z-b~{6W)eEh5zsAgoyH>VwrC%wdDMu9*5l&m$UcP8gk~IR;Gl7|f%xy_4dDijLv)VE zJ`B@?8X>71rf(GMWF7OfU;{U4#~i*PG~unjrB#SNdZ+|>~b5yRNS zNbILL9yM{4>|@kwvw!fbs!2$f=!*onH8<_S_ zeEk1FjWC5h%z99>Ua<)HDbB~m1pS)$jM_QRWea;vJdG%=Q_x{htIl8tQ`kisFL4%s z;T-l3mp_DJ19gD8X6?H?+7r2@Bagu{6B;M literal 1159 zcmcIjO-~a+7=ETLEM2B_7omV6@*&c$Kw(dti)0mYJKu|)6qXCT! z(Y$L}#dXK=k}n+BHW?Zx3dMpqNt1XwolY#vXhK+m%+Us#`fOp^c)YT9hH2@e@;`dyJz4orD^uIiKCMavno0o~bLF z&UucT5@IA=K4;NobU_gWS2=oc?VLcb6X-+`K_5py1}JWLo{`(CDP9wiL5>?3VhH6e zZ>74CwCFl0Vj9QIKe1JTYGE2iIg%J-Xt1rURb*h*g1#^njLNu;I}+}4+{1kaWz*O( zlD1LICl@`pP|TBp9m6hL^Xm-l@pK|{F`;V5Lyi>oL5WMYjUF_{%@+VgM`mG zChaGhDHN^e<(FB@T{5yZA*~rFXV}YzTM%m>40#)cZQ+i8h$-5#A?%JU3S;JslAkCq zI%PL!%@#x}?q`n*x#%Oq19X?fPsd6lg!?oGLAHR?_=r|d5TY5NXlh_ZWp6{rU|I#z z2f_lFq_Kr6KpmRVjwoW7qLrwo8a$@ED)Q*g`TcCapRRpIWc3))BdD5o2vvEbVy}XB z!n+8+a)fSycdP8Zigy&KGsZ}tP}@v;JJE{)+RZrKjXJaLGc(ffGqWk5`Bbn~(7Ok- zHoGopDu|nkzK?~A*!KfW)UZS?Z`f3N_7T5`ogAP|B#8eIBZ_PuVWd_u{(q=cA>j~u zl}fLgMZ_O*OJ&3KRq#Mq7OWmpKOHwP2$>$r8iue14P|;5Uongy^b~$#>@WLHefwsp ThOWsOw$89g2l$lM0X+K+*udgM diff --git a/fighter/MyWorld.ctxt b/fighter/MyWorld.ctxt index a71706b..59c44c9 100644 --- a/fighter/MyWorld.ctxt +++ b/fighter/MyWorld.ctxt @@ -1,12 +1,14 @@ #BlueJ class context comment0.target=MyWorld comment0.text=\r\n\ Write\ a\ description\ of\ class\ MyWorld\ here.\r\n\ \r\n\ @author\ (your\ name)\ \r\n\ @version\ (a\ version\ number\ or\ a\ date)\r\n -comment1.params= -comment1.target=MyWorld() +comment1.params=pCharakterP1\ pCharakterP2 +comment1.target=MyWorld(int,\ int) comment1.text=\r\n\ Constructor\ for\ objects\ of\ class\ MyWorld.\r\n\ \r\n comment2.params= comment2.target=void\ prepare() comment2.text=\r\n\ Prepare\ the\ world\ for\ the\ start\ of\ the\ program.\r\n\ That\ is\:\ create\ the\ initial\ objects\ and\ add\ them\ to\ the\ world.\r\n comment3.params= comment3.target=void\ act() -numComments=4 +comment4.params= +comment4.target=void\ gameEnd() +numComments=5 diff --git a/fighter/MyWorld.java b/fighter/MyWorld.java index e93fbdb..9f04694 100644 --- a/fighter/MyWorld.java +++ b/fighter/MyWorld.java @@ -10,15 +10,19 @@ public class MyWorld extends World { Player1 player1; Player2 player2; + int charakterP1; + int charakterP2; /** * Constructor for objects of class MyWorld. * */ - public MyWorld() + public MyWorld(int pCharakterP1, int pCharakterP2) { // Create a new world with 600x400 cells with a cell size of 1x1 pixels. super(600, 400, 1); prepare(); + charakterP1 = pCharakterP1; + charakterP2 = pCharakterP2; } /** @@ -45,5 +49,15 @@ public class MyWorld extends World } } showText(String.valueOf(player2.leben),300,300); + gameEnd(); + } + + public void gameEnd(){ + if(player1.leben == 0){ + Greenfoot.setWorld(new EndWorld("Player Two")); + } + if(player2.leben == 0){ + Greenfoot.setWorld(new EndWorld("Player One")); + } } } diff --git a/fighter/StartWorld.class b/fighter/StartWorld.class index eb0a0168f3e0763bec0086589dc2ebb862fe024b..f0ba91cb0305b13bb94003033180a058a1a9c83f 100644 GIT binary patch delta 673 zcmaDP^j?VT)W2Q(7#J8F85%coEn^la=3!uE@Ze&wVJPKcC}Sv}yqoy~W5whimRpRK zlhav)rK^C7c^DXhs$yglS3#(ff~u+os$^zhlmse_ zhAOvV)3&Ju3JWo?07(l54hBmGUIr@$Nucd`4Tyspu$T>G-+4mzB|?>RvFjk&=L)pX z4QQV`gA{`&l6}&s4weEsI0b4z5xWl1zWMCP{==d?9jg2myG}I1e}O>zf`Ik~1MLgN zZ(kO~0AQdv18oO|HLun-hA<$G1mc*DKmjI(%E^fw;`NAd;)O>?E>`XFK&?qYoC?(r zGz1dxalqh@2RbeR7_W&)4nr7N2RE<+s21cNL!dz!Kx~jLl(&PydM1Oi))ofGc?>c@ x%6}e%=x&CBNRSAKyPctE2SW+SR%W21dPJ>@h?Qa08$P^1!B+vv)FpA8OZrauULd>Q%E~Bjw zB?Zy8R;}Fx{ek{L^j04^12Ky^9}MSxp2ImG>bt7EeBM6-h~ccRT-iH%6-2S?#vblfDD?xgoJW;}A!DC8W^DTGpG+aJ0fdDjci>a3KN@2I0jJS~*SR zj@e^}MfIzH#~{tbI8F=xpmZ3_MA|6ajH)m^J`> z=7BX1oELzy2{1#zECF)_B&-2z0`O)6%oDIcK$3t(Yruv8#9jVKYv(C$K269HZ 0 && aktuellerSpieler2 > 0){ - Greenfoot.setWorld(new MyWorld()); + Greenfoot.setWorld(new MyWorld(aktuellerSpieler1, aktuellerSpieler2)); } } } diff --git a/fighter/images/fingerprint.jpg b/fighter/images/fingerprint.jpg new file mode 100644 index 0000000000000000000000000000000000000000..eb2ba2163b3cca2bddc43ce6d62e5bf729d67aa0 GIT binary patch literal 3907 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 literal 0 HcmV?d00001 diff --git a/fighter/project.greenfoot b/fighter/project.greenfoot index 68601af..1541dbe 100644 --- a/fighter/project.greenfoot +++ b/fighter/project.greenfoot @@ -1,6 +1,5 @@ #Greenfoot project file class.MyWorld.image=crumpled-paper.jpg -class.Pfeil.image=cursor.png class.Player1.image=man01.png class.Player2.image=man01.png dependency1.from=StartWorld @@ -15,16 +14,13 @@ dependency3.type=UsesDependency dependency4.from=MyWorld dependency4.to=Player2 dependency4.type=UsesDependency -dependency5.from=EndWorld -dependency5.to=StartWorld -dependency5.type=UsesDependency editor.fx.0.height=737 editor.fx.0.width=814 -editor.fx.0.x=151 -editor.fx.0.y=18 +editor.fx.0.x=168 +editor.fx.0.y=39 height=686 -package.numDependencies=5 -package.numTargets=7 +package.numDependencies=4 +package.numTargets=5 project.charset=UTF-8 publish.hasSource=false publish.locked=true @@ -47,49 +43,35 @@ target1.width=120 target1.x=0 target1.y=0 target2.height=70 -target2.name=EndWorld +target2.name=StartWorld target2.showInterface=false target2.type=ClassTarget target2.width=120 target2.x=0 target2.y=0 target3.height=70 -target3.name=StartWorld +target3.name=Player2 target3.showInterface=false target3.type=ClassTarget target3.width=120 target3.x=0 target3.y=0 target4.height=70 -target4.name=startScreen +target4.name=Player1 target4.showInterface=false target4.type=ClassTarget target4.width=120 target4.x=0 target4.y=0 target5.height=70 -target5.name=Player2 +target5.name=MyWorld target5.showInterface=false target5.type=ClassTarget target5.width=120 target5.x=0 target5.y=0 -target6.height=70 -target6.name=Player1 -target6.showInterface=false -target6.type=ClassTarget -target6.width=120 -target6.x=0 -target6.y=0 -target7.height=70 -target7.name=MyWorld -target7.showInterface=false -target7.type=ClassTarget -target7.width=120 -target7.x=0 -target7.y=0 version=3.1.0 width=1294 world.lastInstantiated=StartWorld xPosition=0 -yPosition=12 +yPosition=0