Index: gignore =================================================================== --- .hgignore (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,5 +1,0 @@ - -syntax: regexp -bin\* -syntax: regexp -bin/* Index: ettings/org.eclipse.jdt.core.prefs =================================================================== --- .settings/org.eclipse.jdt.core.prefs (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,5 +1,0 @@ -#Tue Jan 18 16:04:51 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 Index: AndroidManifest.xml =================================================================== --- AndroidManifest.xml (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ AndroidManifest.xml (revision 9b1f66b267b63dfffb82b32a8db972f27510d8e5) @@ -1,10 +1,9 @@ - - Index: default.properties =================================================================== --- default.properties (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ default.properties (revision 9b1f66b267b63dfffb82b32a8db972f27510d8e5) @@ -9,3 +9,3 @@ # Project target. -target=android-8 +target=android-3 Index: res/layout/main.xml =================================================================== --- res/layout/main.xml (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ res/layout/main.xml (revision 9b1f66b267b63dfffb82b32a8db972f27510d8e5) @@ -1,12 +1,12 @@ - - - - - - + + + Index: s/menu/map_menu.xml =================================================================== --- res/menu/map_menu.xml (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,9 +1,0 @@ - - - - - - Index: res/values/strings.xml =================================================================== --- res/values/strings.xml (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ res/values/strings.xml (revision 9b1f66b267b63dfffb82b32a8db972f27510d8e5) @@ -2,11 +2,4 @@ Hello World, advancewars! - Advance Wars - End Turn - Save - Main Menu - Exit - Attack - Move - Cancel + Index: src/com/example/advancewars/advancewars.java =================================================================== --- src/com/example/advancewars/advancewars.java (revision 9b1f66b267b63dfffb82b32a8db972f27510d8e5) +++ src/com/example/advancewars/advancewars.java (revision 9b1f66b267b63dfffb82b32a8db972f27510d8e5) @@ -0,0 +1,13 @@ +package com.example.advancewars; + +import android.app.Activity; +import android.os.Bundle; + +public class advancewars extends Activity { + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + } +} Index: c/com/medievaltech/advancewars/City.java =================================================================== --- src/com/medievaltech/advancewars/City.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,28 +1,0 @@ -package com.medievaltech.advancewars; - -import android.graphics.Canvas; -import android.graphics.Point; - -public class City { - public Player owner; - - public int maxHealth; - public int currentHealth; - - public int sightRange; - - public Point location; - - public City() { - owner = null; - maxHealth = 10; - currentHealth = 10; - } - - public void draw(Canvas c, int x, int y) { - if(owner == null) - c.drawRect(x-20, y-20, x+20, y+20, Player.neutralColor); - else - c.drawRect(x-20, y-20, x+20, y+20, owner.getColor()); - } -} Index: c/com/medievaltech/advancewars/Enum.java =================================================================== --- src/com/medievaltech/advancewars/Enum.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,31 +1,0 @@ -package com.medievaltech.advancewars; - -public class Enum { - public enum GameState { - MAIN_MENU, - BATTLE_MAP - } - - public enum Turn { - YOUR_TURN, - ENEMY_TURN - } - - public enum TerrainType { - LAND, - SEA - } - - public enum MenuOption { - END_TURN, - SAVE, - MAIN, - EXIT - } - - public enum UnitType { - LAND, - SEA, - AIR - } -} Index: c/com/medievaltech/advancewars/Game.java =================================================================== --- src/com/medievaltech/advancewars/Game.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,128 +1,0 @@ -package com.medievaltech.advancewars; - -import java.io.*; - -import android.app.Activity; -import android.os.Bundle; -import android.util.Log; -import android.view.ContextMenu; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ContextMenu.ContextMenuInfo; -import android.view.Window; - -import com.medievaltech.advancewars.Enum.*; - -public class Game extends Activity { - - /** - * Invoked during init to give the Activity a chance to set up its Menu. - * - * @param menu the Menu to which entries may be added - * @return true - */ - @Override - public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - - 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; - } - - /** - * Invoked when the user selects an item from the Menu. - * - * @param item the Menu entry which was selected - * @return true if the Menu item was legit (and we consumed it), false - * otherwise - */ - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int i = item.getItemId(); - - if(i == MenuOption.END_TURN.ordinal()) { - Static.turn = Turn.ENEMY_TURN; - }else if(i == MenuOption.SAVE.ordinal()) { - try { - PrintWriter p = new PrintWriter(new FileWriter(android.os.Environment.getExternalStorageDirectory()+"/save.txt")); - Static.map.save(p); - p.close(); - }catch(IOException ioe) { - ioe.printStackTrace(); - } - }else if(i == MenuOption.MAIN.ordinal()) { - Static.gameState = GameState.MAIN_MENU; - }else if(i == MenuOption.EXIT.ordinal()) { - finish(); - } - - return true; - } - - /** - * Invoked when the Activity is created. - * - * @param savedInstanceState a Bundle containing state saved from a previous - * execution, or null if this is a new execution - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - Log.w("AdvanceWars", "We're inside onCreate"); - - super.onCreate(savedInstanceState); - - Log.w("AdvanceWars", "the super constructor was called successfully"); - - // turn off the window's title bar - requestWindowFeature(Window.FEATURE_NO_TITLE); - - // tell system to use the layout defined in our XML file - setContentView(R.layout.main); - - /*View v = findViewById(R.id.main_view); - Log.i("AdvanceWars", "view is null?: " + (v==null));*/ - - Static.game = this; - - if (savedInstanceState == null) { // we were just launched: set up a new game - Log.w("AdvanceWars", "SIS is null"); - } else { - Log.w("AdvanceWars", "SIS is nonnull"); - - Static.gameState = (GameState)savedInstanceState.getSerializable("gameState"); - } - } - - @Override - public void onCreateContextMenu(ContextMenu menu, View v, - ContextMenuInfo menuInfo) { - super.onCreateContextMenu(menu, v, menuInfo); - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.map_menu, menu); - } - - /** - * Notification that something is about to happen, to give the Activity a - * chance to save state. - * - * @param outState a Bundle into which this Activity should save its state - */ - @Override - protected void onSaveInstanceState(Bundle outState) { - outState.putSerializable("gameState", Static.gameState); - - super.onSaveInstanceState(outState); - Log.w("AdvanceWars", "onSaveInstanceState called"); - } - - @Override - protected void onStop() { - System.exit(1); - super.onStop(); - } -} Index: c/com/medievaltech/advancewars/GameView.java =================================================================== --- src/com/medievaltech/advancewars/GameView.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,360 +1,0 @@ -package com.medievaltech.advancewars; - -import java.io.*; -import java.util.*; - -import com.medievaltech.advancewars.Enum.*; -import com.medievaltech.unit.*; -import com.medievaltech.gui.*; - -import android.content.Context; -import android.graphics.*; -import android.os.*; -import android.view.*; -import android.view.ContextMenu.ContextMenuInfo; -import android.util.AttributeSet; -import android.util.Log; - -class GameView extends SurfaceView implements SurfaceHolder.Callback { - - class DrawingThread extends Thread { - - private Unit selectedUnit; - - private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, - mTilePaint2, mSelectionPaint, mUnitPaint1, mUnitPaint2; - - /** Handle to the surface manager object we interact with */ - private SurfaceHolder mSurfaceHolder; - - public DrawingThread(SurfaceHolder surfaceHolder, Context context, Handler handler) { - mSurfaceHolder = surfaceHolder; - - mLinePaint = new Paint(); - initPaint(mLinePaint, 0, 255, 0); - - mTextPaint = new Paint(); - mTextPaint.setTextSize(12); - mTextPaint.setTextAlign(Paint.Align.CENTER); - initPaint(mTextPaint, 255, 255, 255); - - mButtonPaint = new Paint(); - mButtonPaint.setTextSize(20); - mButtonPaint.setTextAlign(Paint.Align.CENTER); - initPaint(mButtonPaint, 0, 0, 0); - - mTilePaint1 = new Paint(); - initPaint(mTilePaint1, 0, 255, 0); - - mTilePaint2 = new Paint(); - initPaint(mTilePaint2, 0, 0, 255); - - mUnitPaint1 = new Paint(); - initPaint(mUnitPaint1, 255, 0, 0); - - mUnitPaint2 = new Paint(); - initPaint(mUnitPaint2, 160, 160, 255); - - mSelectionPaint = new Paint(); - initPaint(mSelectionPaint, 255, 127, 0); - - Player.neutralColor = new Paint(); - initPaint(Player.neutralColor, 127, 127, 127); - - Static.wndMainMenu = new com.medievaltech.gui.Window(0, 0, 320, 450); - Static.wndMainMenu.addGUIObject("txtTitle", new Text("Main Menu", 100, 30, 120, 20, mTextPaint)); - Static.wndMainMenu.addGUIObject("btnNewGame", new Button("New Game", 100, 90, 120, 20, mLinePaint, mButtonPaint)); - Static.wndMainMenu.addGUIObject("btnLoadGame", new Button("Load Game", 100, 125, 120, 20, mLinePaint, mButtonPaint)); - Static.wndMainMenu.addGUIObject("btnMapEditor", new Button("Map Editor", 100, 160, 120, 20, mLinePaint, mButtonPaint)); - Static.wndMainMenu.addGUIObject("btnQuit", new Button("Quit", 100, 195, 120, 20, mLinePaint, mButtonPaint)); - - Static.grassTile = new Tile(mTilePaint1, TerrainType.LAND); - Static.oceanTile = new Tile(mTilePaint2, TerrainType.SEA); - - Static.map = new Map(Static.grassTile, 6, 8, new Point(10, 25)); - - boolean land = true; - - for(int x=0; x iter = Static.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) - Static.map.getTile(x, y).removeUnit(); - Static.map.getTile(x, y+1).addUnit(cur); - } - Log.i("AdvanceWars", "finished moving enemy units"); - - - Static.turn = Turn.YOUR_TURN; - break; - } - } - - /** - * Draws the ship, fuel/speed bars, and background to the provided - * Canvas. - */ - private void doDraw(Canvas canvas) { - canvas.drawColor(Color.BLACK); - - switch(Static.gameState) { - case MAIN_MENU: - Static.wndMainMenu.draw(canvas); - break; - case BATTLE_MAP: - mTextPaint.setTextSize(12); - - Static.map.draw(canvas); - - if(selectedUnit != null) { - 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); - } - } - - Static.map.drawBuildings(canvas); - Static.map.drawUnits(canvas); - - break; - } - } - } - - public GameView(Context context, AttributeSet attrs) { - super(context, attrs); - - // register our interest in hearing about changes to our surface - SurfaceHolder holder = getHolder(); - holder.addCallback(this); - - // create thread only; it's started in surfaceCreated() - Static.thread = new DrawingThread(holder, context, new Handler() {}); - - setFocusable(true); // make sure we get key events - } - - @Override public boolean onTouchEvent(MotionEvent event) { - Log.i("AdvanceWars", "Detected touch event"); - - if(event.getAction() == MotionEvent.ACTION_UP) { - Log.i("AdvanceWars", "Detected UP touch action"); - switch(Static.gameState) { - case MAIN_MENU: - if(Static.wndMainMenu.getGUIObject("btnNewGame").isClicked(event.getX(), event.getY())) { - Log.i("AdvanceWars", "Switching to battle map"); - Static.gameState = GameState.BATTLE_MAP; - }else if(Static.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)); - - Static.map = new Map(Static.grassTile, width, height, new Point(offsetX, offsetY)); - - Log.i("GameSave", "Created the map"); - - for(int x=0; x= Static.map.offset.x && event.getY() >= Static.map.offset.y) { - int x = ((int)event.getX() - Static.map.offset.x) / 50; - int y = ((int)event.getY() - Static.map.offset.y) / 50; - - Log.i("AdvanceWars", "About to show context menu"); - showContextMenu(); - - /* - - Unit target = Static.map.getTile(x, y).currentUnit; - - if(Static.thread.selectedUnit != null && Static.thread.selectedUnit.getMovementRange().contains(new Point(x, y))) { - //Display a menu allowing the player to move to the target or attack the target or - //get more info on the target - - if(target == null || target == Static.thread.selectedUnit) { - Static.map.getTile(Static.thread.selectedUnit.location.x, Static.thread.selectedUnit.location.y).removeUnit(); - Static.map.getTile(x, y).addUnit(Static.thread.selectedUnit); - }else { - // Display a context menu that gives the option of attacking the target - } - Static.thread.selectedUnit = null; - }else - Static.thread.selectedUnit = target; - */ - } - - Log.i("AdvanceWars", "Touch event handling finished"); - - break; - } - }else if(event.getAction() == MotionEvent.ACTION_DOWN) { - - } - - return true; - } - - /* Callback invoked when the surface dimensions change. */ - public void surfaceChanged(SurfaceHolder holder, int format, int width, - int height) { - Static.thread.setSurfaceSize(width, height); - } - - /* - * Callback invoked when the Surface has been created and is ready to be - * used. - */ - public void surfaceCreated(SurfaceHolder holder) { - Static.run = true; - Static.thread.start(); - } - - /* - * Callback invoked when the Surface has been destroyed and must no longer - * be touched. WARNING: after this method returns, the Surface/Canvas must - * never be touched again! - */ - public void surfaceDestroyed(SurfaceHolder holder) { - // we have to tell thread to shut down & wait for it to finish, or else - // it might touch the Surface after we return and explode - boolean retry = true; - Static.run = false; - while (retry) { - try { - Static.thread.join(); - retry = false; - } catch (InterruptedException e) { - } - } - } -} Index: c/com/medievaltech/advancewars/Map.java =================================================================== --- src/com/medievaltech/advancewars/Map.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,88 +1,0 @@ -package com.medievaltech.advancewars; - -import java.io.*; - -import android.graphics.*; - -import com.medievaltech.unit.Unit; - -public class Map { - private Tile[][] grid; - public Point offset; - - public Map(int width, int height, Point offset) { - grid = new Tile[width][height]; - this.offset = offset; - } - - public Map(Tile t, int width, int height, Point offset) { - grid = new Tile[width][height]; - this.offset = offset; - - for(int x=0; x units; - public static Paint neutralColor; - - public Player(String name, Paint color) { - this.name = name; - this.color = color; - units = new ArrayList(); - } - - public String getName() { - return name; - } - - public Paint getColor() { - return color; - } - - public ArrayList getControlledUnits() { - return units; - } - - public void addUnit(Unit u) { - units.add(u); - } -} Index: c/com/medievaltech/advancewars/Static.java =================================================================== --- src/com/medievaltech/advancewars/Static.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,24 +1,0 @@ -package com.medievaltech.advancewars; - -import com.medievaltech.advancewars.Enum.*; -import com.medievaltech.advancewars.GameView.DrawingThread; - -public class Static { - public static Map map; - - public static GameState gameState; - - public static Tile grassTile, oceanTile; - - public static Turn turn; - - public static Player human, enemy; - - public static DrawingThread thread; - - public static Game game; - - public static boolean run = false; - - public static com.medievaltech.gui.Window wndMainMenu; -} Index: c/com/medievaltech/advancewars/Tile.java =================================================================== --- src/com/medievaltech/advancewars/Tile.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,62 +1,0 @@ -package com.medievaltech.advancewars; - -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Point; - -import com.medievaltech.unit.*; -import com.medievaltech.advancewars.Enum.*; - -public class Tile { - TerrainType type; - public double moveCoefficent; - public Unit currentUnit; - public City currentBuilding; - public Point point; - private Paint p; - - public Tile(Paint p, TerrainType type) { - this.p = p; - this.type = type; - this.currentUnit = null; - this.currentBuilding = null; - } - - 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; - unit.location = point; - } - - public void removeUnit() { - if(currentUnit != null) { - currentUnit = null; - } - - } - - public void addBuilding(City c) { - currentBuilding = c; - c.location = point; - } - - public void draw(Canvas c, int x, int y) { - c.drawRect(x, y, x+50, y+50, p); - } - - public void drawUnit(Canvas c, int x, int y) { - if(currentUnit != null) - currentUnit.draw(c, x+25, y+25); - } - - public void drawBuilding(Canvas c, int x, int y) { - if(currentBuilding != null) - currentBuilding.draw(c, x+25, y+25); - } -} Index: c/com/medievaltech/gui/Button.java =================================================================== --- src/com/medievaltech/gui/Button.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,23 +1,0 @@ -package com.medievaltech.gui; - -import android.graphics.Canvas; -import android.graphics.Paint; - -public class Button extends GUIObject { - private String text; - private Paint textPaint; - private float vOffset; - - public Button(String newText, int newX, int newY, int newWidth, int newHeight, Paint linePaint, Paint textPaint) { - super(newX, newY, newWidth, newHeight, linePaint); - - this.textPaint = textPaint; - text = newText; - vOffset = -(textPaint.getFontMetrics().ascent+textPaint.getFontMetrics().descent)/2; - } - - public void draw(Canvas c) { - c.drawRect(x, y, x+width, y+height, p); - c.drawText(text, x+width/2, y+height/2+vOffset, textPaint); - } -} Index: c/com/medievaltech/gui/GUIObject.java =================================================================== --- src/com/medievaltech/gui/GUIObject.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,40 +1,0 @@ -package com.medievaltech.gui; - -import android.graphics.*; - -public class GUIObject { - protected int x, y, width, height; - protected Paint p; //all properties of the object are determined through the paint object - - public GUIObject(int newX, int newY, int newWidth, int newHeight, Paint p) { - x = newX; - y = newY; - width = newWidth; - height = newHeight; - this.p = p; - } - - public void draw(Canvas c) { - - } - - public boolean isClicked(float xCoord, float yCoord) { - return x <= xCoord && xCoord <= x+width && y <= yCoord && yCoord <= y+height; - } - - public int getX() { - return x; - } - - public int getY() { - return y; - } - - public int getWidth() { - return width; - } - - public int getHeight() { - return height; - } -} Index: c/com/medievaltech/gui/Text.java =================================================================== --- src/com/medievaltech/gui/Text.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,22 +1,0 @@ -package com.medievaltech.gui; - -import android.graphics.Canvas; -import android.graphics.Paint; - -public class Text extends GUIObject { - private String text; - private Paint textPaint; - private float vOffset; - - public Text(String newText, int newX, int newY, int newWidth, int newHeight, Paint textPaint) { - super(newX, newY, newWidth, newHeight, null); - - this.textPaint = textPaint; - text = newText; - vOffset = -(textPaint.getFontMetrics().ascent+textPaint.getFontMetrics().descent)/2; - } - - public void draw(Canvas c) { - c.drawText(text, x+width/2, y+height/2+vOffset, textPaint); - } -} Index: c/com/medievaltech/gui/Window.java =================================================================== --- src/com/medievaltech/gui/Window.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,29 +1,0 @@ -package com.medievaltech.gui; - -import java.util.Hashtable; - -import android.graphics.Canvas; - -public class Window extends GUIObject { - private Hashtable drawableObjects; - - public Window(int newX, int newY, int newWidth, int newHeight) { - super(newX, newY, newWidth, newHeight, null); - - drawableObjects = new Hashtable(); - } - - public void addGUIObject(String name, GUIObject o) { - drawableObjects.put(name, o); - } - - public GUIObject getGUIObject(String name) { - return drawableObjects.get(name); - } - - public void draw(Canvas c) { - for (GUIObject o : drawableObjects.values()) { - o.draw(c); - } - } -} Index: c/com/medievaltech/unit/Artillery.java =================================================================== --- src/com/medievaltech/unit/Artillery.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,52 +1,0 @@ -package com.medievaltech.unit; - -import java.util.List; - -import android.graphics.Point; - -import com.medievaltech.advancewars.Player; -import com.medievaltech.advancewars.Enum.*; - -public class Artillery extends Unit{ - public Artillery(Player p) - { - super(p); - - move = 3; - - type = UnitType.LAND; - minAttackRange = 2; - maxAttackRange = 4; - } - - @Override - public void move(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public void attack(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public List getMovementRange() { - return super.getMovementRange(); - } - - @Override - public void die() - { - - } - - @Override - public List getAttackRange() { - // TODO Auto-generated method stub - return null; - } - - -} Index: c/com/medievaltech/unit/Mech.java =================================================================== --- src/com/medievaltech/unit/Mech.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,52 +1,0 @@ -package com.medievaltech.unit; - -import java.util.List; - -import android.graphics.Point; - -import com.medievaltech.advancewars.Player; -import com.medievaltech.advancewars.Enum.*; - -public class Mech extends Unit{ - public Mech(Player p) - { - super(p); - - move = 2; - - type = UnitType.LAND; - minAttackRange = 1; - maxAttackRange = 1; - } - - @Override - public void move(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public void attack(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public List getMovementRange() { - return super.getMovementRange(); - } - - @Override - public void die() - { - - } - - @Override - public List getAttackRange() { - // TODO Auto-generated method stub - return null; - } - - -} Index: c/com/medievaltech/unit/Recon.java =================================================================== --- src/com/medievaltech/unit/Recon.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,52 +1,0 @@ -package com.medievaltech.unit; - -import java.util.List; - -import android.graphics.Point; - -import com.medievaltech.advancewars.Player; -import com.medievaltech.advancewars.Enum.*; - -public class Recon extends Unit{ - public Recon(Player p) - { - super(p); - - move = 8; - - type = UnitType.LAND; - minAttackRange = 1; - maxAttackRange = 1; - } - - @Override - public void move(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public void attack(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public List getMovementRange() { - return super.getMovementRange(); - } - - @Override - public void die() - { - - } - - @Override - public List getAttackRange() { - // TODO Auto-generated method stub - return null; - } - - -} Index: c/com/medievaltech/unit/SmTank.java =================================================================== --- src/com/medievaltech/unit/SmTank.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,52 +1,0 @@ -package com.medievaltech.unit; - -import java.util.List; - -import android.graphics.Point; - -import com.medievaltech.advancewars.Player; -import com.medievaltech.advancewars.Enum.*; - -public class SmTank extends Unit{ - public SmTank(Player p) - { - super(p); - - move = 7; - - type = UnitType.LAND; - minAttackRange = 1; - maxAttackRange = 1; - } - - @Override - public void move(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public void attack(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public List getMovementRange() { - return super.getMovementRange(); - } - - @Override - public void die() - { - - } - - @Override - public List getAttackRange() { - // TODO Auto-generated method stub - return null; - } - - -} Index: c/com/medievaltech/unit/Soldier.java =================================================================== --- src/com/medievaltech/unit/Soldier.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,62 +1,0 @@ -package com.medievaltech.unit; - -import java.util.List; - -import android.graphics.Point; - -import com.medievaltech.advancewars.Player; -import com.medievaltech.advancewars.Static; -import com.medievaltech.advancewars.Tile; -import com.medievaltech.advancewars.Enum.*; - -public class Soldier extends Unit{ - public Soldier(Player p) - { - super(p); - - move = 3; - - type = UnitType.LAND; - minAttackRange = 1; - maxAttackRange = 1; - } - - @Override - public void move(Point point) { - // TODO Auto-generated method stub - - } - - @Override - public void attack(Point point) { - Tile t = Static.map.getTile(point); - - if(t.currentUnit == null && t.currentBuilding != null) { - t.currentBuilding.currentHealth -= this.currentHealth; - - if(t.currentBuilding.currentHealth <= 0) { - t.currentBuilding.owner = this.owner; - t.currentBuilding.currentHealth = t.currentBuilding.maxHealth; - } - } - } - - @Override - public List getMovementRange() { - return super.getMovementRange(); - } - - @Override - public void die() - { - - } - - @Override - public List getAttackRange() { - // TODO Auto-generated method stub - return null; - } - - -} Index: c/com/medievaltech/unit/Transport.java =================================================================== --- src/com/medievaltech/unit/Transport.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,11 +1,0 @@ -package com.medievaltech.unit; - -import com.medievaltech.advancewars.Player; - -public abstract class Transport extends Unit { - public Unit storedUnit; - - public Transport(Player p) { - super(p); - } -} Index: c/com/medievaltech/unit/Unit.java =================================================================== --- src/com/medievaltech/unit/Unit.java (revision bb2fa26a9c1a32b7ef6280d825b638c058943586) +++ (revision ) @@ -1,91 +1,0 @@ -package com.medievaltech.unit; - -import java.util.*; - -import android.graphics.*; - -import com.medievaltech.advancewars.Player; -import com.medievaltech.advancewars.Enum.*; - -public abstract class Unit { - public UnitType type; - public Player owner; - - public int maxHealth; - public int currentHealth; - - public int maxFuel; - public int currentFuel; - - public int sightRange; - protected int move; - - public int minAttackRange; - public int maxAttackRange; - public Point location; - - public Unit(Player p) - { - p.addUnit(this); - - owner = p; - maxHealth = 10; - currentHealth = 10; - } - - public abstract void move(Point point); - public abstract void attack(Point point); - - public List getMovementRange() { - List l = new LinkedList(); - List prev = new LinkedList(); - List cur = new LinkedList(); - 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<5 && p.x0 && 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<7 && p.y getAttackRange(); - - public void die() { - - } - - public void draw(Canvas c, int x, int y) { - c.drawCircle(x, y, 20, owner.getColor()); - } -}