Index: makefile
===================================================================
--- makefile	(revision a10d42227aba421cc4091d26237fdcd20e0f00ad)
+++ makefile	(revision 57674f39e89e90dfa33c0faf5d044786912de651)
@@ -1,26 +1,31 @@
+NOTE: Currently, this assumes that I have first compiled the .java files into .class files
+
 # Use something like "LostPerception: MAP_FILE_DEPS = maps/*.txt" to specify var for a specific target
 
-#ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/AStarSearch.class astar/BinaryHeap.class astar/QuadTree.class
-#COLLISION_DEPS = collision/Bound.class
+ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/AStarSearch.class astar/BinaryHeap.class astar/QuadTree.class
+COLLISION_DEPS = collision/Bound.class
 #GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Listable.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Textbox.class gamegui/Window.class
-#UTILS_DEPS = utils/DynamicImage.class utils/Utils.class utils/WrappedString.class
+GAMEGUI_DEPS = gamegui/Align.class gamegui/Animation.class gamegui/Button.class gamegui/Label.class gamegui/Member.class gamegui/ScrollBar.class gamegui/ScrollList.class gamegui/Window.class
+UTILS_DEPS = utils/DynamicImage.class utils/Utils.class utils/WrappedString.class
 
-#MAIN_DEPS = main/Action.class main/Armor.class main/Creature.class main/Dialog.class main/Direction.class main/Effect.class main/Enemy.class main/Item.class main/Location.class main/LostHavenRPG.class main/Map.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/NPC.class main/Player.class main/StatType.class main/Tile.class main/Weapon.class
+MAIN_DEPS = main/Action.class main/Armor.class main/Creature.class main/Dialog.class main/Direction.class main/Effect.class main/Enemy.class main/Item.class main/Location.class main/LostHavenRPG.class main/Map.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/NPC.class main/Player.class main/StatType.class main/Tile.class main/Weapon.class
 
 #GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
+LostPerception: GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class
 #MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$MoveSpeed.class main/Effect\$$Hitpoints.class main/Effect\$$Manapoints.class main/Effect\$$Damage.class main/Effect\$$AttackSpeed.class main/LostHavenRPG\$$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
-#UTILS_INNER_DEPS = utils/Utils\$$1.class
+LostPerception: MAIN_INNER_DEPS = main/Armor\$$ArmorType.class main/Effect\$$AttackSpeed.class main/Effect\$$Damage.class main/Effect\$$Hitpoints.class main/Effect\$$MoveSpeed.class main/LostHavenRPG\$$1.class main/LostHavenRPG\$$AuxState.class main/LostHavenRPG\$$GameState.class main/Model\$$1.class
+LostPerception: UTILS_INNER_DEPS = utils/Utils\$$1.class
 
-#INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
+LostPerception: INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
 
-#DIALOG_FILE_DEPS = dialog/*.txt
-#IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png images/*/*.ttf
-#MAP_FILE_DEPS = maps/*.txt
+DIALOG_FILE_DEPS = dialog/*.txt
+IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png images/*/*.ttf
+MAP_FILE_DEPS = maps/*.txt
 
-#CLASS_DEPS = $(MAIN_DEPS) $(ASTAR_DEPS) $(GAMEGUI_DEPS) $(COLLISION_DEPS) $(UTILS_DEPS)
-#FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
+CLASS_DEPS = $(MAIN_DEPS) $(ASTAR_DEPS) $(GAMEGUI_DEPS) $(COLLISION_DEPS) $(UTILS_DEPS)
+FILE_DEPS = $(DIALOG_FILE_DEPS) $(IMAGE_FILE_DEPS) $(MAP_FILE_DEPS)
 
-#LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
-#	jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)
+LostPerception: $(CLASS_DEPS) $(FILE_DEPS)
+	jar cfe $@.jar main.LostHavenRPG $^ $(INNER_DEPS)
 
 ASTAR_DEPS = astar/AStarMap.class astar/AStarNode.class astar/QuadTree.class
@@ -31,9 +36,9 @@
 MAIN_DEPS = main/Action.class main/Creature.class main/Direction.class main/Enemy.class main/Item.class main/Location.class main/Map.class main/MapEditor.class main/MapImage.class main/MapObject.class main/MapType.class main/Model.class main/Player.class main/StatType.class main/Tile.class 
 
-GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
-MAIN_INNER_DEPS = main/MapEditor\$$1.class main/MapEditor\$$AuxState.class  main/MapEditor\$$GroundType.class main/MapEditor\$$State.class main/Model\$$1.class
-UTILS_INNER_DEPS = utils/Utils\$$1.class
+MapEditor: GAMEGUI_INNER_DEPS = gamegui/Button\$$1.class gamegui/Label\$$1.class
+MapEditor: MAIN_INNER_DEPS = main/MapEditor\$$1.class main/MapEditor\$$AuxState.class  main/MapEditor\$$GroundType.class main/MapEditor\$$State.class main/Model\$$1.class
+MapEditor: UTILS_INNER_DEPS = utils/Utils\$$1.class
 
-INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
+MapEditor: INNER_DEPS = $(GAMEGUI_INNER_DEPS) $(MAIN_INNER_DEPS) $(UTILS_INNER_DEPS)
 
 IMAGE_FILE_DEPS = images/*/*.png images/creatures/*/*/*.png