From db584c83d45fe30934f4c99a499fb6f9f9c44e65 Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Sat, 26 Dec 2020 12:46:39 +0100 Subject: [PATCH] despawn fix --- src/main/java/core/math/Coordinates.java | 2 +- .../java/core/objects/core/GameObject.java | 22 ------------------ target/classes/objects/ships/BattleShip.class | Bin 3157 -> 3216 bytes target/classes/objects/ships/Shell.class | Bin 1415 -> 1382 bytes 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/main/java/core/math/Coordinates.java b/src/main/java/core/math/Coordinates.java index a935958..215d3b7 100644 --- a/src/main/java/core/math/Coordinates.java +++ b/src/main/java/core/math/Coordinates.java @@ -52,6 +52,6 @@ public class Coordinates { public static boolean outOfBounds(Vector2D position, Vector2D size) { return (position.x + size.magnitude() < 0 || position.x - size.magnitude() > Master.SCREEN_Y_COORDINATES * Master.SCREEN_RATIO || - position.y + size.magnitude() < 0 || position.y - position.magnitude() > Master.SCREEN_Y_COORDINATES); + position.y + size.magnitude() < 0 || position.y - size.magnitude() > Master.SCREEN_Y_COORDINATES); } } diff --git a/src/main/java/core/objects/core/GameObject.java b/src/main/java/core/objects/core/GameObject.java index 3ebf025..720dbe6 100644 --- a/src/main/java/core/objects/core/GameObject.java +++ b/src/main/java/core/objects/core/GameObject.java @@ -104,28 +104,6 @@ public abstract class GameObject implements Drawable { g2d.fillOval((int) abs.x, (int) abs.y, (int) sizeAbs.x, (int) sizeAbs.y); } - /** - * This method draws an oval at the current position and size with arguments - * - * @param g2d The Graphics2D object provided by the master - * @param arg Arguments like "center" for the object being drawn in the center - */ - public void drawOval(Graphics2D g2d, String arg) { - - Vector2D abs; - - if(arg.contains("center")){ - abs = Coordinates.getWorldCoordinates(getCenterPosition()); - } else { - abs = Coordinates.getWorldCoordinates(position); - } - - Vector2D sizeAbs = Coordinates.getWorldCoordinates(size); - - g2d.setPaint(mainColor); - g2d.drawOval((int) abs.x, (int) abs.y, (int) sizeAbs.x, (int) sizeAbs.y); - } - /** * Destroy this {@code GameObject} */ diff --git a/target/classes/objects/ships/BattleShip.class b/target/classes/objects/ships/BattleShip.class index 200598cda150cb2b60a7bd8c25f9daf68a51f25d..f25ab333815863736ff49dafc1d8737aa6484a47 100644 GIT binary patch delta 1292 zcmcaAF+q~+)W2Q(7#J9=8P;#)`oL((&S1sJAfKFHl&W8pnwOGVlv<=8lwX>c5|o-; z5(E|DWZ+=1;bE|4uw!IkDbB1)Wn>VUEWjdS&Bb8J;K0Mc&EUw$;I845l~|UjpIBa^ z@0_2LUu5kAHa0&gD>b>KSRc%BPs~mA2MbK*XAyOAanTIpV&GtK=3#JQaAjoRE>4A8 z%E%zC0WksLFsOU1LAtaV+<6#07(6H6VNv1|VqjqK=3($*@SQx3$%W0IharF=aPk8t zL+M~1h7gduISTTNGfOh_^Fa26@i2rlL`-&O*5Qs~h-PPq;bDknh?`u+tk0dmkjT!E z#KVxxkTQ7-vkgxILmCf*0z*0@gPjJ*&yxjMblEa_7_u0$Cp)vKyXEpQ;bMqlDCA)%Vu)j85KK=k@yIXAtjfzFAxhvl-^FGtA{-n8z@GGdnvABjdu!JRH(ei$QK*!ox6yVX6Q_ zKR+wOaxMlzh7~*vJ(C?dgjrTIGN?|z$SyuPpF@Cg?c@dybH_@Cd^oo1uY$k)d(&500|HCI$uuDF!wM z1_o&cK?WHHZ3bBeR|YwTcm{cf6b1!`W(EcZF$N|E28L9I7KT=^-%=S&7)%)$!6xy5 zOk!YQ*u=oaz{SA8U^jU`r)s^{ZU)OpNlq=TEezHo49p@7%-b34w=pSV|Vn`&1Nb|5DMBPbC;9q7-%1onoomiBfAH?1uUyxO}Mycig^G58@| z#RoQ1hk=zrmqCa@59|tv?}g#65N7CN=mz_~hrtkPcpW%g85pd!wlJv8WT@8y`8-H# z8$;+0hDiSGZ4B`{7*e+}WN1ZhVaVCRP$0rkoSnRtAqV7)T@0mgS1>bx!bS}2A7ch~ z22%z(26F~I1}g?D25YcuK;aF_;*hxLWnf@nW?0iRW6Y6+S?dp z!Vx~?0tbQ}11Ez$*gS~uxZu9yVwk`%5$wB343nV->Vx?V46GpEt${}&8v`Q)1A`OT z7>Ki2A;t*Qa)Ht@RJRp0;MugbwlP#7TmsRq3)T*C1sgbIK}n1a>I!CtX<+N7Gt7Xd l!`oLJv$-u#2#lv9DV8h73mYY~yl3K*bAnKExUzDn! zo|>0hl$fLM3l_HKVz6VdXJ>HWVQ^${Vq_4;qK1)yB|WtyoRNW9L(`LsfrG(?hryM> zjgf&jr6{pHD8Do>B`7tygpol?!zU}TEKy%JvAjgzy(qCDBQv?!$i>>zQ!`A6fq}t; zhryGM?oF{JhBqOp+WN3?V!Wp$uV@ z=Q8VXM=(UPGeq$)L^H%pzQU}}9mf#Q&XB;vkjRiUnUBSWBaR`3he3fMb#f4kD_c4b zLk2_U-!IC5a%T85tN|xELZB@_85v7-AS11k+PXJo1Y&tMcIVJgEk0fq_utPCr-7z7zs@-Xx=7&0>Oc;@A$ z7CGl678j=$vooxj+`*y6vW}5KZgMw=+~g}9Vvbb|xeSa9)eH;_Obj&)QVexS{6YpH z27U$s21bT@uzUjp6N3hWCIbTlI|CyFH$x)>BSX_d28Lt?R$SACwlG+3W3UzA%0aNU zF*s{&Vc^x?#o*4su#LeR;YvQRJ=zSC3_1*I47y;KL42tWcbPgvH$x8tBLgESLZCL* zfy0l1!CGqzgW606EiJ7r4E|c%>KTG}Fog4GZ)1qv!H~R-Ax$fC3q#fphCC65!tCU& z3|Sy&>|!W}yMmbk6jowjKN>NxGng>QF_;VU;$eOP6j)$DG)z#!TrR=Fp*&r*iVxg zrhtr@e4ksa9;A~EY@Z`o7sPH>h%NyxPznX9Wnf^if?CO@t+kDz3=y6X-8x|15Ifnx zp$Cd#HmIG<4Aa4>WCp`bXquYEz|63aVX+LuG6o29Im0rBRSXOaTnvm1s~OfZtY?q} E09pmwbN~PV diff --git a/target/classes/objects/ships/Shell.class b/target/classes/objects/ships/Shell.class index f487acf589e08a53ffd44edab59acd337c914fe3..8cb2189e357474661d8474f9e0fe0ed2b49deafd 100644 GIT binary patch delta 428 zcmZqYe#XUh>ff$?3=9m`4Bi{L{xfoMG4L{I@i1sJ=uFmT(vs8TVbEs~WMtqd$S=+; z$;{8=VlZSdVrMYsVNhl;nOw{i#b(CCV9sDM`7)C_n-vd(HG|D2W^P77TLwl3I|c@Z zb_R9^76t|e?a4AMTJ;+l7#Nrs>=_ssq!`#37#IW?_!$HlL>Pn^q#1-6R2f7Vv=~Gg z92giFv>>_|92uM#KtLPh4hBY$Nes>mf(%SxmH>kw12Y37gA0QW)IK`~Ca@fvmi9IV zO@w`1AklgTNd{I1DX;}%AOQw8xCLwst_*Grj0}tn?hH0?!$5{JFbHUAZDG*W+QPuI zgTY`MgDIM^3~~(o4Dw)8dB9E-fSSt4-~l(wn1PYO3gmuPt!)gJ=q4yLurR0~nZOD+ J!4n*0UH}m;D~JF9 delta 442 zcmaFH)y~az>ff$?3=9m`41OEA{xd3ZGVn5J@i1sJXfQHxr{t#=yQCHuB$nrKG4L|z z@-XNz=uZ}A(vmaeVK8D4WMtqd$S=+;$;{8=VlZJaWoIzsVNhl;pB&8;#b(LFV8viP zc{h_fn=KE69fSSm7fjrYf({If42}#83=hti+{nPdz{KFh zz`!8Kz&_cUMY3L>L5#tffq_8_qLjgf!Ic373_!LsFoLu*xG@MaFo9VD41x^I42%r! z4Ej(@>=>B9a%@`K+Zc2Z=5v8Xr5IQlq`~Hkf%$B3^Vt|Y7(5vm>lqjsycq1^hJg%c zU=YyK+QMLAASSTFP4EE+kuLz^m@`fQ