Changeset 1291908 in galcon-client

Timestamp:

May 28, 2010, 12:55:50 AM (14 years ago)

Author:

Zero Cool <devnull@…>

Branches:

master

Children:

5a03a06

Parents:

3e9f39e

Message:

Fleet attack function works now

Location:

src/com/example/helloandroid

Files:

• Fleet.java (modified) (3 diffs)
• Planet.java (modified) (1 diff)

src/com/example/helloandroid/Fleet.java

@@ -15 +15 @@
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
                 //Calculate initial coordinates and direction 
-                if(destination.x - source.x != 0){
+                if(destination.getX() - source.getX() != 0){
                 //line formula 
-                slope = ((source.y - destination.y)/(source.x - destination.x));
-                xIntercept = destination.y - (slope*destination.x);
+                slope = ((source.getY() - destination.getY())/(source.getX() - destination.getX()));
+                xIntercept = destination.getY() - (slope*destination.getX());
                 
                 //direction
@@ -24 +24 @@
                 
                 //coordinates for all 4 coordinates
-                if(destination.x - source.x < 0 )
+                if(destination.getX() - source.getX() < 0 )
                         direction += Math.PI;
                 
-                x = (int)((Math.cos(direction)*(source.radius + 10) + source.x));
-                y = (int)((Math.sin(direction)*(source.radius + 10) + source.y));
+                x = (int)((Math.cos(direction)*(source.radius + 10) + source.getX()));
+                y = (int)((Math.sin(direction)*(source.radius + 10) + source.getY()));
                 } else {
-                        if((destination.y - source.y) > 0 ){
+                        if((destination.getY() - source.getY()) > 0 ){
                                 direction = Math.PI/2;
-                                x = destination.x;
-                                y = source.y + source.radius + 10;
+                                x = destination.getX();
+                                y = source.getY() + source.radius + 10;
                         } else {
                                 direction = 3*Math.PI/2;
-                                x = destination.x;
-                                y = source.y - source.radius - 10;
+                                x = destination.getX();
+                                y = source.getY() - source.radius - 10;
                         }
                 }
@@ -125 +125 @@
         // attack the destination planet
         public void attack() {
-                if(numShips <= destination.numShips ){
-                
+                if(numShips <= destination.getNumShips()){
+                        destination.setNumShips(destination.getNumShips() - numShips);
+                } else {
+                        destination.setNumShips(numShips - destination.getNumShips());
+                        destination.setFaction(this.faction);
                 }
         }

src/com/example/helloandroid/Planet.java

@@ -41 +41 @@
         }
         
+        public void setFaction(int faction) {
+                this.faction = faction;
+        }
+        
         public void update() {
                 //regen ships if not owned by faction 0