test

djas · Apr 28, 2015 · 1edbead · 1edbead
1 parent 1d32c1d
commit 1edbead
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/MockGui.java b/src/MockGui.java
@@ -294,7 +294,8 @@ public class MockGui extends JPanel{
 				for(int i=1; i<map.getTF().quantity; i++){
 				if(	(map.getTF().getTowerArray()[i].getTowerXlocation() == local[0]) && (map.getTF().getTowerArray()[i].getTowerYlocation() == local[1])){
 					//TODO //how to destroy tower?
-				map.getStatGui().payDay(map.getTF().getTowerArray()[i]._sellCost);
+					map.getTF().getTowerArray()[i].moveOffToSell();
+				map.getStatGui().payDay(map.getTF().getTowerArray()[i].getSellValue());
 				}
 				}
 				}

diff --git a/src/StatGui.java b/src/StatGui.java
@@ -19,6 +19,7 @@ public class StatGui extends JPanel implements ActionListener{
 	JLabel hpLabel, moneyLabel, towersnumLabel, sellLabelBasic, sellLabelAOE, upgradeLabelBasic, upgradeLabelAOE;
 	JButton buttonAOETower, buttonBasicTower, buttonSellTower, buttonUpgradeTower;
 	public int towerPlacerVar = 1; //1:Basic, 2:AOE, 3:Sell, 4:Upgrade
+	public int notTowers = 1;
 
 	public StatGui (int x, int y) {
 		X = x;
@@ -159,7 +160,7 @@ public class StatGui extends JPanel implements ActionListener{
 	}
 
 	public void updateNumTowers(){
-		towersnumLabel.setText("[# of Towers]: " + map.TF.quantity);
+		towersnumLabel.setText("[# of Towers]: " + (map.TF.quantity - notTowers));
 	}
 
 	public void updateBasicSellLabel(){

diff --git a/src/TowerMock.java b/src/TowerMock.java
@@ -169,6 +169,12 @@ public class TowerMock{
 		return _sellCost * _level;
 	}
 
+	public void moveOffToSell() {
+		_xlocation = -1000;
+		_range = 0;
+		_map.getStatGui().notTowers++;
+	}
+
 	public int getBuyCost() {
 			return _buyCost;
 	}