From 45902348e20792c4103cf101acdb996114572ee0 Mon Sep 17 00:00:00 2001
From: ssl10003 <solomon.lin@uconn.edu>
Date: Fri, 24 Apr 2015 11:37:39 -0400
Subject: [PATCH] rename dealdamage

---
 .project              | 6 ++++++
 src/Main.java         | 8 ++++++++
 src/MockGui.java      | 4 ++--
 src/TowerFactory.java | 2 +-
 src/TowerMock.java    | 5 +++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.project b/.project
index 9b62d4c..901f736 100644
--- a/.project
+++ b/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.metrics.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sourceforge.metrics.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/Main.java b/src/Main.java
index 16a4ab8..bd0661b 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,4 +1,5 @@
 import java.awt.*;
+
 import javax.swing.*;
 
 public class Main extends JFrame{
@@ -34,6 +35,13 @@ public class Main extends JFrame{
 		frame.setSize(650,720);
 		frame.setVisible(true);
 		
+		map.createMinion(MinionTypes.BASIC);
+		try {
+			Thread.sleep(50);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		map.createMinion(MinionTypes.BASIC);
 		mg.step();
 		
diff --git a/src/MockGui.java b/src/MockGui.java
index 5739418..7da67b8 100644
--- a/src/MockGui.java
+++ b/src/MockGui.java
@@ -218,7 +218,7 @@ public class MockGui extends JPanel{
 	
 	//if Basic tower is attacking, draw dots to where minion is
 	public void drawAllBasicAttacks(TowerFactory TF, Graphics g){
-		for(int i = 0; i < TF.getNum(); i++){
+		for(int i = 1; i < TF.getNum(); i++){
 			if(TF.getTowerArray()[i].basicDealDamage() && TF.getTowerArray()[i].type == TowerTypes.BASIC){
 				int towerDotX = (TF.getTowerArray()[i]._xlocation * 32) + 15;
 				int towerDotY = (TF.getTowerArray()[i]._ylocation *32) + 15;
@@ -244,7 +244,7 @@ public class MockGui extends JPanel{
 	}
 	
 	public void drawAllAOEAttacks(TowerFactory TF, Graphics g){
-		for(int i = 0; i < TF.getNum(); i++){
+		for(int i = 1; i < TF.getNum(); i++){
 			if( TF.getTowerArray()[i].basicDealDamage() && TF.getTowerArray()[i].type == TowerTypes.AOE){
 			drawAOEAttack((TF.getTowerArray()[i]._xlocation * 32) + 15, (TF.getTowerArray()[i]._ylocation *32) + 15, g);
 		
diff --git a/src/TowerFactory.java b/src/TowerFactory.java
index 4c296db..fe9f43d 100644
--- a/src/TowerFactory.java
+++ b/src/TowerFactory.java
@@ -33,7 +33,7 @@ public class TowerFactory {
 		int total = 0;
 		while (i < quantity) {
 			if (0 == (towerarray[i].type.compareTo(TowerTypes.AOE))) {
-				total += towerarray[i].dealDamage(x, y);
+				total += towerarray[i].inRange(x, y);
 			}
 			i++;
 		}
diff --git a/src/TowerMock.java b/src/TowerMock.java
index d51238c..b62ac3f 100644
--- a/src/TowerMock.java
+++ b/src/TowerMock.java
@@ -35,6 +35,7 @@ public class TowerMock{
 		_isTower = isTower;
 		if (!isTower) {
 			health = 20;
+			_power = 0;
 		}
 		
 		this.type=type;
@@ -78,7 +79,7 @@ public class TowerMock{
 				return false;
 			}
 			if (m.isAlive()) {
-				if (1 == dealDamage(m.getX(), m.getY())) {
+				if (1 == inRange(m.getX(), m.getY())) {
 					currentTarget = m;
 					return true;
 				}
@@ -90,7 +91,7 @@ public class TowerMock{
 	
 	
 	
-	public int dealDamage(int x, int y) {
+	public int inRange(int x, int y) {
 		int deltax = (32*_xlocation - x);
 		int deltay = (32*_ylocation - y);
 		int dist2 = deltax*deltax + deltay*deltay;