Tweaking to fit GUI

.gitignore

@@ -1,7 +1,4 @@
 # Created by .gitignore support plugin (hsz.mobi)
 serverTime.iml
 .idea
-junit-4.7.jar
-jbox2d-library-2.2.1.1.jar
-jbox2d-testbed-2.2.1.1.jar
-jbox2d-serialization-1.1.0.jar
+src/collector/src/tileMapStuff/codeNameMetalMayhem.java

README.md

@@ -0,0 +1,9 @@
+serverTime
+==========
+
+server exploration
+this is a group project for our Software enginering class
+building a game that will allow two users to compete in different games by havging common variables representing
+different objects in the individual games.
+run the game class to run the currnet collector game
+

out/production/serverTime/Color.txt

@@ -0,0 +1 @@
+BLACK

out/production/serverTime/collector/src/tileMapStuff/levelOne.txt

@@ -0,0 +1,17 @@
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
+1,0,0,0,1,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,1,0,0,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,1
+1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
+1,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1
+1,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+
+

out/test/test.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/serverTime" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

src/collector/src/tileMapStuff/Coin.java

@@ -0,0 +1,40 @@
+package collector.src.tileMapStuff;
+
+import java.awt.*;
+
+/**
+ * Created by newScanTron on 11/11/2014.
+ */
+public class Coin extends Entity
+{
+    /**
+     * Create a new entity in the game
+     *  @param map         The map this entity is going to wander around
+     * @param x           The initial x position of this entity in grid cells
+     * @param y           The initial y position of this entity in grid cells
+     */
+    Map map = new Map();
+    public Coin(Map map, float x, float y)
+    {
+        super(map, x, y);
+    }
+
+    public void paint(Graphics g) {
+        // work out the screen position of the entity based on the
+        // x/y position and the size that tiles are being rendered at. So
+        // if we're at 1.5,1.5 and the tile size is 10 we'd render on screen
+        // at 15,15.
+        int xp = (int) (Map.TILE_SIZE * x);
+        int yp = (int) (Map.TILE_SIZE * y);
+        g.setColor(new Color(222, 104, 244));
+        g.drawRect (xp ,yp , Map.TILE_SIZE, Map.TILE_SIZE);
+
+    }
+    //proximity detection
+    public float proximity(float x, float y)
+    {
+        float distance = 0;
+        distance = (float) Math.sqrt(Math.pow((this.x - x), 2)+Math.pow((this.y -y), 2));
+        return distance;
+    }
+}

src/collector/src/tileMapStuff/Entity.java

@@ -0,0 +1,119 @@
+package collector.src.tileMapStuff;
+
+import main.DBOps;
+import main.Driver;
+
+import java.awt.*;
+
+public class Entity {
+	/** The x and y position of this entity in terms of grid cells
+     * that make up the map object*/
+	protected float x;
+	protected float y;
+	protected Map map;
+	/** The size of this entity, this is used to calculate collisions with walls */
+	private float size = 0.4f;
+	private boolean grounded = false;
+    protected int score = 0;
+    protected Color playColor = new Color(203, 200, 106);
+    private Thread scoreThread = new Thread(new UpdateScore());
+
+    public Entity(Map map, float x, float y)
+    {
+        this.map = map;
+        this.x = x;
+        this.y = y;
+    }
+    public float getX()
+    {
+        return x;
+    }
+
+    public float getY()
+    {
+        return y;
+    }
+
+    public void setScore(int add)
+    {
+        this.score += add;
+    }
+
+    public boolean move(float dx, float dy)
+    {
+        float nx = x + dx;
+		float ny = y + dy;
+        // check if the new position of the entity collides with
+		// anything
+        if (validLocation(nx, ny)) {
+			// if it doesn't then change our position to the new position
+			x = nx;
+			y = ny;
+			if (map.isCoin(x, y, 1))
+            {
+                map.setClear((int)x, (int)y);
+                setScore(1);
+                scoreThread = new Thread(new UpdateScore());
+                scoreThread.start();
+                System.out.println(score);
+            }
+			return true;
+		}
+		return false;
+	}
+
+	public boolean validLocation(float nx, float ny)
+    {
+
+        grounded = false;
+        if (map.isBlocked(nx, ny))
+        {
+            return false;
+        }
+        if (map.isBlocked(nx + size, ny))
+        {
+            return false;
+        }
+        if (map.isBlocked(nx, ny + size))
+        {
+            grounded = true;
+            return false;
+        }
+        if (map.isBlocked(nx + size, ny + size))
+        {
+            grounded = true;
+            return false;
+        }
+        return true;
+    }
+
+    // check to see if Entity is grounded
+    public boolean isGrounded()
+    {
+        grounded = true;
+        if (map.isBlocked(x, y +size))
+        {
+            grounded = true;
+        }
+        return grounded;
+    }
+
+	public void paint(Graphics g) {
+		int xp = (int) (Map.TILE_SIZE * x);
+		int yp = (int) (Map.TILE_SIZE * y);
+		g.setColor(playColor);
+        g.fillRect(xp, yp, 10, 10);
+	}
+
+	private class UpdateScore implements Runnable {
+
+		public void run() {
+			int DBscore = Integer.parseInt((DBOps.getData("scores", "1", "id", "Collector")).get(0)) + 5;
+            DBOps.updateData("scores", "Collector", "" + DBscore, "id", "1");
+            DBscore = Integer.parseInt((DBOps.getData("users", Driver.currentUser.getName(), "user", "scoredCollector")).get(0)) + 5;
+			DBOps.updateData("users", "scoredCollector", "" + DBscore, "user", Driver.currentUser.getName() );
+            return;
+		}
+
+	}
+}