[Nitsloch-svn] SF.net SVN: nitsloch: [105] trunk/src

[<dd...@us...>]

Revision: 105
          http://nitsloch.svn.sourceforge.net/nitsloch/?rev=105&view=rev
Author:   ddwatts
Date:     2007-12-06 15:50:47 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
More complex hard coded map for testing.

Modified Paths:
--------------
    trunk/src/game/GameWorld.java
    trunk/src/gui/Controller.java
    trunk/src/land/Shop.java

Modified: trunk/src/game/GameWorld.java
===================================================================
--- trunk/src/game/GameWorld.java	2007-12-06 23:41:23 UTC (rev 104)
+++ trunk/src/game/GameWorld.java	2007-12-06 23:50:47 UTC (rev 105)
@@ -27,6 +27,7 @@
 import src.land.Land;
 import src.land.Exit;
 import src.land.Obstruction;
+import src.land.Shop;
 import src.land.Street;
 
 /**
@@ -61,7 +62,7 @@
 	}
 
 	private void debugAddCity(){
-		Land[][] newCity = new Land[4][6];
+		Land[][] newCity = new Land[6][6];
 		newCity[0][0] = new Obstruction(ObstructionLandType.WALL, false);
 		newCity[0][1] = new Obstruction(ObstructionLandType.WALL, false);
 		newCity[0][2] = new Obstruction(ObstructionLandType.WALL, false);
@@ -81,11 +82,23 @@
 		newCity[2][4] = new Street(StreetType.REGULAR_STREET, -1, null, null, null);
 		newCity[2][5] = new Obstruction(ObstructionLandType.WALL, false);
 		newCity[3][0] = new Obstruction(ObstructionLandType.WALL, false);
-		newCity[3][1] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[3][1] = new Shop(Shops.AMMO_L);
 		newCity[3][2] = new Obstruction(ObstructionLandType.WALL, false);
 		newCity[3][3] = new Obstruction(ObstructionLandType.WALL, false);
 		newCity[3][4] = new Obstruction(ObstructionLandType.WALL, false);
 		newCity[3][5] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[4][0] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[4][1] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[4][2] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[4][3] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[4][4] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[4][5] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[5][0] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[5][1] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[5][2] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[5][3] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[5][4] = new Obstruction(ObstructionLandType.WALL, false);
+		newCity[5][5] = new Obstruction(ObstructionLandType.WALL, false);
 		
 		//newCity[2][2].setEnemy(new Enemy(Enemies.E_000, 2, 2, 1));
 		newCity[2][4].setEnemy(new Enemy(Enemies.E_000, 2, 4, 1));

Modified: trunk/src/gui/Controller.java
===================================================================
--- trunk/src/gui/Controller.java	2007-12-06 23:41:23 UTC (rev 104)
+++ trunk/src/gui/Controller.java	2007-12-06 23:50:47 UTC (rev 105)
@@ -39,8 +39,6 @@
 public class Controller {
 	
 	private GameFrame gf;
-	//private int explodeRow;
-	//private int explodeCol;
 	
 	/**
 	 * Sets the game frame for this controller.

Modified: trunk/src/land/Shop.java
===================================================================
--- trunk/src/land/Shop.java	2007-12-06 23:41:23 UTC (rev 104)
+++ trunk/src/land/Shop.java	2007-12-06 23:50:47 UTC (rev 105)
@@ -42,6 +42,14 @@
 	private Shops type;
 	
 	/**
+	 * Constructor sets up type of shop.
+	 * @param type Shops : type
+	 */
+	public Shop(Shops type){
+		this.type = type;
+	}
+	
+	/**
 	 * Not possible for shops
 	 * @param item Item : the item
 	 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.