From 8e15ad3ac84048ea17452da874abbe06b84b691c Mon Sep 17 00:00:00 2001
From: Nilstrieb <nils.heydecker@gmx.ch>
Date: Fri, 18 Dec 2020 18:40:59 +0100
Subject: [PATCH] big update, stonks

---
 .idea/misc.xml                                |   2 +-
 2DGame.iml                                    |   2 +
 src/main/java/Main.java                       |   5 +-
 .../java/core/{ => general}/Drawable.java     |   2 +-
 src/main/java/core/{ => general}/Master.java  |  50 +++++++++----
 src/main/java/core/math/Coords.java           |  10 ++-
 src/main/java/core/math/Vector2D.java         |  14 +++-
 src/main/java/core/objects/base/DebugPos.java |   1 +
 .../core/objects/core/CollGameObject.java     |  18 +++++
 .../java/core/objects/core/GameObject.java    |  22 ++++--
 src/main/java/core/physics/Collidable.java    |   6 +-
 .../java/core/physics/hitboxes/Hitbox.java    |   5 +-
 .../core/physics/hitboxes/RectHitBox.java     |  11 ++-
 src/main/java/objects/GameObject.java         |  67 ++++++++++++++++++
 src/main/java/objects/ships/BattleShip.java   |   7 +-
 src/main/java/objects/ships/Shell.java        |  15 +++-
 src/main/java/objects/ships/Submarine.java    |   1 -
 src/main/java/objects/ships/Turret.java       |  11 ++-
 target/classes/BasicEx$1.class                | Bin 660 -> 0 bytes
 target/classes/BasicEx.class                  | Bin 2155 -> 0 bytes
 target/classes/core/Master.class              | Bin 6573 -> 7807 bytes
 target/classes/objects/DebugPos.class         | Bin 876 -> 0 bytes
 target/classes/objects/ships/BattleShip.class | Bin 2304 -> 2396 bytes
 target/classes/objects/ships/Shell.class      | Bin 991 -> 1384 bytes
 target/classes/objects/ships/Turret.class     | Bin 4048 -> 3834 bytes
 target/classes/objects/world/Grid.class       | Bin 1155 -> 1160 bytes
 26 files changed, 200 insertions(+), 49 deletions(-)
 create mode 100644 2DGame.iml
 rename src/main/java/core/{ => general}/Drawable.java (96%)
 rename src/main/java/core/{ => general}/Master.java (77%)
 create mode 100644 src/main/java/objects/GameObject.java
 delete mode 100644 target/classes/BasicEx$1.class
 delete mode 100644 target/classes/BasicEx.class
 delete mode 100644 target/classes/objects/DebugPos.class

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5f60ad7..0f9e86a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="false" project-jdk-name="15" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="14" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/2DGame.iml b/2DGame.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/2DGame.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 9f78e99..01c14d8 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -1,4 +1,4 @@
-import core.Master;
+import core.general.Master;
 
 import javax.swing.*;
 import java.awt.*;
@@ -24,7 +24,8 @@ class Main extends JFrame {
         add(master);
 
         setTitle("Points");
-        setSize(1000, (int) (1000 / Master.SCREEN_RATIO));
+        int w = 1500;
+        setSize(w, (int) (w / Master.SCREEN_RATIO));
         setLocationRelativeTo(null);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
diff --git a/src/main/java/core/Drawable.java b/src/main/java/core/general/Drawable.java
similarity index 96%
rename from src/main/java/core/Drawable.java
rename to src/main/java/core/general/Drawable.java
index 6658c96..7efc348 100644
--- a/src/main/java/core/Drawable.java
+++ b/src/main/java/core/general/Drawable.java
@@ -1,4 +1,4 @@
-package core;
+package core.general;
 
 import java.awt.Graphics2D;
 
diff --git a/src/main/java/core/Master.java b/src/main/java/core/general/Master.java
similarity index 77%
rename from src/main/java/core/Master.java
rename to src/main/java/core/general/Master.java
index 92dc4e4..d4d4429 100644
--- a/src/main/java/core/Master.java
+++ b/src/main/java/core/general/Master.java
@@ -1,12 +1,15 @@
-package core;
+package core.general;
 
 import core.math.Vector2D;
+import core.objects.core.CollGameObject;
 import core.physics.Collidable;
 import core.physics.Collision;
 import core.objects.base.DebugPos;
+import core.physics.hitboxes.Hitbox;
 import objects.ships.BattleShip;
 import core.objects.core.GameObject;
 import objects.ships.Submarine;
+import objects.ships.Turret;
 import objects.world.Grid;
 import objects.world.Wall;
 
@@ -45,6 +48,7 @@ public class Master extends JPanel {
      */
     private final ArrayList<ArrayList<Drawable>> drawables;
 
+
     /**
      * All physics objects that exist
      */
@@ -55,6 +59,11 @@ public class Master extends JPanel {
      */
     private final ArrayList<GameObject> objectBuffer;
 
+    /**
+     * All physics objects that exist
+     */
+    private final ArrayList<Collidable> collidablesBuffer;
+
     /**
      * Whether the left mouse button has been pressed since the last frame
      */
@@ -74,6 +83,7 @@ public class Master extends JPanel {
         objects = new ArrayList<>();
         objectBuffer = new ArrayList<>();
         collidables = new ArrayList<>();
+        collidablesBuffer = new ArrayList<>();
         drawables = new ArrayList<>();
         drawables.add(new ArrayList<>());
 
@@ -82,9 +92,11 @@ public class Master extends JPanel {
 
         BattleShip battleShip = new BattleShip(Color.DARK_GRAY);
         BattleShip bs = new BattleShip(140, 10, 10, 80, Color.GREEN);
-        /*for (int i = 0; i < 10; i++) {
-            bs.addTurret(new Turret(bs, 25, 10 * i + 1, 50, i % 5));
-        }*/
+
+        for (int i = 0; i < 8; i++) {
+            bs.addTurret(new Turret(bs, 2.5, 10 * i + 1, 5, (i % 5 )+ 1));
+
+        }
         create(bs);
         create(battleShip);
 
@@ -143,11 +155,16 @@ public class Master extends JPanel {
      * This method is the entry method for each frame. It handles everything about the frame
      */
     public void refresh() {
+        long time = System.currentTimeMillis();
+        objects.clear();
         objects.addAll(objectBuffer);
-        objectBuffer.clear();
-        objects.forEach(GameObject::update);
+        collidables.clear();
+        collidables.addAll(collidablesBuffer);
+        objects.forEach(GameObject::startUpdate);
+        long time2 = System.currentTimeMillis();
         mousePressed = false;
         repaint();
+        System.out.println("Frame took " + (System.currentTimeMillis() - time) + "ms, " + (time2 - time) + "ms for update, " + (System.currentTimeMillis() - time2) + "ms for draw");
     }
 
     /**
@@ -182,8 +199,8 @@ public class Master extends JPanel {
      */
     public void create(GameObject obj, int renderLayer) {
         objectBuffer.add(obj);
-        if (obj instanceof Collidable) {
-            collidables.add((Collidable) obj);
+        if (obj instanceof CollGameObject) {
+            collidablesBuffer.add((Collidable) obj);
         }
         addDrawable(obj, renderLayer);
 
@@ -221,15 +238,20 @@ public class Master extends JPanel {
      * @return True if it collides with something, false if it doesn't - Should return a Collision
      */
     public Collision doesCollide(Collidable collidable) {
+        long time = System.nanoTime();
         Collision collides = null;
 
         for (Collidable other : collidables) {
-            double distance = Vector2D.distance(other.getCenterPos(), collidable.getCenterPos());
 
-            if (other != collidable && (distance < other.getHitbox().getSize() + collidable.getHitbox().getSize())) {
+            if (!collidable.getIgnores().contains(other.getClass()) && !other.isTrigger()) {  //ONLY calculate when it's not ignored
 
-                if (other.getHitbox().collidesWith(collidable.getHitbox())) {
-                    collides = new Collision(collidable, other);
+                double distance = Vector2D.distance(other.getCenterPos(), collidable.getCenterPos());
+                if (other != collidable && (distance < other.getHitbox().getSize() + collidable.getHitbox().getSize())) {
+
+                    if (other.getHitbox().collidesWith(collidable.getHitbox())) {
+                        collides = new Collision(collidable, other);
+                        collidable.onCollision();
+                    }
                 }
             }
         }
@@ -245,11 +267,11 @@ public class Master extends JPanel {
     }
 
     public void destroy(GameObject gameObject) {
-        objects.remove(gameObject);
         objectBuffer.remove(gameObject);
         drawables.get(gameObject.getLayer()).remove(gameObject);
         if (gameObject instanceof Collidable) {
-            collidables.remove(gameObject);
+            collidablesBuffer.remove(gameObject);
+            drawables.get(Hitbox.HITBOX_RENDER_LAYER).remove(((CollGameObject) gameObject).getHitbox());
         }
     }
 }
diff --git a/src/main/java/core/math/Coords.java b/src/main/java/core/math/Coords.java
index 858f04e..7a60ef1 100644
--- a/src/main/java/core/math/Coords.java
+++ b/src/main/java/core/math/Coords.java
@@ -1,7 +1,6 @@
 package core.math;
 
-import core.Master;
-import core.math.Vector2D;
+import core.general.Master;
 
 /**
  * This class provides everything about the local coordinate system the game uses
@@ -24,6 +23,7 @@ public class Coords {
 
     /**
      * Get the world coordinates of a point in map coordinates
+     *
      * @param value A point in map coordinates
      * @return The point in world coordinates
      */
@@ -44,4 +44,10 @@ public class Coords {
         double y = (value.y / master.getH()) * Master.SCREEN_Y_COORDINATES;
         return new Vector2D(x, y);
     }
+
+    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);
+    }
 }
diff --git a/src/main/java/core/math/Vector2D.java b/src/main/java/core/math/Vector2D.java
index fa8050c..caa05ab 100644
--- a/src/main/java/core/math/Vector2D.java
+++ b/src/main/java/core/math/Vector2D.java
@@ -4,7 +4,7 @@ package core.math;
 import java.awt.*;
 
 /**
- * A 2-dimensional Vector that can be used to store position or velocity
+ * A 2-dimensional Vector that can be used to store position or velocity or size or whatever
  */
 public class Vector2D {
 
@@ -44,6 +44,7 @@ public class Vector2D {
         return new Vector2D(point.x, point.y);
     }
 
+
     /**
      * Add another Vector to this vector, modifies this object
      *
@@ -123,6 +124,17 @@ public class Vector2D {
         return new Vector2D(a.x - b.x, a.y - b.y);
     }
 
+    /**
+     * Divide a Vector by a scalar
+     *
+     * @param a Vector a
+     * @param b Scalar b
+     * @return The result
+     */
+    public static Vector2D divideS(Vector2D a, double b) {
+        return new Vector2D(a.x / b, a.y / b);
+    }
+
     /**
      * Rotate a point around another point
      * <p>
diff --git a/src/main/java/core/objects/base/DebugPos.java b/src/main/java/core/objects/base/DebugPos.java
index 3299c63..d13c840 100644
--- a/src/main/java/core/objects/base/DebugPos.java
+++ b/src/main/java/core/objects/base/DebugPos.java
@@ -1,5 +1,6 @@
 package core.objects.base;
 
+import core.math.Coords;
 import core.math.Vector2D;
 import core.objects.core.GameObject;
 
diff --git a/src/main/java/core/objects/core/CollGameObject.java b/src/main/java/core/objects/core/CollGameObject.java
index 4a1c161..3213694 100644
--- a/src/main/java/core/objects/core/CollGameObject.java
+++ b/src/main/java/core/objects/core/CollGameObject.java
@@ -5,12 +5,16 @@ import core.objects.core.GameObject;
 import core.physics.Collidable;
 import core.physics.hitboxes.Hitbox;
 
+import java.util.ArrayList;
+
 /**
  * A specialization of GameObject with Collidable properties
  */
 public abstract class CollGameObject extends GameObject implements Collidable {
 
     protected Hitbox hitbox;
+    protected ArrayList<Class<?>> ignores = new ArrayList<>();
+    protected boolean isTrigger = false;
 
     public CollGameObject(Vector2D position, Vector2D size, Hitbox hitbox) {
         super(position, size);
@@ -54,4 +58,18 @@ public abstract class CollGameObject extends GameObject implements Collidable {
     public Vector2D getSize() {
         return size;
     }
+
+    @Override
+    public void onCollision() {
+    }
+
+    @Override
+    public ArrayList<Class<?>> getIgnores() {
+        return ignores;
+    }
+
+    @Override
+    public boolean isTrigger() {
+        return isTrigger;
+    }
 }
diff --git a/src/main/java/core/objects/core/GameObject.java b/src/main/java/core/objects/core/GameObject.java
index 3ebe307..d0b7eb1 100644
--- a/src/main/java/core/objects/core/GameObject.java
+++ b/src/main/java/core/objects/core/GameObject.java
@@ -1,18 +1,20 @@
 package core.objects.core;
 
 import core.math.Coords;
-import core.Drawable;
-import core.Master;
+import core.general.Drawable;
+import core.general.Master;
 import core.math.Vector2D;
 
 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)} methods that have to be
+ * {@link #update()} and {@link #draw(Graphics2D)} methods that have to be overridden
  */
 public abstract class GameObject implements Drawable {
 
+    protected boolean doesDespawn = true;
+
     protected Vector2D position;
     protected Vector2D size;
 
@@ -37,6 +39,12 @@ public abstract class GameObject implements Drawable {
         this.layer = 0;
     }
 
+    public void startUpdate(){
+        if(Coords.outOfBounds(position, size)){
+            destroy();
+        }
+        update();
+    }
 
     /**
      * <p>The update method is called every frame before the {@link #draw(Graphics2D)} method by the master object on each object. Everything
@@ -99,7 +107,12 @@ public abstract class GameObject implements Drawable {
 
         Vector2D abs;
 
-        abs = (arg.contains("center")) ? Coords.getWorldCoords(getCenterPosition()) : Coords.getWorldCoords(position);
+        if(arg.contains("center")){
+            abs = Coords.getWorldCoords(new Vector2D(position.x - size.x / 2, position.y - size.y / 2));
+        } else {
+            abs = Coords.getWorldCoords(position);
+        }
+
         Vector2D sizeAbs = Coords.getWorldCoords(size);
 
         g2d.setPaint(mainColor);
@@ -121,7 +134,6 @@ public abstract class GameObject implements Drawable {
         g2d.fillRoundRect((int) abs.x, (int) abs.y, (int) sizeAbs.x, (int) sizeAbs.y, arcW, arcH);
     }
 
-    @Deprecated
     public void destroy() {
         master.destroy(this);
     }
diff --git a/src/main/java/core/physics/Collidable.java b/src/main/java/core/physics/Collidable.java
index 91f153c..1091f6e 100644
--- a/src/main/java/core/physics/Collidable.java
+++ b/src/main/java/core/physics/Collidable.java
@@ -3,10 +3,14 @@ package core.physics;
 import core.math.Vector2D;
 import core.physics.hitboxes.Hitbox;
 
+import java.util.ArrayList;
+
 public interface Collidable {
 
     Hitbox getHitbox();
     Vector2D getCenterPos();
     Vector2D getSize();
-
+    void onCollision();
+    ArrayList<Class<?>> getIgnores();
+    boolean isTrigger();
 }
diff --git a/src/main/java/core/physics/hitboxes/Hitbox.java b/src/main/java/core/physics/hitboxes/Hitbox.java
index 00eb65f..4f005fa 100644
--- a/src/main/java/core/physics/hitboxes/Hitbox.java
+++ b/src/main/java/core/physics/hitboxes/Hitbox.java
@@ -1,11 +1,12 @@
 package core.physics.hitboxes;
 
-import core.Drawable;
+import core.general.Drawable;
 import core.math.Vector2D;
-import core.physics.Collision;
 
 public abstract class Hitbox implements Drawable {
 
+
+    public static final int HITBOX_RENDER_LAYER = 1;
     private final boolean isTrigger;
 
     protected Hitbox(boolean isTrigger) {
diff --git a/src/main/java/core/physics/hitboxes/RectHitBox.java b/src/main/java/core/physics/hitboxes/RectHitBox.java
index bab67d0..866c9ca 100644
--- a/src/main/java/core/physics/hitboxes/RectHitBox.java
+++ b/src/main/java/core/physics/hitboxes/RectHitBox.java
@@ -1,7 +1,7 @@
 package core.physics.hitboxes;
 
 import core.math.Coords;
-import core.Master;
+import core.general.Master;
 import core.math.Vector2D;
 
 import java.awt.*;
@@ -31,7 +31,7 @@ public class RectHitBox extends Hitbox {
         this.x2 = Vector2D.add(x1, new Vector2D(size.x, 0));
         this.y1 = Vector2D.add(x1, new Vector2D(0, size.y));
         this.y2 = Vector2D.add(x1, new Vector2D(size.x, size.y));
-        Master.getMaster().addDrawable(this, 1);
+        Master.getMaster().addDrawable(this, HITBOX_RENDER_LAYER);
     }
 
     /**
@@ -46,7 +46,6 @@ public class RectHitBox extends Hitbox {
         this.x2 = Vector2D.add(x1, new Vector2D(size.x, 0));
         this.y1 = Vector2D.add(x1, new Vector2D(0, size.y));
         this.y2 = Vector2D.add(x1, new Vector2D(size.x, size.y));
-        Master.getMaster().addDrawable(this, 1);
     }
 
     /**
@@ -166,10 +165,10 @@ public class RectHitBox extends Hitbox {
         return y2;
     }
 
-    @Override
+/*    @Override
     public String toString() {
         return "RectHitBox{" + x1 + " " + x2 + "\n" + y1 + " " + y2 + "}";
-    }
+    }*/
 
     @Override
     public void draw(Graphics2D g2d) {
@@ -177,7 +176,7 @@ public class RectHitBox extends Hitbox {
         Vector2D abs = Coords.getWorldCoords(x1);
         Vector2D sizeAbs = Coords.getWorldCoords(Vector2D.subtract(y2, x1));
 
-        g2d.drawRect((int)abs.x, (int)abs.y, (int)sizeAbs.x, (int)sizeAbs.y);
         g2d.setPaint(Color.MAGENTA);
+        g2d.drawRect((int)abs.x, (int)abs.y, (int)sizeAbs.x, (int)sizeAbs.y);
     }
 }
diff --git a/src/main/java/objects/GameObject.java b/src/main/java/objects/GameObject.java
new file mode 100644
index 0000000..6234486
--- /dev/null
+++ b/src/main/java/objects/GameObject.java
@@ -0,0 +1,67 @@
+package objects;
+
+import core.general.Master;
+import core.math.Vector2D;
+
+import java.awt.*;
+
+/**
+ * The GameObject class is the superclass of every GameObject that can be displayed on screen. It has the 2
+ * {@link #update(Master)} and {@link #draw(Graphics2D, int, Master)} methods that have to be
+ */
+public abstract class GameObject {
+
+    protected int w;
+    protected int h;
+
+    protected Vector2D position;
+    protected Vector2D size;
+
+    protected Vector2D velocity;
+
+    public GameObject(double x, double y, double xSize, double ySize) {
+        this(new Vector2D(x, y), new Vector2D(xSize, ySize));
+    }
+
+    public GameObject(Vector2D position, Vector2D size) {
+        this.position = position;
+        this.size = size;
+        this.velocity = new Vector2D();
+    }
+
+    public abstract void draw(Graphics2D g2d, int w, Master master);
+    public abstract void update(Master master);
+
+
+    public double getMapCoords(double value, boolean isX){
+        if (isX){
+            return (position.x + value / 100 * size.x);
+        } else {
+            return (position.y + value / 100 * size.y);
+        }
+    }
+
+    public double getMapCoordsSize(double value, boolean useX){
+        if (useX){
+            return (value / 100 * size.x);
+        } else {
+            return (value / 100 * size.y);
+        }
+    }
+
+    public double getWorldCoords(double value, boolean isX){
+        if (isX){
+            return (value / 100 * w);
+        } else {
+            return (value / 100 * h);
+        }
+    }
+
+    public int getWorldCoordsFromLocal(double value, boolean isX){
+        return (int) getWorldCoords(getMapCoords(value, isX), isX);
+    }
+
+    public int getWorldCoordsFromLocalSize(double value, boolean useX){
+        return (int) getWorldCoords(getMapCoordsSize(value, useX), useX);
+    }
+}
diff --git a/src/main/java/objects/ships/BattleShip.java b/src/main/java/objects/ships/BattleShip.java
index 6a036dd..999d06f 100644
--- a/src/main/java/objects/ships/BattleShip.java
+++ b/src/main/java/objects/ships/BattleShip.java
@@ -14,10 +14,9 @@ public class BattleShip extends GameObject {
 
     public BattleShip(Color mainColor) {
         this(20, 20, 10, 40, mainColor);
-        //TODO turret size should use w and h but correct just like with world coords
-        turrets.add(new Turret(this, 2.5, 10, 5, 3));
-        //turrets.add(new Turret(this, 25, 10, 50, 2));
-        //turrets.add(new Turret(this, 25, 70, 50, 2));
+        turrets.add(new Turret(this, 2.5, 7, 5, 3));
+        turrets.add(new Turret(this, 2.5, 15, 5, 3));
+        turrets.add(new Turret(this, 2.5, 25, 5, 3));
     }
 
     public BattleShip(double x, double y, double xSize, double ySize, Color mainColor) {
diff --git a/src/main/java/objects/ships/Shell.java b/src/main/java/objects/ships/Shell.java
index 991cf83..3c82ae7 100644
--- a/src/main/java/objects/ships/Shell.java
+++ b/src/main/java/objects/ships/Shell.java
@@ -1,20 +1,23 @@
 package objects.ships;
 
 import core.math.Vector2D;
-import core.objects.core.GameObject;
+import core.objects.core.CollGameObject;
+import core.physics.hitboxes.RectHitBox;
 
 import java.awt.*;
 
 /**
  * A shell fired by a cannon
  */
-public class Shell extends GameObject {
+public class Shell extends CollGameObject {
 
 
     public Shell(Vector2D position, Vector2D size, Vector2D velocity) {
-        super(position, size/*, new RectHitBox(position, size)*/);
+        super(position, size, new RectHitBox(position, size));
         this.velocity = velocity;
         this.mainColor = Color.ORANGE;
+        this.ignores.add(Shell.class);
+        this.isTrigger = true;
     }
 
     @Override
@@ -26,4 +29,10 @@ public class Shell extends GameObject {
     public void update() {
         moveTo(Vector2D.add(position, velocity));
     }
+
+    @Override
+    public void onCollision() {
+        destroy();
+        //master.debugPos(position);
+    }
 }
diff --git a/src/main/java/objects/ships/Submarine.java b/src/main/java/objects/ships/Submarine.java
index b9cfb6c..2b6dc4a 100644
--- a/src/main/java/objects/ships/Submarine.java
+++ b/src/main/java/objects/ships/Submarine.java
@@ -27,5 +27,4 @@ public class Submarine extends CollGameObject {
         Vector2D centerRelPos = new Vector2D(relPos.x - size.x/2, relPos.y - size.y/2);
         moveTo(centerRelPos);
     }
-
 }
diff --git a/src/main/java/objects/ships/Turret.java b/src/main/java/objects/ships/Turret.java
index 86e480d..6ca7943 100644
--- a/src/main/java/objects/ships/Turret.java
+++ b/src/main/java/objects/ships/Turret.java
@@ -81,8 +81,8 @@ public class Turret extends GameObject {
 
         Point msLoc = master.getMouseLocation();
         Vector2D mouseRel = Coords.getMapCoordsFromWorld(Vector2D.fromPoint(msLoc)); //100 correct
-        Vector2D center = battleShip.getMapCoords(getCenterPosition());
-        double targetRotation = -Math.atan2(center.x - mouseRel.x, center.y - mouseRel.y);
+        Vector2D centerMap = battleShip.getMapCoords(getCenterPosition());
+        double targetRotation = -Math.atan2(centerMap.x - mouseRel.x, centerMap.y - mouseRel.y);
 
         rotation = ExMath.angleLerp(rotation, targetRotation, ROTATION_SPEED);
 
@@ -98,14 +98,13 @@ public class Turret extends GameObject {
                 lastShot = System.currentTimeMillis();
 
                 Vector2D shellVel = Vector2D.getUnitVector(rotation).negative().multiply(SHELL_SPEED);
-                master.debugPos(battleShip.getMapCoords(center));
-                master.debugPos(center);
+                //master.debugPos(centerMap);
                 Vector2D pos = Vector2D.rotateAround(
-                        battleShip.getMapCoords(center),
+                        centerMap,
                         spawnPosNR,
                         rotation);
 
-                master.debugPos(pos);
+                //master.debugPos(pos);
                 master.create(new Shell(pos, new Vector2D(SHELL_SIZE, SHELL_SIZE), shellVel));
             }
         }
diff --git a/target/classes/BasicEx$1.class b/target/classes/BasicEx$1.class
deleted file mode 100644
index fd3f4b91be4be388cc75c6af3a78569475cf0c10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 660
zcmX^0Z`VEs1_mnz4Ne9o24;2!79Ivx1~x_pPN&4;%w*RJ6+=b_wvvp@Vif~M22LNS
zs5KV@2LmTN0~ZeiHv<nNgLGD6S)zVod5L~%S!!O1zHfeMajIiVVnIo25hDYeO=ezZ
zi5(*Yvxa6ECj%b?KRbf}4}&0s5F-OS)I>%Gw%o*GuyS6X<ou#keP1xwnu|e%L6n_A
zjE6xSWD_@%93ulyF36&QqSWHz)D%Vr9u2qyHNzMgSe)}yQW+WeeKPY>{YrC_Qj0<o
zlX6lS8H9ZDlM{2o5{oiHe5fD`$d`-^+%O|l46PX%<TQM+dCe8%OKXrFjH!$a(s<M`
zGH?awmlh?bx@CfF=7D-w4`eDM1HWrta!!76W?s5)YDq?Z3J-%S$dhcK@Cx;0WZ>{i
zEiUoMFD_wZ;PK4MOD%HFNh~f-EoM+)U}E54U|?Vr5CFv&0|NsS0|Ns$g9HO3gCqk3
zgB=4CScFSUdn*H@)^-N=jbJrW3=9lx42%p64Dt-p3=9ln5LFB^46+O$zy&sqk%5sx
zoIwt1mNNq*SQWR{76!&G47}SIgb{{ufu)ofxEPd?4CICz$ju<npuoV$z`~#ic7PIt
dG6Mqx3j-g63WFM0gpWa;fq{VwY6$}a0{}4ze&zrG

diff --git a/target/classes/BasicEx.class b/target/classes/BasicEx.class
deleted file mode 100644
index 296712bcb07a66f56d3acaa35b971e284500e829..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2155
zcmX^0Z`VEs1_mpJ8ZHJV24;2!79Ivx1~x_pp{&HR#0vf5^31$+eJ{77#N1Ry1~!|_
zyv!0iMh0dL%`h$o4hBwk1}+{3Zjc6cr^MpSWY-Et1~!nQP)~LSUPcB%WMe`yb5o0i
z7#JA%c^Cv31Q{9l6O&6a^Ya2yi_-Foa#K?n8MHKfpypU>`hfK6CzhA!r<SGWmFPQy
z75iism!#&U7FlyK@GuC2Tr0xJpse9ZK(%HVCj$qA7!QLug9IZ3YYE6Hj10nHT`+Hg
z-3K;TiibfO<SEwTlEk7Cb_Q8S2JYniqEvm~#Nv|FA}$6Q24;|X3Oo#o3`&d)Y`I`@
zMh0FVBxTm1AX4FBP-ReKWMEEAf%p&ZE9d;&g8aPHyb@%uA_O@YG#DA!0`fESN{T@S
zY4I><Gw3ifa1^JOgk+ZFq%tyyYJlCZpOcuEt{+@dl$n=q4T%^%9tM2|14ah+;?$Dh
z%&JsI238GEPl%im4}&p-2_u7OacYTAesUrx3W8E|5=%16QbY0?8N{Kcf<hkQ9Ee^s
z9tLv;3q}Ts;?xqC)U?FXoD%1p{Nhyqg480gL5vJ68lIYA><m_n44lxYR59dYuw<|S
z#g#210}oOZgA<WG4}$}PBO`-AVoHi{era(kEQ%Q!6p@?)NdzbgtTn@g7#JCxc^F(6
zTp1adi%Rnt8N@W8DF+-XL8W<liAg!B)?5tk3?A$Zo;(a*4Bm_k!tiKt1tqS)($vya
zMh5Q8yt4f4RG-9>)FMPcpc(`T2xd@}`0+6KGXyX)a22PPgk=_ICV?V_MI#ENM1~=V
zhani0h}er#(~44yGZ-0Iobyvs85#I}GV@aXN^_G^i$XwdV`LBl#Y0Y5Vo@fD4;5r7
z$;d2bWZ;D72u22$+{8?<7o)L7JR<{3Vo`cABZDv&X+{R#oW$IultdMf87hX13{0sN
zj0`+b!MxOR6$3^Fd5i#u<T`L5S!;$dGBBnxGRQz|2PF_ltRO35WZ(+UFD*(=b;|?=
z2M;t6=z#*9k%8MUwYbDL73B9~Mg{?={QQ#QlA^={-_(+f{FGvTHiir?hD?Smc7|*o
zh8%`mMg}F2Mo1Ee#E!lX*dM;BC5dT?$tC$km5dDBxyZaTP+x!}4yp-afk$FqN=|CA
zicfxic4>h%#2;W~(CmXGf}$~`vLF>%Iq{MZEAi_^PO(svofC6%f-_4}tpyko_}Li>
zK<TZJhasLJL4bjcpN*jeBv8u35DQ9TJf3-ZsYT8?iN(dK#q10fj0~z6p@uC0*cqxA
z8RYOQWn^H3gcgGW0|x^W0|OW<GAJ>CfH;E$0|Nsq10$%~U|?hjVPIg01@jpgl(n`q
zFludMVAtBsz!NDTptXyEkAY!3gV0t6QLQZuqT3iGH-e1|Wnf?sV_;=qVBlq7Vc=un
zVBlwvW)NafVi0BsV_;z5VPIrnU{GcVXNUl+=VoAoTGhzF0+zGZ+RY#nxt&37D}%h2
z))of&Z4AocT0-jE7&Ns6*&GC!TedOiYB6qOFw|n(#$c+oo53<tYdeGWHU>L{6O<S@
z7#JAD8MqlF7(^JP7^E1a8B`c#7&IAV8T1(B8LSvok(^@<bq*&(BtsO`Ipz$EVCQh|
zVsK($*umh2FdS6BGB9W|a4_g08N$gB%@D)DAixERN2nnV3`}4{_;xdJL~dvB@z!G5
z#^8%EiI0Jqfq_ArfrCMZftNuSZW;#z8$%o@ganvC$pmg1BRIl1AfXb7FbCoy0S0yk
zL9iKO5Oq**F)(m2Br+s1Ffy<(B!fdeg&~!J0UX|z3~AsPV`4~WU}nf;$Y;m{vx*ps
d8HyOn7#J9Y7?>C=LFt2mfuWqClA)SG5&-JV_*?)0

diff --git a/target/classes/core/Master.class b/target/classes/core/Master.class
index e0c9a966bfc347574001c976f913239a25eec841..1d8e907d7e474bfc4be46086601aa494049e3fad 100644
GIT binary patch
delta 4701
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

delta 3528
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

diff --git a/target/classes/objects/DebugPos.class b/target/classes/objects/DebugPos.class
deleted file mode 100644
index 1dfedb2beabc7aae4dd400993a44f5a99c619e51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 876
zcmX^0Z`VEs1_mnzV=e|J24;2!79Ivx1~x_pq2&CcRQ=q<k_`Q@)Z~)<A|n?@2A1Uf
zf=WgPF%3;0OlfN_1`Y;Jb_OmU25tr(Mh5Zxq^#8Bl45<ZQuoB%RDZAlBLkaFW?p8A
z9V3Ib1~zlBiD`y`+{XtpnxBz@Swl07lR=O{h@C;0he3ovl#xLIW}8cDQfYcXela5h
zM_Fo4esX3>B_o3fHZwUH#2F;m86<faq!^?b8Thgi%M$ey%S-f~^K<fx7#UdIgIrzx
z7#Re7P-Uz^R?G4*$bocm<|bz5fi-Y2C@?axC8y?<q!w{82r?+~Feo#qFfwqY6eX7X
zmnG&fGH7WajB+nZEXc@AE;e$ph6v^)=B4WgmlS2@rCV!;F*2|?=clAHGVuFk=B4_T
z<|d^Ug(N2Bq%txH`Q#@j=7c2{WrFxnL6(w?%wn({IFO6=Vc}rS$iPvMUz}NznV-kV
zz*3x9mCDG#0&){0g9LW>fNW<@H%eh-5QR7m6evjUWn^G0El5c$No8c<3eGPrN=|jl
z1UZZsW~Uw~z!(%61Q|FOK!BNn5tJqv7#UO<7#PwRm>HNE7#L)<w6`%Z>TG9V*V@g%
z6uF&&cPoQ{)+PqAtqd|785kIt7}OXT7=##D7#J9M88{jE7(^KO8KfBm7}OaU7!)98
zFlaDnf~;VWVbEd_WncuE%b?95%D}|H$e_cZ3$@dMfti7cfq{WTOIt{O8-pUkd{DY#
zU=U$oXAlLOD+W;qH<yD!k3pY-k%5uHfPo)snl=Li*d|7VF>GJ~Nw5(-U^XMv2u21&
HuxE?_G!wGU

diff --git a/target/classes/objects/ships/BattleShip.class b/target/classes/objects/ships/BattleShip.class
index 431889524f545f62be0d0109726e01c7ede5cc46..66e57a4f43e3b41c3eaee4ca4051947900a0037d 100644
GIT binary patch
delta 1021
zcmZn=x+BDO>ff$?3=9m`40RK^woAz{fB~C>2$*KzVi07I;$h%ske+x+ja!yMj-5fC
zhe3fsaWXTbi8`Bu9z+?NgC&H)#h}ih!Ooxw(xS!4Ad{S5l&U}3ol#jrmO%$3sLRN}
ztf3jk$-u#&&%<EAU^uynQJKw{hrxuwbn<FOX>M}{3w8!e9tJB0>&X`x<=Jd`80;AA
zCx2r!WOL+UaAI(ttjpxYA<N*(!{El?KDnI9kj)b$?lpNGlNy^34}&j*-{xCPCmH!N
zxfrq-ve_AOco=dS@-}Z|VPRw}m@LmIZWPAP#!$q?z`;<=!;s97BEXQq&&p5+@@qK{
zLmY!HBLk0TUS4XEb53G$acVI;L)GN}tXeEJj0|#<?ODYqv9eG0X5-UUXJBApWDsKD
zXAoduWbkKTU|?bhU|?flWZ-59WME_nVqjoc!obbI#K6FiFu9FQzFt&>L7Z(ngXA^_
znQ*Nw47|G;1S7RX7=%R_lyJ(ZAjxb5+Y!vbz#zuJ%D})Nz#zyV$e_(2#Nf&x%n;8Y
z!Vm(M1KY?D$`A&Ql>|^YGcYnRaxic+@PHgP`2(A1y_(i;2HD8%4BA^6c(o)sw=(D<
zj2B{HVPIeoXW(LxU=U@HWRPZ%0vm0|z{bG9AOkmAh9R6Gf`Jh%7ReC7zzk+ZF+_l!
zC&LiU5W&C>7BgTlWZ-0A1Vs<X1q=-J49N_v;IL8G($?C-V6=_FOn@r~!P>@P0}3PU
zT?`Hk4BHr75U%3`+au2)$)LcX#-IpxnHa<<xXaWTVi;mUo(4rI#6|{d1}3muc|qpZ
z?_%&kGnWf&hAIOOgBsXOP*^cA@IuXGWQb=-fSTmQzywyy1u{t+6rBjyK}^wP;AGGO
zn*wne7t|C61}=s~h9m~YIsq<F;)5D!1vQXOTWcGGH^MMbYGPneKr)C8>@iTpvOx@D
sU}i`Kr;9X(bZG2nFfcRZGZZqEFhE$P3?&Q|3?Qo+87dj78EP3M0p3rAS^xk5

delta 964
zcmca3)F8xl>ff$?3=9lb3>6c(whMYPfB_eSAcF)C12==@#M^4z(hM@}46-~7at!j5
zc^FLuxEK@}l-L=RK?+nD8N?^2Gb&3+GpK?1>WmD`8k%983>*xaJPcY4+LISCDzoYG
zFz7MpPd?2k&27kF#Li&M!(hT-I{71`JexTWg9U@-WHBZ~HftUR8wT6SzD!OW(hT-I
z3=RyAlczHovN?mqT_&GnQe$)DVQ^>g*!+v>BqLuk7efj|Dmz0O4?{Xb#^#GGER0@R
zj0~b0K3R!niTXK-dFlH8Nm;4MCDxi@{A>(4TnroxxjYQ93~>SsQT(h71t4!0@-Rd&
zs53I~c;@A$7CGl678j=$von-TmS@vqDPv@in;g$7K3Rd4eR4J%pROVU0|O(25CcDh
z00ScfD72UuycpOR7#X-3ycrl7d>9xQG8niSm>3usbS5ujldoqMVGw28&LF;xK`MMB
z0|NsSgD(RE10Mr30|SEqgCK(tgEoUGgC7F}gBU~?gFiz6I1+R~!N<S|Hk$`(b_)Y1
z0~Z4WgN&BCrUa`5`*sEet=$aLk=q$mw=(c*Npfyw&_LKC#K2O|z`!8Ez{McRAj%-c
zAk82Rw#try4P*%1Dj9}Ah9Cw;uvjod5ZG}t3?U3b46I<WP=+7|b}&neL7Rb-fsw(T
z!2{}~WCm8S!_~F4wYD(mY-2DG;L3rs>T|X+m}zZc;MLy6V8y_&jlmA#JV+oYFi0{e
zGN>^qfn5d(1a-K})EUAU!oh(M!JrPc(VBq?>{ecoxw{yg(2V5*J4cOyhe4ge59EJP
z;4v`pLd|4kh-8R@n&ia51Xj!iGD#aXiXg^lF>o?yBe{$VY6=4b7eh2d3<IM87brnN
z&9j1<$EK~djlmV<(|AaHgHi|sgCdeaY+#RpBAN|i5CbzqJUD$MFeE}#LlOfsLncEu
aLmmT!mCumJP{aVTnvtQHp_HMVK@tGS6M8QI

diff --git a/target/classes/objects/ships/Shell.class b/target/classes/objects/ships/Shell.class
index 5c94f50dbb685bf3694ea5916da29a1b9ab3cff4..a6e08cab799ecf60c96b07b3e46a1ec5483a3559 100644
GIT binary patch
delta 887
zcmcc5{({Tu)W2Q(7#J9=8NAsUm>3xplJkpF^$Rj8i!+mp^)oU{lJYB3i}iz2lS@1@
zOPum6xEL52Sa=v%8Q3Nonj3R5a4>MPGjM?fxM8~Uld@8iON#ZuMmgu_<hUp1ruu^g
z85uk$A7m7r{DDzQ9m5h2ux-|wVVn%S41DYi{5%W-41yC&t+<65MA#Wbc^JeP#3%03
zujgfu<YACv5NBlI%uUS9bI#AnF9PY2;bD+vkYi+E&rHwDFG?+DWDxbqN-Rs%FD=Q;
z(RVB=O04wBEH1I;Vo+dEWM@#~VNhmJVPp`-qK1)yIWZ-LkwH`gVnR-0Ub;TS57ug$
zQ6SsYco@_fG#D8;GmArtGSkyjix?RgqqrD&8MJs9v>9|JvomTa@G|J}Fz7P~GBR)!
z<QHd_Waj5_F&Hu!u`?KhY&V(g&nV7l2MrUE$<r9cId~b&co@tXEGBPdRF(x9XT`%{
z&0xdGz@Cy?TvC)@$;iO0p&7==U=P){uAVy|6bLz)#hLkej0{}C`K3k4scxA$sUS{9
zYEF(G$cqe$47>~+3?RV5z{tSLV9UVBV8_6~(9Xclz{0@5psl5?vzvi2Qd?&`1M_wU
zb}ikl3_Mz!7=*SmNN8<gkQU<I#vmWA#j=$_bt3}<0~3Qi0|SE;16w@<1A_nqKZ78H
z2!jxVG=ngMDuW1v7K12*0|Ntt7Q}1@M+PU5)ePF8@L*sB*~j3_AjrT3W(hC|GB7hR
zGPp44KwV|Wzyy|K)6(9?poy@M3oI(hz{(&6HeZaP9%KX?+yXWRR|Yo*Mg~R(cLp1{
zVIad97zDJmwlL^wZDHWq!C<hB!4%zCIR<_Pd9blOU?&PdO=V>8fSY9uHk*NgRcjlA
cCCC6>NJu~&rp&;?po(MyE8GN6aF}@k0Bhr$@Bjb+

delta 519
zcmaFCb)Vhv)W2Q(7#J9=7)-esm>8JZ8CZB2SQ*$D8N~CGvQm>viuIH8i&FL76LVAj
z!2%Pl%y~H(I2btD8Mt^DxEXjR{<7lcW8i0J5a3}DWDuHc&!{iQ!63rJAj%-b$iSJK
zn3?CCpOat2#lXQJ&ch(VAURo>NyD0hL7Im_hJlBXfukV5II|=(KaYz+jzONCL4k)s
zkwJ-(K?rPfZemG>epqU9Nq&)$3nK$_VoJ*70w!k;4h9t-22}>N$-9}9Sr{4YH6{x%
zgRsbC3+6T!W)01-$)}iQ>p2*h7(jrTfsuigL7jn-L4$#TA)SGlfrWvAL0C&$XFCI<
zmhM&tcCAeeyjvNBH!?6VFfnK{Ffa&#l?XDhF$ghmGYB&XF^Di|F)%P_fyIRxv>9|j
zCNl_wyurW-GLAu)fd_1%Feqdgm>KFB8T1$=p|;vFFo7l6w6wP|h#@Qjg**d;1OqFB
zB-jEmh$^@RYz+Dg1`Lc0j0}bhMsTx0K4M@H(9+t%Af>g1fqe&q>^25vG*gurWEuDw
U<iN)AfZZqnHI|XV80=FM0Kcd~s{jB1

diff --git a/target/classes/objects/ships/Turret.class b/target/classes/objects/ships/Turret.class
index 47a3d557913e05b9d301f3310af01e093e7b746d..bc981b0276702ed173f2b8baf17f407f24e78fa1 100644
GIT binary patch
delta 2345
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
PN&%B0Dc~NsEW8f@n~wx2

delta 2551
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

diff --git a/target/classes/objects/world/Grid.class b/target/classes/objects/world/Grid.class
index c26fd1ec5ac4ace63db08fc0404f249b813e597e..488ac1a3802f0a77b5a20698efd14ccf897ee01d 100644
GIT binary patch
delta 40
vcmZqX?BJ9?^>5cc1_lOe274|BCI)791{NL$Rt7dk2ASmiqE!8jQkg6Ozsv|#

delta 35
qcmeC+Z03|Y^>5cc1_lNz274|BCI)791{NL$Rt7dk2JwyZnJfU8X9jlw