Add missing documentation

Add portal
Update enemies to be generated randomly

Signed-off-by: Chris Cromer <chris@cromer.cl>

Game.iml

@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <javadoc-paths>
-      <root url="file://$MODULE_DIR$/doc" />
+      <root url="file://$MODULE_DIR$/javadoc" />
     </javadoc-paths>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

src/cl/cromer/game/Celda.java

@@ -28,6 +28,14 @@ import java.util.logging.Logger;
  * This class is a cell that will contain a game element such as a player, enemy, prize, etc
  */
 public class Celda extends JComponent implements Constantes {
+	/**
+	 * The x graphical coordinate of the cell
+	 */
+	private int xPixels;
+	/**
+	 * The y graphical coordinate of the cell
+	 */
+	private int yPixels;
 	/**
 	 * The x coordinate of the cell
 	 */
@@ -63,12 +71,19 @@ public class Celda extends JComponent implements Constantes {
 
 	/**
 	 * Initialize the cell with its coordinates
-	 * @param x The x coordinate
-	 * @param y The y coordinate
 	 */
-	public Celda(int x, int y) {
+	public Celda() {
-		this.x = x;
+		logger = getLogger(this.getClass(), CELDA_LOG_LEVEL);
-		this.y = y;
+	}
+
+	/**
+	 * Initialize the cell with its coordinates
+	 * @param xPixels The x graphical coordinate
+	 * @param yPixels The y graphical coordinate
+	 */
+	public Celda(int xPixels, int yPixels) {
+		this.xPixels = xPixels;
+		this.yPixels = yPixels;
 		logger = getLogger(this.getClass(), CELDA_LOG_LEVEL);
 	}
 
@@ -189,7 +204,7 @@ public class Celda extends JComponent implements Constantes {
 
 		for (BufferedImage tile : textures) {
 			if (tile != null) {
-				g.drawImage(tile, x, y, null);
+				g.drawImage(tile, xPixels, yPixels, null);
 			}
 		}
 
@@ -198,27 +213,22 @@ public class Celda extends JComponent implements Constantes {
 			case PLAYER:
 			case ENEMY:
 			case CHEST:
+			case PORTAL:
 				try {
 					if (animation != null && animation.getFrame() != null) {
-						g.drawImage(animation.getFrame(), x + animation.getXOffset(), y + animation.getYOffset(), null);
+						g.drawImage(animation.getFrame(), xPixels + animation.getXOffset(), yPixels + animation.getYOffset(), null);
 					}
 				}
 				catch (AnimationException e) {
 					logger.warning(e.getMessage());
 				}
 				break;
-			case PORTAL:
-				g.setColor(Color.pink);
-				g.fillRect(x + 1, y + 1, CELL_PIXELS - 1, CELL_PIXELS - 1);
-				g.setColor(Color.black);
-				g.drawString(String.valueOf(END), x + (CELL_PIXELS / 2), y + (CELL_PIXELS / 2));
-				break;
 		}
 
 		// The cell is selected
 		if (isSelected()) {
 			g.setColor(Color.black);
-			g.drawRect(x, y, CELL_PIXELS - 1, CELL_PIXELS - 1);
+			g.drawRect(xPixels, yPixels, CELL_PIXELS - 1, CELL_PIXELS - 1);
 		}
 	}
 
@@ -248,7 +258,7 @@ public class Celda extends JComponent implements Constantes {
 	 * @return Returns true if the cell is selected
 	 */
 	public boolean selected(int clickX, int clickY) {
-		Rectangle rectangle = new Rectangle(x, y, CELL_PIXELS, CELL_PIXELS);
+		Rectangle rectangle = new Rectangle(xPixels, yPixels, CELL_PIXELS, CELL_PIXELS);
 		if (rectangle.contains(new Point(clickX, clickY))) {
 			selected = !selected;
 			return true;

src/cl/cromer/game/Constantes.java

@@ -48,6 +48,7 @@ public interface Constantes {
 	Level IMAGE_LOG_LEVEL = Level.WARNING;
 	Level CELDA_LOG_LEVEL = Level.WARNING;
 	Level JSON_LOG_LEVEL = Level.WARNING;
+	Level PORTAL_LOG_LEVEL = Level.WARNING;
 	/**
 	 * Use a global log if true or individual logs if false
 	 */
@@ -68,36 +69,82 @@ public interface Constantes {
 	 * The number of cells to draw vertically
 	 */
 	int VERTICAL_CELLS = 10;
-	int TOP_MARGIN = 40;
-	int LEFT_MARGIN = 40;
-	Dimension SCREEN_SIZE = Toolkit.getDefaultToolkit().getScreenSize();
 	/**
-	 * The letter that represents the end
+	 * The amount of margin before drawing the cells
 	 */
-	char END = 'F';
+	int TOP_MARGIN = 40;
+	/**
+	 * The amount of margin to the left and right of cells
+	 */
+	int LEFT_MARGIN = 40;
+	/**
+	 * The screen size
+	 */
+	Dimension SCREEN_SIZE = Toolkit.getDefaultToolkit().getScreenSize();
 	/**
 	 * The amount of chests to draw
 	 */
-	int CHESTS = 3;
+	int CHESTS = 4;
 	/**
 	 * The amount of enemies to draw
 	 */
-	int ENEMIES = 2;
+	int ENEMIES = 4;
+	/**
+	 * The player's start x position
+	 */
 	int PLAYER_START_X = 2;
+	/**
+	 * The player's start y position
+	 */
 	int PLAYER_START_Y = 1;
+	/**
+	 * The font size to use
+	 */
 	int FONT_SIZE = 12;
+	/**
+	 * The minimum speed of the enemies
+	 */
 	int MINIMUM_SPEED = 100;
+	/**
+	 * The maximum speed of the enemies
+	 */
 	int MAXIMUM_SPEED = 500;
+	/**
+	 * The default speed of the enemies
+	 */
 	int DEFAULT_SPEED = 100;
+	/**
+	 * The minimum volume
+	 */
 	int MINIMUM_VOLUME = 0;
+	/**
+	 * The maximum volume
+	 */
 	int MAXIMUM_VOLUME = 100;
+	/**
+	 * The default volume
+	 */
 	int DEFAULT_VOLUME = 100;
+	/**
+	 * Generates the scene manually instead of from the JSON file if true
+	 */
 	boolean GENERATE_SCENE = false;
-	boolean EXPORT_SCENE = true;
+	/**
-	Font BOLD_FONT = new Font("monospaced", Font.BOLD, FONT_SIZE);
+	 * Exports the scene to a JSON file if true
-	Font FONT = new Font("monospaced", Font.PLAIN, FONT_SIZE);
+	 */
-
+	boolean EXPORT_SCENE = false;
+	/**
+	 * Use pretty JSON if true
+	 */
 	boolean PRETTY_JSON = false;
+	/**
+	 * The normal font to use
+	 */
+	Font FONT = new Font("monospaced", Font.PLAIN, FONT_SIZE);
+	/**
+	 * The bold font to use
+	 */
+	Font BOLD_FONT = new Font("monospaced", Font.BOLD, FONT_SIZE);
 
 	/**
 	 * Generate a random number between given min and max
@@ -179,13 +226,4 @@ public interface Constantes {
 		}
 		return logger;
 	}
-
-	/**
-	 * The sprite type
-	 */
-	enum SpriteType {
-		PLAYER,
-		ENEMY,
-		CHEST
-	}
 }

src/cl/cromer/game/Escenario.java

@@ -61,7 +61,7 @@ public class Escenario extends JComponent implements Constantes {
 	/**
 	 * A hashmap that contains all the sprites for the game
 	 */
-	private Map<SpriteType, Animation> sprites = new AnimationMap();
+	private Map<Animation.SpriteType, Animation> sprites = new AnimationMap();
 	/**
 	 * A collection of tiles that can be used in the scene
 	 */
@@ -74,6 +74,14 @@ public class Escenario extends JComponent implements Constantes {
 	 * The logger
 	 */
 	private Logger logger;
+	/**
+	 * The magic portal
+	 */
+	private Celda portal;
+	/**
+	 * The enemies
+	 */
+	private ArrayList<Celda> enemies = new ArrayList<>();
 
 	/**
 	 * Initialize the scene
@@ -82,7 +90,10 @@ public class Escenario extends JComponent implements Constantes {
 		logger = getLogger(this.getClass(), ESCENARIO_LOG_LEVEL);
 		this.canvas = canvas;
 		loadResources();
-		player = new Celda(PLAYER_START_X, PLAYER_START_Y);
+
+		// TODO: change to player object later
+		player = new Celda();
+		player.setCoords(PLAYER_START_X, PLAYER_START_Y);
 
 		celdas = new Celda[HORIZONTAL_CELLS][VERTICAL_CELLS];
 
@@ -130,13 +141,13 @@ public class Escenario extends JComponent implements Constantes {
 				celdas[i][j].setType(cells[i][j].type);
 
 				if (cells[i][j].type == Celda.Type.PLAYER) {
-					celdas[i][j].setAnimation(sprites.get(SpriteType.PLAYER));
+					celdas[i][j].setAnimation(sprites.get(Animation.SpriteType.PLAYER));
 				}
 				else if (cells[i][j].type == Celda.Type.ENEMY) {
-					celdas[i][j].setAnimation(sprites.get(SpriteType.ENEMY));
+					celdas[i][j].setAnimation(sprites.get(Animation.SpriteType.ENEMY));
 				}
 				else if (cells[i][j].type == Celda.Type.CHEST) {
-					celdas[i][j].setAnimation(sprites.get(SpriteType.CHEST));
+					celdas[i][j].setAnimation(sprites.get(Animation.SpriteType.CHEST));
 				}
 
 				for (int k = 0; k < cells[i][j].textures.size(); k++) {
@@ -179,6 +190,16 @@ public class Escenario extends JComponent implements Constantes {
 			}
 			arrayList.add(new RandomPositionList(random_x, random_y, Celda.Type.OBSTACLE));
 		}
+
+		random_x = random(0, HORIZONTAL_CELLS - 1);
+		random_y = random(0, VERTICAL_CELLS - 1);
+		while (arrayList.contains(new RandomPositionList(random_x, random_y, Celda.Type.PORTAL)) || celdas[random_x][random_y].getType() != Celda.Type.SPACE) {
+			random_x = random(0, HORIZONTAL_CELLS - 1);
+			random_y = random(0, VERTICAL_CELLS - 1);
+		}
+		arrayList.add(new RandomPositionList(random_x, random_y, Celda.Type.PORTAL));
+
+		// Chests need to be last to make sure they are openable
 		for (int i = 0; i < CHESTS; i++) {
 			random_x = random(0, HORIZONTAL_CELLS - 1);
 			random_y = random(0, VERTICAL_CELLS - 1);
@@ -189,11 +210,6 @@ public class Escenario extends JComponent implements Constantes {
 			}
 			arrayList.add(new RandomPositionList(random_x, random_y, Celda.Type.CHEST));
 		}
-		/*random_value = random(1, cells);
-		while (arrayList.contains(new RandomPositionList(random_value, Celda.Type.PORTAL))) {
-			random_value = random(1, cells);
-		}
-		arrayList.add(new RandomPositionList(random_value, Celda.Type.PORTAL));*/
 
 		for (RandomPositionList randomList : arrayList) {
 			int x = randomList.getX();
@@ -201,10 +217,16 @@ public class Escenario extends JComponent implements Constantes {
 			celdas[x][y].setType(randomList.getType());
 			switch (randomList.getType()) {
 				case ENEMY:
-					celdas[x][y].setAnimation(sprites.get(SpriteType.ENEMY));
+					celdas[x][y].setAnimation(sprites.get(Animation.SpriteType.ENEMY));
+					celdas[x][y].setCoords(x, y);
+					enemies.add(celdas[x][y]);
 					break;
 				case CHEST:
-					celdas[x][y].setAnimation(sprites.get(SpriteType.CHEST));
+					celdas[x][y].setAnimation(sprites.get(Animation.SpriteType.CHEST));
+					break;
+				case PORTAL:
+					celdas[x][y].setAnimation(sprites.get(Animation.SpriteType.PORTAL));
+					portal = celdas[x][y];
 					break;
 				case OBSTACLE:
 					try {
@@ -417,23 +439,15 @@ public class Escenario extends JComponent implements Constantes {
 
 				if (x == PLAYER_START_X && y == PLAYER_START_Y) {
 					celdas[x][y].setType(Celda.Type.PLAYER);
-					celdas[x][y].setAnimation(sprites.get(SpriteType.PLAYER));
+					celdas[x][y].setAnimation(sprites.get(Animation.SpriteType.PLAYER));
 				}
-				else if (x == 10 && y == 3) {
+				/*else if (x == 10 && y == 3) {
 					celdas[x][y].setType(Celda.Type.ENEMY);
-					celdas[x][y].setAnimation(sprites.get(SpriteType.ENEMY));
+					celdas[x][y].setAnimation(sprites.get(Animation.SpriteType.ENEMY));
 				}
 				else if (x == 10 && y == 7) {
 					celdas[x][y].setType(Celda.Type.ENEMY);
-					celdas[x][y].setAnimation(sprites.get(SpriteType.ENEMY));
+					celdas[x][y].setAnimation(sprites.get(Animation.SpriteType.ENEMY));
-				}
-				/*else if (x == 16 && y == 1) {
-					celdas[x][y].setType(Celda.Type.CHEST);
-					celdas[x][y].setAnimation(sprites.get(SpriteType.CHEST));
-				}
-				else if (x == 12 && y == 7) {
-					celdas[x][y].setType(Celda.Type.CHEST);
-					celdas[x][y].setAnimation(sprites.get(SpriteType.CHEST));
 				}*/
 			}
 		}
@@ -454,7 +468,7 @@ public class Escenario extends JComponent implements Constantes {
 
 			loadCharacter(animation, characterSheet, character);
 
-			sprites.put(SpriteType.PLAYER, animation);
+			sprites.put(Animation.SpriteType.PLAYER, animation);
 		}
 		catch (SheetException e) {
 			logger.warning(e.getMessage());
@@ -469,7 +483,7 @@ public class Escenario extends JComponent implements Constantes {
 
 			loadCharacter(animation, characterSheet, character);
 
-			sprites.put(SpriteType.ENEMY, animation);
+			sprites.put(Animation.SpriteType.ENEMY, animation);
 		}
 		catch (SheetException e) {
 			logger.warning(e.getMessage());
@@ -484,12 +498,24 @@ public class Escenario extends JComponent implements Constantes {
 			animation.addImage(Animation.Direction.NONE, chestSheet.getTexture(78));
 			animation.addImage(Animation.Direction.NONE, chestSheet.getTexture(80));
 			animation.setYOffset(0);
-			sprites.put(SpriteType.CHEST, animation);
+			sprites.put(Animation.SpriteType.CHEST, animation);
 		}
 		catch (SheetException e) {
 			logger.warning(e.getMessage());
 		}
 
+		animation = new Animation();
+		for (int i = 0; i < 120; i++) {
+			StringBuilder stringBuilder = new StringBuilder();
+			stringBuilder.append(i);
+			while (stringBuilder.length() < 3) {
+				stringBuilder.insert(0, 0);
+			}
+			stringBuilder.append(".png");
+			animation.addImage(Animation.Direction.NONE, "/res/img/portal/gray/" + stringBuilder.toString());
+		}
+		sprites.put(Animation.SpriteType.PORTAL, animation);
+
 		// Load the background textures
 		textureSheet = new Sheet("/res/img/textures/3.png", 64, 64);
 	}
@@ -737,6 +763,24 @@ public class Escenario extends JComponent implements Constantes {
 		return player;
 	}
 
+	/**
+	 * Get the portal
+	 *
+	 * @return Returns the cell contain the portal
+	 */
+	public Celda getPortal() {
+		return portal;
+	}
+
+	/**
+	 * Get the enemies
+	 *
+	 * @return Returns an array list containing the enemies
+	 */
+	public ArrayList<Celda> getEnemies() {
+		return enemies;
+	}
+
 	/**
 	 * Get the parent canvas of this scene
 	 * @return Returns the parent canvas

src/cl/cromer/game/Lienzo.java

@@ -16,6 +16,7 @@
 package cl.cromer.game;
 
 import cl.cromer.game.object.Enemy;
+import cl.cromer.game.object.Portal;
 import cl.cromer.game.sound.Sound;
 import cl.cromer.game.sound.SoundException;
 import cl.cromer.game.sprite.AnimationException;
@@ -23,6 +24,7 @@ import cl.cromer.game.sprite.AnimationException;
 import javax.sound.sampled.Clip;
 import java.awt.*;
 import java.awt.event.*;
+import java.util.ArrayList;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
@@ -60,13 +62,21 @@ public class Lienzo extends Canvas implements Constantes {
 	 */
 	private Image imageBuffer;
 	/**
-	 * The first enemy
+	 * The threads for the objects
 	 */
-	private Enemy enemy;
+	private ArrayList<Thread> threads = new ArrayList<>();
 	/**
-	 * The second enemy
+	 * The enemies
 	 */
-	private Enemy enemy2;
+	private ArrayList<Enemy> enemies = new ArrayList<>();
+	/**
+	 * The current direction that is assigned to an enemy
+	 */
+	private Enemy.Direction enemyDirection = Enemy.Direction.DOWN;
+	/**
+	 * The magic portal
+	 */
+	private Portal portal;
 	/**
 	 * The logger
 	 */
@@ -133,17 +143,31 @@ public class Lienzo extends Canvas implements Constantes {
 
 		final Lock lock = new ReentrantLock(true);
 
-		enemy = new Enemy(escenario, lock);
+		for (Celda celda : escenario.getEnemies()) {
-		enemy.setCoordinates(10, 3);
+			Enemy enemy = new Enemy(escenario, celda, lock);
-		enemy2 = new Enemy(escenario, lock);
+			enemy.setDirection(enemyDirection);
-		enemy2.setCoordinates(10, 7);
+			if (enemyDirection == Enemy.Direction.UP) {
-		enemy2.setDirection(Enemy.Direction.DOWN);
+				enemyDirection = Enemy.Direction.DOWN;
+			}
+			else if (enemyDirection == Enemy.Direction.DOWN) {
+				enemyDirection = Enemy.Direction.LEFT;
+			}
+			else if (enemyDirection == Enemy.Direction.LEFT) {
+				enemyDirection = Enemy.Direction.RIGHT;
+			}
+			else {
+				enemyDirection = Enemy.Direction.UP;
+			}
+			enemies.add(enemy);
+			threads.add(new Thread(enemy));
+		}
 
-		Thread thread = new Thread(enemy);
+		portal = new Portal(escenario);
-		Thread thread2 = new Thread(enemy2);
+		threads.add(new Thread(portal));
 
-		thread.start();
+		for (Thread thread : threads) {
-		thread2.start();
+			thread.start();
+		}
 
 		try {
 			backgroundMusic = new Sound("/res/snd/GameLoop.wav");
@@ -259,8 +283,9 @@ public class Lienzo extends Canvas implements Constantes {
 		if (speed <= 0) {
 			speed = 1;
 		}
-		enemy.setSpeed(speed);
+		for (Enemy enemy : enemies) {
-		enemy2.setSpeed(speed);
+			enemy.setSpeed(speed);
+		}
 		requestFocus();
 	}
 

src/cl/cromer/game/RandomPositionList.java

@@ -16,7 +16,7 @@
 package cl.cromer.game;
 
 /**
- * This class is used to save locations of random cells for enemies, obstacles, and prizes
+ * This class is used to save locations of random cells for enemies, obstacles, chests, etc
  */
 public class RandomPositionList {
 	/**

src/cl/cromer/game/json/Cell.java

@@ -19,7 +19,16 @@ import cl.cromer.game.Celda;
 
 import java.util.ArrayList;
 
+/**
+ * This class represents the structure of a cell in JSON
+ */
 public class Cell {
+	/**
+	 * The type of cell, e.g. player, chest, enemy, etc
+	 */
 	public Celda.Type type;
+	/**
+	 * A list of the textures to apply to the cell
+	 */
 	public ArrayList<Integer> textures = new ArrayList<>();
 }

src/cl/cromer/game/object/Enemy.java

@@ -39,11 +39,11 @@ public class Enemy implements Runnable, Constantes {
 	/**
 	 * The current x position of the enemy
 	 */
-	private int x = 0;
+	private int x;
 	/**
 	 * The current y position of the enemy
 	 */
-	private int y = 0;
+	private int y;
 	/**
 	 * The current direction the enemy is facing
 	 */
@@ -70,12 +70,13 @@ public class Enemy implements Runnable, Constantes {
 	 *
 	 * @param escenario The scene the enemy is in
 	 */
-	public Enemy(Escenario escenario, Lock lock) {
+	public Enemy(Escenario escenario, Celda celda, Lock lock) {
 		this.lock = lock;
 		logger = getLogger(this.getClass(), ENEMY_LOG_LEVEL);
 		this.escenario = escenario;
-		celda = new Celda(x, y);
+		this.celda = celda;
-		celda.setType(Celda.Type.ENEMY);
+		this.x = celda.getX();
+		this.y = celda.getY();
 	}
 
 	/**

src/cl/cromer/game/object/Portal.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2019 Chris Cromer
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+package cl.cromer.game.object;
+
+import cl.cromer.game.Celda;
+import cl.cromer.game.Constantes;
+import cl.cromer.game.Escenario;
+import cl.cromer.game.sprite.AnimationException;
+
+import java.util.logging.Logger;
+
+/**
+ * This class handles the portal functionality
+ */
+public class Portal implements Runnable, Constantes {
+	/**
+	 * The scene the portal is in
+	 */
+	private Escenario escenario;
+	/**
+	 * The cell that contains the portal
+	 */
+	private Celda celda;
+	/**
+	 * If the portal is active or not
+	 */
+	private boolean active = true;
+	/**
+	 * The logger
+	 */
+	private Logger logger;
+
+	/**
+	 * Initialize the portal
+	 *
+	 * @param escenario The scene that contains the portal
+	 */
+	public Portal(Escenario escenario) {
+		this.escenario = escenario;
+		logger = getLogger(this.getClass(), PORTAL_LOG_LEVEL);
+		celda = escenario.getPortal();
+	}
+
+	/**
+	 * This method animates the portal
+	 */
+	private void animate() {
+		try {
+			celda.getAnimation().getNextFrame();
+		}
+		catch (AnimationException e) {
+			logger.warning(e.getMessage());
+		}
+	}
+
+	/**
+	 * Check of the portal is active or not
+	 *
+	 * @return Returns true if active or false is inactive
+	 */
+	public boolean isActive() {
+		return active;
+	}
+
+	/**
+	 * Set the portal's active state
+	 *
+	 * @param active True if active or false if inactive
+	 */
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+
+	/**
+	 * This method is run when the thread starts
+	 */
+	@Override
+	public void run() {
+		while (active) {
+			try {
+				// 1000 / 30 = 33      30 frames per second(1000 milliseconds) is 33.33
+				Thread.sleep(33);
+			}
+			catch (InterruptedException e) {
+				logger.warning(e.getMessage());
+			}
+			synchronized (this) {
+				animate();
+				escenario.getCanvas().repaint();
+			}
+		}
+	}
+}

src/cl/cromer/game/sprite/Animation.java

@@ -54,6 +54,18 @@ public class Animation implements Cloneable, Constantes {
 	 */
 	private Logger logger;
 
+	/**
+	 * The sprite type
+	 */
+	public enum SpriteType {
+		PLAYER,
+		ENEMY,
+		CHEST,
+		GEM,
+		KEY,
+		PORTAL
+	}
+
 	/**
 	 * Initialize the sprite
 	 */

src/cl/cromer/game/sprite/AnimationMap.java

@@ -24,7 +24,7 @@ import java.util.logging.Logger;
  * This class is used to copy the sprite into a new sprite object so that the sprite doesn't get passed by reference
  * This is important because 2 cells share the same sprite, but not the same frame of animation
  */
-public class AnimationMap extends HashMap<Constantes.SpriteType, Animation> implements Constantes {
+public class AnimationMap extends HashMap<Animation.SpriteType, Animation> implements Constantes {
 	/**
 	 * Clone the sprite object when returning
 	 *