Changeset c3ad11c in advance-wars

Timestamp:

Aug 26, 2011, 9:54:05 PM (13 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

511177b

Parents:

99433bb

Message:

Units are now colored based on the player that controls them. The controlling player is specified in the unit's constructor.

Location:

src/com/medievaltech

Files:

• advancewars/GameView.java (modified) (9 diffs)
• advancewars/Map.java (modified) (1 diff)
• unit/Artillery.java (modified) (2 diffs)
• unit/Mech.java (modified) (2 diffs)
• unit/Recon.java (modified) (2 diffs)
• unit/SmTank.java (modified) (2 diffs)
• unit/Soldier.java (modified) (2 diffs)
• unit/Transport.java (modified) (1 diff)
• unit/Unit.java (modified) (3 diffs)

src/com/medievaltech/advancewars/GameView.java

@@ -2 +2 @@
 
 import java.io.*;
+import java.util.*;
 
 import com.medievaltech.advancewars.Enum.*;
@@ -27 +28 @@
         public Turn mTurn;
         
-        //temporary variable to let the enemy control a specific unit
-        //ownership of units hasn't been implemented yet
-        public Unit enemyUnit;
+        public Player enemy;
+        private Unit selectedUnit;
         
         private int mCanvasHeight = 1;
@@ -35 +35 @@
 
         private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1,
-                                mTilePaint2, mSelectionPaint, mUnitPaint;
+                                mTilePaint2, mSelectionPaint, mUnitPaint1, mUnitPaint2;
 
         /** Indicate whether the surface has been created & is ready to draw */
@@ -44 +44 @@
         
         private com.medievaltech.gui.Window wndMainMenu;
-        private Unit selectedUnit;
         
         public DrawingThread(SurfaceHolder surfaceHolder, Context context, Handler handler) {
@@ -73 +72 @@
             mTilePaint2.setARGB(255, 0, 0, 255);
             
-            mUnitPaint = new Paint();
-            mUnitPaint.setAntiAlias(true);
-            mUnitPaint.setARGB(255, 255, 0, 0);
+            mUnitPaint1 = new Paint();
+            mUnitPaint1.setAntiAlias(true);
+            mUnitPaint1.setARGB(255, 255, 0, 0);
+            
+            mUnitPaint2 = new Paint();
+            mUnitPaint2.setAntiAlias(true);
+            mUnitPaint2.setARGB(255, 160, 160, 255);
             
             mSelectionPaint = new Paint();
@@ -106 +109 @@
             }
             
-            enemyUnit = new Soldier(mUnitPaint);
-            
-            mMap.getTile(0, 0).addUnit(enemyUnit);
-            mMap.getTile(2, 3).addUnit(new Soldier(mUnitPaint));
-            mMap.getTile(5, 6).addUnit(new Soldier(mUnitPaint));
+            Player humanPlayer = new Player("Human", mUnitPaint1);
+            enemy = new Player("Comp", mUnitPaint2);
+            
+            mMap.getTile(0, 0).addUnit(new Soldier(enemy));
+            mMap.getTile(2, 3).addUnit(new Soldier(humanPlayer));
+            mMap.getTile(5, 6).addUnit(new Soldier(humanPlayer));
             
             mTurn = Turn.YOUR_TURN;
@@ -184 +188 @@
                 switch(mGameState) {
                 case BATTLE_MAP:
-                        int x = thread.enemyUnit.location.x;
-                        int y = thread.enemyUnit.location.y;
-                        thread.mMap.getTile(x, y).removeUnit();
-                                thread.mMap.getTile(x, y+1).addUnit(thread.enemyUnit);
-                        mTurn = Turn.YOUR_TURN;
+                        Iterator<Unit> iter = enemy.getControlledUnits().iterator();
+                        Unit cur;
+                        int x, y;
+                        
+                        Log.i("AdvanceWars", "starting to move enemy units");
+                        while(iter.hasNext()) {
+                                cur = iter.next();
+                                x = cur.location.x;
+                        y = cur.location.y;
+                        
+                        Log.i("AdvanceWars", "moving enemy unit");
+                        
+                        //any unit that's in the way is removed (needs to be changed eventuallyy)
+                        thread.mMap.getTile(x, y).removeUnit();
+                                thread.mMap.getTile(x, y+1).addUnit(cur);
+                        }
+                        Log.i("AdvanceWars", "finished moving enemy units");
+                        
+                                
+                                mTurn = Turn.YOUR_TURN;
                         break;
                 }
@@ -295 +314 @@
                                         int y = Integer.parseInt(unit.substring(unit.indexOf(",")+1));
                                         
-                                        mGame.mThread.mMap.getTile(x, y).addUnit(new Soldier(mGame.mThread.mUnitPaint));
+                                        Player humanPlayer = new Player("Human", mGame.mThread.mUnitPaint1);
+                                        
+                                        mGame.mThread.mMap.getTile(x, y).addUnit(new Soldier(humanPlayer));
                                 }
                                 
@@ -328 +349 @@
                         }
                         
+                        Log.i("AdvanceWars", "Touch event handling finished");
+                        
                         break;
                 }

src/com/medievaltech/advancewars/Map.java

@@ -62 +62 @@
                                         Unit u = grid[x][y].currentUnit;
                                         //p.println(u.type);
+                                        //we also need to save the owner of the unit
                                         p.println(u.location.x+","+u.location.y);
                                 }

src/com/medievaltech/unit/Artillery.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Artillery extends Unit{
-        public Artillery(Paint p) 
+        public Artillery(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Mech.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Mech extends Unit{
-        public Mech(Paint p) 
+        public Mech(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Recon.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Recon extends Unit{
-        public Recon(Paint p) 
+        public Recon(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/SmTank.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class SmTank extends Unit{
-        public SmTank(Paint p) 
+        public SmTank(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Soldier.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Soldier extends Unit{
-        public Soldier(Paint p) 
+        public Soldier(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Transport.java

@@ -1 +1 @@
 package com.medievaltech.unit;
-
-import android.graphics.Paint;
 
 public abstract class Transport extends Unit {
         public Unit storedUnit;
         
-        public Transport(Paint p) {
+        public Transport(Player p) {
                 super(p);
         }

src/com/medievaltech/unit/Unit.java

@@ -8 +8 @@
 
 public abstract class Unit {
-        private Paint p;
-        
         public UnitType type;
-        //public Player owner;
+        public Player owner;
         
         public int maxHealth;
@@ -26 +24 @@
         public Point location;
         
-        public Unit(Paint p) 
+        public Unit(Player p) 
         {
-                this.p = p;
+                p.addUnit(this);
+                
+                owner = p;
                 maxHealth = 10;
                 currentHealth = 10;
-                
         }
         
@@ -87 +86 @@
         
         public void draw(Canvas c, int x, int y) {
-                c.drawCircle(x, y, 20, p);
+                c.drawCircle(x, y, 20, owner.getColor());
         }
 }