Merge branch 'front-end' of https://github.com/Alan19/TapMonsters.git …

…into front-end

TapMonster/src/MonsterDex/MonsterDex.java

@@ -5,8 +5,11 @@
 import java.util.List;
 
 import guiPractice.ClickableScreen;
+import guiPractice.components.Action;
 import guiPractice.components.Button;
 import guiPractice.components.Graphic;
+import guiPractice.components.TextArea;
+import guiPractice.components.TextLabel;
 import guiPractice.components.Visible;
 import interfaces.MonDexInterface;
 
@@ -17,6 +20,8 @@ public class MonsterDex extends ClickableScreen implements Runnable{
 	private Button Back;
 	private Graphic Background;
 	private static Graphic MonsterImg;
+	private static TextArea Description;
+	private TextLabel Name;
 
 	private static int PosX = 100;
 	private static int PosY = 100;
@@ -29,31 +34,30 @@ public MonsterDex(int width,int height) {
 	}
 
 
-	public void initObjects(ArrayList<Visible> viewObjects){
+	public void initObjects(final ArrayList<Visible> viewObjects){
 		Monsters = new ArrayList<MonDexInterface>();
 		Next = new Button(getWidth() - 110, getHeight() - 70, 90, 50, "Next", Color.decode("#a52a2a"), null);
-		Back = new Button(20, getHeight() - 70, 90, 50, "Back", Color.decode("#a52a2a"), null);
+		Back = new Button(20, getHeight() - 70, 90, 50, "Back", Color.decode("#a52a2a"), new Action() {
+
+			public void act() {
+				MonID++;
+			}
+		});
+
 		Background = new Graphic(0,0,getWidth(),getHeight(),"src/resources/background.jpg");
 		MonsterImg = getMonster();
 		viewObjects.add(Background);
 		viewObjects.add(Next);
 		viewObjects.add(Back);	
 		viewObjects.add(MonsterImg);
-//		for(int i = MonID; i < MonID+1; i++){
-//			MonsterImg = new Graphic(PosX,PosY, 100,100,"src/MonsterSprites/"+MonID+".gif");
-//			PosX += 200;
-//			MonID++;
-//			viewObjects.add(MonsterImg);
-//		}
-	}
 
+	}
 
-	private MonsterGraphic getMonster() {
+	private Graphic getMonster() {
 		MonID++;
 		return new MonsterGraphic(PosX, PosY, 100, 100, MonID);
 	}
 
-
 	public void run() {
 		// TODO Auto-generated method stub
 

TapMonster/src/MonsterDex/MonsterDexScreen.java

@@ -3,23 +3,25 @@
 import guiPractice.GUIApplication;
 
 public class MonsterDexScreen extends GUIApplication{
+
+	public static MonsterDexScreen profile;
 
-	public MonsterDexScreen() {
-		super(1200,900);
-		// TODO Auto-generated constructor stub
+	public static void main(String[] args) {
+		MonsterDexScreen profile = new MonsterDexScreen();
+		Thread app = new Thread(profile);
+		app.start();
 	}
-
+	
 	@Override
 	protected void initScreen() {
 		MonsterDex dex = 
 				new MonsterDex(getWidth(),getHeight());
 		setScreen(dex);
 	}
 
-	public static void main(String[] args) {
-		MonsterDexScreen profile = new MonsterDexScreen();
-		Thread app = new Thread(profile);
-		app.start();
+	public MonsterDexScreen() {
+		super(1000,800);
 	}
+
 
 }

TapMonster/src/MonsterDex/MonsterGraphic.java

@@ -1,5 +1,6 @@
 package MonsterDex;
 
+import guiPractice.components.Action;
 import guiPractice.components.Graphic;
 
 public class MonsterGraphic extends Graphic{
@@ -22,6 +23,11 @@ private static String randInt() {
 		return Integer.toString((int)(Math.random()*10));
 	}
 
+	public void act() {
+		// TODO Auto-generated method stub
+
+	}
+
 
 
 }

TapMonster/src/main/InventoryScreen.java

@@ -70,6 +70,8 @@ public void initObjects(ArrayList<Visible> viewObjects) {
 
 	//each artifact has a name and description
 	//shows how many artifacts are collected
+	//can make interface for adding "you gained +something" for
+	//every artifact that is collected in the inventory
 
 	@Override
 	public void initAllObjects(List<Visible> viewObjects) {