From 70610c7c5311a588d8737f6bd8fc7e366584ac72 Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Sun, 13 Dec 2020 12:23:02 +0100 Subject: [PATCH] no useless parameters --- src/main/java/core/Drawable.java | 9 ++++---- src/main/java/core/Master.java | 2 +- src/main/java/core/physics/RectHitBox.java | 2 +- src/main/java/objects/DebugPos.java | 3 +-- src/main/java/objects/GameObject.java | 20 ++++-------------- src/main/java/objects/ships/BattleShip.java | 7 +++--- src/main/java/objects/ships/Shell.java | 3 +-- src/main/java/objects/ships/Submarine.java | 5 ++--- src/main/java/objects/ships/Turret.java | 4 +--- src/main/java/objects/world/Grid.java | 12 +++++------ src/main/java/objects/world/Wall.java | 5 ++--- target/classes/core/Master.class | Bin 6149 -> 6106 bytes target/classes/objects/DebugPos.class | Bin 1051 -> 984 bytes target/classes/objects/GameObject.class | Bin 3214 -> 3028 bytes target/classes/objects/ships/BattleShip.class | Bin 2333 -> 2299 bytes target/classes/objects/ships/Shell.class | Bin 1114 -> 1047 bytes target/classes/objects/ships/Turret.class | Bin 3653 -> 3568 bytes target/classes/objects/world/Grid.class | Bin 1153 -> 1150 bytes 18 files changed, 27 insertions(+), 45 deletions(-) diff --git a/src/main/java/core/Drawable.java b/src/main/java/core/Drawable.java index ddef1bf..6658c96 100644 --- a/src/main/java/core/Drawable.java +++ b/src/main/java/core/Drawable.java @@ -1,7 +1,10 @@ package core; -import java.awt.*; +import java.awt.Graphics2D; +/** + * This interface has to be implemented by every + */ public interface Drawable { /** @@ -12,8 +15,6 @@ public interface Drawable { *

This function is NOT intended to be called manually.

* * @param g2d The {@code Graphics2D} object given by the master - * @param w The width of the screen - * @param master The master object itself */ - void draw(Graphics2D g2d, int w, Master master); + void draw(Graphics2D g2d); } diff --git a/src/main/java/core/Master.java b/src/main/java/core/Master.java index 19b0fc2..6aa2585 100644 --- a/src/main/java/core/Master.java +++ b/src/main/java/core/Master.java @@ -111,7 +111,7 @@ public class Master extends JPanel { Graphics2D g2d = (Graphics2D) g.create(); - drawables.forEach(o -> o.draw(g2d, w, this)); + drawables.forEach(o -> o.draw(g2d)); } diff --git a/src/main/java/core/physics/RectHitBox.java b/src/main/java/core/physics/RectHitBox.java index 0b4cc14..4f68345 100644 --- a/src/main/java/core/physics/RectHitBox.java +++ b/src/main/java/core/physics/RectHitBox.java @@ -149,7 +149,7 @@ public class RectHitBox extends Hitbox { } @Override - public void draw(Graphics2D g2d, int w, Master master) { + public void draw(Graphics2D g2d) { this.w = w; int h = (int) (w / Master.SCREEN_RATIO); diff --git a/src/main/java/objects/DebugPos.java b/src/main/java/objects/DebugPos.java index e731685..20f888f 100644 --- a/src/main/java/objects/DebugPos.java +++ b/src/main/java/objects/DebugPos.java @@ -1,6 +1,5 @@ package objects; -import core.Master; import core.math.Vector2D; import java.awt.*; @@ -15,7 +14,7 @@ public class DebugPos extends GameObject { } @Override - public void draw(Graphics2D g2d, int w, Master master) { + public void draw(Graphics2D g2d) { g2d.setPaint(Color.green); g2d.drawOval((int) (position.x - size.x / 2), (int) (position.y - size.y / 2), (int) size.x, (int) size.y); } diff --git a/src/main/java/objects/GameObject.java b/src/main/java/objects/GameObject.java index b6420f6..bb13948 100644 --- a/src/main/java/objects/GameObject.java +++ b/src/main/java/objects/GameObject.java @@ -10,13 +10,10 @@ import java.awt.*; /** * The GameObject class is the superclass of every GameObject that can be displayed on screen. It has the 2 - * {@link #update()} and {@link #draw(Graphics2D, int, Master)} methods that have to be + * {@link #update()} and {@link #draw(Graphics2D)} methods that have to be */ public abstract class GameObject implements Drawable { - protected int w; - protected int h; - protected Vector2D position; protected Vector2D size; @@ -67,11 +64,8 @@ public abstract class GameObject implements Drawable { * This method draws a rectangle at the current position and size * * @param g2d The Graphics2D object provided by the master - * @param w The width of the screen */ - public void drawRect(Graphics2D g2d, int w) { - this.w = w; - h = (int) (this.w / Master.SCREEN_RATIO); + public void drawRect(Graphics2D g2d) { Vector2D abs = Coords.getWorldCoords(position); Vector2D sizeAbs = Coords.getWorldCoordsSize(size); @@ -83,11 +77,8 @@ public abstract class GameObject implements Drawable { * This method draws a rectangle at the current position and size * * @param g2d The Graphics2D object provided by the master - * @param w The width of the screen */ - public void drawOval(Graphics2D g2d, int w) { - this.w = w; - h = (int) (this.w / Master.SCREEN_RATIO); + public void drawOval(Graphics2D g2d) { Vector2D abs = Coords.getWorldCoords(position); Vector2D sizeAbs = Coords.getWorldCoordsSize(size); @@ -99,13 +90,10 @@ public abstract class GameObject implements Drawable { * This method draws a rounded rectangle at the current position and size * * @param g2d The Graphics2D object provided by the master - * @param w The width of the screen * @param arcW The arc width of the rectangle * @param arcH The arc height of the rectangle */ - public void drawRoundRect(Graphics2D g2d, int w, int arcW, int arcH) { - this.w = w; - h = (int) (w / Master.SCREEN_RATIO); + public void drawRoundRect(Graphics2D g2d, int arcW, int arcH) { Vector2D abs = Coords.getWorldCoords(position); Vector2D sizeAbs = Coords.getWorldCoordsSize(size); diff --git a/src/main/java/objects/ships/BattleShip.java b/src/main/java/objects/ships/BattleShip.java index a936191..1356515 100644 --- a/src/main/java/objects/ships/BattleShip.java +++ b/src/main/java/objects/ships/BattleShip.java @@ -1,6 +1,5 @@ package objects.ships; -import core.Master; import objects.GameObject; import java.awt.*; @@ -27,10 +26,10 @@ public class BattleShip extends GameObject { } @Override - public void draw(Graphics2D g2d, int w, Master master) { + public void draw(Graphics2D g2d) { - drawRoundRect(g2d, w, w/10, w/10); - turrets.forEach((turret -> turret.draw(g2d, w, master))); + drawRoundRect(g2d, master.getW()/10, master.getW()/10); + turrets.forEach((turret -> turret.draw(g2d))); } @Override diff --git a/src/main/java/objects/ships/Shell.java b/src/main/java/objects/ships/Shell.java index 830f7a9..14f466d 100644 --- a/src/main/java/objects/ships/Shell.java +++ b/src/main/java/objects/ships/Shell.java @@ -1,6 +1,5 @@ package objects.ships; -import core.Master; import core.math.Vector2D; import objects.GameObject; @@ -15,7 +14,7 @@ public class Shell extends GameObject { } @Override - public void draw(Graphics2D g2d, int w, Master master) { + public void draw(Graphics2D g2d) { g2d.setPaint(Color.orange); g2d.fillOval((int) position.x, (int) position.y, (int) size.x, (int) size.y); } diff --git a/src/main/java/objects/ships/Submarine.java b/src/main/java/objects/ships/Submarine.java index 985c8e5..7bb43fa 100644 --- a/src/main/java/objects/ships/Submarine.java +++ b/src/main/java/objects/ships/Submarine.java @@ -1,7 +1,6 @@ package objects.ships; import core.Coords; -import core.Master; import core.math.Vector2D; import core.physics.Collidable; import core.physics.Hitbox; @@ -21,9 +20,9 @@ public class Submarine extends GameObject implements Collidable { } @Override - public void draw(Graphics2D g2d, int w, Master master) { + public void draw(Graphics2D g2d) { g2d.setPaint(Color.BLUE); - drawOval(g2d, w); + drawOval(g2d); } @Override diff --git a/src/main/java/objects/ships/Turret.java b/src/main/java/objects/ships/Turret.java index 6fe83b1..ea5ff2c 100644 --- a/src/main/java/objects/ships/Turret.java +++ b/src/main/java/objects/ships/Turret.java @@ -1,7 +1,6 @@ package objects.ships; import core.math.ExMath; -import core.Master; import core.math.Vector2D; import objects.GameObject; @@ -42,8 +41,7 @@ public class Turret extends GameObject { } @Override - public void draw(Graphics2D g2d, int w, Master master) { - h = w / 16 * 9; + public void draw(Graphics2D g2d) { g2d.setPaint(mainColor); Vector2D abs = battleShip.getWorldCoordsFromLocal(position); int sizeAbs = (int) battleShip.getWorldCoordsFromLocalSize(size).x; diff --git a/src/main/java/objects/world/Grid.java b/src/main/java/objects/world/Grid.java index 83a555e..8d68f32 100644 --- a/src/main/java/objects/world/Grid.java +++ b/src/main/java/objects/world/Grid.java @@ -10,23 +10,23 @@ import java.awt.*; */ public class Grid extends GameObject { - private final int gridSpacing = 50; + private static final int GRID_SPACING = 50; public Grid() { super(0, 0, 0, 0); } @Override - public void draw(Graphics2D g2d, int w, Master master) { + public void draw(Graphics2D g2d) { g2d.setPaint(Color.LIGHT_GRAY); - this.w = w; - h = w/16*9; + int w = master.getW(); + int h = w/16*9; g2d.drawRect(0, 0, w, h); - int verticalLines = w / gridSpacing; - int horizontalLines = h / gridSpacing; + int verticalLines = w / GRID_SPACING; + int horizontalLines = h / GRID_SPACING; for (int i = 0; i < horizontalLines; i++) { int y = i * h / horizontalLines; diff --git a/src/main/java/objects/world/Wall.java b/src/main/java/objects/world/Wall.java index ee0dbe6..61e68c5 100644 --- a/src/main/java/objects/world/Wall.java +++ b/src/main/java/objects/world/Wall.java @@ -1,6 +1,5 @@ package objects.world; -import core.Master; import core.math.Vector2D; import core.physics.Collidable; import core.physics.Hitbox; @@ -19,8 +18,8 @@ public class Wall extends GameObject implements Collidable { } @Override - public void draw(Graphics2D g2d, int w, Master master) { - drawRect(g2d, w); + public void draw(Graphics2D g2d) { + drawRect(g2d); } @Override diff --git a/target/classes/core/Master.class b/target/classes/core/Master.class index 49e3fdf93bdff03c7e8da9cd262b4345fa8bc9b7..dde115fb4cf8c731f1ae462c9d7212956558031e 100644 GIT binary patch delta 171 zcmZoQxTU{gKQohw#^!U(KCDa<8k5g4i*0t`e9FSewpop@f|+v{12Y3N0|P_YXG_GB7YGKx7y`F$ge#Ksdt>hMx?K3?2;p zoArc#u|zO2N-#iZ@Zm!uX=_GVI+V=QN6VDw~UV9N!IF*5L?D9L8Z<>Y1HWZ+{EVc?(qkja>J3IhiN z%VbIBa6w@Pb_Nj!X9iIQa|Q+mEe4j!jm)Cr3=A#|b`16mObj5F1A`+2GXo=o)8v`V dO0tq*l{^fL3=9m63>FNQVA`31fq{v^1ppQTC-VRR diff --git a/target/classes/objects/GameObject.class b/target/classes/objects/GameObject.class index b0b47742c7288d4eb6f641ee16eaf9f2b5221e18..967cd7a10cffc362961f452b5451cf7d0ce888dc 100644 GIT binary patch delta 1731 zcmeB^ydutZ>ff$?3=9lb4DB1a{xkA&F_42b&o9bJan8>#N+}M`tV-o#uxD^!XK>_UaAI(te45ER%9V$~jlrFffw6*-fzgGN zfsw(JhrtUhQVCM+!^7aq;K#_ok(Qa06O@`MR5rYpRB~PME%6_5`Fig#Da{>&drReAT3|%Yhuq$iR|V zlpM~;!00*Ii**ij3IprppRD?63NYw1P7j7#O%1m>3usq!}a_WEe6T7#K_# zSQ!`?BpI?8vcay91O*fWBUsFf!JUB_%*tVKhpNkEaA#m=U}Rur;0Bw!ip??_WUd?o zI|BoQ90Lo3JOd|#0s|j|B7-D@5`zMRGJ`sU3fL|MuxT1_yEGVt8AQN#X)uU0h%hj* zFf!yZ2rw`(Ff!yb6oAdQV>hb@nJ>k_#=yW}%D~EC#=ym3!63+B$so^Q#h}7qi)6Mc z+-y~bLa^Da3XIZ)9L#U}6BdPYfJB zt_&OuZVUnp9t;u;o(u*IUSPLrK}?6c&5)stp`3w{frCMlp#tnS0R}~eN(K=IW(G!v zDs*?%<8l~Iclo2cD~N%EA(%mcA(TOaA&kL*A)FL<)k7Ut%}@gku%!&_;OMY~2ACBK zG{me}AwkAqr!C0>3Mdfi(I?3YX0w7qO-6PbLlC(I`z%ejbGSo8Efs?W&Lp?(s12Y3Bg8?`&Sr~*E)WLzt%D~7F!5{#2vpEA3 zIH_@JZDG*X+Qtxua04VyWHN9tWP$DFfhdGp%UBP}(NI(R7}&s$vIF^i3xkXH76um) zhNygy|FWG8z;GjKD2awiJ|BdAn?I<5}tI6ZV%d7`@ppJPfH z1R2U0lo`rlj;Uv0V9!8vw@K3=jYS delta 1836 zcmca2-Y3a*>ff$?3=9lb3==kT{b%&zWZ+;h<6$souwZ0hEN5h3^yFkvW3b|3ux7Af zWZ(&Q4svz%iw|-P@$_e8U~~Z~x8q^32P@CuVsK<|VrOvXVQ^t^oh-)Wr{&1t&coor z;L6A#l%84=o?n!c;+&sflu{g=S(VDg;Kkt0&fvqt;LG4QxsS5Y7-W`8|`kvll}Y4?{FV1S11ST4qj;e_3JZ3NtnsnbMgWfUuJ0tm)F|U(^E5yk%1+#C^>wx zFzX!QJO*|K7EtgpFfg!y!i9lh@+MY&)&d4bhQi6uSha$S7#JA17?>Cs7~~iv7~~m> z85kH$7+4t?7$g}=7)lvHKoS%T42)p05C$6tW-zOa!3L_XoWX{Hoq>^om4O>pPoSJ;*F61~vu;1`7sO21^Dm25SaE1{(%>23rOd1_vZ_R6*u|oXnug zP|Y9$c9Q}_4TA^+6GJTn0|N&G;~xeUkXsoU>KN)lHZU+SY-C^q`@~&KW-EiKmev*q z)Amgamic{K8Emz-Fw_g~U~ur$+QJ~ZgTc*;MO$kNgVHtzPi@^T4E}w(TNr}+Bw0XA z5E<0BjUjX+0|NsS1IX2o5b$JRW$LN(hNEbO$;Io%nT|F$_&j6A`C1Hj0`QrdVoatN20mEo*|Nfl_82j zm?4@$njwZkg&~eXhasN9jUjY~aLir?rJa za0`RK_7(^h4@Xt>6gh&KwZ(#^RNCagkTe9qCV2sp|VA;;VyaApl`M`dt zVvuC0W-w-`0b8%dz{0@5UG=Y;gsQiIAMi1tgdImiPh-(BHWWhxd6N566W4hpuv1MQa#}ucQ z_BMvJ9SjZ#PlF^I>S5>wh0)|Z qZm|G=Xk3XfB`7ty zgpomNvL1`Lq^D+>5Ca2)H4lRggDoQiTVir@YC#DjgUMt)7O}~NObQ&*4E8(>4h)Wy z&6o_?oI&bbCg(D#3AphvxHEV#GO&QmWn_>5YdFsIX!0rMWJWzOFNnpLFPV!Wg&~!l zA&rM2ogriMS{4>Y#;nQmjN(RN{A>(4AQ$HHFvK#%2{1(QvoaKLF$gjg@-Rd&s53I~ zc;@A$7CGl678j=$von-T{>`ezQpU(2H~Al{++=q)8DUQb1_mYuF9tRSMh0#MZw5vN zpUGuxwwAsO3=Dh>%nS?+0t|u-f(+UWA`E^E3=ConObiSRIt=~{0Sq9Z!=S~W&A&l`hE2B~q+5uAg@J)VoPmo$fH3Tl!Q0~1&=7sw>- zZ46T32-iW3(PZFc&;pwRaTyoX6b1$^hG>Qu21WrcP`pFUvx1t(rmdB>jlmUR7$|BP z7!;5UVgq{&6n$(EgBX|@;=w_az>o-yYJ>O=6VgV&GuV64sal&bHWSX`1?WUV>5 zfk~E&i$R*fl!w8L!F+NNlOeYyNT(GegS-Y!0~-S`12+TTWM5`m)(i$V2ByjV%=Usp4D1ZT4B8AL48{x$3}OsSlkYQ&vNAGQ qF<4LLWzkWTVBlep1k3R-FfuSO@G_V%m@+UhFf!OMFfcGN*a84?x*3-M delta 205 zcmbQvaf^fN)W2Q(7#J9=7@Rh8iZ@Zm!uX=?qgDxV=QN6VDw~UV9N!IF*5L?C|Spp&dJNb#=ytG&A>ldj@g#AhJlTN zWpV~`45kbW42%p83=9lR42}RX^eA!w diff --git a/target/classes/objects/ships/Turret.class b/target/classes/objects/ships/Turret.class index e77ea7d1a9182effae529876955c83b869399e7d..fddcfd65e204d694061005e4a7b3aaadba781143 100644 GIT binary patch delta 2010 zcmX>q^Ff;H)W2Q(7#J9=7*1{El4RuNVo+vKVP{a~VNhdGpKQly&8Er2pv9m)xt>vl zTbDtPok5?6!GOVV@;b&eabq3^69#QY2A1N?s#GopT?R8A26G0($=XZ`+?EVh>QuMg}&pU@FKo7l;MQ z3~@XR@nCnQ6eX7XWag!^GJpZ24i`f*Lkc@XDi1>%LpmdaKvrT|qJBU}xy$Vd!G$p1hPrOS71vmxrN`p`Vd~FSFP;zqB|tpeVJtI5h?A ziYP7yONNO&43iipPyWH8!(quVm4{&(!}Q5ItZK5B3^REcW-&}=WZ=jx%_+$&$f*P= zpTom2mto%IeAW<^1&j>B`AJ!+$tA`5#Tl6e#rnY+sW~}Z4D%TlfxNnyk->g)Bdg|Q z0X7MaVuqzW49ggnZ#H1#Vq})k@R{t$C_Fii-FEVP_HBtP7;G6B8CEhdFfcK+Fi0`1 zV&H-ES2IX4tU=JNMI$IblWLb0Cll$t; zSah~9*g-gEtlA)%K9ESCtn4-hNA2AVu8|w-)U3?F`x582mv|$jktW>?j5?1_lOQ1`Y;21`!5* z1{H>S15mNWV8dX{;KN|bP{3ftP|je@(8yrJ(9dAUFq^@iVKsvT!*&KohQkcb43`*O z7;ZASGQ4DPWB9;e$MB88lMz%D2{8D8V=9e-i(xf`E5mjM9tIAE?F^O-I~aHvI2k4} zq%iDc-~pvIMnPCSG72*6s%O~Ez{nuN@Rwl^gEj*bg9^i2hP@0t49pA$3=bLhG4L?3 zFxW6$W!TRE%0Z0`6BrIK@G!739Asc%kY!;0&oGIBgB^sF*%>SuL4bkbH$&_%237_} zhC>Xw(A2@rz{SAFz`)1|ic4s!@By)dwYD(8l7+4I76uC$aI&z|-oju9VVbdMZDGjU z#!zI%Dl5slg`py)U6cjHs7Yzx!BAIj$)=^Xg&|CWO@yIk2SeLdhOo)Ac_iyCL^)X! zL^;6m%mp(oz0ZsrVp`8khB&Pq3`tuVctN^%FihCSFhzvHeH+6JD;`i{lWiAeY2VJ^ z31W+KwTp6tI3T4gI~ZnLfi&gqW|$u-$qP~-!r(5#;J%%~Q<7&p!@_M0OIqqV8JGVr zM#Q`qgAfA)Lm&eWLlA=uLokCnLkNR0Ll}b%LpVb)Lli?YLkvSMLmWdTLp(z#LjuE8 zh9rjh49N`37*ZK_Fr+cuX2@Xp#Sq8Hz>p1&=oSWEh8+w}42K!C8F(0OGsrU>VbEsa zW$0um1V?^77sFJrRvrd!h608O;MnH`#Q-$+c^JNeqnwdJhT$nV%9$9{8E%22oSDIx z;T$;1L6Luy;V8o~23Ce(hII_b!6i#B!xV5b-~cBBIZ!evVBiEN15g@ZXQ*TrVPpg) Ogic68H~}sMPXYiaI+EuA delta 2112 zcmew$eN=|))W2Q(7#J9=7|w0vl4O+TWZ+;>=3!7_;9+E7%-~{BV^C*j(BNUvWYC&y zz-Y~;!^5D@a4E(QYzOCAO* z29wFMObXmK47ThHc03IB3=We$nB>K57@T+*oEaP#85k=;mbmgTxG}g-u4NKu^qf4E zNlDj+!Iy`DmBEjZfmOrBMKg?x!Gj?HBofHTz^38m=?M~2V+iJ92w@1F{DeupKAeXk zf!(b*g1k0>67Xpj{gMfoL(C7JnoAe&-&7~&Y>85!8Xf~g?WTp$*xF(mRZ zBr&)%GH|36C6@bS=B2VSfB~Zp7eg9DIy*xK4?`wH79)c|R$^JAeokUux_)qFaYXXxQ!=w;}eJe@^Lvy5Q^55q);NsJ79nZ>^OrNyZMMXANbsVQJr zL~$|LFihcLn94A1@+%e{4jYCUJPb1#W=)o3Rg<-0n8U*`mth(s14nLYPDy4#P9;eB zd>)1c3=1bGvWBQGW@He~Ps&P7E-BV8&d4k%)(_4|&B@_nSj4atWl+-A+QJ~cjX_mw z3xlB676$EY4Ek0qP>$&~28%5W*7bd6tdcBS7_3EES##Qx`^?xtJVzLhT^q!;?gNpI zeWI+QtlJn|w0ARjM1qXj&0rHL!r;ZXoxulUT3;J8>vjhJZ45!$n;62jF{p~NYHeX) zXGzF0;{Z7(Qk1P-l)Zf$LkzPSrzoe^7KVEEMGT1`)2&50SrSA!GC*$N0trCeklts; ztu4wW$}Y+!%Ds&tL2C;GuLwhO;tqz?Df1W6}q&*04{$KcDT$>0Z$#wrFLhC>YQ47(V37`PZNFjz9|W~k?3;AU9C zkj}7&fro*Ufq_vA7R!uU40{>&F))I~_A~H+(g33ts03kPW>8?{VmQE{$H2m1$ncZl zAOk4-*)zOmIK;riz{cRqaF^jQ0}lf`!*qtp3`ZDv7&sV?GB7YGGBE#VSi!)>&cMOW zpvK6~P{v-*V8aLk3=F>+5`HnTGB7e6V<>>8DQ*TX20jJ`Mn+I%Llck>lnqTkeYVD6%PrZow6-urO0d<7 zFtqPr=-kQ>DFaU_u(ZLxh@lH)I&#W@SpiBHT3Z+jw=wk3WQfz+!H~L@ffr=t4u;9w z7^aIbcx_{tZN&php|b6wEbZGFd_Zhbu69vw5C^1`We3B&dMl8w!rcsuA|-i2DnuB( zL>RobGx$jIY-d=qjbS-B5fyJ_V1T9+F9sn728Lh;Q1v6j5Xzv=5XNB45W!%>5XlhC z5W|qn5XX?qkibyMkjT)gf!8L}9DF(fcDFyu09VW?+d zXkp-G*umh$aGXJpfrsHXgFM3t20aE|hE9e;Xi}NVkjk)|0hCe-7$(3|3L`Y7@GyJ@ zrv*j^8HT6ew7|rm&TtEy7MK}~8P0*z0tEl45t`a8G;$sF`NdMQMqOeQ;-sf g94LVlFmQqs2qb%7 diff --git a/target/classes/objects/world/Grid.class b/target/classes/objects/world/Grid.class index 463e07d348c4d1a53780918e7fd05b3b94e59c02..394b5dac58da97d4a060710b11218e56d5850c4c 100644 GIT binary patch delta 750 zcmZqV{Kvs{>ff$?3=9lb4E7VbTqZUda`Q3pvoi?rFbFaTP26W$FTxyw;cl&bFw=2~+xNHIvWGsy5T z$TG+=GH@fwF*2~ErGB9gsdU7%FF(~jbC^9H9GH|36C6))JCYLZWuxogFdU|SV zhJoZ&cor1A{pOCj%n` z0|TcPA0Hpzb_T|cU}ZWC3=CXg0|Xd27z7z~85kINAPO1u81%sg8!#9`3}FmnU}fN7 zU|=ZH-o(JZje%Ed3xja|HU>#s83BPD0nQ9NZDwW}*=-E+G6F_9W-PKGl9kzvO_WWP zbrFM%D4T4CC~J-xyEd~ZyNoFNHU{MuHpb=uA48O|fR)H(h_Zl`h_W+_vdhAifSk+B z0CKJ!13v=;gD3+#gE#{}gG4=pID-^}JcA5_DuXP8HiJBaDT4xo9fKl+2ZKC=AA<@* z1cNF=B7+)3HiHU7A%iB^k7*2C40a4$3`Pv<4D1Yg3ff$?3=9lb47L-wTqa%+mE}$^%1j9^NKDSmOJ`(Y^yFmVW8i0J5a3}D zWDuI@W6UkWAj-}l#={`aAThDaQkH{3iibg(frpWSv7D2EgF%*uK@QBz;9?M&tj;JW zEW)6|!=TEb#K^#rQj}QklbM$~Ih(OSMNPveE3qt5Ke4<--@PcYAR{xm*vQ4&(