Changeset ebaddd9 in advance-wars for src

Timestamp:

Feb 2, 2011, 3:36:46 AM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

6a639f7

Parents:

5d77d43

Message:

Added code to draw a unit's possible movement options on the map.

Location:

src/com/medievaltech

Files:

• advancewars/GameView.java (modified) (6 diffs)
• game/Map.java (modified) (1 diff)
• game/Soldier.java (modified) (2 diffs)
• game/Tile.java (modified) (1 diff)
• game/Unit.java (modified) (3 diffs)

src/com/medievaltech/advancewars/GameView.java

@@ -48 +48 @@
 
         /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2,
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2, mSelectionPaint,
                 mUnitPaint;
         
@@ -60 +60 @@
         
         private com.medievaltech.gui.Window wndMainMenu, wndBattleMap;
+        private Unit selectedUnit;
+        private boolean test = false;
         
         public DrawingThread(SurfaceHolder surfaceHolder, Context context, Handler handler) {
@@ -94 +96 @@
             mUnitPaint.setAntiAlias(true);
             mUnitPaint.setARGB(255, 255, 0, 0);
+            
+            mSelectionPaint = new Paint();
+            mSelectionPaint.setAntiAlias(true);
+            mSelectionPaint.setARGB(255, 255, 127, 0);
             
             wndMainMenu = new com.medievaltech.gui.Window(0, 0, 320, 450);;
@@ -112 +118 @@
                         for(int y=0; y<mMap.getHeight(); y++) {
                                 if(land)
-                                        mMap.setTile(x, y, new Tile(grassTile));
+                                        mMap.setTile(x, y, new Tile(grassTile, new Point(x, y)));
                                 else
-                                        mMap.setTile(x, y, new Tile(oceanTile));
+                                        mMap.setTile(x, y, new Tile(oceanTile, new Point(x, y)));
                                 land = !land;
                         }
@@ -122 +128 @@
             mMap.getTile(2, 3).addUnit(new Soldier(mUnitPaint));
             mMap.getTile(5, 7).addUnit(new Soldier(mUnitPaint));
+            
+            selectedUnit = mMap.getTile(2, 3).currentUnit;
             
             mGameState = GameState.MAIN_MENU;
@@ -343 +351 @@
                 
                 mMap.draw(canvas, 10, 25);
+                
+                for(Point p : selectedUnit.getMovementRange()) {
+                        canvas.drawRect(p.x*50+10, p.y*50+25, p.x*50+50+10, p.y*50+50+25, mSelectionPaint);
+                        if(!test)
+                                Log.i("AdvanceWars", "("+p.x+","+p.y+")");
+                }
+                test = true;
                 
                 text = "Advance Wars grid test";

src/com/medievaltech/game/Map.java

@@ -16 +16 @@
                 for(int x=0; x<getWidth(); x++)
                         for(int y=0; y<getHeight(); y++)
-                                grid[x][y] = new Tile(t);
+                                grid[x][y] = new Tile(t, new Point(x, y));
         }
         

src/com/medievaltech/game/Soldier.java

@@ -9 +9 @@
         public Soldier(Paint p) {
                 super(p);
+                
+                move = 2;
         }
         
@@ -24 +26 @@
 
         @Override
-        public List<Point> getRange() {
-                // TODO Auto-generated method stub
-                return null;
+        public List<Point> getMovementRange() {
+                return super.getMovementRange();
         }
 

src/com/medievaltech/game/Tile.java

@@ -22 +22 @@
         }
         
-        public Tile(Tile t) {
+        public Tile(Tile t, Point point) {
                 this.type = t.type;
                 this.moveCoefficent = t.moveCoefficent;
                 this.p = t.p;
+                this.point = point;
         }
         
         public void addUnit(Unit unit) {
-                currentUnit = unit;     
+                currentUnit = unit;
+                unit.location = point;
         }
         

src/com/medievaltech/game/Unit.java

@@ -1 +1 @@
 package com.medievaltech.game;
 
+import java.util.LinkedList;
 import java.util.List;
 
@@ -26 +27 @@
         
         public int sightRange;
-        public int move;
+        protected int move;
         
         public int minAttackRange;
@@ -36 +37 @@
         }
         
-        public abstract void move(Point point);
-        public abstract void attack(Point point);
+        public abstract boolean move(Point point);
+        public abstract boolean attack(Point point);
         
-        public abstract List<Point> getRange();
+        public List<Point> getMovementRange() {
+                List<Point> l = new LinkedList<Point>();
+                List<Point> prev = new LinkedList<Point>();
+                List<Point> cur = new LinkedList<Point>();
+                boolean[][] visited = new boolean[move*2+1][move*2+1];
+                
+                for(int x=0; x<=move*2; x++)
+                        for(int y=0; y<=move*2; y++)
+                                visited[x][y] = false;
+                
+                prev.add(new Point(location));
+                l.addAll(prev);
+                visited[move][move] = true;
+
+                for(int dist=1; dist <= move; dist++) {
+                        for(Point p : prev) {
+                                if(p.x>0 && p.x>location.x-move && !visited[p.x-location.x+move-1][p.y-location.y+move]) {
+                                        cur.add(new Point(p.x-1, p.y));
+                                        visited[p.x-location.x+move-1][p.y-location.y+move] = true;
+                                }
+                                if(p.x<8 && p.x<location.x+move && !visited[p.x-location.x+move+1][p.y-location.y+move]) {
+                                        cur.add(new Point(p.x+1, p.y));
+                                        visited[p.x-location.x+move+1][p.y-location.y+move] = true;
+                                }
+                                if(p.y>0 && p.y>location.y-move && !visited[p.x-location.x+move][p.y-location.y+move-1]) {
+                                        cur.add(new Point(p.x, p.y-1));
+                                        visited[p.x-location.x+move][p.y-location.y+move-1] = true;
+                                }
+                                if(p.y<6 && p.y<location.y+move && !visited[p.x-location.x+move][p.y-location.y+move+1]) {
+                                        cur.add(new Point(p.x, p.y+1));
+                                        visited[p.x-location.x+move][p.y-location.y+move+1] = true;
+                                }
+                        }
+                        
+                        l.addAll(cur);
+                        prev.clear();
+                        prev.addAll(cur);
+                        cur.clear();
+                }
+                
+                return l;
+        }
+        
         public abstract List<Point> getAttackRange();