Changeset fea4b77 in advance-wars for src

Timestamp:

Jun 6, 2011, 6:07:43 PM (13 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

99433bb

Parents:

b660017

Message:

Implemented turn and support for computer-controller movement of units. Right now, the computer moves a specific unit down one square when its his turn.

Location:

src/com/medievaltech

Files:

• advancewars/Game.java (modified) (3 diffs)
• advancewars/GameView.java (modified) (4 diffs)
• 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/Unit.java (modified) (1 diff)

src/com/medievaltech/advancewars/Game.java

@@ -15 +15 @@
 
 public class Game extends Activity {
-        private static final int MENU_SAVE = 1;
-        private static final int MENU_MAIN = 2;
-    private static final int MENU_EXIT = 3;
-
-    /** A handle to the thread that's actually running the animation. */
     public DrawingThread mThread;
-
-    /** A handle to the View in which the game is running. */
     private GameView mGameView;
     
@@ -35 +28 @@
         super.onCreateOptionsMenu(menu);
 
-        menu.add(0, MENU_SAVE, 0, R.string.menu_save);
-        menu.add(0, MENU_MAIN, 0, R.string.menu_main);
-        menu.add(0, MENU_EXIT, 0, R.string.menu_exit);
+        menu.add(0, MenuOption.END_TURN.ordinal(), 0, R.string.menu_end_turn);
+        menu.add(0, MenuOption.SAVE.ordinal(), 0, R.string.menu_save);
+        menu.add(0, MenuOption.MAIN.ordinal(), 0, R.string.menu_main);
+        menu.add(0, MenuOption.EXIT.ordinal(), 0, R.string.menu_exit);
         return true;
     }
@@ -50 +44 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-                case MENU_SAVE:
-                        try {
-                                PrintWriter p = new PrintWriter(new FileWriter(android.os.Environment.getExternalStorageDirectory()+"/save.txt"));
-                                mThread.mMap.save(p);
-                                p.close();
-                        }catch(IOException ioe) {
-                                ioe.printStackTrace();
-                        }
-                        break;
-                case MENU_MAIN:
-                        mThread.mGameState = GameState.MAIN_MENU;
-                        break;
-            case MENU_EXIT:
-                finish();
-                break;
+        int i = item.getItemId();
+        
+        if(i == MenuOption.END_TURN.ordinal()) {
+                mThread.mTurn = Turn.ENEMY_TURN;
+        }else if(i == MenuOption.SAVE.ordinal()) {
+                try {
+                        PrintWriter p = new PrintWriter(new FileWriter(android.os.Environment.getExternalStorageDirectory()+"/save.txt"));
+                        mThread.mMap.save(p);
+                        p.close();
+                }catch(IOException ioe) {
+                        ioe.printStackTrace();
+                }
+        }else if(i == MenuOption.MAIN.ordinal()) {
+                mThread.mGameState = GameState.MAIN_MENU;
+        }else if(i == MenuOption.EXIT.ordinal()) {
+                finish();
         }
 

src/com/medievaltech/advancewars/GameView.java

@@ -19 +19 @@
     class DrawingThread extends Thread {        
         public GameState mGameState;
-
-        /*
-         * Member (state) fields
-         */
-
+        
+        //maybe make this private and make an accessor for it
+        public Map mMap;
+        
+        public Tile grassTile, oceanTile;
+        
+        public Turn mTurn;
+        
+        //temporary variable to let the enemy control a specific unit
+        //ownership of units hasn't been implemented yet
+        public Unit enemyUnit;
+        
         private int mCanvasHeight = 1;
         private int mCanvasWidth = 1;
 
-        /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2, mSelectionPaint,
-                mUnitPaint;
-        
-        //maybe make this private and make an accessor for it
-        public Map mMap;
-        
-        public Tile grassTile, oceanTile;
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1,
+                                mTilePaint2, mSelectionPaint, mUnitPaint;
 
         /** Indicate whether the surface has been created & is ready to draw */
@@ -105 +106 @@
             }
             
+            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));
+            
+            mTurn = Turn.YOUR_TURN;
             
             mGameState = GameState.MAIN_MENU;
@@ -129 +135 @@
                     c = mSurfaceHolder.lockCanvas(null);
                     synchronized(mSurfaceHolder) {
+                        doLogic();
                         doDraw(c);
                     }
@@ -169 +176 @@
                 Log.i("AdvanceWars", "width: "+mCanvasWidth+", height: "+mCanvasHeight);
             }
+        }
+        
+        private void doLogic() {
+                if(mTurn == Turn.YOUR_TURN)
+                        return;
+                
+                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;
+                        break;
+                }
         }
 

src/com/medievaltech/unit/Artillery.java

@@ -5 +5 @@
 import android.graphics.Paint;
 import android.graphics.Point;
+
+import com.medievaltech.advancewars.Enum.*;
 
 public class Artillery extends Unit{
@@ -13 +15 @@
                 move = 3;
                 
-                type = Type.LAND;
+                type = UnitType.LAND;
                 minAttackRange = 2;
                 maxAttackRange = 4;

src/com/medievaltech/unit/Mech.java

@@ -5 +5 @@
 import android.graphics.Paint;
 import android.graphics.Point;
+
+import com.medievaltech.advancewars.Enum.*;
 
 public class Mech extends Unit{
@@ -13 +15 @@
                 move = 2;
                 
-                type = Type.LAND;
+                type = UnitType.LAND;
                 minAttackRange = 1;
                 maxAttackRange = 1;

src/com/medievaltech/unit/Recon.java

@@ -5 +5 @@
 import android.graphics.Paint;
 import android.graphics.Point;
+
+import com.medievaltech.advancewars.Enum.*;
 
 public class Recon extends Unit{
@@ -13 +15 @@
                 move = 8;
                 
-                type = Type.LAND;
+                type = UnitType.LAND;
                 minAttackRange = 1;
                 maxAttackRange = 1;

src/com/medievaltech/unit/SmTank.java

@@ -5 +5 @@
 import android.graphics.Paint;
 import android.graphics.Point;
+
+import com.medievaltech.advancewars.Enum.*;
 
 public class SmTank extends Unit{
@@ -13 +15 @@
                 move = 7;
                 
-                type = Type.LAND;
+                type = UnitType.LAND;
                 minAttackRange = 1;
                 maxAttackRange = 1;

src/com/medievaltech/unit/Soldier.java

@@ -5 +5 @@
 import android.graphics.Paint;
 import android.graphics.Point;
+
+import com.medievaltech.advancewars.Enum.*;
 
 public class Soldier extends Unit{
@@ -13 +15 @@
                 move = 3;
                 
-                type = Type.LAND;
+                type = UnitType.LAND;
                 minAttackRange = 1;
                 maxAttackRange = 1;

src/com/medievaltech/unit/Unit.java

@@ -2 +2 @@
 
 import java.util.*;
+
 import android.graphics.*;
 
-public abstract class Unit 
-{
-        public enum Type
-        {
-                LAND,SEA,AIR
-        }
+import com.medievaltech.advancewars.Enum.*;
 
+public abstract class Unit {
         private Paint p;
         
-        public Type type;
+        public UnitType type;
         //public Player owner;