Changes in / [8a4e64f:3e9f39e] in galcon-client

File:

• src/com/example/helloandroid/Fleet.java (modified) (3 diffs)

src/com/example/helloandroid/Fleet.java

@@ -1 +1 @@
 package com.example.helloandroid;
 
+import java.math.*;
+
 public class Fleet {
-        int x;
-        int y;
-        double direction;
-        Planet destination;
-        int numShips;
-        int faction;
+        private int x;
+        private int y;
+        private double slope, xIntercept; 
+        private double direction;
+        private Planet destination;
+        private int numShips;
+        private int faction;
         
+        /* Optimising: pre-calculate paths */
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
-                x = source.getX();
-                y = source.getY();
+                //Calculate initial coordinates and direction 
+                if(destination.x - source.x != 0){
+                //line formula 
+                slope = ((source.y - destination.y)/(source.x - destination.x));
+                xIntercept = destination.y - (slope*destination.x);
+                
+                //direction
+                direction = 1/Math.tan(slope);
+                
+                //coordinates for all 4 coordinates
+                if(destination.x - source.x < 0 )
+                        direction += Math.PI;
+                
+                x = (int)((Math.cos(direction)*(source.radius + 10) + source.x));
+                y = (int)((Math.sin(direction)*(source.radius + 10) + source.y));
+                } else {
+                        if((destination.y - source.y) > 0 ){
+                                direction = Math.PI/2;
+                                x = destination.x;
+                                y = source.y + source.radius + 10;
+                        } else {
+                                direction = 3*Math.PI/2;
+                                x = destination.x;
+                                y = source.y - source.radius - 10;
+                        }
+                }
                 
                 this.numShips = numShips;
@@ -18 +46 @@
         }
         
+                
+        public int getX() {
+                return x;
+        }
+
+
+
+        public void setX(int x) {
+                this.x = x;
+        }
+
+
+
+        public int getY() {
+                return y;
+        }
+
+
+
+        public void setY(int y) {
+                this.y = y;
+        }
+
+
+
+        public double getDirection() {
+                return direction;
+        }
+
+
+
+        public void setDirection(double direction) {
+                this.direction = direction;
+        }
+
+
+
+        public Planet getDestination() {
+                return destination;
+        }
+
+
+
+        public void setDestination(Planet destination) {
+                this.destination = destination;
+        }
+
+
+
+        public int getNumShips() {
+                return numShips;
+        }
+
+
+
+        public void setNumShips(int numShips) {
+                this.numShips = numShips;
+        }
+
+
+
+        public int getFaction() {
+                return faction;
+        }
+
+
+
+        public void setFaction(int faction) {
+                this.faction = faction;
+        }
+
+
+
         public void update() {
                 
@@ -24 +125 @@
         // attack the destination planet
         public void attack() {
+                if(numShips <= destination.numShips ){
                 
+                }
         }
 }