From a332f3488ca2fa7efdfd0f39c57dce48287b0679 Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Thu, 24 Dec 2020 14:35:13 +0100 Subject: [PATCH] coordinate stuff --- src/main/java/objects/ships/BattleShip.java | 4 ++-- target/classes/objects/ships/Turret.class | Bin 3983 -> 3881 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/objects/ships/BattleShip.java b/src/main/java/objects/ships/BattleShip.java index c390e4e..79326c0 100644 --- a/src/main/java/objects/ships/BattleShip.java +++ b/src/main/java/objects/ships/BattleShip.java @@ -13,7 +13,7 @@ import java.util.ArrayList; /** * A Battleship that can have several turrets */ -public class BattleShip extends CollGameObject { +public class BattleShip extends GameObject { public static final double SPPED = 1; private static final double TURN_RATE = 0.05; @@ -31,7 +31,7 @@ public class BattleShip extends CollGameObject { } public BattleShip(double x, double y, double xSize, double ySize, Color mainColor) { - super(x, y, xSize, ySize, new RectHitBox(new Vector2D(x, y), new Vector2D(xSize, ySize))); + super(x, y, xSize, ySize); turrets = new ArrayList<>(); this.mainColor = mainColor; this.doesDespawn = false; diff --git a/target/classes/objects/ships/Turret.class b/target/classes/objects/ships/Turret.class index 29e49a4b06ac879c431c271a1475be83ac946d2d..62c93bac3c9759e54d6f93b63d3ba8c0e896630d 100644 GIT binary patch delta 2192 zcmeB|Un$3R>ff$?3=9m`438#q&E{e&NGwXtD`8}in{3N2H}UKf4kiXe9tI-@O7_1qL85u;A^NUjTa}!H4^quqbi&8T45=&Bx z85xArQ%l10i*izsL^&C38SK~@?0Fa*7#t_(GRf=NGC1=vxG*>}GB8$hF{m@R@i4eE zcrY?>q-Eyh_?IQ-Ffy=fczSwzYKE~hcun5Lq@-)h;K#$j%HYq)z^dWmq8Y};;K>jO z5(#2tVAF5|DFvAn!ov{C5H^{US-n1jhar+dijjfU$;Z*zo0EZqA)1FF24pEmQGQ8c zNoIZ?NJktGLp(zQBLf>)FcoB)3&a9-h9n+_WU#wZiW19xGV@Yd8Nh&1hl?SdA%mSE zlZPRTA)ApwAS+{U44A~!$FQN06Dsl zk%3u5GYsUYVjhMPhEhfbw%o+xlGGwb22mey*ruoEr4}XT==*|&t+^P=87kNrDtQ>H z7^)c=gt4e$WDrPCE%D7SEl%~xPX>8#vLA~Chb==b4?`V8{p36rbA1bjMjnPHPz*|e z)Fu`n#gki6el9rfxEMGXT6h>*8QLbFXVF(-V(8#u=mhEELDEyq#n8>r!_Lsl!_ddj zKUs-YhkG)^6n2KGJPgwqrcaJ!HFliMFo&ICE)T;zhWU&PLMSfw%qu7@VPxRTEC#zb zpeVJtI5hq&DI^8_95}T8JHNj8F&~N z7=##P8Kl5w@-ql9Ffgz%Ffy<*>}OzPIKaTbFo%JYfs=t@vH_QV{Xqr>1~~?H1_lNh z25tsX1_1_122rqXIR*s=c?NX`1%^Wm3=DP*Yzzzx8VrXSj)2pv2E$Q?V+@R7F$V@m z1|~4eg~5@51W6AULo=1%tIR<1YM!C=0H!KTknXA6UkENf1C za-SKC&K3qID4SIqB+&;F>64Y+#^9>Go53@3H-l}Y))oenEetkVTNv2e^F77>c$rl=*1yV5r%_ z(BP}Jg+Wkj8$Y-jM5eGEwqrx-FAUNVF;yl2P;M|2ef55qnN zZH8+M`V8C*rx@fJt~2N}@Gz7zlt3fDn<0+jGy@Lr1`mcC4EhXQ43P}eV99{t z12h?MFuY*6$#9E-kwJjr0mE%@GLT`o!f=N{pMjadgkcZEU2p*s#xM&h^5sC0AIZQD bj{JM<47ThHw#ff$?3=9lb3~wfK&7S;}U1Q?eCu)WaM(hm6JPalbri=^{`AJ!+$tA`5 z#Tl6e#rjT(B_%nj!5NtalXo(DdzgOhwWavBR=NF|EGcxd{rjUf<6#JAh?xA9NxeRbhas9lijjfU$;Z*zo0EZqA(n?B4rB#KQGQ8cNoIZ? z$fg7yhD3%WMg}&pU@FKo7l;Mw3@JPesSI9>3>+y%iRC_-d8w=nV8E!u#gNI6#m}vrJY#4?_XS4Q!FFK0f~8AV(L099_)F zz^nmsF$Y5_4?`J4F(U(eN@{UQQGO-Jp%pv~l?+vk3~afH#U-glj10U!;4t+CbFH}; zY8YzS8R~c#>KPgs8Mr}mlVw>9IqVslco>=)S|*3Fm}^-vwDB;sgCayUJ+;I)u>cbG zZbkXI;HcnY;9%(FVd!G$p1g-eU&WB2mxrMbq?`v?ITynOhKcM9lXw^=GfbJx&#J>c zgJC8+!z><#*$i_gyRjN;)-WvKVOYqph>?LWv)DJkv^X`OD7CmaH3jU)C@uzjh9x`< zOBt3;-o>ipWzVpJhhZf{HzNZ_UTS(`NoH9pNX2R%hBXY!7#TQnOLIyx3vw!z6Xf#M-GsWd$xznGChLSym;RuNt=P$1efY~f+p%CK#+1X~~(cNpS39*b55&eUp3GTsUeN4)8D>WH_|>1{*KqW_}JmM#h(u?Kn;A zxfrAv4l_72FftrrU|?Wkn93leaPGCNJR9as|0T3anb4 zL4ZM=K@{w04F-7zO$IdvEwKG!5FK#))uHw?GF)P~3^I2zKeuwd*$xKFEev*jb~;-a z>||MU+LQatSah~9xIo#g+8~KOkVv1b>^25>?cEICk-Hh}Bek|Lm~COO)7rwo-kvYQ z;G564oxvY!S{pO#c7~vB458Ya7$UbZsL6sS47}T^yIXF^8IXO}UxCFRB?u6Lf!p^w-|9r5m<#21ke%Q`XxQ(GcbRz=; z12Y3CK%*GM7#JAz7&sX88AKQi7!()`8FUzo7%Uh}7(5uv7|Ix|8EP497}^hj;;{H)6lb{3aD#!7L4=W+;U={9Tf#Ekp>@NmZ21bVa48;tL4E1Li7??yDxEOdD7#Ml9wlS1wZDA%P1d9m6 z)Ex}dw=%>aB@LE@_WV9GHfBUTuh81U0FUZ=Xk0_YT%a0780O}KVjW~RD5;5Zw2N}K zZ)fn|#?WKM1##j0nGBIyI~X#yGVp?I-@&kW8^dz`Z49fdxIqeZMHtp@V_2^%2~r-j zgJH834@g*&XB)$I5MwvPu1HCq-SrIiks=IpMHuF8XYiNg-p;UR8^eBZnn6k!LEwTS zh=GM6gn@@4ltF|cj6s1RoWX)2lEH%^njwlImLZKHj-iqvo}r&1kzpxAGQ)a?6ozdK zX$;30(itu?WH8)i$YprOkjKc%5X;ETPy|j8RSZ1!496Jk86Gg`GjKE9Wzb-F$e_;v zs%d(lsidEwjNvK+D3L5>NMLxxpwGa?5X-O*o?LjK$%TiJf#EU36Hszt_`&cLnq1y6 zJY&#jU}msjxWe!pT+l=@Y(h#Tat!Ls{~2N#*ukmf1v`U1JA*wlBO@r8EQchMSKy-X FH2~4i;mH61