Changes in src/com/example/helloandroid/Planet.java [8a4e64f:159eef8] in galcon-client

File:

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

src/com/example/helloandroid/Planet.java

@@ -1 +1 @@
 package com.example.helloandroid;
-
-import java.util.ArrayList;
 
 public class Planet {
         int radius;
         int regenRate;  // ships per second
-        private int x;
-        private int y;
+        int x;
+        int y;
         int faction;
         int numShips;
@@ -29 +27 @@
         }
         
-        public int getRadius() {
-                return radius;
-        }
-        
-        public int getNumShips() {
-                return numShips;
-        }
-        
-        public void setNumShips(int num) {
-                numShips = num;
-        }
-        
         public void update() {
                 //regen ships if not owned by faction 0
-                numShips++;
         }
         
@@ -49 +34 @@
                 
         }
-        
-        public boolean collides(Planet p) {
-                double dist = Math.sqrt(Math.pow(this.x-p.x, 2) + Math.pow(this.y-p.y, 2));
-                
-                return dist <= this.radius + p.radius;
-        }
-        
-        public static boolean collisionDetected(Planet p, ArrayList<Planet> curPlanets) {
-                for(Planet p2 : curPlanets) {
-                        if(p.collides(p2))
-                                return true;
-                }
-                
-                return false;
-        }
 }