Merge remote-tracking branch 'jmaloney/master'

SoftwareEngineeringProject/src/MoveClasses/MoveDataBase.java

@@ -0,0 +1,25 @@
+package MoveClasses;
+
+import java.util.ArrayList;
+
+import edu.ycp.cs320.fokemon.Pokemon;
+import edu.ycp.cs320.fokemon.Status;
+
+public class MoveDataBase {
+	static ArrayList <Effect> effect;
+
+
+	public static void createMove(MoveName moveName){
+		effect.clear();
+
+
+		switch (moveName) {
+        case Tackle: 
+                 break;
+        default: //no effect
+                 break;
+		}
+
+
+	}
+}

SoftwareEngineeringProject/src/MoveClasses/MoveName.java

@@ -0,0 +1,12 @@
+package MoveClasses;
+
+public enum MoveName {
+	Tackle,
+	Bite,
+	Ember,
+	Recover,
+	Spore,
+	Blizzard,
+	Acid,
+	Thunder_Wave;
+}