v0.4.2 !

DialogueGraphView

.classpath

@@ -10,7 +10,7 @@
 	<classpathentry kind="lib" path="lib/prefuse.jar"/>
 	<classpathentry kind="lib" path="lib/rsyntaxtextarea.jar"/>
 	<classpathentry kind="lib" path="lib/ui.jar"/>
-	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
+	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

hacked-libtiled/tiled/core/TileSet.java

@@ -74,6 +74,7 @@ public class TileSet implements Iterable<Tile>
     private Color transparentColor;
     private Image tileSetImage;
     public Spritesheet sheet = null;
+    public Rectangle sheetDimensions;
 
     /**
      * Default constructor
@@ -120,8 +121,10 @@ public class TileSet implements Iterable<Tile>
         importTileBitmap(buffered, cutter);
     }
     
-    public void loadFromProject(String name, TMXMap tmxMap) {
+    public void loadFromProject(String name, TMXMap tmxMap, int tileWidth, int tileHeight) {
     	sheet = tmxMap.getProject().getSpritesheet(name);
+    	tileDimensions.width = tileWidth;
+    	tileDimensions.height = tileHeight;
     	int i = 0;
     	Image tileImage = sheet.getImage(i);
         while (tileImage != null) {

hacked-libtiled/tiled/io/TMXMapReader.java

@@ -30,6 +30,7 @@ package tiled.io;
 
 import java.awt.Color;
 import java.awt.Image;
+import java.awt.Rectangle;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -382,7 +383,10 @@ public class TMXMapReader
                         // case.
                     	
                     	if (tmxMap.getProject().getSpritesheet(name) != null) {
-                    		set.loadFromProject(name, tmxMap);
+                    		set.loadFromProject(name, tmxMap, tileWidth, tileHeight);
+                    		set.sheetDimensions = new Rectangle();
+                    		set.sheetDimensions.width = getAttribute(child, "width", 0);
+                    		set.sheetDimensions.height = getAttribute(child, "height", 0);
                     	} else {
                     	
 

hacked-libtiled/tiled/io/TMXMapWriter.java

@@ -257,7 +257,11 @@ public class TMXMapWriter
         if (tileBitmapFile != null) {
             w.startElement("image");
             w.writeAttribute("source", getRelativePath(wp, tileBitmapFile));
-
+            if (set.sheetDimensions != null) {
+            	w.writeAttribute("width", set.sheetDimensions.width);
+            	w.writeAttribute("height", set.sheetDimensions.height);
+            }
+            
             Color trans = set.getTransparentColor();
             if (trans != null) {
                 w.writeAttribute("trans", Integer.toHexString(

hacked-libtiled/tiled/view/OrthogonalRenderer.java

@@ -90,4 +90,5 @@ public class OrthogonalRenderer implements MapRenderer
 
         g.translate(-bounds.x * tileWidth, -bounds.y * tileHeight);
     }
+    
 }

packaging/Linux/ATCS/ATCS.cmd

@@ -1 +1 @@
-start "" "javaw.exe" -Xmx512M -cp "lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\ATCS_v0.4.0.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
+start "" "javaw.exe" -Xmx512M -cp "lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\ATCS_v0.4.2.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Linux/ATCS/ATCS.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Xmx512M -cp lib/AndorsTrainer_v0.1.2.jar:lib/ATCS_v0.4.0.jar:lib/prefuse.jar:lib/json_simple-1.1.jar:lib/jide-oss.jar:lib/ui.jar:lib/junit-4.10.jar:lib/rsyntaxtextarea.jar:lib/bsh-2.0b4.jar com.gpl.rpg.atcontentstudio.ATContentStudio
+java -Xmx512M -cp lib/AndorsTrainer_v0.1.2.jar:lib/ATCS_v0.4.2.jar:lib/prefuse.jar:lib/json_simple-1.1.jar:lib/jide-oss.jar:lib/ui.jar:lib/junit-4.10.jar:lib/rsyntaxtextarea.jar:lib/bsh-2.0b4.jar com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Windows/ATCS.cmd

@@ -1 +1 @@
-start "" "D:\Programs\jdk1.6.0_24\\bin\javaw.exe" -Xmx512M -cp "lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\ATCS_v0.0.4.jar;lib\AndorsTrainer_V0.1.2.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
+start "" "javaw.exe" -Xmx512M -cp "lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\ATCS_v0.4.1.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Windows/ATCS_Installer.nsi

@@ -1,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.4.0"
+!define VERSION "0.4.2"
 !define JAVA_BIN "java"
 
 Name "Andor's Trail Content Studio v${VERSION}"

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -18,7 +18,7 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.4.0";
+	public static final String APP_VERSION = "v0.4.2";
 
 	public static boolean STARTED = false;
 	public static StudioFrame frame = null;

src/com/gpl/rpg/atcontentstudio/model/Project.java

@@ -522,6 +522,13 @@ public class Project implements ProjectTreeNode, Serializable {
 		return gde;
 	}
 
+	public NPC getNPCIgnoreCase(String id) {
+		NPC gde = createdContent.gameData.getNPCIgnoreCase(id);
+		if (gde == null) gde = alteredContent.gameData.getNPCIgnoreCase(id);
+		if (gde == null) gde = baseContent.gameData.getNPCIgnoreCase(id);
+		return gde;
+	}
+
 	public int getNPCCount() {
 		return createdContent.gameData.npcs.size() + baseContent.gameData.npcs.size();
 	}
@@ -833,7 +840,7 @@ public class Project implements ProjectTreeNode, Serializable {
 		int index = -1;
 		while (--i >= 0) {
 			NPC npc = getNPC(i);
-			if (spawngroup_id.equals(npc.spawngroup_id)) {
+			if (spawngroup_id.equalsIgnoreCase(npc.spawngroup_id)) {
 				for (NPC present : result) {
 					if (present.id.equals(npc.id)) {
 						alreadyAdded = true;
@@ -851,7 +858,7 @@ public class Project implements ProjectTreeNode, Serializable {
 		}
 		if (result.isEmpty()) {
 			//Fallback case. A single NPC does not declare a spawn group, but is referred by its ID in maps' spawn areas.
-			NPC npc = getNPC(spawngroup_id);
+			NPC npc = getNPCIgnoreCase(spawngroup_id);
 			if (npc != null) result.add(npc);
 		}
 		return result;

src/com/gpl/rpg/atcontentstudio/model/gamedata/Dialogue.java

@@ -171,7 +171,7 @@ public class Dialogue extends JSONElement {
 						requirement.parent = this;
 						if (requirementJson.get("requireType") != null) requirement.type = RequirementType.valueOf((String) requirementJson.get("requireType"));
 						requirement.required_obj_id = (String) requirementJson.get("requireID");
-						requirement.required_value = JSONElement.getInteger(Integer.parseInt(requirementJson.get("value").toString()));
+						if (requirementJson.get("value") != null) requirement.required_value = JSONElement.getInteger(Integer.parseInt(requirementJson.get("value").toString()));
 						if (requirementJson.get("negate") != null) requirement.negated = (Boolean) requirementJson.get("negate");
 						requirement.state = State.parsed;
 						reply.requirements.add(requirement);

src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataSet.java

@@ -212,6 +212,16 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 		return null;
 	}
 	
+	public NPC getNPCIgnoreCase(String id) {
+		if (npcs == null) return null;
+		for (NPC gde : npcs) {
+			if (id.equalsIgnoreCase(gde.id)){
+				return gde;
+			}
+		}
+		return null;
+	}
+	
 	public Quest getQuest(String id) {
 		if (quests == null) return null;
 		for (Quest gde : quests) {

src/com/gpl/rpg/atcontentstudio/model/maps/KeyArea.java

@@ -12,6 +12,7 @@ public class KeyArea extends MapObject {
 	public String dialogue_id = null;
 	public Dialogue dialogue = null;
 	public Requirement requirement = null;
+	public boolean oldSchoolRequirement = true;
 	
 	public KeyArea(tiled.core.MapObject obj) {
 		dialogue_id = obj.getProperties().getProperty("phrase");
@@ -29,6 +30,9 @@ public class KeyArea extends MapObject {
 				requireType = fields[0];
 				requireId = fields[1];
 			}
+			oldSchoolRequirement = true;
+		} else {
+			oldSchoolRequirement = false;
 		}
 		requirement = new Requirement();
 		requirement.type = Requirement.RequirementType.valueOf(requireType);
@@ -59,6 +63,7 @@ public class KeyArea extends MapObject {
 			dialogue = (Dialogue) newOne;
 			newOne.addBacklink(parentMap);
 		}
+		requirement.elementChanged(oldOne, newOne);
 	}
 	
 	@Override
@@ -69,16 +74,34 @@ public class KeyArea extends MapObject {
 			tmxObject.getProperties().setProperty("phrase", dialogue_id);
 		}
 		if (requirement != null) {
-			tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
-			if (requirement.required_obj != null) {
-				tmxObject.getProperties().setProperty("requireId", requirement.required_obj.id);
-			} else if (requirement.required_obj_id != null) {
-				tmxObject.getProperties().setProperty("requireId", requirement.required_obj_id);
-			}
-			if (requirement.required_value != null) {
-				tmxObject.getProperties().setProperty("requireValue", requirement.required_value.toString());
+			if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
+				tmxObject.setName(requirement.required_obj_id+":"+Integer.toString(requirement.required_value));
+			} else {
+				tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
+				if (requirement.required_obj != null) {
+					tmxObject.getProperties().setProperty("requireId", requirement.required_obj.id);
+				} else if (requirement.required_obj_id != null) {
+					tmxObject.getProperties().setProperty("requireId", requirement.required_obj_id);
+				}
+				if (requirement.required_value != null) {
+					tmxObject.getProperties().setProperty("requireValue", requirement.required_value.toString());
+				}
 			}
 		}
 	}
 
+	public void updateNameFromRequirementChange() {
+		if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
+			name = requirement.required_obj_id+":"+Integer.toString(requirement.required_value);
+		} else if (oldSchoolRequirement) {
+			int i = 0;
+			String futureName = requirement.type.toString() + "#" + Integer.toString(i);
+			while (parentMap.getMapObject(futureName) != null) {
+				i++;
+				futureName = requirement.type.toString() + "#" + Integer.toString(i);
+			}
+			this.name = futureName;
+		}
+	}
+
 }

src/com/gpl/rpg/atcontentstudio/model/maps/MapObject.java

@@ -94,6 +94,7 @@ public abstract class MapObject {
 	public abstract void savePropertiesInTmxObject(tiled.core.MapObject tmxObject);
 	
 	public static MapObject newMapchange(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Mapchange");
 		MapObject result = new MapChange(obj);
 		result.type = Types.mapchange;
 		initObj(result, obj, parentMap);
@@ -101,6 +102,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newSpawnArea(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Spawnarea");
 		MapObject result = new SpawnArea(obj);
 		result.type = Types.spawn;
 		initObj(result, obj, parentMap);
@@ -108,6 +110,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newRest(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Rest");
 		MapObject result = new RestArea(obj);
 		result.type = Types.rest;
 		initObj(result, obj, parentMap);
@@ -115,6 +118,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newKey(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Key");
 		MapObject result = new KeyArea(obj);
 		result.type = Types.key;
 		initObj(result, obj, parentMap);
@@ -122,6 +126,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newReplace(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Replace");
 		MapObject result = new ReplaceArea(obj);
 		result.type = Types.replace;
 		initObj(result, obj, parentMap);
@@ -129,6 +134,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newScript(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Script");
 		MapObject result = new ScriptArea(obj);
 		result.type = Types.script;
 		initObj(result, obj, parentMap);
@@ -136,6 +142,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newContainer(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Container");
 		MapObject result = new ContainerArea(obj);
 		result.type = Types.container;
 		initObj(result, obj, parentMap);
@@ -143,6 +150,7 @@ public abstract class MapObject {
 	}
 
 	public static MapObject newSign(tiled.core.MapObject obj, TMXMap parentMap) {
+		if (obj.getName() == null) obj.setName("Sign");
 		MapObject result = new SignArea(obj);
 		result.type = Types.sign;
 		initObj(result, obj, parentMap);

src/com/gpl/rpg/atcontentstudio/model/maps/ReplaceArea.java

@@ -1,21 +1,62 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
 import java.awt.Image;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
 
 public class ReplaceArea extends MapObject {
 
+	public Requirement requirement = null;
+	public boolean oldSchoolRequirement = true;
+	
+	public List<ReplaceArea.Replacement> replacements = null;
+
 	public ReplaceArea(tiled.core.MapObject obj) {
-		// TODO Auto-generated constructor stub
+//		String requireType = obj.getProperties().getProperty("requireType");
+		String requireId = obj.getProperties().getProperty("requireId");
+		String requireValue = obj.getProperties().getProperty("requireValue");
+		if (requireId == null) {
+			String[] fields = obj.getName().split(":");
+			if (fields.length == 2) {
+//				requireType = Requirement.RequirementType.questProgress.toString();
+				requireValue = fields[1];
+				requireId = fields[0];
+			} /*else if (fields.length == 3) {
+				requireValue = fields[2];
+				requireType = fields[0];
+				requireId = fields[1];
+			}*/
+			oldSchoolRequirement = true;
+		} else {
+			oldSchoolRequirement = false;
+		}
+		requirement = new Requirement();
+		//Replace areas only support questProgress requirements ATM
+		//requirement.type = Requirement.RequirementType.valueOf(requireType);
+		requirement.type = Requirement.RequirementType.questProgress;
+		requirement.required_obj_id = requireId;
+		if (requireValue != null) requirement.required_value = Integer.parseInt(requireValue);
+		requirement.state = GameDataElement.State.parsed;
+		
+		
+		for (Object s : obj.getProperties().keySet()) {
+			if (replacements == null) replacements = new LinkedList<ReplaceArea.Replacement>();
+			replacements.add(new Replacement(s.toString(), obj.getProperties().getProperty(s.toString())));
+		}
+		
 	}
 
 	@Override
 	public void link() {
-		// TODO Auto-generated method stub
-		
+		requirement.parent = parentMap;
+		requirement.link();
 	}
 	
 	@Override
@@ -25,14 +66,79 @@ public class ReplaceArea extends MapObject {
 	
 	@Override
 	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-		// TODO Auto-generated method stub
-		
+		requirement.elementChanged(oldOne, newOne);
+	}
+	
+	public ReplaceArea.Replacement addReplacement(String source, String target) {
+		Replacement repl = new Replacement(source, target); 
+		addReplacement(repl);
+		return repl;
+	}
+	
+	public void addReplacement(ReplaceArea.Replacement repl) {
+		if (replacements == null) replacements = new LinkedList<ReplaceArea.Replacement>();
+		replacements.add(repl);
+	}
+	
+//	public void removeReplacement(String source, String target) {
+//		replacedLayers.remove(source);
+//	}
+	
+	public void removeReplacement(Replacement repl) {
+		replacements.remove(repl);
 	}
 	
 	@Override
 	public void savePropertiesInTmxObject(tiled.core.MapObject tmxObject) {
-		// TODO Auto-generated method stub
-		
+		if (replacements != null) {
+			for(Replacement r : replacements)
+			tmxObject.getProperties().setProperty(r.sourceLayer, r.targetLayer);
+		}
+		if (requirement != null) {
+			if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
+				tmxObject.setName(requirement.required_obj_id+":"+Integer.toString(requirement.required_value));
+			} else {
+				tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
+				if (requirement.required_obj != null) {
+					tmxObject.getProperties().setProperty("requireId", requirement.required_obj.id);
+				} else if (requirement.required_obj_id != null) {
+					tmxObject.getProperties().setProperty("requireId", requirement.required_obj_id);
+				}
+				if (requirement.required_value != null) {
+					tmxObject.getProperties().setProperty("requireValue", requirement.required_value.toString());
+				}
+			}
+		}
+	}
+
+	//Don't use yet !
+	public void updateNameFromRequirementChange() {
+		if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
+			name = requirement.required_obj_id+":"+Integer.toString(requirement.required_value);
+		} else if (oldSchoolRequirement) {
+			int i = 0;
+			String futureName = requirement.type.toString() + "#" + Integer.toString(i);
+			while (parentMap.getMapObject(futureName) != null) {
+				i++;
+				futureName = requirement.type.toString() + "#" + Integer.toString(i);
+			}
+			this.name = futureName;
+		}
 	}
 	
+	public class Replacement {
+		public String sourceLayer, targetLayer;
+		public Replacement(String source, String target) {
+			this.sourceLayer = source;
+			this.targetLayer = target;
+		}
+	}
+
+	public boolean hasReplacementFor(String name) {
+		if (name == null) return false;
+		for (Replacement repl : replacements) {
+			if (name.equalsIgnoreCase(repl.sourceLayer)) return true;
+		}
+		return false;
+	}
 }

src/com/gpl/rpg/atcontentstudio/model/maps/SpawnArea.java

@@ -12,6 +12,7 @@ public class SpawnArea extends MapObject {
 
 	public int quantity = 1;
 	public int spawnchance = 10;
+	public boolean active = true;
 	public List<NPC> spawnGroup = new ArrayList<NPC>();
 	
 	public SpawnArea(tiled.core.MapObject obj) {
@@ -21,6 +22,9 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("spawnchance") != null) {
 			this.spawnchance = Integer.parseInt(obj.getProperties().getProperty("spawnchance"));
 		}
+		if (obj.getProperties().getProperty("active") != null) {
+			this.active = Boolean.parseBoolean(obj.getProperties().getProperty("active"));
+		}
 	}
 
 	@Override
@@ -67,6 +71,9 @@ public class SpawnArea extends MapObject {
 		if (spawnchance != 10) {
 			tmxObject.getProperties().setProperty("spawnchance", Integer.toString(spawnchance));
 		}
+		if (!this.active) {
+			tmxObject.getProperties().setProperty("active", Boolean.toString(active));
+		}
 	}
 	
 }

src/com/gpl/rpg/atcontentstudio/model/maps/TMXMap.java

@@ -33,6 +33,12 @@ public class TMXMap extends GameDataElement {
 
 	private static final long serialVersionUID = 1609502879500898837L;
 	
+	public static final String GROUND_LAYER_NAME = "Ground";
+	public static final String OBJECTS_LAYER_NAME = "Objects";
+	public static final String ABOVE_LAYER_NAME = "Above";
+	public static final String WALKABLE_LAYER_NAME = "Walkable";
+	
+	
 	public File tmxFile = null;
 	public tiled.core.Map tmxMap = null;
 	public Set<Spritesheet> usedSpritesheets = null;
@@ -335,4 +341,24 @@ public class TMXMap extends GameDataElement {
 		return result;
 	}
 	
+	public MapObject getMapObject(String name) {
+		MapObject result = null;
+		for (MapObjectGroup group : groups) {
+			for (MapObject obj : group.mapObjects) {
+				if (obj.name.equals(name)) {
+					result = obj;
+					break;
+				}
+			}
+		}
+		return result;
+	}
+	
+	public static boolean isPaintedLayerName(String name) {
+		return GROUND_LAYER_NAME.equalsIgnoreCase(name) ||
+				OBJECTS_LAYER_NAME.equalsIgnoreCase(name) ||
+				ABOVE_LAYER_NAME.equalsIgnoreCase(name) ||
+				WALKABLE_LAYER_NAME.equalsIgnoreCase(name);
+	}
+	
 }

src/com/gpl/rpg/atcontentstudio/model/maps/Worldmap.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -52,7 +53,7 @@ public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeN
 	public File worldmapFile;
 	public GameSource parent;
 	
-	public Map<String, Map<String, Point>> segments = new HashMap<String, Map<String,Point>>();
+	public Map<String, Map<String, Point>> segments = new LinkedHashMap<String, Map<String,Point>>();
 
 	public Worldmap(GameSource gameSource) {
 		this.parent = gameSource;
@@ -261,6 +262,7 @@ public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeN
 			Source input = new DOMSource(doc);
 			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
 			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+			transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "2");
 			transformer.transform(input, output);
 		} catch (TransformerConfigurationException e) {
 			// TODO Auto-generated catch block

src/com/gpl/rpg/atcontentstudio/model/maps/WorldmapSegment.java

@@ -2,12 +2,26 @@ package com.gpl.rpg.atcontentstudio.model.maps;
 
 import java.awt.Image;
 import java.awt.Point;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -103,6 +117,32 @@ public class WorldmapSegment extends GameDataElement {
 		((Worldmap)parent).save();
 	}
 	
+	public String toXml() {
+		Document doc;
+		try {
+			doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+			doc.setXmlVersion("1.0");
+			Element root = doc.createElement("worldmap");
+			doc.appendChild(root);
+			root.appendChild(this.toXmlElement(doc));
+			Transformer transformer = TransformerFactory.newInstance().newTransformer();
+			ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			Result output = new StreamResult(baos);
+			Source input = new DOMSource(doc);
+			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+			transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "2");
+			transformer.transform(input, output);
+			return baos.toString();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+		} catch (TransformerException e) {
+			e.printStackTrace();
+		}
+		return null;
+		
+	}
+	
 	public Element toXmlElement(Document doc) {
 		Element element = doc.createElement("segment");
 		element.setAttribute("id", id);

src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSelector.java

@@ -6,9 +6,12 @@ import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFileChooser;
@@ -108,9 +111,15 @@ public class WorkspaceSelector extends JFrame {
 		//Layout, labels and dialog behavior.
 		setTitle("Select your workspace");
 		
+		JLabel logoLabel = new JLabel();
+		try {
+			logoLabel = new JLabel(new ImageIcon(ImageIO.read(WorkspaceSelector.class.getResource("/com/gpl/rpg/atcontentstudio/img/atcs_logo_banner.png"))), JLabel.CENTER);
+		} catch (IOException e1) {}
+		
 		JPanel dialogPane = new JPanel();
 		dialogPane.setLayout(new BorderLayout());
 		
+		dialogPane.add(logoLabel, BorderLayout.NORTH);
 		dialogPane.add(new JLabel("Workspace : "), BorderLayout.WEST);
 		dialogPane.add(combo, BorderLayout.CENTER);
 		dialogPane.add(browse, BorderLayout.EAST);

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java

@@ -717,63 +717,67 @@ public class DialogueEditor extends JSONElementEditor {
 				JLabel label = ((JLabel)c);
 				Dialogue.Reward reward = (Dialogue.Reward)value;
 				
-				if (reward.type != null) {
-					String rewardObjDesc = null;
-					if( reward.reward_obj != null) {
-						rewardObjDesc = reward.reward_obj.getDesc();
-					} else if (reward.reward_obj_id != null) {
-						rewardObjDesc = reward.reward_obj_id;
-					}
-					switch (reward.type) {
-					case activateMapChangeArea:
-						label.setText("Activate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
-						break;
-					case actorCondition:
-						label.setText("Give actor condition "+rewardObjDesc+" for "+reward.reward_value+" turns");
-						if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
-						break;
-					case alignmentChange:
-						label.setText("Change alignment for faction "+rewardObjDesc+" : "+reward.reward_value);
-						break;
-					case createTimer:
-						label.setText("Create timer "+rewardObjDesc);
-						break;
-					case deactivateMapChangeArea:
-						label.setText("Deactivate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
-						break;
-					case deactivateSpawnArea:
-						label.setText("Deactivate spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
-						break;
-					case dropList:
-						label.setText("Give contents of droplist "+rewardObjDesc);
-						if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
-						break;
-					case giveItem:
-						label.setText("Give "+reward.reward_value+" "+rewardObjDesc);
-						if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
-						break;
-					case questProgress:
-						label.setText("Give quest progress "+rewardObjDesc+":"+reward.reward_value);
-						if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
-						break;
-					case removeSpawnArea:
-						label.setText("Remove all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
-						break;
-					case skillIncrease:
-						label.setText("Increase skill "+rewardObjDesc+" level");
-						break;
-					case spawnAll:
-						label.setText("Respawn all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
-						break;
-					}
-				} else {
-					label.setText("New, undefined reward");
-				}
+				decorateRewardJLabel(label, reward);
 			}
 			return c;
 		}
 	}
 	
+	public static void decorateRewardJLabel(JLabel label, Dialogue.Reward reward) {
+		if (reward.type != null) {
+			String rewardObjDesc = null;
+			if( reward.reward_obj != null) {
+				rewardObjDesc = reward.reward_obj.getDesc();
+			} else if (reward.reward_obj_id != null) {
+				rewardObjDesc = reward.reward_obj_id;
+			}
+			switch (reward.type) {
+			case activateMapChangeArea:
+				label.setText("Activate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
+				break;
+			case actorCondition:
+				label.setText("Give actor condition "+rewardObjDesc+" for "+reward.reward_value+" turns");
+				if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
+				break;
+			case alignmentChange:
+				label.setText("Change alignment for faction "+rewardObjDesc+" : "+reward.reward_value);
+				break;
+			case createTimer:
+				label.setText("Create timer "+rewardObjDesc);
+				break;
+			case deactivateMapChangeArea:
+				label.setText("Deactivate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
+				break;
+			case deactivateSpawnArea:
+				label.setText("Deactivate spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
+				break;
+			case dropList:
+				label.setText("Give contents of droplist "+rewardObjDesc);
+				if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
+				break;
+			case giveItem:
+				label.setText("Give "+reward.reward_value+" "+rewardObjDesc);
+				if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
+				break;
+			case questProgress:
+				label.setText("Give quest progress "+rewardObjDesc+":"+reward.reward_value);
+				if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
+				break;
+			case removeSpawnArea:
+				label.setText("Remove all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
+				break;
+			case skillIncrease:
+				label.setText("Increase skill "+rewardObjDesc+" level");
+				break;
+			case spawnAll:
+				label.setText("Respawn all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
+				break;
+			}
+		} else {
+			label.setText("New, undefined reward");
+		}
+	}
+	
 	
 	public static class RepliesListModel implements ListModel {
 
@@ -981,19 +985,23 @@ public class DialogueEditor extends JSONElementEditor {
 		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
 			Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if (c instanceof JLabel) {
-				((JLabel)c).setText(((Requirement)value).getDesc());
-				if (((Requirement)value).required_obj != null) {
-					if (((Requirement)value).required_obj.getIcon() != null) {
-						((JLabel)c).setIcon(new ImageIcon(((Requirement)value).required_obj.getIcon()));
-					}
-				} if (((Requirement)value).type == null) {
-					((JLabel)c).setText("New, undefined requirement.");
-				}
+				decorateRequirementJLabel((JLabel)c, (Requirement)value);
 			}
 			return c;
 		}
 	}
 	
+	public static void decorateRequirementJLabel(JLabel label, Requirement req) {
+		label.setText(req.getDesc());
+		if (req.required_obj != null) {
+			if (req.required_obj.getIcon() != null) {
+				label.setIcon(new ImageIcon(req.required_obj.getIcon()));
+			}
+		} if (req.type == null) {
+			label.setText("New, undefined requirement.");
+		}
+	}
+	
 	public class DialogueFieldUpdater implements FieldUpdateListener {
 		@Override
 		public void valueChanged(JComponent source, Object value) {

src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java

@@ -1,7 +1,11 @@
 package com.gpl.rpg.atcontentstudio.ui.gamedataeditors.dialoguetree;
 
 import java.awt.BasicStroke;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Image;
+import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
@@ -9,6 +13,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JToolTip;
+import javax.swing.ToolTipManager;
+
 import prefuse.Display;
 import prefuse.Visualization;
 import prefuse.action.ActionList;
@@ -42,7 +52,11 @@ import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.DialogueEditor;
+import com.gpl.rpg.atcontentstudio.ui.map.TMXMapEditor.TMXReplacementViewer;
+import com.jidesoft.swing.JideBoxLayout;
 
 public class DialogueGraphView extends Display {
 
@@ -147,6 +161,7 @@ public class DialogueGraphView extends Display {
         setSize(500,500);
         pan(250, 250);
         setHighQuality(true);
+        addControlListener(new TooltipControl());
         addControlListener(new DoubleClickControl());
         addControlListener(new WheelZoomControl());
         addControlListener(new ZoomControl());
@@ -434,6 +449,90 @@ public class DialogueGraphView extends Display {
 			}
 		}
 	}
+	
+	class TooltipControl extends ControlAdapter {
+		
+		@Override
+		public void itemEntered(VisualItem item, MouseEvent e) {
+			if (item.get(TARGET) != null) {
+				tooltippedItem = item;
+				if (!tooltipActivated) {
+					setToolTipText("");
+					ToolTipManager.sharedInstance().registerComponent(DialogueGraphView.this);
+					ToolTipManager.sharedInstance().setEnabled(true);
+					tooltipActivated = true;
+				}
+			}
+		}
+		@Override
+		public void itemExited(VisualItem item, MouseEvent e) {
+			//Hides the tooltip...
+			ToolTipManager.sharedInstance().setEnabled(false);
+			ToolTipManager.sharedInstance().unregisterComponent(DialogueGraphView.this);
+			tooltipActivated = false;
+		}
+	}
+	
+	JToolTip tt = null;
+	private VisualItem tooltippedItem = null;
+	private VisualItem lastTTItem = null;
+    private boolean tooltipActivated = false;
+	
+	@Override
+	public Point getToolTipLocation(MouseEvent event) {
+		return new Point(event.getX() + 5, event.getY() + 5);
+	}
+	
+	@Override
+	public JToolTip createToolTip() {
+		if (tt == null) tt = super.createToolTip();
+		if (tooltippedItem == lastTTItem) {
+			return tt;
+		}
+		tt = super.createToolTip();
+		lastTTItem = tooltippedItem;
+    	tt.setLayout(new BorderLayout());
+    	JPanel content = new JPanel();
+    	content.setLayout(new JideBoxLayout(content, JideBoxLayout.PAGE_AXIS));
+    	JLabel label;
+    	if (tooltippedItem != null) {
+    		Object target = tooltippedItem.get(TARGET);
+    		if (target != null) {
+    			if (target instanceof Dialogue) {
+    				Dialogue d = (Dialogue) target;
+    				label = new JLabel(new ImageIcon(DefaultIcons.getDialogueIcon()));
+    				label.setText(d.id);
+    				content.add(label, JideBoxLayout.FIX);
+    				if (tooltippedItem.get(REPLY) == null) {
+    					if (d.rewards != null && !d.rewards.isEmpty()) {
+    						for (Dialogue.Reward r : d.rewards) {
+    							label = new JLabel();
+    							DialogueEditor.decorateRewardJLabel(label, r);
+    							content.add(label, JideBoxLayout.FIX);
+    						}
+    					}
+    				} else { 
+    					Object replObj = tooltippedItem.get(REPLY);
+    					if (replObj instanceof Dialogue.Reply) {
+    						Dialogue.Reply r = (Dialogue.Reply) replObj;
+    						if (r.requirements != null && !r.requirements.isEmpty()) {
+    							for (Requirement req : r.requirements) {
+    								label = new JLabel();
+    								DialogueEditor.decorateRequirementJLabel(label, req);
+        							content.add(label, JideBoxLayout.FIX);
+    							}
+    						}
+    					}
+    				}
+    			}
+    		}
+    		
+    	}
+    	
+    	tt.add(content, BorderLayout.CENTER);
+    	tt.setPreferredSize(tt.getLayout().preferredLayoutSize(tt));
+    	return tt;
+	}
 
 }
 

src/com/gpl/rpg/atcontentstudio/ui/map/WorldMapEditor.java

@@ -25,6 +25,9 @@ import javax.swing.JViewport;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
+
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
@@ -46,6 +49,9 @@ public class WorldMapEditor extends Editor {
 
 	private static final long serialVersionUID = -8358238912588729094L;
 	
+
+	private RSyntaxTextArea editorPane;
+	
 	public EditMode editMode = EditMode.moveViewSelect;
 	
 	public enum EditMode {
@@ -72,6 +78,10 @@ public class WorldMapEditor extends Editor {
 		add(editorTabsHolder, BorderLayout.CENTER);
 
 		editorTabsHolder.add("Map", buildSegmentTab(worldmap));
+		
+		JScrollPane xmlScroller = new JScrollPane(getXmlEditorPane(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		xmlScroller.getVerticalScrollBar().setUnitIncrement(16);
+		editorTabsHolder.add("XML", xmlScroller);
 	}
 	
 	@Override
@@ -80,6 +90,22 @@ public class WorldMapEditor extends Editor {
 
 	}
 
+	public JPanel getXmlEditorPane() {
+		JPanel pane = new JPanel();
+		pane.setLayout(new JideBoxLayout(pane, JideBoxLayout.PAGE_AXIS, 6));
+		editorPane = new RSyntaxTextArea();
+		editorPane.setText(((WorldmapSegment)target).toXml());
+		editorPane.setEditable(false);
+		editorPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);
+		pane.add(editorPane, JideBoxLayout.VARY);
+
+		return pane;
+	}
+	
+	public void updateXmlViewText(String text) {
+		editorPane.setText(text);
+	}
+	
 	
 	private JPanel buildSegmentTab(final WorldmapSegment worldmap) {
 		JPanel pane = new JPanel();