From 04bf26e88074f23edddb998dad31b397d8422bf5 Mon Sep 17 00:00:00 2001
From: Kyle Adelsberger <kpup24@frontier.com>
Date: Thu, 14 Sep 2017 16:13:10 -0500
Subject: [PATCH 1/9] addition class has own radius just as other enemy derived
 classes

---
 MathHero_Kyle/src/Addition.java | 1 +
 MathHero_Kyle/src/Enemy.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MathHero_Kyle/src/Addition.java b/MathHero_Kyle/src/Addition.java
index 5d79d9c..dcaa8df 100644
--- a/MathHero_Kyle/src/Addition.java
+++ b/MathHero_Kyle/src/Addition.java
@@ -10,6 +10,7 @@ public Addition()
 		int n2 = (int)(Math.random()*9)+1;
 		solution = n1+n2;
 		problem = ""+n1+"+"+n2;
+		radius = 5;
 	}
 
 	public String getProblem()
diff --git a/MathHero_Kyle/src/Enemy.java b/MathHero_Kyle/src/Enemy.java
index 47b01a8..8904704 100644
--- a/MathHero_Kyle/src/Enemy.java
+++ b/MathHero_Kyle/src/Enemy.java
@@ -4,7 +4,7 @@ public abstract class Enemy
 {
 	protected double r,t,speed;
 	protected Color color = Color.BLACK;
-	protected int radius = 5;
+	protected int radius;
 	private boolean dying1 = false;
 	private boolean dying2 = false;
 	private boolean dead = false;

From b3c919b92145ae2192a07eaaae2424564521a859 Mon Sep 17 00:00:00 2001
From: Kyle Adelsberger <kpup24@frontier.com>
Date: Thu, 14 Sep 2017 16:38:35 -0500
Subject: [PATCH 2/9] moved solution and problem variables to superclass from
 subclasses

---
 MathHero_Kyle/src/Addition.java          | 3 ---
 MathHero_Kyle/src/BigAddition.java       | 3 ---
 MathHero_Kyle/src/BigMultiplication.java | 3 ---
 MathHero_Kyle/src/Division.java          | 3 ---
 MathHero_Kyle/src/Enemy.java             | 3 +++
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/MathHero_Kyle/src/Addition.java b/MathHero_Kyle/src/Addition.java
index dcaa8df..89ee4fa 100644
--- a/MathHero_Kyle/src/Addition.java
+++ b/MathHero_Kyle/src/Addition.java
@@ -1,8 +1,5 @@
 public class Addition extends Enemy
 {
-	protected String problem;
-	protected int solution;
-
 	public Addition()
 	{
 		super(.6);
diff --git a/MathHero_Kyle/src/BigAddition.java b/MathHero_Kyle/src/BigAddition.java
index 8afbdb5..8054a5d 100644
--- a/MathHero_Kyle/src/BigAddition.java
+++ b/MathHero_Kyle/src/BigAddition.java
@@ -1,8 +1,5 @@
 public class BigAddition extends Enemy
 {
-	protected String problem;
-	protected int solution;
-
 	public BigAddition()
 	{
 		super(.3);
diff --git a/MathHero_Kyle/src/BigMultiplication.java b/MathHero_Kyle/src/BigMultiplication.java
index 3767702..af8b684 100644
--- a/MathHero_Kyle/src/BigMultiplication.java
+++ b/MathHero_Kyle/src/BigMultiplication.java
@@ -1,8 +1,5 @@
 public class BigMultiplication extends Enemy
 {
-	protected String problem;
-	protected int solution;
-
 	public BigMultiplication()
 	{
 		super(.05);
diff --git a/MathHero_Kyle/src/Division.java b/MathHero_Kyle/src/Division.java
index 9a69e58..84e30a1 100644
--- a/MathHero_Kyle/src/Division.java
+++ b/MathHero_Kyle/src/Division.java
@@ -1,8 +1,5 @@
 public class Division extends Enemy
 {
-	protected String problem;
-	protected int solution;
-
 	public Division()
 	{
 		super(.3);
diff --git a/MathHero_Kyle/src/Enemy.java b/MathHero_Kyle/src/Enemy.java
index 8904704..11219ba 100644
--- a/MathHero_Kyle/src/Enemy.java
+++ b/MathHero_Kyle/src/Enemy.java
@@ -10,6 +10,8 @@ public abstract class Enemy
 	private boolean dead = false;
 	private int alpha = 255;
 	private int arrowR = Util.PLAYER_RADIUS+Util.ARROW_LENGTH;
+	protected String problem;
+	protected int solution;
 
 	public Enemy(double speed)
 	{
@@ -85,6 +87,7 @@ else if(dying1)
 				dying2 = true;
 		}
 	}
+	
 
 	public abstract String getProblem();
 	public abstract int getSolution();

From d31e4fdc675a495ef0ff5da612c155d54dfc19fe Mon Sep 17 00:00:00 2001
From: xerxesman <31903174+xerxesman@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:13:51 -0500
Subject: [PATCH 3/9] added radius variable to subtraction class

---
 MathHero_Kyle/src/Subtraction.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MathHero_Kyle/src/Subtraction.java b/MathHero_Kyle/src/Subtraction.java
index 912735b..c44aefd 100644
--- a/MathHero_Kyle/src/Subtraction.java
+++ b/MathHero_Kyle/src/Subtraction.java
@@ -11,6 +11,7 @@ public Subtraction()
 		solution = n1;
 		problem = ""+(n1+n2)+"-"+n2;
 		color = java.awt.Color.RED;
+		radius = 5;
 	}
 
 	public String getProblem()

From 0983ca6a81e9afcfab2deedcb60877f69ecad189 Mon Sep 17 00:00:00 2001
From: xerxesman <31903174+xerxesman@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:23:05 -0500
Subject: [PATCH 4/9] removed unnecessary super variables from subtraction

---
 MathHero_Kyle/src/Subtraction.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/MathHero_Kyle/src/Subtraction.java b/MathHero_Kyle/src/Subtraction.java
index c44aefd..0631468 100644
--- a/MathHero_Kyle/src/Subtraction.java
+++ b/MathHero_Kyle/src/Subtraction.java
@@ -1,8 +1,5 @@
 public class Subtraction extends Enemy
 {
-	protected String problem;
-	protected int solution;
-
 	public Subtraction()
 	{
 		super(.4);

From 1fc675ba28ed72e0d5750ba86f233995b483ccb6 Mon Sep 17 00:00:00 2001
From: xerxesman <31903174+xerxesman@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:27:22 -0500
Subject: [PATCH 5/9] simplified string compilation for String problem;

---
 MathHero_Kyle/src/Addition.java          | 2 +-
 MathHero_Kyle/src/BigAddition.java       | 2 +-
 MathHero_Kyle/src/BigMultiplication.java | 2 +-
 MathHero_Kyle/src/Division.java          | 2 +-
 MathHero_Kyle/src/Subtraction.java       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MathHero_Kyle/src/Addition.java b/MathHero_Kyle/src/Addition.java
index 89ee4fa..e4291ce 100644
--- a/MathHero_Kyle/src/Addition.java
+++ b/MathHero_Kyle/src/Addition.java
@@ -6,7 +6,7 @@ public Addition()
 		int n1 = (int)(Math.random()*9)+1;
 		int n2 = (int)(Math.random()*9)+1;
 		solution = n1+n2;
-		problem = ""+n1+"+"+n2;
+		problem = n1+"+"+n2;
 		radius = 5;
 	}
 
diff --git a/MathHero_Kyle/src/BigAddition.java b/MathHero_Kyle/src/BigAddition.java
index 8054a5d..6be236c 100644
--- a/MathHero_Kyle/src/BigAddition.java
+++ b/MathHero_Kyle/src/BigAddition.java
@@ -6,7 +6,7 @@ public BigAddition()
 		int n1 = (int)(Math.random()*90)+10;
 		int n2 = (int)(Math.random()*90)+10;
 		solution = n1+n2;
-		problem = ""+n1+"+"+n2;
+		problem = n1+"+"+n2;
 		radius = 15;
 	}
 
diff --git a/MathHero_Kyle/src/BigMultiplication.java b/MathHero_Kyle/src/BigMultiplication.java
index af8b684..158848e 100644
--- a/MathHero_Kyle/src/BigMultiplication.java
+++ b/MathHero_Kyle/src/BigMultiplication.java
@@ -6,7 +6,7 @@ public BigMultiplication()
 		int n1 = (int)(Math.random()*90)+10;
 		int n2 = (int)(Math.random()*90)+10;
 		solution = n1*n2;
-		problem = ""+n1+"*"+n2;
+		problem = n1+"*"+n2;
 		radius = 20;
 	}
 
diff --git a/MathHero_Kyle/src/Division.java b/MathHero_Kyle/src/Division.java
index 84e30a1..5dcf96b 100644
--- a/MathHero_Kyle/src/Division.java
+++ b/MathHero_Kyle/src/Division.java
@@ -6,7 +6,7 @@ public Division()
 		int n1 = (int)(Math.random()*9)+1;
 		int n2 = (int)(Math.random()*9)+1;
 		solution = n1;
-		problem = ""+(n1*n2)+"/"+n2;
+		problem = n1+"/"+n2;
 		radius = 8;
 		color = java.awt.Color.RED;
 	}
diff --git a/MathHero_Kyle/src/Subtraction.java b/MathHero_Kyle/src/Subtraction.java
index 0631468..9446b7d 100644
--- a/MathHero_Kyle/src/Subtraction.java
+++ b/MathHero_Kyle/src/Subtraction.java
@@ -6,7 +6,7 @@ public Subtraction()
 		int n1 = (int)(Math.random()*9)+1;
 		int n2 = (int)(Math.random()*9)+1;
 		solution = n1;
-		problem = ""+(n1+n2)+"-"+n2;
+		problem = n1+"-"+n2;
 		color = java.awt.Color.RED;
 		radius = 5;
 	}

From d68f7e339e410eb81d83eaec1812304a83d8f068 Mon Sep 17 00:00:00 2001
From: xerxesman <31903174+xerxesman@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:31:03 -0500
Subject: [PATCH 6/9] brought multiplication class up to speed with the other
 classes

---
 MathHero_Kyle/src/Multiplication.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/MathHero_Kyle/src/Multiplication.java b/MathHero_Kyle/src/Multiplication.java
index 3ff7680..9b0c7b7 100644
--- a/MathHero_Kyle/src/Multiplication.java
+++ b/MathHero_Kyle/src/Multiplication.java
@@ -1,15 +1,12 @@
 public class Multiplication extends Enemy
 {
-	protected String problem;
-	protected int solution;
-
 	public Multiplication()
 	{
 		super(.4);
 		int n1 = (int)(Math.random()*9)+1;
 		int n2 = (int)(Math.random()*9)+1;
 		solution = n1*n2;
-		problem = ""+n1+"*"+n2;
+		problem = n1+"*"+n2;
 		radius = 8;
 	}
 

From 6106793a2093ec763d45b919861ac6d886508c5a Mon Sep 17 00:00:00 2001
From: xerxesman <31903174+xerxesman@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:34:42 -0500
Subject: [PATCH 7/9] moved methods getproblem & getsolution to parent class

---
 MathHero_Kyle/src/Addition.java          | 10 ----------
 MathHero_Kyle/src/BigAddition.java       | 10 ----------
 MathHero_Kyle/src/BigMultiplication.java | 10 ----------
 MathHero_Kyle/src/Division.java          | 10 ----------
 MathHero_Kyle/src/Enemy.java             | 10 ++++++++--
 MathHero_Kyle/src/Multiplication.java    | 10 ----------
 MathHero_Kyle/src/Subtraction.java       | 10 ----------
 7 files changed, 8 insertions(+), 62 deletions(-)

diff --git a/MathHero_Kyle/src/Addition.java b/MathHero_Kyle/src/Addition.java
index e4291ce..b4c82c3 100644
--- a/MathHero_Kyle/src/Addition.java
+++ b/MathHero_Kyle/src/Addition.java
@@ -9,14 +9,4 @@ public Addition()
 		problem = n1+"+"+n2;
 		radius = 5;
 	}
-
-	public String getProblem()
-	{
-		return problem;
-	}
-
-	public int getSolution()
-	{
-		return solution;
-	}
 }
\ No newline at end of file
diff --git a/MathHero_Kyle/src/BigAddition.java b/MathHero_Kyle/src/BigAddition.java
index 6be236c..3b2a7c3 100644
--- a/MathHero_Kyle/src/BigAddition.java
+++ b/MathHero_Kyle/src/BigAddition.java
@@ -9,14 +9,4 @@ public BigAddition()
 		problem = n1+"+"+n2;
 		radius = 15;
 	}
-
-	public String getProblem()
-	{
-		return problem;
-	}
-
-	public int getSolution()
-	{
-		return solution;
-	}
 }
\ No newline at end of file
diff --git a/MathHero_Kyle/src/BigMultiplication.java b/MathHero_Kyle/src/BigMultiplication.java
index 158848e..08746c6 100644
--- a/MathHero_Kyle/src/BigMultiplication.java
+++ b/MathHero_Kyle/src/BigMultiplication.java
@@ -9,14 +9,4 @@ public BigMultiplication()
 		problem = n1+"*"+n2;
 		radius = 20;
 	}
-
-	public String getProblem()
-	{
-		return problem;
-	}
-
-	public int getSolution()
-	{
-		return solution;
-	}
 }
\ No newline at end of file
diff --git a/MathHero_Kyle/src/Division.java b/MathHero_Kyle/src/Division.java
index 5dcf96b..32d72f5 100644
--- a/MathHero_Kyle/src/Division.java
+++ b/MathHero_Kyle/src/Division.java
@@ -10,14 +10,4 @@ public Division()
 		radius = 8;
 		color = java.awt.Color.RED;
 	}
-
-	public String getProblem()
-	{
-		return problem;
-	}
-
-	public int getSolution()
-	{
-		return solution;
-	}
 }
\ No newline at end of file
diff --git a/MathHero_Kyle/src/Enemy.java b/MathHero_Kyle/src/Enemy.java
index 11219ba..5097112 100644
--- a/MathHero_Kyle/src/Enemy.java
+++ b/MathHero_Kyle/src/Enemy.java
@@ -88,9 +88,15 @@ else if(dying1)
 		}
 	}
 	
+	public String getProblem()
+	{
+		return problem;
+	}
 
-	public abstract String getProblem();
-	public abstract int getSolution();
+	public int getSolution()
+	{
+		return solution;
+	}
 
 	public void draw(Graphics g)
 	{
diff --git a/MathHero_Kyle/src/Multiplication.java b/MathHero_Kyle/src/Multiplication.java
index 9b0c7b7..7b7c959 100644
--- a/MathHero_Kyle/src/Multiplication.java
+++ b/MathHero_Kyle/src/Multiplication.java
@@ -9,14 +9,4 @@ public Multiplication()
 		problem = n1+"*"+n2;
 		radius = 8;
 	}
-
-	public String getProblem()
-	{
-		return problem;
-	}
-
-	public int getSolution()
-	{
-		return solution;
-	}
 }
\ No newline at end of file
diff --git a/MathHero_Kyle/src/Subtraction.java b/MathHero_Kyle/src/Subtraction.java
index 9446b7d..1ac33cc 100644
--- a/MathHero_Kyle/src/Subtraction.java
+++ b/MathHero_Kyle/src/Subtraction.java
@@ -10,14 +10,4 @@ public Subtraction()
 		color = java.awt.Color.RED;
 		radius = 5;
 	}
-
-	public String getProblem()
-	{
-		return problem;
-	}
-
-	public int getSolution()
-	{
-		return solution;
-	}
 }
\ No newline at end of file

From 72c722974cdcfbe7018843405a857e60665bf580 Mon Sep 17 00:00:00 2001
From: xerxesman <31903174+xerxesman@users.noreply.github.com>
Date: Thu, 14 Sep 2017 18:45:12 -0500
Subject: [PATCH 8/9] removed methods relevant to mouse usage. dead code.

---
 MathHero_Kyle/src/ListeningGameComponent.java | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/MathHero_Kyle/src/ListeningGameComponent.java b/MathHero_Kyle/src/ListeningGameComponent.java
index 76b65d9..4406ceb 100644
--- a/MathHero_Kyle/src/ListeningGameComponent.java
+++ b/MathHero_Kyle/src/ListeningGameComponent.java
@@ -160,39 +160,6 @@ public void keyReleased(KeyEvent e)
 	 */
 	public void keyTyped(KeyEvent e){}
 
-	/**
-	 * Returns weather a mouse button is pressed.
-	 * @param	b	button number
-	 * @return	true if the button is pressed
-	 */
-	public boolean isMousePressed(int b)
-	{
-		if(b == 1)
-			return mousePressed1;
-		else if(b == 2)
-			return mousePressed2;
-		else if(b == 3)
-			return mousePressed3;
-
-		return false;
-	}
-
-	/**
-	 * Returns weather any mouse button is pressed.
-	 * @return	true if the button is pressed
-	 */
-	public boolean isMousePressed()
-	{
-		if(mousePressed1)
-			return mousePressed1;
-		else if(mousePressed2)
-			return mousePressed2;
-		else if(mousePressed3)
-			return mousePressed3;
-
-		return false;
-	}
-
 	/**
 	 * Returns weather a mouse button is pressed.
 	 * @param	k	the key pressed (Ex. "A", "B", "C"...")

From ae2390955c5ab97468b1d35ef35842400a37afe0 Mon Sep 17 00:00:00 2001
From: Kyle Adelsberger <kpup24@frontier.com>
Date: Tue, 26 Sep 2017 16:27:25 -0500
Subject: [PATCH 9/9] added a worthless variable

---
 MathHero_Kyle/src/Addition.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MathHero_Kyle/src/Addition.java b/MathHero_Kyle/src/Addition.java
index b4c82c3..7469306 100644
--- a/MathHero_Kyle/src/Addition.java
+++ b/MathHero_Kyle/src/Addition.java
@@ -8,5 +8,6 @@ public Addition()
 		solution = n1+n2;
 		problem = n1+"+"+n2;
 		radius = 5;
+		int x7=72;
 	}
 }
\ No newline at end of file