Changeset 113d7cf in advance-wars for src/com

Timestamp:

May 9, 2011, 6:23:05 PM (13 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

bdd63ba

Parents:

ae564dc

Message:

Implemented saving/loading of the map and the units on it. Also did some package refactoring (renamed com.medievaltech.game to com.medievaltech.unit and moved some classes into com.medievaltech.advancewars)

Location:

src/com/medievaltech

Files:

• advancewars/Game.java (modified) (6 diffs)
• advancewars/GameView.java (modified) (10 diffs)
• advancewars/Map.java (moved) (moved from src/com/medievaltech/game/Map.java ) (2 diffs)
• advancewars/Tile.java (moved) (moved from src/com/medievaltech/game/Tile.java ) (2 diffs)
• game/Player.java (deleted)
• unit/Artillery.java (moved) (moved from src/com/medievaltech/game/Artillery.java ) (1 diff)
• unit/Mech.java (moved) (moved from src/com/medievaltech/game/Mech.java ) (1 diff)
• unit/Recon.java (moved) (moved from src/com/medievaltech/game/Recon.java ) (1 diff)
• unit/SmTank.java (moved) (moved from src/com/medievaltech/game/SmTank.java ) (1 diff)
• unit/Soldier.java (moved) (moved from src/com/medievaltech/game/Soldier.java ) (1 diff)
• unit/Transport.java (moved) (moved from src/com/medievaltech/game/Transport.java ) (1 diff)
• unit/Unit.java (moved) (moved from src/com/medievaltech/game/Unit.java ) (2 diffs)

src/com/medievaltech/advancewars/Game.java

@@ -1 +1 @@
 package com.medievaltech.advancewars;
 
-import com.medievaltech.advancewars.R;
-import com.medievaltech.advancewars.GameView;
+import java.io.*;
+
 import com.medievaltech.advancewars.GameView.DrawingThread;
 
@@ -14 +14 @@
 
 public class Game extends Activity {
-    private static final int MENU_EXIT = 1;
-    private static final int MENU_NEW = 2;
+        private static final int MENU_SAVE = 1;
+        private static final int MENU_MAIN = 2;
+    private static final int MENU_EXIT = 3;
     
     public enum State{BUST, ACTIVE, DOUBLEDOWN};
@@ -35 +36 @@
         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);
         return true;
@@ -49 +52 @@
     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:
-                this.finish();
+                finish();
                 break;
         }
@@ -93 +108 @@
             
             mGameView.getThread().mGameState = (GameState)savedInstanceState.getSerializable("gameState");
-            
-                    mGameView.getThread().mPlayerWins = savedInstanceState.getInt("playerWins");
-                    mGameView.getThread().mPlayerLosses = savedInstanceState.getInt("playerLosses");
         }
     }
@@ -117 +129 @@
     protected void onSaveInstanceState(Bundle outState) {
         outState.putSerializable("gameState", mGameView.getThread().mGameState);
-            outState.putSerializable("playerWins", mGameView.getThread().mPlayerWins);
-            outState.putSerializable("playerLosses", mGameView.getThread().mPlayerLosses);
-            
+        
         super.onSaveInstanceState(outState);
-        Log.w("Blackjack", "onSaveInstanceState called");
+        Log.w("AdvanceWars", "onSaveInstanceState called");
     }
     

src/com/medievaltech/advancewars/GameView.java

@@ -1 +1 @@
 package com.medievaltech.advancewars;
 
-import com.medievaltech.game.*;
+import java.io.*;
+
+import com.medievaltech.advancewars.Tile.TerrainType;
+import com.medievaltech.unit.*;
 import com.medievaltech.gui.*;
 
@@ -12 +15 @@
 import android.widget.TextView;
 
-/**
- * View that draws, takes keystrokes, etc. for a simple LunarLander game.
- * 
- * Has a mode which RUNNING, PAUSED, etc. Has a x, y, dx, dy, ... capturing the
- * current ship physics. All x/y etc. are measured with (0,0) at the lower left.
- * updatePhysics() advances the physics based on realtime. draw() renders the
- * ship, and does an invalidate() to prompt another draw() as soon as possible
- * by the system.
- */
 class GameView extends SurfaceView implements SurfaceHolder.Callback {
         
@@ -39 +33 @@
         private int mCanvasHeight = 1;
         private int mCanvasWidth = 1;
-        public int mPlayerWins = 0, mPlayerLosses = 0;
 
         /** Message handler used by thread to interact with TextView */
@@ -51 +44 @@
                 mUnitPaint;
         
-        private Map mMap;
+        //maybe make this private and make an accessor for it
+        public Map mMap;
+        
+        public Tile grassTile, oceanTile;
 
         /** Indicate whether the surface has been created & is ready to draw */
@@ -59 +55 @@
         private SurfaceHolder mSurfaceHolder;
         
-        private com.medievaltech.gui.Window wndMainMenu, wndBattleMap;
+        private com.medievaltech.gui.Window wndMainMenu;
         private Unit selectedUnit;
         
@@ -66 +62 @@
             mSurfaceHolder = surfaceHolder;
             mHandler = handler;
-            mContext = context;
             
             mLinePaint = new Paint();
@@ -107 +102 @@
             wndMainMenu.addGUIObject("btnQuit", new Button("Quit", 100, 195, 120, 20, mLinePaint, mButtonPaint));
             
-            Tile grassTile = new Tile(mTilePaint1);
-            Tile oceanTile = new Tile(mTilePaint2);
+            grassTile = new Tile(mTilePaint1, TerrainType.LAND);
+            oceanTile = new Tile(mTilePaint2, TerrainType.SEA);
             
             mMap = new Map(grassTile, 6, 8, new Point(10, 25));
@@ -336 +331 @@
         private void doDraw(Canvas canvas) {
                 canvas.drawColor(Color.BLACK);
-                
-                String text;
-                Paint.FontMetrics metrics = mTextPaint.getFontMetrics();
                 
                 switch(mGameState) {
@@ -380 +372 @@
     }
 
-    /** Handle to the application context, used to e.g. fetch Drawables. */
-    private Context mContext;
-
     /** Pointer to the text view to display "Paused.." etc. */
     private TextView mStatusText;
@@ -421 +410 @@
                                 thread.mGameState = GameState.BATTLE_MAP;
                         }else if(thread.wndMainMenu.getGUIObject("btnLoadGame").isClicked(event.getX(), event.getY())) {
+                                BufferedReader b;
+                        try {
+                                b = new BufferedReader(new FileReader(android.os.Environment.getExternalStorageDirectory()+"/save.txt"));
+                                
+                                int width = Integer.parseInt(b.readLine());
+                                int height = Integer.parseInt(b.readLine());
+                                
+                                String offset = b.readLine();
+                                Log.i("GameSave", offset);
+                                int offsetX = Integer.parseInt(offset.substring(0, offset.indexOf("x")));
+                                int offsetY = Integer.parseInt(offset.substring(offset.indexOf("x")+1));
+                                
+                                thread.mMap = new Map(thread.grassTile, width, height, new Point(offsetX, offsetY));
+                                
+                                Log.i("GameSave", "Created the map");
+                                
+                                for(int x=0; x<width; x++) {
+                                        String line = b.readLine();
+                                        Log.i("GameSave", line);
+                                        String[] arr = line.split(",");
+                                        for(int y=0; y<arr.length; y++) {
+                                                TerrainType type = TerrainType.values()[Integer.parseInt(arr[y])];
+                                                if(type.equals(TerrainType.LAND))
+                                                        thread.mMap.setTile(x, y, new Tile(thread.grassTile, new Point(10, 25)));
+                                                else
+                                                        thread.mMap.setTile(x, y, new Tile(thread.oceanTile, new Point(10, 25)));
+                                        }
+                                }
+                                
+                                while(b.ready()) {
+                                        String unit = b.readLine();
+                                        Log.i("GameSave", unit);
+                                        int x = Integer.parseInt(unit.substring(0, unit.indexOf(",")));
+                                        int y = Integer.parseInt(unit.substring(unit.indexOf(",")+1));
+                                        
+                                        mGame.mThread.mMap.getTile(x, y).addUnit(new Soldier(mGame.mThread.mUnitPaint));
+                                }
+                                
+                                b.close();
+                        }catch(IOException ioe) {
+                                ioe.printStackTrace();
+                        }
                                 thread.mGameState = GameState.BATTLE_MAP;
                         }else if(thread.wndMainMenu.getGUIObject("btnQuit").isClicked(event.getX(), event.getY())) {

src/com/medievaltech/advancewars/Map.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.advancewars;
 
-import android.graphics.Canvas;
-import android.graphics.Point;
+import java.io.*;
+
+import com.medievaltech.unit.Unit;
+
+
+import android.graphics.*;
 
 public class Map {
@@ -42 +46 @@
         }
         
+        public void save(PrintWriter p) {
+                p.println(getWidth());
+                p.println(getHeight());
+                p.println(offset.x+"x"+offset.y);
+                
+                for(int x=0; x<getWidth(); x++) {
+                        p.print(grid[x][0].type.ordinal());
+                        for(int y=1; y<getHeight(); y++)
+                                p.print(","+grid[x][y].type.ordinal());
+                        p.println();
+                }
+                
+                for(int x=0; x<getWidth(); x++) {
+                        for(int y=1; y<getHeight(); y++) {
+                                if(grid[x][y].currentUnit != null) {
+                                        Unit u = grid[x][y].currentUnit;
+                                        //p.println(u.type);
+                                        p.println(u.location.x+","+u.location.y);
+                                }
+                        }
+                }
+        }
+        
         public void draw(Canvas c) {
                 for(int x=0; x<getWidth(); x++)

src/com/medievaltech/advancewars/Tile.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.advancewars;
+
+import com.medievaltech.unit.Unit;
 
 import android.graphics.Canvas;
@@ -17 +19 @@
         private Paint p;
         
-        public Tile(Paint p) {
+        public Tile(Paint p, TerrainType type) {
                 this.p = p;
+                this.type = type;
                 this.currentUnit = null;
         }

src/com/medievaltech/unit/Artillery.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
 import java.util.List;

src/com/medievaltech/unit/Mech.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
 import java.util.List;

src/com/medievaltech/unit/Recon.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
 import java.util.List;

src/com/medievaltech/unit/SmTank.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
 import java.util.List;

src/com/medievaltech/unit/Soldier.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
 import java.util.List;

src/com/medievaltech/unit/Transport.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
 import android.graphics.Paint;

src/com/medievaltech/unit/Unit.java

@@ -1 @@
-package com.medievaltech.game;
+package com.medievaltech.unit;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Point;
+import java.util.*;
+import android.graphics.*;
 
 public abstract class Unit 
@@ -18 +14 @@
         
         public Type type;
-        public Player owner;
+        //public Player owner;
         
         public int maxHealth;