v0.6.8 released.

Untested yet, and error-prone, because it was made with a LOT of
copy-paste-replacing.

.classpath

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="src" path="hacked-libtiled"/>
-	<classpathentry kind="src" path="siphash-zackehh/src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jide-oss.jar"/>
-	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
-	<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/bsh-2.0b4.jar"/>
-	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar" sourcepath="lib/jsoup-1.10.2-sources.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="res"/>
+	<classpathentry kind="src" path="hacked-libtiled"/>
+	<classpathentry kind="src" path="siphash-zackehh/src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/jide-oss.jar"/>
+	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
+	<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/bsh-2.0b4.jar"/>
+	<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar" sourcepath="lib/jsoup-1.10.2-sources.jar"/>
+	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.4.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

ATCS_JAR.jardesc

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.1.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-    <selectedProjects/>
-    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <javaElement handleIdentifier="=ATContentStudio/siphash-zackehh\/src\/main\/java"/>
-        <javaElement handleIdentifier="=ATContentStudio/res"/>
-        <javaElement handleIdentifier="=ATContentStudio/src"/>
-        <javaElement handleIdentifier="=ATContentStudio/hacked-libtiled"/>
-    </selectedElements>
-</jardesc>
+<?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
+<jardesc>
+    <jar path="ATCS/ATCS_v0.6.7.jar"/>
+    <options buildIfNeeded="true" compress="true" descriptionLocation="/ATCS/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+    <selectedProjects/>
+    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
+        <sealing sealJar="false">
+            <packagesToSeal/>
+            <packagesToUnSeal/>
+        </sealing>
+    </manifest>
+    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
+        <javaElement handleIdentifier="=ATCS/res"/>
+        <javaElement handleIdentifier="=ATCS/src"/>
+        <javaElement handleIdentifier="=ATCS/siphash-zackehh\/src\/main\/java"/>
+        <javaElement handleIdentifier="=ATCS/hacked-libtiled"/>
+    </selectedElements>
+</jardesc>

hacked-libtiled/tiled/core/Map.java

@@ -111,11 +111,14 @@ public class Map implements Iterable<MapLayer>
 
     public MapLayer addLayer(MapLayer layer) {
         layer.setMap(this);
-        layers.add(layer);
         if (layer instanceof TileLayer) {
         	tileLayers.add((TileLayer) layer);
+        	layers.add(layer);
         } else if (layer instanceof ObjectGroup) {
+        	layers.insertElementAt(layer, objectGroups.size());
         	objectGroups.add((ObjectGroup) layer);
+        } else {
+        	layers.add(layer);
         }
         return layer;
     }

hacked-libtiled/tiled/io/TMXMapWriter.java

@@ -181,7 +181,12 @@ public class TMXMapWriter
             firstgid += tileset.getMaxTileId() + 1;
         }
 
-        for (MapLayer layer : map) {
+        for (MapLayer layer : map.getTileLayers()) {
+            writeMapLayer(layer, w, wp);
+        }
+
+        for (MapLayer layer : map.getObjectGroup()) {
+        	if (map.getTileLayers().contains(layer)) continue;
             writeMapLayer(layer, w, wp);
         }
         firstGidPerTileset = null;

packaging/ATCS_latest

@@ -0,0 +1 @@
+v0.6.7

packaging/Linux/ATCS/ATCS.cmd

@@ -4,7 +4,7 @@ set "ATCS_DIR=%~dp0"
 set "MAX_MEM=512M"
 set "CP=%ATCS_DIR%lib\*"
 set "JAVA=javaw.exe"
-set "JAVA_OPTS="
+set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
 set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
 set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"
 

packaging/Linux/ATCS/ATCS.sh

@@ -3,7 +3,7 @@ ATCS_DIR=$(dirname $(readlink -f "$0" || greadlink -f "$0" || stat -f "$0"))
 MAX_MEM=512M
 CP=$(find ${ATCS_DIR}/lib/ -name '*.jar' | paste -sd: -)
 JAVA=java
-JAVA_OPTS=
+JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
 ENV_FILE=${ATCS_DIR}/ATCS.env
 MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio
 

packaging/Windows/ATCS.cmd

@@ -4,7 +4,7 @@ set "ATCS_DIR=%~dp0"
 set "MAX_MEM=512M"
 set "CP=%ATCS_DIR%lib\*"
 set "JAVA=javaw.exe"
-set "JAVA_OPTS="
+set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
 set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
 set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"
 

packaging/Windows/ATCS_Installer.nsi

@@ -1,7 +1,7 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.1"
-!define TRAINER_VERSION "0.1.3"
+!define VERSION "0.6.8"
+!define TRAINER_VERSION "0.1.4"
 !define JAVA_BIN "javaw"
 
 Name "Andor's Trail Content Studio v${VERSION}"

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

@@ -1,32 +1,57 @@
 package com.gpl.rpg.atcontentstudio;
 
+import java.awt.Color;
+import java.awt.Desktop;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Toolkit;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-
-import prefuse.data.expression.parser.ExpressionParser;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.plaf.FontUIResource;
 
 import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
 import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 
+import prefuse.data.expression.parser.ExpressionParser;
+
 
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.1";
+	public static final String APP_VERSION = "v0.6.8";
+	
+	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
+	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
+	
+	public static final String FONT_SCALE_ENV_VAR_NAME = "FONT_SCALE";
 
 	public static boolean STARTED = false;
+	public static float SCALING=1.0f;
 	public static StudioFrame frame = null;
 
 	//Need to keep a strong reference to it, to avoid garbage collection that'll reset these loggers.
@@ -36,6 +61,17 @@ public class ATContentStudio {
 	 * @param args
 	 */
 	public static void main(String[] args) {
+		String fontScaling = System.getProperty(FONT_SCALE_ENV_VAR_NAME);
+		Float fontScale = null;
+		if (fontScaling != null) {
+			try {
+				fontScale = Float.parseFloat(fontScaling);
+				SCALING=fontScale;
+			} catch (NumberFormatException e) {
+				System.err.println("Failed to parse font scaling parameter. Using default.");
+				e.printStackTrace();
+			}
+		}
 		
 		ConfigCache.init();
 		
@@ -52,6 +88,9 @@ public class ATContentStudio {
 		} catch (UnsupportedLookAndFeelException e) {
 			e.printStackTrace();
 		}
+		
+		
+		scaleUIFont();
 
 		//Need to keep a strong reference to it, to avoid garbage collection that'll reset this setting.
 		Logger l = Logger.getLogger(ExpressionParser.class.getName());
@@ -74,6 +113,11 @@ public class ATContentStudio {
 					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable(){
 						public void run() {
 							Workspace.setActive(workspaceRoot);
+							if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
+								new Thread() {
+									public void run() {checkUpdate();}
+								}.start();
+							}
 							frame = new StudioFrame(APP_NAME+" "+APP_VERSION);
 							frame.setVisible(true);
 							frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
@@ -95,4 +139,89 @@ public class ATContentStudio {
 		});
 	}
 	
+	private static void checkUpdate() {
+		BufferedReader in = null;
+		try {
+			URL url = new URL(CHECK_UPDATE_URL);
+			in = new BufferedReader(new InputStreamReader(url.openStream()));
+
+			String inputLine, lastLine = null;
+			while ((inputLine = in.readLine()) != null) {lastLine = inputLine;}
+			if (lastLine != null && !lastLine.equals(APP_VERSION)) {
+				
+				// for copying style
+			    JLabel label = new JLabel();
+			    Font font = label.getFont();
+		        Color color = label.getBackground();
+
+			    // create some css from the label's font
+			    StringBuffer style = new StringBuffer("font-family:" + font.getFamily() + ";");
+			    style.append("font-weight:" + (font.isBold() ? "bold" : "normal") + ";");
+			    style.append("font-size:" + font.getSize() + "pt;");
+			    style.append("background-color: rgb("+color.getRed()+","+color.getGreen()+","+color.getBlue()+");");
+				
+				JEditorPane ep = new JEditorPane("text/html", "<html><body style=\"" + style + "\">"
+						+ "You are not running the latest ATCS version.<br/>"
+						+ "You can get the latest version ("+lastLine+") by clicking the link below.<br/>"
+						+ "<a href=\""+DOWNLOAD_URL+"\">"+DOWNLOAD_URL+"</a><br/>"
+						+ "<br/>"
+						+ "</body></html>");
+				
+				ep.setEditable(false);
+				ep.setBorder(null);
+				
+				ep.addHyperlinkListener(new HyperlinkListener() {
+					
+					@Override
+					public void hyperlinkUpdate(HyperlinkEvent e) {
+						try {
+							if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+								Desktop.getDesktop().browse(e.getURL().toURI());
+							}
+						} catch (IOException e1) {
+							e1.printStackTrace();
+						} catch (URISyntaxException e1) {
+							e1.printStackTrace();
+						}
+					}
+				});
+				
+				JOptionPane.showMessageDialog(null, ep, "Update available", JOptionPane.INFORMATION_MESSAGE);
+			}
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				if (in != null) in.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	public static void scaleUIFont() {
+		if (SCALING != 1.0f) {
+			System.out.println("Scaling fonts to "+SCALING);
+			UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+			Map<Object, Object> newDefaults = new HashMap<Object, Object>();
+			for (Enumeration<Object> e = defaults.keys(); e.hasMoreElements();) {
+				Object key = e.nextElement();
+				Object value = defaults.get(key);
+				if (value instanceof Font) {
+					Font font = (Font) value;
+					int newSize = (int)(font.getSize() * SCALING);
+					if (value instanceof FontUIResource) {
+						newDefaults.put(key, new FontUIResource(font.getName(), font.getStyle(), newSize));
+					} else {
+						newDefaults.put(key, new Font(font.getName(), font.getStyle(), newSize));
+					}
+				}
+			}
+			for (Object key : newDefaults.keySet()) {
+				defaults.put(key, newDefaults.get(key));
+			}
+		}
+	}
 }

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

@@ -222,6 +222,8 @@ public class Project implements ProjectTreeNode, Serializable {
 	public void refreshTransients(Workspace w) {
 		this.parent = w;
 
+		projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
+
 		try {
 			knownSpritesheetsProperties = new Properties();
 			knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
@@ -254,7 +256,6 @@ public class Project implements ProjectTreeNode, Serializable {
 
 		linkAll();
 		
-		projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
 	}
 	
 	public void linkAll() {
@@ -670,7 +671,7 @@ public class Project implements ProjectTreeNode, Serializable {
 	public Spritesheet getSpritesheet(int index) {
 		if (index < createdContent.gameSprites.spritesheets.size()) {
 			return createdContent.gameSprites.spritesheets.get(index);
-		} else if (index < getQuestCount()){
+		} else if (index < getSpritesheetCount()){
 			return getSpritesheet(baseContent.gameSprites.spritesheets.get(index - createdContent.gameSprites.spritesheets.size()).id);
 		}
 		return null;

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

@@ -42,6 +42,8 @@ public class WorkspaceSettings {
 	public Setting<String> translatorLanguage = new NullDefaultPrimitiveSetting<String>("translatorLanguage");
 	public static Boolean DEFAULT_ALLOW_INTERNET = true;
 	public Setting<Boolean> useInternet = new PrimitiveSetting<Boolean>("useInternet", DEFAULT_ALLOW_INTERNET);
+	public static Boolean DEFAULT_CHECK_UPDATE = true;
+	public Setting<Boolean> checkUpdates = new PrimitiveSetting<Boolean>("checkUpdates", DEFAULT_CHECK_UPDATE);
 	
 
 	public List<Setting<? extends Object>> settings = new ArrayList<Setting<? extends Object>>();
@@ -55,6 +57,7 @@ public class WorkspaceSettings {
 		settings.add(imageEditorCommand);
 		settings.add(translatorLanguage);
 		settings.add(useInternet);
+		settings.add(checkUpdates);
 		file = new File(parent.baseFolder, FILENAME);
 		if (file.exists()) {
 			load(file);

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

@@ -21,7 +21,9 @@ public class ActorCondition extends JSONElement {
 	
 	private static final long serialVersionUID = -3969824899972048507L;
 
-	public static final Integer CLEAR_AC_MAGNITUDE = -99;
+	public static final Integer MAGNITUDE_CLEAR = -99;
+	public static final Integer DURATION_FOREVER = 999;;
+	public static final Integer DURATION_NONE = 0;
 	
 	// Available from init state
 	//public String id; inherited.
@@ -43,9 +45,16 @@ public class ActorCondition extends JSONElement {
 		blood
 	}
 	
+	public static enum VisualEffectID {
+		redSplash
+		,blueSwirl
+		,greenSplash
+		,miss
+	}
+	
 	public static class RoundEffect implements Cloneable {
 		// Available from parsed state
-		public String visual_effect = null;
+		public VisualEffectID visual_effect = null;
 		public Integer hp_boost_min = null;
 		public Integer hp_boost_max = null;
 		public Integer ap_boost_min = null;
@@ -180,7 +189,13 @@ public class ActorCondition extends JSONElement {
 				this.round_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentAP")).get("max")));
 				this.round_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentAP")).get("min")));
 			}
-			this.round_effect.visual_effect = (String) roundEffect.get("visualEffectID");
+			String vfx = (String) roundEffect.get("visualEffectID");
+			this.round_effect.visual_effect = null;
+			if (vfx != null) {
+				try {
+					this.round_effect.visual_effect = VisualEffectID.valueOf(vfx);
+				} catch(IllegalArgumentException e) {}
+			}
 		}
 		Map fullRoundEffect = (Map) aCondJson.get("fullRoundEffect");
 		if (fullRoundEffect != null) {
@@ -193,7 +208,13 @@ public class ActorCondition extends JSONElement {
 				this.full_round_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentAP")).get("max")));
 				this.full_round_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentAP")).get("min")));
 			}
-			this.full_round_effect.visual_effect = (String) fullRoundEffect.get("visualEffectID");
+			String vfx = (String) roundEffect.get("visualEffectID");
+			this.full_round_effect.visual_effect = null;
+			if (vfx != null) {
+				try {
+					this.full_round_effect.visual_effect = VisualEffectID.valueOf(vfx);
+				} catch(IllegalArgumentException e) {}
+			}
 		}
 		this.state = State.parsed;
 
@@ -214,6 +235,9 @@ public class ActorCondition extends JSONElement {
 		}
 		if (this.icon_id != null) {
 			String spritesheetId = this.icon_id.split(":")[0];
+			if (getProject().getSpritesheet(spritesheetId) == null) {
+				System.out.println(this.id);
+			}
 			getProject().getSpritesheet(spritesheetId).addBacklink(this);
 		}
 		
@@ -275,7 +299,7 @@ public class ActorCondition extends JSONElement {
 		if (this.stacking != null && this.stacking == 1) jsonAC.put("isStacking", this.stacking);
 		if (this.round_effect != null) {
 			Map jsonRound = new LinkedHashMap();
-			if (this.round_effect.visual_effect != null) jsonRound.put("visualEffectID", this.round_effect.visual_effect);
+			if (this.round_effect.visual_effect != null) jsonRound.put("visualEffectID", this.round_effect.visual_effect.toString());
 			if (this.round_effect.hp_boost_min != null || this.round_effect.hp_boost_max != null) {
 				Map jsonHP = new LinkedHashMap();
 				if (this.round_effect.hp_boost_min != null) jsonHP.put("min", this.round_effect.hp_boost_min);
@@ -296,7 +320,7 @@ public class ActorCondition extends JSONElement {
 		}
 		if (this.full_round_effect != null) {
 			Map jsonFullRound = new LinkedHashMap();
-			if (this.full_round_effect.visual_effect != null) jsonFullRound.put("visualEffectID", this.full_round_effect.visual_effect);
+			if (this.full_round_effect.visual_effect != null) jsonFullRound.put("visualEffectID", this.full_round_effect.visual_effect.toString());
 			if (this.full_round_effect.hp_boost_min != null || this.full_round_effect.hp_boost_max != null) {
 				Map jsonHP = new LinkedHashMap();
 				if (this.full_round_effect.hp_boost_min != null) jsonHP.put("min", this.full_round_effect.hp_boost_min);

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

@@ -54,9 +54,11 @@ public class Dialogue extends JSONElement {
 		
 		public enum RewardType {
 			questProgress,
+			removeQuestProgress,
 			dropList,
 			skillIncrease,
 			actorCondition,
+			actorConditionImmunity,
 			alignmentChange,
 			giveItem,
 			createTimer,
@@ -249,6 +251,7 @@ public class Dialogue extends JSONElement {
 						reward.map = reward.map_name != null ? proj.getMap(reward.map_name) : null;
 						break;
 					case actorCondition:
+					case actorConditionImmunity:
 						reward.reward_obj = proj.getActorCondition(reward.reward_obj_id);
 						break;
 					case alignmentChange:
@@ -264,6 +267,7 @@ public class Dialogue extends JSONElement {
 						reward.reward_obj = proj.getItem(reward.reward_obj_id);
 						break;
 					case questProgress:
+					case removeQuestProgress:
 						reward.reward_obj = proj.getQuest(reward.reward_obj_id);
 						if (reward.reward_obj != null && reward.reward_value != null) {
 							QuestStage stage = ((Quest)reward.reward_obj).getStage(reward.reward_value);

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

@@ -34,6 +34,7 @@ public class Item extends JSONElement {
 	public String category_id = null;
 	public String description = null;
 	public HitEffect hit_effect = null;
+	public HitReceivedEffect hit_received_effect = null;
 	public KillEffect kill_effect = null;
 	public EquipEffect equip_effect = null;
 	
@@ -58,6 +59,14 @@ public class Item extends JSONElement {
 		public List<TimedConditionEffect> conditions_target = null;
 	}
 	
+	public static class HitReceivedEffect extends HitEffect {
+		//Available from parsed state
+		public Integer hp_boost_min_target = null;
+		public Integer hp_boost_max_target = null;
+		public Integer ap_boost_min_target = null;
+		public Integer ap_boost_max_target = null;
+	}
+	
 	public static class EquipEffect {
 		//Available from parsed state
 		public Integer damage_boost_min = null;
@@ -246,6 +255,53 @@ public class Item extends JSONElement {
 			}
 		}
 		
+		Map hitReceivedEffect = (Map) itemJson.get("hitReceivedEffect");
+		if (hitReceivedEffect != null) {
+			this.hit_received_effect = new HitReceivedEffect();
+			if (hitReceivedEffect.get("increaseCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("min")));
+				this.hit_received_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("max")));
+			}
+			if (hitReceivedEffect.get("increaseCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("min")));
+				this.hit_received_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("max")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("min")));
+				this.hit_received_effect.hp_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("max")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("min")));
+				this.hit_received_effect.ap_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("max")));
+			}
+			List conditionsSourceJson = (List) hitReceivedEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.hit_received_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_source.add(condition);
+				}
+			}
+			List conditionsTargetJson = (List) hitReceivedEffect.get("conditionsTarget");
+			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
+				this.hit_received_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsTargetJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_target.add(condition);
+				}
+			}
+		}
+		
 		Map killEffect = (Map) itemJson.get("killEffect");
 		if (killEffect == null) {
 			killEffect = (Map) itemJson.get("useEffect");
@@ -321,6 +377,18 @@ public class Item extends JSONElement {
 				if (ce.condition != null) ce.condition.addBacklink(this);
 			}
 		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_target != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_target) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
 		if (this.kill_effect != null && this.kill_effect.conditions_source != null) {
 			for (TimedConditionEffect ce : this.kill_effect.conditions_source) {
 				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
@@ -422,6 +490,47 @@ public class Item extends JSONElement {
 				}
 			}
 		}
+		if (this.hit_received_effect != null) {
+			clone.hit_received_effect = new HitReceivedEffect();
+			clone.hit_received_effect.ap_boost_max = this.hit_received_effect.ap_boost_max;
+			clone.hit_received_effect.ap_boost_min = this.hit_received_effect.ap_boost_min;
+			clone.hit_received_effect.hp_boost_max = this.hit_received_effect.hp_boost_max;
+			clone.hit_received_effect.hp_boost_min = this.hit_received_effect.hp_boost_min;
+			clone.hit_received_effect.ap_boost_max_target = this.hit_received_effect.ap_boost_max_target;
+			clone.hit_received_effect.ap_boost_min_target = this.hit_received_effect.ap_boost_min_target;
+			clone.hit_received_effect.hp_boost_max_target = this.hit_received_effect.hp_boost_max_target;
+			clone.hit_received_effect.hp_boost_min_target = this.hit_received_effect.hp_boost_min_target;
+			if (this.hit_received_effect.conditions_source != null) {
+				clone.hit_received_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_source.add(cclone);
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				clone.hit_received_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_target) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_target.add(cclone);
+				}
+			}
+		}
 		if (this.kill_effect != null) {
 			clone.kill_effect = new KillEffect();
 			clone.kill_effect.ap_boost_max = this.kill_effect.ap_boost_max;
@@ -600,6 +709,74 @@ public class Item extends JSONElement {
 				}
 			}
 		}
+		if (this.hit_received_effect != null) {
+			Map hitReceivedEffectJson = new LinkedHashMap();
+			itemJson.put("hitReceivedEffect", hitReceivedEffectJson);
+			if (this.hit_received_effect.hp_boost_min != null || this.hit_received_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min != null) hpJson.put("min", this.hit_received_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max != null) hpJson.put("max", this.hit_received_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min != null || this.hit_received_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min != null) apJson.put("min", this.hit_received_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max != null) apJson.put("max", this.hit_received_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.hp_boost_min_target != null || this.hit_received_effect.hp_boost_max_target != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min_target != null) hpJson.put("min", this.hit_received_effect.hp_boost_min_target);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max_target != null) hpJson.put("max", this.hit_received_effect.hp_boost_max_target);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min_target != null || this.hit_received_effect.ap_boost_max_target != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min_target != null) apJson.put("min", this.hit_received_effect.ap_boost_min_target);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max_target != null) apJson.put("max", this.hit_received_effect.ap_boost_max_target);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				List conditionsTargetJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsTarget", conditionsTargetJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_target) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsTargetJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
 		if (this.kill_effect != null) {
 			Map killEffectJson = new LinkedHashMap();
 			if (this.category != null && this.category.action_type != null && this.category.action_type == ItemCategory.ActionType.equip) {

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

@@ -47,6 +47,8 @@ public class NPC extends JSONElement {
 	public Integer block_chance = null;
 	public Integer damage_resistance = null;
 	public HitEffect hit_effect = null;
+	public HitReceivedEffect hit_received_effect = null;
+	public DeathEffect death_effect = null;
 	
 	//Available from linked state
 	public Dialogue dialogue = null;
@@ -70,17 +72,29 @@ public class NPC extends JSONElement {
         protectSpawn,
         wholeMap
 	}
-	
-	public static class HitEffect {
+
+	public static class DeathEffect {
 		//Available from parsed state
 		public Integer hp_boost_min = null;
 		public Integer hp_boost_max = null;
 		public Integer ap_boost_min = null;
 		public Integer ap_boost_max = null;
 		public List<TimedConditionEffect> conditions_source = null;
+	}
+	
+	public static class HitEffect extends DeathEffect {
+		//Available from parsed state
 		public List<TimedConditionEffect> conditions_target = null;
 	}
 	
+	public static class HitReceivedEffect extends HitEffect {
+		//Available from parsed state
+		public Integer hp_boost_min_target = null;
+		public Integer hp_boost_max_target = null;
+		public Integer ap_boost_min_target = null;
+		public Integer ap_boost_max_target = null;
+	}
+	
 	public static class TimedConditionEffect {
 		//Available from parsed state
 		public Integer magnitude = null;
@@ -224,6 +238,79 @@ public class NPC extends JSONElement {
 			}
 		}
 	
+		Map hitReceivedEffect = (Map) npcJson.get("hitReceivedEffect");
+		if (hitReceivedEffect != null) {
+			this.hit_received_effect = new HitReceivedEffect();
+			if (hitReceivedEffect.get("increaseCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("max")));
+				this.hit_received_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("min")));
+			}
+			if (hitReceivedEffect.get("increaseCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("max")));
+				this.hit_received_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("min")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("max")));
+				this.hit_received_effect.hp_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("min")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("max")));
+				this.hit_received_effect.ap_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("min")));
+			}
+			List conditionsSourceJson = (List) hitReceivedEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.hit_received_effect.conditions_source = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_source.add(condition);
+				}
+			}
+			List conditionsTargetJson = (List) hitReceivedEffect.get("conditionsTarget");
+			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
+				this.hit_received_effect.conditions_target = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsTargetJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_target.add(condition);
+				}
+			}
+		}
+		
+		Map deathEffect = (Map) npcJson.get("deathEffect");
+		if (deathEffect != null) {
+			this.death_effect = new HitEffect();
+			if (deathEffect.get("increaseCurrentHP") != null) {
+				this.death_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentHP")).get("max")));
+				this.death_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentHP")).get("min")));
+			}
+			if (deathEffect.get("increaseCurrentAP") != null) {
+				this.death_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentAP")).get("max")));
+				this.death_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentAP")).get("min")));
+			}
+			List conditionsSourceJson = (List) deathEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.death_effect.conditions_source = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.death_effect.conditions_source.add(condition);
+				}
+			}
+		}
+		
 	}
 	
 	@Override
@@ -267,6 +354,24 @@ public class NPC extends JSONElement {
 				if (ce.condition != null) ce.condition.addBacklink(this);
 			}
 		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_target != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_target) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.death_effect != null && this.death_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.death_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
 		this.state = State.linked;
 	}
 	
@@ -343,6 +448,69 @@ public class NPC extends JSONElement {
 				}
 			}
 		}
+		if (this.hit_received_effect != null) {
+			clone.hit_received_effect = new HitReceivedEffect();
+			clone.hit_received_effect.ap_boost_max = this.hit_received_effect.ap_boost_max;
+			clone.hit_received_effect.ap_boost_min = this.hit_received_effect.ap_boost_min;
+			clone.hit_received_effect.hp_boost_max = this.hit_received_effect.hp_boost_max;
+			clone.hit_received_effect.hp_boost_min = this.hit_received_effect.hp_boost_min;
+			clone.hit_received_effect.ap_boost_max_target = this.hit_received_effect.ap_boost_max_target;
+			clone.hit_received_effect.ap_boost_min_target = this.hit_received_effect.ap_boost_min_target;
+			clone.hit_received_effect.hp_boost_max_target = this.hit_received_effect.hp_boost_max_target;
+			clone.hit_received_effect.hp_boost_min_target = this.hit_received_effect.hp_boost_min_target;
+			if (this.hit_received_effect.conditions_source != null) {
+				clone.hit_received_effect.conditions_source = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_source.add(cclone);
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				clone.hit_received_effect.conditions_target = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_target) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_target.add(cclone);
+				}
+			}
+		}
+		if (this.death_effect != null) {
+			clone.death_effect = new DeathEffect();
+			clone.death_effect.ap_boost_max = this.death_effect.ap_boost_max;
+			clone.death_effect.ap_boost_min = this.death_effect.ap_boost_min;
+			clone.death_effect.hp_boost_max = this.death_effect.hp_boost_max;
+			clone.death_effect.hp_boost_min = this.death_effect.hp_boost_min;
+			if (this.death_effect.conditions_source != null) {
+				clone.death_effect.conditions_source = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.death_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.death_effect.conditions_source.add(cclone);
+				}
+			}
+		}
 		clone.max_ap = this.max_ap;
 		clone.max_hp = this.max_hp;
 		clone.monster_class = this.monster_class;
@@ -478,6 +646,110 @@ public class NPC extends JSONElement {
 				}
 			}
 		}
+		if (this.hit_received_effect != null) {
+			Map hitReceivedEffectJson = new LinkedHashMap();
+			npcJson.put("hitReceivedEffect", hitReceivedEffectJson);
+			if (this.hit_received_effect.hp_boost_min != null || this.hit_received_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min != null) hpJson.put("min", this.hit_received_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max != null) hpJson.put("max", this.hit_received_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min != null || this.hit_received_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min != null) apJson.put("min", this.hit_received_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max != null) apJson.put("max", this.hit_received_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.hp_boost_min_target != null || this.hit_received_effect.hp_boost_max_target != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min_target != null) hpJson.put("min", this.hit_received_effect.hp_boost_min_target);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max_target != null) hpJson.put("max", this.hit_received_effect.hp_boost_max_target);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min_target != null || this.hit_received_effect.ap_boost_max_target != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min_target != null) apJson.put("min", this.hit_received_effect.ap_boost_min_target);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max_target != null) apJson.put("max", this.hit_received_effect.ap_boost_max_target);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				List conditionsTargetJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsTarget", conditionsTargetJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_target) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsTargetJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
+		if (this.death_effect != null) {
+			Map deathEffectJson = new LinkedHashMap();
+			npcJson.put("deathEffect", deathEffectJson);
+			if (this.death_effect.hp_boost_min != null || this.death_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				deathEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.death_effect.hp_boost_min != null) hpJson.put("min", this.death_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.death_effect.hp_boost_max != null) hpJson.put("max", this.death_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.death_effect.ap_boost_min != null || this.death_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				deathEffectJson.put("increaseCurrentAP", apJson);
+				if (this.death_effect.ap_boost_min != null) apJson.put("min", this.death_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.death_effect.ap_boost_max != null) apJson.put("max", this.death_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.death_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				deathEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.death_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
 		return npcJson;
 	}
 	

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

@@ -99,8 +99,8 @@ public class Quest extends JSONElement {
 	public void parse(Map questJson) {
 		this.visible_in_log = JSONElement.getInteger((Number) questJson.get("showInLog"));
 		List questStagesJson = (List) questJson.get("stages");
+		this.stages = new ArrayList<QuestStage>();
 		if (questStagesJson != null && !questStagesJson.isEmpty()) {
-			this.stages = new ArrayList<QuestStage>();
 			for (Object questStageJsonObj : questStagesJson) {
 				Map questStageJson = (Map)questStageJsonObj;
 				QuestStage questStage = new QuestStage(this);

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

@@ -53,12 +53,61 @@ public class Requirement extends JSONElement {
 		usedItem,
 		spentGold,
 		consumedBonemeals,
-		hasActorCondition
+		hasActorCondition,
+		factionScore
+	}
+	
+	public enum SkillID {
+		weaponChance
+		,weaponDmg
+		,barter
+		,dodge
+		,barkSkin
+		,moreCriticals
+		,betterCriticals
+		,speed				// Raises max ap
+		,coinfinder
+		,moreExp
+		,cleave				// +10ap on kill
+		,eater				// +1hp per kill
+		,fortitude			// +N hp per levelup
+		,evasion			// increase successful flee chance & reduce chance of monster attack
+		,regeneration		// +N hp per round
+		,lowerExploss
+		,magicfinder
+		,resistanceMental	// lowers chance to get negative active conditions by monsters (Mental like Dazed)
+		,resistancePhysical	// lowers chance to get negative active conditions by monsters (Physical Capacity like Minor fatigue)
+		,resistanceBlood	// lowers chance to get negative active conditions by monsters (Blood Disorder like Weak Poison)
+		,shadowBless
+		,crit1			// lowers atk ability
+		,crit2			// lowers def ability ,rejuvenation	// Reduces magnitudes of conditions
+		,rejuvenation	// Reduces magnitudes of conditions
+		,taunt			// Causes AP loss of attackers that miss
+		,concussion		// AC loss for monsters with (AC-BC)>N
+		,weaponProficiencyDagger
+		,weaponProficiency1hsword
+		,weaponProficiency2hsword
+		,weaponProficiencyAxe
+		,weaponProficiencyBlunt
+		,weaponProficiencyUnarmed
+		,armorProficiencyShield
+		,armorProficiencyUnarmored
+		,armorProficiencyLight
+		,armorProficiencyHeavy
+		,fightstyleDualWield
+		,fightstyle2hand
+		,fightstyleWeaponShield
+		,specializationDualWield
+		,specialization2hand
+		,specializationWeaponShield
 	}
 	
 	@Override
 	public String getDesc() {
-		return ((negated != null && negated) ? "NOT " : "")+required_obj_id+(required_value == null ? "" : ":"+required_value.toString());
+		return ((negated != null && negated) ? "NOT " : "")
+				+(type == null ? "" : type.toString()+":")
+				+(required_obj_id == null ? "" : required_obj_id+":")
+				+(required_value == null ? "" : required_value.toString());
 	}
 
 	@Override

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

@@ -19,20 +19,20 @@ public class KeyArea extends MapObject {
 		String requireType = obj.getProperties().getProperty("requireType");
 		String requireId = obj.getProperties().getProperty("requireId");
 		String requireValue = obj.getProperties().getProperty("requireValue");
-		if (requireId == null) {
+		oldSchoolRequirement = false;
+		if (requireType == null) {
 			String[] fields = obj.getName().split(":");
 			if (fields.length == 2) {
 				requireType = Requirement.RequirementType.questProgress.toString();
 				requireValue = fields[1];
 				requireId = fields[0];
+				oldSchoolRequirement = true;
 			} else if (fields.length == 3) {
 				requireValue = fields[2];
 				requireType = fields[0];
 				requireId = fields[1];
+				oldSchoolRequirement = true;
 			}
-			oldSchoolRequirement = true;
-		} else {
-			oldSchoolRequirement = false;
 		}
 		requirement = new Requirement();
 		if (requireType != null) requirement.type = Requirement.RequirementType.valueOf(requireType);
@@ -76,7 +76,7 @@ public class KeyArea extends MapObject {
 		}
 		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));
+				tmxObject.setName(requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : Integer.toString(requirement.required_value)));
 			} else {
 				if (requirement.type != null) {
 					tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
@@ -89,13 +89,16 @@ public class KeyArea extends MapObject {
 				if (requirement.required_value != null) {
 					tmxObject.getProperties().setProperty("requireValue", requirement.required_value.toString());
 				}
+				if (requirement.negated != null) {
+					tmxObject.getProperties().setProperty("requireNegation", Boolean.toString(requirement.negated));
+				}
 			}
 		}
 	}
 
 	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);
+			name = requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : Integer.toString(requirement.required_value));
 		} else if (oldSchoolRequirement) {
 			int i = 0;
 			String futureName = requirement.type.toString() + "#" + Integer.toString(i);

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

@@ -12,39 +12,36 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 public class ReplaceArea extends MapObject {
 
 	public Requirement requirement = null;
-	public boolean oldSchoolRequirement = true;
+	public boolean oldSchoolRequirement = false;
 	
 	public List<ReplaceArea.Replacement> replacements = null;
 
 	public ReplaceArea(tiled.core.MapObject obj) {
-//		String requireType = obj.getProperties().getProperty("requireType");
+		String requireType = obj.getProperties().getProperty("requireType");
 		String requireId = obj.getProperties().getProperty("requireId");
 		String requireValue = obj.getProperties().getProperty("requireValue");
-		if (requireId == null) {
+		if (requireType == null) {
 			String[] fields = obj.getName().split(":");
 			if (fields.length == 2) {
-//				requireType = Requirement.RequirementType.questProgress.toString();
+				requireType = Requirement.RequirementType.questProgress.toString();
 				requireValue = fields[1];
 				requireId = fields[0];
+				oldSchoolRequirement = true;
 			} /*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;
+		if (requireType != null) requirement.type = Requirement.RequirementType.valueOf(requireType);
 		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 (!TMXMap.isPaintedLayerName(s.toString())) continue;
 			if (replacements == null) replacements = new ArrayList<ReplaceArea.Replacement>();
 			replacements.add(new Replacement(s.toString(), obj.getProperties().getProperty(s.toString())));
 		}
@@ -94,7 +91,7 @@ public class ReplaceArea extends MapObject {
 		}
 		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));
+				tmxObject.setName(requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : Integer.toString(requirement.required_value)));
 			} else {
 				tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
 				if (requirement.required_obj != null) {
@@ -105,6 +102,9 @@ public class ReplaceArea extends MapObject {
 				if (requirement.required_value != null) {
 					tmxObject.getProperties().setProperty("requireValue", requirement.required_value.toString());
 				}
+				if (requirement.negated != null) {
+					tmxObject.getProperties().setProperty("requireNegation", Boolean.toString(requirement.negated));
+				}
 			}
 		}
 	}
@@ -112,7 +112,7 @@ public class ReplaceArea extends MapObject {
 	//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);
+			name = requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : Integer.toString(requirement.required_value));
 		} else if (oldSchoolRequirement) {
 			int i = 0;
 			String futureName = requirement.type.toString() + "#" + Integer.toString(i);

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

@@ -273,11 +273,12 @@ public class TMXMap extends GameDataElement {
 
 	public void save() {
 		if (writable) {
+			String xml = toXml();
 			try {
 				//TODO: check in fileutils, to test the workspace's filesystem once at startup, and figure out how many of these can occur, instead of hard-coded '2'
 				dismissNextChangeNotif += 2;
 				FileWriter w = new FileWriter(tmxFile);
-				w.write(toXml());
+				w.write(xml);
 				w.close();
 				this.state = State.saved;
 				changedOnDisk = false;

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

@@ -35,6 +35,7 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.Project;
@@ -222,6 +223,7 @@ public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeN
 
 			for (WorldmapSegment segment : this) {
 				root.appendChild(segment.toXmlElement(doc));
+				segment.state = GameDataElement.State.saved;
 			}
 
 			saveDocToFile(doc, worldmapFile);

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

@@ -24,6 +24,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.SaveEvent;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
@@ -32,6 +33,8 @@ public class WorldmapSegment extends GameDataElement {
 
 	private static final long serialVersionUID = 2658610076889592723L;
 	
+	public static final String TEMP_LABEL_KEY = "ATCS_INTERNAL_TEMPORARY_KEY_FOR_LABEL";
+	
 	public int segmentX;
 	public int segmentY;
 	public Map<String, Point> mapLocations = new LinkedHashMap<String, Point>();
@@ -102,8 +105,28 @@ public class WorldmapSegment extends GameDataElement {
 
 	@Override
 	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		boolean modified = false;
+		if (newOne == null && writable) {
+			//A referenced map may have been deleted.
+			if (mapLocations.containsKey(oldOne.id)) {
+				mapLocations.remove(oldOne.id);
+				modified = true;
+			}
+			for (String label : labelledMaps.keySet()) { 
+				if (labelledMaps.get(label).contains(oldOne.id)) {
+					labelledMaps.get(label).remove(oldOne.id);
+					modified = true;
+				}
+			}
+		}
+		
 		oldOne.removeBacklink(this);
 		if(newOne != null) newOne.addBacklink(this);
+		
+		if (modified) {
+			this.state = GameDataElement.State.modified;
+			childrenChanged(new ArrayList<ProjectTreeNode>());
+		}
 	}
 
 	@Override
@@ -154,6 +177,7 @@ public class WorldmapSegment extends GameDataElement {
 			map.setAttribute("x", Integer.toString(mapLocations.get(s).x + segmentX));
 			map.setAttribute("y", Integer.toString(mapLocations.get(s).y + segmentY));
 			for (String label : labelledMaps.keySet()) {
+				if (TEMP_LABEL_KEY.equals(label)) continue;
 				if (labelledMaps.get(label).contains(s)) {
 					map.setAttribute("area", label);
 				}
@@ -161,7 +185,9 @@ public class WorldmapSegment extends GameDataElement {
 			element.appendChild(map);
 		}
 		
-		for (NamedArea area : labels.values()) {
+		for (String key : labels.keySet()) {
+			if (TEMP_LABEL_KEY.equals(key)) continue;
+			NamedArea area = labels.get(key);
 			Element namedArea = doc.createElement("namedarea");
 			namedArea.setAttribute("id", area.id);
 			namedArea.setAttribute("name", area.name);

src/com/gpl/rpg/atcontentstudio/model/sprites/Spritesheet.java

@@ -14,6 +14,7 @@ import java.util.Map;
 import javax.imageio.ImageIO;
 import javax.swing.tree.TreeNode;
 
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
@@ -174,7 +175,7 @@ public class Spritesheet extends GameDataElement {
 		}
 		Image result = getImage(index);
 		if (result == null) return null;
-		result = result.getScaledInstance(16, 16, BufferedImage.SCALE_SMOOTH);
+		result = result.getScaledInstance((int)(16*ATContentStudio.SCALING), (int)(16*ATContentStudio.SCALING), Image.SCALE_SMOOTH);
 		cache_icon.put(index, result);
 		return result;
 	}

src/com/gpl/rpg/atcontentstudio/model/tools/writermode/WriterModeData.java

@@ -167,6 +167,9 @@ public class WriterModeData extends GameDataElement {
 			this.id = (String) json.get("id");
 			this.index = ((Number)json.get("index")).intValue();
 			this.id_prefix = (String) json.get("id_prefix");
+			if (threadsNextIndex.get(id_prefix) == null || threadsNextIndex.get(id_prefix) <= index) {
+				threadsNextIndex.put(id_prefix, index+1);
+			}
 			this.text = (String) json.get("text");
 			this.dialogue_id = (String) json.get("dialogue");
 			if (json.get("begin") != null && ((Boolean)json.get("begin"))) begin = this;
@@ -541,6 +544,7 @@ public class WriterModeData extends GameDataElement {
 				nodesById.put(dialogue.getID(), dialogue);
 			}
 		}
+		
 		this.state = State.parsed;
 	}
 	
@@ -557,6 +561,11 @@ public class WriterModeData extends GameDataElement {
 			this.parse();
 		} 
 		if (this.state == State.parsed) {
+			for (String prefix : threadsNextIndex.keySet()) {
+				while (getProject().getDialogue(prefix+threadsNextIndex.get(prefix)) != null) {
+					threadsNextIndex.put(prefix, threadsNextIndex.get(prefix)+1);
+				}
+			}
 			for (WriterDialogue dialogue : nodesById.values()) {
 				if (dialogue.dialogue_id != null) {
 					dialogue.dialogue = getProject().getDialogue(dialogue.dialogue_id);
@@ -571,32 +580,34 @@ public class WriterModeData extends GameDataElement {
 						}
 					}
 					//TODO Seriously, this is failure-prone by design. Can't do much better though...
-					List<Dialogue.Reply> linked = new ArrayList<Dialogue.Reply>(dialogue.dialogue.replies.size());
-					if (dialogue.dialogue != null && dialogue.dialogue.replies != null) {
-						//Try to hook to existing replies... not as easy when there's no ID.
-						Dialogue.Reply best = null;
-						int score, maxScore = 0;
-						for (Dialogue.Reply dReply : dialogue.dialogue.replies) {
-							//Never link twice to the same...
-							if (linked.contains(dReply)) continue;
-							score = 0;
-							//Arbitrary values... hopefully this gives good results.
-							//Same target gives good hope of preserving at least the structure.
-							if (dReply.next_phrase_id != null && dReply.next_phrase_id.equals(reply.next_dialogue_id)) score +=50;
-							//Same text is almost as good as an ID, but there may be duplicates due to requirements system...
-							if (dReply.text != null && dReply.text.equals(reply.text)) score +=40;
-							//Same slot in the list. That's not so bad if all else fails, and could help sort duplicates with same text.
-							if (dialogue.dialogue.replies.indexOf(dReply) == dialogue.replies.indexOf(reply)) score +=20;
-							//Both have null text. It's not much, but it's something....
-							if (dReply.text == null && reply.text == null) score += 10;
-							if (score > maxScore) {
-								maxScore = score;
-								best = dReply;
-							}							
-						}
-						if (maxScore > 0) {
-							reply.reply = best;
-							linked.add(best);
+					if (dialogue.dialogue != null) {
+						List<Dialogue.Reply> linked = new ArrayList<Dialogue.Reply>(dialogue.dialogue.replies.size());
+						if (dialogue.dialogue != null && dialogue.dialogue.replies != null) {
+							//Try to hook to existing replies... not as easy when there's no ID.
+							Dialogue.Reply best = null;
+							int score, maxScore = 0;
+							for (Dialogue.Reply dReply : dialogue.dialogue.replies) {
+								//Never link twice to the same...
+								if (linked.contains(dReply)) continue;
+								score = 0;
+								//Arbitrary values... hopefully this gives good results.
+								//Same target gives good hope of preserving at least the structure.
+								if (dReply.next_phrase_id != null && dReply.next_phrase_id.equals(reply.next_dialogue_id)) score +=50;
+								//Same text is almost as good as an ID, but there may be duplicates due to requirements system...
+								if (dReply.text != null && dReply.text.equals(reply.text)) score +=40;
+								//Same slot in the list. That's not so bad if all else fails, and could help sort duplicates with same text.
+								if (dialogue.dialogue.replies.indexOf(dReply) == dialogue.replies.indexOf(reply)) score +=20;
+								//Both have null text. It's not much, but it's something....
+								if (dReply.text == null && reply.text == null) score += 10;
+								if (score > maxScore) {
+									maxScore = score;
+									best = dReply;
+								}							
+							}
+							if (maxScore > 0) {
+								reply.reply = best;
+								linked.add(best);
+							}
 						}
 					}
 				}

src/com/gpl/rpg/atcontentstudio/model/tools/writermode/WriterModeDataSet.java

@@ -109,7 +109,7 @@ public class WriterModeDataSet implements ProjectTreeNode, Serializable {
 
 	@Override
 	public String getDesc() {
-		return (needsSaving() ? "*" : "")+"Dialogue sketchs";
+		return (needsSaving() ? "*" : "")+"Dialogue sketches";
 	}
 
 	@Override

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

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import javax.imageio.ImageIO;
 
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
 
 public class DefaultIcons {
@@ -107,6 +108,10 @@ public class DefaultIcons {
 	public static Image getNPCImage() { return getImage(NPC_RES); }
 	public static Image getNPCIcon() { return getIcon(NPC_RES); }
 	
+	private static String BONEMEAL_RES = "/com/gpl/rpg/atcontentstudio/img/bonemeal.png";
+	public static Image getBonemealImage() { return getImage(BONEMEAL_RES); }
+	public static Image getBonemealIcon() { return getIcon(BONEMEAL_RES); }
+	
 	private static String NPC_CLOSE_RES = "/com/gpl/rpg/atcontentstudio/img/npc_close.png";
 	public static Image getNPCCloseImage() { return getImage(NPC_CLOSE_RES); }
 	public static Image getNPCCloseIcon() { return getIcon(NPC_CLOSE_RES); }
@@ -130,6 +135,14 @@ public class DefaultIcons {
 	private static String GOLD_RES = "/com/gpl/rpg/atcontentstudio/img/ui_icon_coins.png";
 	public static Image getGoldImage() { return getImage(GOLD_RES); }
 	public static Image getGoldIcon() { return getIcon(GOLD_RES); }
+
+	private static String SKILL_RES = "/com/gpl/rpg/atcontentstudio/img/ui_icon_skill.png";
+	public static Image getSkillImage() { return getImage(SKILL_RES); }
+	public static Image getSkillIcon() { return getIcon(SKILL_RES); }
+
+	private static String IMMUNITY_RES = "/com/gpl/rpg/atcontentstudio/img/ui_icon_immunity.png";
+	public static Image getImmunityImage() { return getImage(IMMUNITY_RES); }
+	public static Image getImmunityIcon() { return getIcon(IMMUNITY_RES); }
 	
 	private static String ITEM_CATEGORY_RES = "/com/gpl/rpg/atcontentstudio/img/equip_weapon.png";
 	public static Image getItemCategoryImage() { return getImage(ITEM_CATEGORY_RES); }
@@ -227,10 +240,22 @@ public class DefaultIcons {
 	public static Image getCreateTileLayerImage() { return getImage(CREATE_TILE_LAYER_RES); }
 	public static Image getCreateTileLayerIcon() { return getIcon(CREATE_TILE_LAYER_RES); }
 
+	private static String LABEL_RES = "/com/gpl/rpg/atcontentstudio/img/label.png";
+	public static Image getLabelImage() { return getImage(LABEL_RES); }
+	public static Image getLabelIcon() { return getIcon(LABEL_RES); }
+
 	private static String ZOOM_RES = "/com/gpl/rpg/atcontentstudio/img/zoom.png";
 	public static Image getZoomImage() { return getImage(ZOOM_RES); }
 	public static Image getZoomIcon() { return getIcon(ZOOM_RES); }
 	
+	private static String TIMER_RES = "/com/gpl/rpg/atcontentstudio/img/timer.png";
+	public static Image getTimerImage() { return getImage(TIMER_RES); }
+	public static Image getTimerIcon() { return getIcon(TIMER_RES); }
+	
+	private static String ALIGNMENT_RES = "/com/gpl/rpg/atcontentstudio/img/alignment.png";
+	public static Image getAlignmentImage() { return getImage(ALIGNMENT_RES); }
+	public static Image getAlignmentIcon() { return getIcon(ALIGNMENT_RES); }
+	
 	private static String STATUS_RED_RES = "/com/gpl/rpg/atcontentstudio/img/status_red.png";
 	public static Image getStatusRedImage() { return getImage(STATUS_RED_RES); }
 	public static Image getStatusRedIcon() { return getIcon(STATUS_RED_RES); }
@@ -267,7 +292,7 @@ public class DefaultIcons {
 	
 	private static Image getIcon(String res) {
 		if (iconCache.get(res) == null) {
-			Image icon = getImage(res).getScaledInstance(16, 16, Image.SCALE_SMOOTH);
+			Image icon = getImage(res).getScaledInstance((int)(16*ATContentStudio.SCALING), (int)(16*ATContentStudio.SCALING), Image.SCALE_SMOOTH);
 			iconCache.put(res, icon);
 		}
 		return iconCache.get(res);

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

@@ -316,11 +316,15 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 //	}
 	
 	public static JSpinner addIntegerField(JPanel pane, String label, Integer initialValue, boolean allowNegatives, boolean editable, final FieldUpdateListener listener) {
+		return addIntegerField(pane, label, initialValue, 0, allowNegatives, editable, listener);
+	}
+	
+	public static JSpinner addIntegerField(JPanel pane, String label, Integer initialValue, Integer defaultValue, boolean allowNegatives, boolean editable, final FieldUpdateListener listener) {
 		JPanel tfPane = new JPanel();
 		tfPane.setLayout(new JideBoxLayout(tfPane, JideBoxLayout.LINE_AXIS, 6));
 		JLabel tfLabel = new JLabel(label);
 		tfPane.add(tfLabel, JideBoxLayout.FIX);
-		final JSpinner spinner = new JSpinner(new SpinnerNumberModel(initialValue != null ? initialValue.intValue() : 0, allowNegatives ? Integer.MIN_VALUE : 0, Integer.MAX_VALUE, 1));
+		final JSpinner spinner = new JSpinner(new SpinnerNumberModel(initialValue != null ? initialValue.intValue() : defaultValue.intValue(), allowNegatives ? Integer.MIN_VALUE : 0, Integer.MAX_VALUE, 1));
 		((JSpinner.DefaultEditor)spinner.getEditor()).getTextField().setHorizontalAlignment(JTextField.LEFT);
 		spinner.setEnabled(editable);
 		((DefaultFormatter)((NumberEditor)spinner.getEditor()).getTextField().getFormatter()).setCommitsOnValidEdit(true);

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

@@ -338,6 +338,7 @@ public class JSONImportWizard extends JDialog {
 									} else if (existingNode.getDataType() == GameSource.Type.altered) {
 										errors.add("An item with id "+node.id+" is already altered in this project.");
 									} else {
+										node.jsonFile = existingNode.jsonFile;
 										warnings.add("An item with id "+node.id+" exists in the used game source. This one will be inserted as \"altered\"");
 									}
 									existingNode = null;
@@ -412,7 +413,7 @@ public class JSONImportWizard extends JDialog {
 				proj.createElements(created);
 				JSONElement lastNode = created.get(created.size() - 1);
 				if (lastNode != null) {
-					lastNode.save();
+					//	lastNode.save();
 					ATContentStudio.frame.selectInTree(lastNode);
 				}
 				JSONImportWizard.this.setVisible(false);

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

@@ -18,6 +18,7 @@ import javax.swing.ListModel;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.NotificationListener;
 
@@ -54,7 +55,7 @@ public class NotificationsPane extends JList {
 					label.setBorder(BorderFactory.createLineBorder(Color.BLUE));
 //					label.setForeground(Color.WHITE);
 				}
-				f = f.deriveFont(10f);
+				f = f.deriveFont(10f*ATContentStudio.SCALING);
 				label.setFont(f);
 				return label;
 			}

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

@@ -0,0 +1,35 @@
+package com.gpl.rpg.atcontentstudio.ui;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Image;
+
+import javax.swing.Icon;
+
+public class OverlayIcon implements Icon {
+	
+	private Image background;
+	private Image overlay;
+	
+	public OverlayIcon(Image background, Image overlay) {
+		this.background = background;
+		this.overlay = overlay;
+	}
+	
+	@Override
+	public void paintIcon(Component c, Graphics g, int x, int y) {
+		g.drawImage(background, x, y, null);
+		g.drawImage(overlay, x, y, null);
+	}
+
+	@Override
+	public int getIconWidth() {
+		return Math.max(background.getWidth(null), overlay.getWidth(null));
+	}
+
+	@Override
+	public int getIconHeight() {
+		return Math.max(background.getHeight(null), overlay.getHeight(null));
+	}
+
+}

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

@@ -140,14 +140,14 @@ public class ProjectsTree extends JPanel {
 		projectsTree.addTreeSelectionListener(new TreeSelectionListener() {
 			@Override
 			public void valueChanged(TreeSelectionEvent e) {
-				List<TreePath> newPaths = new ArrayList<TreePath>();
-				for (TreePath path : e.getPaths()) {
-					if (e.isAddedPath(path)) newPaths.add(path);
-				}
+//				List<TreePath> newPaths = new ArrayList<TreePath>();
+//				for (TreePath path : e.getPaths()) {
+//					if (e.isAddedPath(path)) newPaths.add(path);
+//				}
 				if (e.getPath() == null) {
-					ATContentStudio.frame.actions.selectionChanged(null, newPaths.toArray(new TreePath[newPaths.size()]));
+					ATContentStudio.frame.actions.selectionChanged(null, projectsTree.getSelectionPaths());
 				} else {
-					ATContentStudio.frame.actions.selectionChanged((ProjectTreeNode) e.getPath().getLastPathComponent(), newPaths.toArray(new TreePath[newPaths.size()]));
+					ATContentStudio.frame.actions.selectionChanged((ProjectTreeNode) e.getPath().getLastPathComponent(), projectsTree.getSelectionPaths());
 				}
 			}
 		});
@@ -242,17 +242,17 @@ public class ProjectsTree extends JPanel {
 			addNextSeparator = false;
 		}
 		
-		if (actions.testWriter.isEnabled()) {
+		if (actions.createWriter.isEnabled()) {
 			addNextSeparator = true;
-			popupMenu.add(new JMenuItem(actions.testWriter));
+			popupMenu.add(new JMenuItem(actions.createWriter));
 		}
 //		if (actions.testCommitWriter.isEnabled()) {
 //			addNextSeparator = true;
 //			popupMenu.add(new JMenuItem(actions.testCommitWriter));
 //		}
-		if (actions.createWriter.isEnabled()) {
+		if (actions.generateWriter.isEnabled()) {
 			addNextSeparator = true;
-			popupMenu.add(new JMenuItem(actions.createWriter));
+			popupMenu.add(new JMenuItem(actions.generateWriter));
 		}
 		if (addNextSeparator) {
 			popupMenu.add(new JSeparator());

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

@@ -40,7 +40,7 @@ public class StudioFrame extends JFrame {
 
 	private static final long serialVersionUID = -3391514100319186661L;
 	
-
+	
 	final ProjectsTree projectTree;
 	final EditorsArea editors;
 	
@@ -165,6 +165,7 @@ public class StudioFrame extends JFrame {
 				public void actionPerformed(ActionEvent e) {
 					try {
 						UIManager.setLookAndFeel(i.getClassName());
+						ATContentStudio.scaleUIFont();
 						SwingUtilities.updateComponentTreeUI(ATContentStudio.frame);
 						ConfigCache.setFavoriteLaFClassName(i.getClassName());
 					} catch (ClassNotFoundException e1) {

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

@@ -9,6 +9,7 @@ import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.jidesoft.swing.JideBoxLayout;
 
 
@@ -19,7 +20,7 @@ private static final long serialVersionUID = 8239669104275145995L;
 		super(parent, "Loading...");
 		this.setIconImage(DefaultIcons.getMainIconImage());
 		this.getContentPane().setLayout(new JideBoxLayout(this.getContentPane(), JideBoxLayout.PAGE_AXIS, 6));
-		this.getContentPane().add(new JLabel("<html><font size=5>Please wait.<br/>"+message+"</font></html>"), JideBoxLayout.VARY);
+		this.getContentPane().add(new JLabel("<html><font size="+(int)(5 * ATContentStudio.SCALING)+">Please wait.<br/>"+message+"</font></html>"), JideBoxLayout.VARY);
 		JMovingIdler idler = new JMovingIdler();
 		idler.setBackground(Color.WHITE);
 		idler.setForeground(Color.GREEN);
@@ -46,7 +47,7 @@ private static final long serialVersionUID = 8239669104275145995L;
 				info.setVisible(true);
 				workload.run();
 				info.dispose();
-				if (showConfirm) JOptionPane.showMessageDialog(parent, "<html><font size=5>Done !</font></html>");
+				if (showConfirm) JOptionPane.showMessageDialog(parent, "<html><font size="+(int)(5 * ATContentStudio.SCALING)+">Done !</font></html>");
 			};
 		}.start();
 	}

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

@@ -31,8 +31,12 @@ import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataCategory;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
+import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
 import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeDataSet;
@@ -122,19 +126,45 @@ public class WorkspaceActions {
 					ATContentStudio.frame.closeEditor(element);
 					element.childrenRemoved(new ArrayList<ProjectTreeNode>());
 					if (element instanceof JSONElement) {
-						@SuppressWarnings("unchecked")
-						GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
-						category.remove(element);
-						if (impactedCategories.get(category) == null) {
-							impactedCategories.put(category, new HashSet<File>());
+						if (element.getParent() instanceof GameDataCategory<?>) {
+							@SuppressWarnings("unchecked")
+							GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
+							category.remove(element);
+							if (impactedCategories.get(category) == null) {
+								impactedCategories.put(category, new HashSet<File>());
+							}
+							
+							GameDataElement newOne = element.getProject().getGameDataElement(((JSONElement)element).getClass(), element.id);
+							if (element instanceof Quest) {
+								for (QuestStage oldStage : ((Quest) element).stages) {
+									QuestStage newStage = newOne != null ? ((Quest) newOne).getStage(oldStage.progress) : null;
+									for (GameDataElement backlink : oldStage.getBacklinks()) {
+										backlink.elementChanged(oldStage, newStage);
+									}
+								}
+							}
+							for (GameDataElement backlink : element.getBacklinks()) {
+								backlink.elementChanged(element, newOne);
+							}
+							impactedCategories.get(category).add(((JSONElement) element).jsonFile);
 						}
-						impactedCategories.get(category).add(((JSONElement) element).jsonFile);
 					} else if (element instanceof TMXMap) {
-						TMXMapSet parent = (TMXMapSet) element.getParent();
-						parent.tmxMaps.remove(element);
+						((TMXMap)element).delete();
+						GameDataElement newOne = element.getProject().getMap(element.id);
+						for (GameDataElement backlink : element.getBacklinks()) {
+							backlink.elementChanged(element, newOne);
+						}
 					} else if (element instanceof WriterModeData) {
 						WriterModeDataSet parent = (WriterModeDataSet) element.getParent();
 						parent.writerModeDataList.remove(element);
+					} else if (element instanceof WorldmapSegment) {
+						if (element.getParent() instanceof Worldmap) {
+							((Worldmap)element.getParent()).remove(element);
+							element.save();
+							for (GameDataElement backlink : element.getBacklinks()) {
+								backlink.elementChanged(element, element.getProject().getWorldmapSegment(element.id));
+							}
+						}
 					}
 				}
 				new Thread() {
@@ -165,20 +195,52 @@ public class WorkspaceActions {
 					@Override
 					public void run() {
 						node.childrenRemoved(new ArrayList<ProjectTreeNode>());
-						if (node.getParent() instanceof GameDataCategory<?>) {
-							((GameDataCategory<?>)node.getParent()).remove(node);
-							List<SaveEvent> events = node.attemptSave();
-							if (events == null || events.isEmpty()) {
-								node.save();
-							} else {
-								new SaveItemsWizard(events, null).setVisible(true);
+						if (node instanceof JSONElement) {
+							if (node.getParent() instanceof GameDataCategory<?>) {
+								((GameDataCategory<?>)node.getParent()).remove(node);
+								List<SaveEvent> events = node.attemptSave();
+								if (events == null || events.isEmpty()) {
+									node.save();
+								} else {
+									new SaveItemsWizard(events, null).setVisible(true);
+								}
+								GameDataElement newOne = node.getProject().getGameDataElement(((JSONElement)node).getClass(), node.id);
+								if (node instanceof Quest) {
+									for (QuestStage oldStage : ((Quest) node).stages) {
+										QuestStage newStage = newOne != null ? ((Quest) newOne).getStage(oldStage.progress) : null;
+										for (GameDataElement backlink : oldStage.getBacklinks()) {
+											backlink.elementChanged(oldStage, newStage);
+										}
+									}
+								}
+								for (GameDataElement backlink : node.getBacklinks()) {
+									backlink.elementChanged(node, newOne);
+								}
 							}
+//							((GameDataCategory<?>)node.getParent()).remove(node);
+//							List<SaveEvent> events = node.attemptSave();
+//							if (events == null || events.isEmpty()) {
+//								node.save();
+//							} else {
+//								new SaveItemsWizard(events, null).setVisible(true);
+//							}
 						} else if (node instanceof TMXMap) {
-							TMXMapSet parent = (TMXMapSet) node.getParent();
-							parent.tmxMaps.remove(node);
+							((TMXMap)node).delete();
+							GameDataElement newOne = node.getProject().getMap(node.id);
+							for (GameDataElement backlink : node.getBacklinks()) {
+								backlink.elementChanged(node, newOne);
+							}
 						} else if (node instanceof WriterModeData) {
 							WriterModeDataSet parent = (WriterModeDataSet) node.getParent();
 							parent.writerModeDataList.remove(node);
+						} else if (node instanceof WorldmapSegment) {
+							if (node.getParent() instanceof Worldmap) {
+								((Worldmap)node.getParent()).remove(node);
+								node.save();
+								for (GameDataElement backlink : node.getBacklinks()) {
+									backlink.elementChanged(node, node.getProject().getWorldmapSegment(node.id));
+								}
+							}
 						}
 					}
 				}.start();
@@ -192,12 +254,9 @@ public class WorkspaceActions {
 				for (TreePath selected : selectedPaths) {
 					if (selected.getLastPathComponent() instanceof GameDataElement && ((GameDataElement)selected.getLastPathComponent()).writable) {
 						elementsToDelete.add((GameDataElement) selected.getLastPathComponent());
-						multiMode = true;
-					} else {
-						multiMode = false;
-						break;
 					}
 				}
+				multiMode = elementsToDelete.size() > 1;
 				putValue(Action.NAME, "Delete all selected elements");
 				setEnabled(multiMode);
 			} else if (selectedNode instanceof GameDataElement && ((GameDataElement)selectedNode).writable) {
@@ -340,7 +399,7 @@ public class WorkspaceActions {
 		};
 	};
 	
-	public ATCSAction testWriter = new ATCSAction("Create dialogue sketch", "Create a dialogue sketch for fast dialogue edition"){
+	public ATCSAction createWriter = new ATCSAction("Create dialogue sketch", "Create a dialogue sketch for fast dialogue edition"){
 		public void actionPerformed(ActionEvent e) {
 			if (selectedNode == null || selectedNode.getProject() == null) return;
 			new WriterSketchCreationWizard(selectedNode.getProject()).setVisible(true);
@@ -375,7 +434,7 @@ public class WorkspaceActions {
 		}
 	};*/
 	
-	public ATCSAction createWriter = new ATCSAction("Generate dialogue sketch", "Generates a dialogue sketch from this dialogue and its tree.") {
+	public ATCSAction generateWriter = new ATCSAction("Generate dialogue sketch", "Generates a dialogue sketch from this dialogue and its tree.") {
 		public void actionPerformed(ActionEvent e) {
 			if (selectedNode == null || selectedNode.getProject() == null || !(selectedNode instanceof Dialogue)) return;
 			new WriterSketchCreationWizard(selectedNode.getProject(), (Dialogue)selectedNode).setVisible(true);
@@ -413,9 +472,9 @@ public class WorkspaceActions {
 		actions.add(exportProject);
 		actions.add(showAbout);
 		actions.add(exitATCS);
-		actions.add(testWriter);
-//		actions.add(testCommitWriter);
 		actions.add(createWriter);
+//		actions.add(testCommitWriter);
+		actions.add(generateWriter);
 		actions.add(editWorkspaceSettings);
 		selectionChanged(null, null);
 	}

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

@@ -31,9 +31,10 @@ public class WorkspaceSettingsEditor extends JDialog {
 	JRadioButton useSystemDefaultImageViewerButton, useSystemDefaultImageEditorButton, useCustomImageEditorButton;
 	JTextField imageEditorCommandField;
 	
+	JCheckBox useInternetBox;
 	JCheckBox translatorModeBox;
 	JComboBox<String> translatorLanguagesBox; 
-	JCheckBox useInternetBox;
+	JCheckBox checkUpdatesBox;
 	
 	
 	
@@ -53,7 +54,7 @@ public class WorkspaceSettingsEditor extends JDialog {
 		
 		
 		pane.add(getExternalToolsPane(), JideBoxLayout.FIX);
-		pane.add(getTranslatorModePane(), JideBoxLayout.FIX);
+		pane.add(getInternetPane(), JideBoxLayout.FIX);
 		pane.add(new JPanel(), JideBoxLayout.VARY);
 
 		buttonPane.add(new JPanel(), JideBoxLayout.VARY);
@@ -155,10 +156,14 @@ public class WorkspaceSettingsEditor extends JDialog {
 		return pane;
 	}
 	
-	public JPanel getTranslatorModePane() {
-		CollapsiblePanel pane = new CollapsiblePanel("Translator options");
+	public JPanel getInternetPane() {
+		
+		CollapsiblePanel pane = new CollapsiblePanel("Internet options");
 		pane.setLayout(new JideBoxLayout(pane, JideBoxLayout.PAGE_AXIS));
 		
+		useInternetBox = new JCheckBox("Allow connecting to internet to retrieve data from weblate and check for updates.");
+		pane.add(useInternetBox, JideBoxLayout.FIX);
+		
 		translatorModeBox = new JCheckBox("Activate translator mode");
 		pane.add(translatorModeBox, JideBoxLayout.FIX);
 		
@@ -171,14 +176,15 @@ public class WorkspaceSettingsEditor extends JDialog {
 
 		pane.add(new JLabel("If your language isn't here, complain on the forums at https://andorstrail.com/"), JideBoxLayout.FIX);
 		
-		useInternetBox = new JCheckBox("Allow connecting to internet to retrieve data from weblate.");
-		pane.add(useInternetBox, JideBoxLayout.FIX);
+		checkUpdatesBox = new JCheckBox("Check for ATCS updates at startup");
+		pane.add(checkUpdatesBox, JideBoxLayout.FIX);
 		
-		translatorModeBox.addActionListener(new ActionListener() {
+		useInternetBox.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				translatorLanguagesBox.setEnabled(translatorModeBox.isSelected());
-				useInternetBox.setEnabled(translatorModeBox.isSelected());
+				translatorLanguagesBox.setEnabled(useInternetBox.isSelected());
+				translatorModeBox.setEnabled(useInternetBox.isSelected());
+				checkUpdatesBox.setEnabled(useInternetBox.isSelected());
 			}
 		});
 		
@@ -196,19 +202,20 @@ public class WorkspaceSettingsEditor extends JDialog {
 		useSystemDefaultImageEditorButton.setSelected(settings.useSystemDefaultImageEditor.getCurrentValue());
 		useCustomImageEditorButton.setSelected(!(settings.useSystemDefaultImageViewer.getCurrentValue() || settings.useSystemDefaultImageEditor.getCurrentValue()));
 		imageEditorCommandField.setText(settings.imageEditorCommand.getCurrentValue());
-		//Translator
+		//Internet
+		useInternetBox.setSelected(settings.useInternet.getCurrentValue());
 		if (settings.translatorLanguage.getCurrentValue() != null) {
 			translatorModeBox.setSelected(true);
 			translatorLanguagesBox.setSelectedItem(settings.translatorLanguage.getCurrentValue());
-			translatorLanguagesBox.setEnabled(true);
-			useInternetBox.setEnabled(true);
+			translatorLanguagesBox.setEnabled(useInternetBox.isSelected());
 		} else {
 			translatorModeBox.setSelected(false);
 			translatorLanguagesBox.setSelectedItem(null);
 			translatorLanguagesBox.setEnabled(false);
-			useInternetBox.setEnabled(false);
 		}
-		useInternetBox.setSelected(settings.useInternet.getCurrentValue());
+		translatorModeBox.setEnabled(useInternetBox.isSelected());
+		checkUpdatesBox.setSelected(settings.checkUpdates.getCurrentValue());
+		checkUpdatesBox.setEnabled(useInternetBox.isSelected());
 	}
 	
 	public void pushToModel() {
@@ -219,13 +226,14 @@ public class WorkspaceSettingsEditor extends JDialog {
 		settings.useSystemDefaultImageViewer.setCurrentValue(useSystemDefaultImageViewerButton.isSelected());
 		settings.useSystemDefaultImageEditor.setCurrentValue(useSystemDefaultImageEditorButton.isSelected());
 		settings.imageEditorCommand.setCurrentValue(imageEditorCommandField.getText());
-		//Translator
+		//Internet
+		settings.useInternet.setCurrentValue(useInternetBox.isSelected());
 		if (translatorModeBox.isSelected()) {
 			settings.translatorLanguage.setCurrentValue((String)translatorLanguagesBox.getSelectedItem());
 		} else {
 			settings.translatorLanguage.resetDefault();
 		}
-		settings.useInternet.setCurrentValue(useInternetBox.isSelected());
+		settings.checkUpdates.setCurrentValue(checkUpdatesBox.isSelected());
 		settings.save();
 	}
 	

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

@@ -35,13 +35,15 @@ public class ActorConditionEditor extends JSONElementEditor {
 	private IntegerBasedCheckBox positiveBox;
 	private IntegerBasedCheckBox stackingBox;
 	
-	private JTextField roundVisualField;
+	//private JTextField roundVisualField;
+	private JComboBox roundVisualField;
 	private JSpinner roundHpMinField;
 	private JSpinner roundHpMaxField;
 	private JSpinner roundApMinField;
 	private JSpinner roundApMaxField;
 	
-	private JTextField fullRoundVisualField;
+	//private JTextField fullRoundVisualField;
+	private JComboBox fullRoundVisualField;
 	private JSpinner fullRoundHpMinField;
 	private JSpinner fullRoundHpMaxField;
 	private JSpinner fullRoundApMinField;
@@ -82,7 +84,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 		stackingBox = addIntegerBasedCheckBox(pane, "Stacking", ac.stacking, ac.writable, listener);
 		
 		
-		CollapsiblePanel roundEffectPane = new CollapsiblePanel("Effect every round (4s): ");
+		CollapsiblePanel roundEffectPane = new CollapsiblePanel("Effect every round (6s): ");
 		roundEffectPane.setLayout(new JideBoxLayout(roundEffectPane, JideBoxLayout.PAGE_AXIS));
 		final ActorCondition.RoundEffect roundEffect;
 		if (ac.round_effect != null) {
@@ -90,7 +92,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 		} else {
 			roundEffect = new ActorCondition.RoundEffect();
 		}
-		roundVisualField = addTextField(roundEffectPane, "Visual effect ID: ", roundEffect.visual_effect, ac.writable, listener);
+		roundVisualField = addEnumValueBox(roundEffectPane, "Visual effect ID:", ActorCondition.VisualEffectID.values(), roundEffect.visual_effect, ac.writable, listener);//addTextField(roundEffectPane, "Visual effect ID: ", roundEffect.visual_effect, ac.writable, listener);
 		roundHpMinField = addIntegerField(roundEffectPane, "HP Bonus Min: ", roundEffect.hp_boost_min, true, ac.writable, listener);
 		roundHpMaxField = addIntegerField(roundEffectPane, "HP Bonus Max: ", roundEffect.hp_boost_max, true, ac.writable, listener);
 		roundApMinField = addIntegerField(roundEffectPane, "AP Bonus Min: ", roundEffect.ap_boost_min, true, ac.writable, listener);
@@ -99,7 +101,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 		pane.add(roundEffectPane, JideBoxLayout.FIX);
 		
 		
-		CollapsiblePanel fullRoundEffectPane = new CollapsiblePanel("Effect every full round (20s): ");
+		CollapsiblePanel fullRoundEffectPane = new CollapsiblePanel("Effect every full round (25s): ");
 		fullRoundEffectPane.setLayout(new JideBoxLayout(fullRoundEffectPane, JideBoxLayout.PAGE_AXIS));
 		final ActorCondition.RoundEffect fullRoundEffect;
 		if (ac.full_round_effect != null) {
@@ -107,7 +109,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 		} else {
 			fullRoundEffect = new ActorCondition.RoundEffect();
 		}
-		fullRoundVisualField = addTextField(fullRoundEffectPane, "Visual effect ID: ", fullRoundEffect.visual_effect, ac.writable, listener);
+		fullRoundVisualField = addEnumValueBox(fullRoundEffectPane, "Visual effect ID:", ActorCondition.VisualEffectID.values(), fullRoundEffect.visual_effect, ac.writable, listener);//addTextField(fullRoundEffectPane, "Visual effect ID: ", fullRoundEffect.visual_effect, ac.writable, listener);
 		fullRoundHpMinField = addIntegerField(fullRoundEffectPane, "HP Bonus min: ", fullRoundEffect.hp_boost_min, true, ac.writable, listener);
 		fullRoundHpMaxField = addIntegerField(fullRoundEffectPane, "HP Bonus max: ", fullRoundEffect.hp_boost_max, true, ac.writable, listener);
 		fullRoundApMinField = addIntegerField(fullRoundEffectPane, "AP Bonus min: ", fullRoundEffect.ap_boost_min, true, ac.writable, listener);
@@ -194,7 +196,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 					if (aCond.round_effect == null) {
 						aCond.round_effect = new ActorCondition.RoundEffect();
 					}
-					aCond.round_effect.visual_effect = (String) value;
+					aCond.round_effect.visual_effect = (ActorCondition.VisualEffectID) value;
 				}
 			} else if (source == roundHpMinField) {
 				if (value == null) {
@@ -264,7 +266,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 					if (aCond.full_round_effect == null) {
 						aCond.full_round_effect = new ActorCondition.RoundEffect();
 					}
-					aCond.full_round_effect.visual_effect = (String) value;
+					aCond.full_round_effect.visual_effect = (ActorCondition.VisualEffectID) value;
 				}
 			} else if (source == fullRoundHpMinField) {
 				if (value == null) {

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

@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.swing.ButtonGroup;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -22,6 +23,7 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.JTextArea;
@@ -50,6 +52,7 @@ import com.gpl.rpg.atcontentstudio.ui.BooleanBasedCheckBox;
 import com.gpl.rpg.atcontentstudio.ui.CollapsiblePanel;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.FieldUpdateListener;
+import com.gpl.rpg.atcontentstudio.ui.OverlayIcon;
 import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.dialoguetree.DialogueGraphView;
 import com.jidesoft.swing.JideBoxLayout;
 
@@ -96,6 +99,9 @@ public class DialogueEditor extends JSONElementEditor {
 	private JComboBox rewardObjIdCombo;
 	private MyComboBox rewardObj;
 	private JComponent rewardValue;
+	private JRadioButton rewardConditionTimed;
+	private JRadioButton rewardConditionForever;
+	private JRadioButton rewardConditionClear;
 	
 	private RepliesListModel repliesListModel;
 	@SuppressWarnings("rawtypes")
@@ -114,6 +120,7 @@ public class DialogueEditor extends JSONElementEditor {
 	private JComboBox requirementTypeCombo;
 	private JPanel requirementParamsPane;
 	private MyComboBox requirementObj;
+	private JComboBox requirementSkill;
 	private JTextField requirementObjId;
 	private JComponent requirementValue;
 	private BooleanBasedCheckBox requirementNegated;
@@ -357,6 +364,7 @@ public class DialogueEditor extends JSONElementEditor {
 		if (rewardObj != null) {
 			removeElementListener(rewardObj);
 		}
+		boolean immunity = false;
 		if (reward.type != null) {
 			switch (reward.type) {
 			case activateMapObjectGroup:
@@ -383,12 +391,59 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardObj = null;
 				rewardValue = null;
 				break;
+			case actorConditionImmunity:
+				immunity = true;
 			case actorCondition:
+				
 				rewardMap = null;
 				rewardObjId = null;
 				rewardObjIdCombo = null;
 				rewardObj = addActorConditionBox(pane, ((Dialogue)target).getProject(), "Actor Condition: ", (ActorCondition) reward.reward_obj, writable, listener);
-				rewardValue = addIntegerField(pane, "Duration: ", reward.reward_value, false, writable, listener);
+				rewardConditionTimed = new JRadioButton("For a number of rounds");
+				pane.add(rewardConditionTimed, JideBoxLayout.FIX);
+				rewardValue = addIntegerField(pane, "Duration: ", reward.reward_value, 1, false, writable, listener);
+				rewardConditionForever = new JRadioButton("Forever");
+				pane.add(rewardConditionForever, JideBoxLayout.FIX);
+				if (!immunity) {
+					rewardConditionClear = new JRadioButton("Clear actor condition");
+					pane.add(rewardConditionClear, JideBoxLayout.FIX);
+				}
+				
+				ButtonGroup radioGroup = new ButtonGroup();
+				radioGroup.add(rewardConditionTimed);
+				radioGroup.add(rewardConditionForever);
+				if (!immunity) radioGroup.add(rewardConditionClear);
+				
+				if (immunity) {
+					rewardConditionTimed.setSelected(reward.reward_value == null || (reward.reward_value != ActorCondition.DURATION_FOREVER && reward.reward_value != ActorCondition.MAGNITUDE_CLEAR));
+					rewardConditionForever.setSelected(reward.reward_value != null && reward.reward_value != ActorCondition.DURATION_FOREVER);
+					rewardConditionClear.setSelected(reward.reward_value != null && reward.reward_value != ActorCondition.MAGNITUDE_CLEAR);
+				} else {
+					rewardConditionTimed.setSelected(reward.reward_value != null && reward.reward_value != ActorCondition.DURATION_FOREVER);
+					rewardConditionForever.setSelected(reward.reward_value == null || reward.reward_value == ActorCondition.DURATION_FOREVER);
+				}
+				rewardValue.setEnabled(rewardConditionTimed.isSelected());
+				
+				rewardConditionTimed.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						listener.valueChanged(rewardConditionTimed, new Boolean(rewardConditionTimed.isSelected()));
+					}
+				});
+				rewardConditionForever.addActionListener(new ActionListener() {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						listener.valueChanged(rewardConditionForever, new Boolean(rewardConditionForever.isSelected()));
+					}
+				});
+				if (!immunity) {
+					rewardConditionClear.addActionListener(new ActionListener() {
+						@Override
+						public void actionPerformed(ActionEvent e) {
+							listener.valueChanged(rewardConditionClear, new Boolean(rewardConditionClear.isSelected()));
+						}
+					});
+				}
 				break;
 			case alignmentChange:
 				rewardMap = null;
@@ -417,6 +472,7 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardObj = addItemBox(pane, ((Dialogue)target).getProject(), "Item: ", (Item) reward.reward_obj, writable, listener);
 				rewardValue = addIntegerField(pane, "Quantity: ", reward.reward_value, false, writable, listener);
 				break;
+			case removeQuestProgress:
 			case questProgress:
 				rewardMap = null;
 				rewardObjId = null;
@@ -425,9 +481,13 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardValue = addQuestStageBox(pane, ((Dialogue)target).getProject(), "Quest stage: ", reward.reward_value, writable, listener, (Quest) reward.reward_obj, rewardObj);
 				break;
 			case skillIncrease:
+				Requirement.SkillID skillId = null;
+				try {
+					skillId = reward.reward_obj_id == null ? null : Requirement.SkillID.valueOf(reward.reward_obj_id);
+				} catch(IllegalArgumentException e) {}
 				rewardMap = null;
-				rewardObjId = addTextField(pane, "Skill ID: ", reward.reward_obj_id, writable, listener);
-				rewardObjIdCombo = null;
+				rewardObjId = null;// addTextField(pane, "Skill ID: ", reward.reward_obj_id, writable, listener);
+				rewardObjIdCombo = addEnumValueBox(pane, "Skill ID: ", Requirement.SkillID.values(), skillId, writable, listener);
 				rewardObj = null;
 				rewardValue = null;
 				break;
@@ -683,8 +743,13 @@ public class DialogueEditor extends JSONElementEditor {
 				requirementValue = addQuestStageBox(pane, project, "Quest stage: ", requirement.required_value, writable, listener, (Quest) requirement.required_obj, requirementObj);
 				break;
 			case skillLevel:
+				Requirement.SkillID skillId = null;
+				try {
+					skillId = requirement.required_obj_id == null ? null : Requirement.SkillID.valueOf(requirement.required_obj_id);
+				} catch(IllegalArgumentException e) {}
 				requirementObj = null;
-				requirementObjId = addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+				requirementSkill = addEnumValueBox(pane, "Skill ID:", Requirement.SkillID.values(), skillId, writable, listener);
+				requirementObjId = null;//addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
 				requirementValue = addIntegerField(pane, "Level: ", requirement.required_value, false, writable, listener);
 				break;
 			case timerElapsed:
@@ -692,6 +757,11 @@ public class DialogueEditor extends JSONElementEditor {
 				requirementObjId = addTextField(pane, "Timer ID:", requirement.required_obj_id, writable, listener);
 				requirementValue = addIntegerField(pane, "Timer value: ", requirement.required_value, false, writable, listener);
 				break;
+			case factionScore:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum score: ", requirement.required_value, true, writable, listener);
+				break;
 			case wear:
 				requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener);
 				requirementObjId = null;
@@ -797,14 +867,27 @@ public class DialogueEditor extends JSONElementEditor {
 				label.setIcon(new ImageIcon(DefaultIcons.getObjectLayerIcon()));
 				break;
 			case actorCondition:
-				label.setText("Give actor condition "+rewardObjDesc+" for "+reward.reward_value+" turns");
+				boolean rewardClear = reward.reward_value != null && reward.reward_value.intValue() == ActorCondition.MAGNITUDE_CLEAR;
+				if (rewardClear) {
+					label.setText("Clear actor condition "+rewardObjDesc);
+				} else {
+					boolean rewardForever = reward.reward_value != null && reward.reward_value.intValue() == ActorCondition.DURATION_FOREVER;
+					label.setText("Give actor condition "+rewardObjDesc+(rewardForever ? " forever" : " for "+reward.reward_value+" turns"));
+				}
 				if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
 				break;
+			case actorConditionImmunity:
+				boolean rewardForever = reward.reward_value == null || reward.reward_value.intValue() == ActorCondition.DURATION_FOREVER;
+				label.setText("Give immunity to actor condition "+rewardObjDesc+(rewardForever ? " forever" : " for "+reward.reward_value+" turns"));
+				if (reward.reward_obj != null) label.setIcon(new OverlayIcon(reward.reward_obj.getIcon(), DefaultIcons.getImmunityIcon()));
+				break;
 			case alignmentChange:
 				label.setText("Change alignment for faction "+rewardObjDesc+" : "+reward.reward_value);
+				label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon()));
 				break;
 			case createTimer:
 				label.setText("Create timer "+rewardObjDesc);
+				label.setIcon(new ImageIcon(DefaultIcons.getTimerIcon()));
 				break;
 			case deactivateMapObjectGroup:
 				label.setText("Deactivate map object group "+rewardObjDesc+" on map "+reward.map_name);
@@ -826,12 +909,17 @@ public class DialogueEditor extends JSONElementEditor {
 				label.setText("Give quest progress "+rewardObjDesc+":"+reward.reward_value);
 				if (reward.reward_obj != null) label.setIcon(new ImageIcon(reward.reward_obj.getIcon()));
 				break;
+			case removeQuestProgress:
+				label.setText("Removes 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);
 				label.setIcon(new ImageIcon(DefaultIcons.getNPCIcon()));
 				break;
 			case skillIncrease:
 				label.setText("Increase skill "+rewardObjDesc+" level");
+				label.setIcon(new ImageIcon(DefaultIcons.getSkillIcon()));
 				break;
 			case spawnAll:
 				label.setText("Respawn all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
@@ -1066,7 +1154,18 @@ public class DialogueEditor extends JSONElementEditor {
 			if (req.required_obj.getIcon() != null) {
 				label.setIcon(new ImageIcon(req.required_obj.getIcon()));
 			}
-		} if (req.type == null) {
+		} else if (req.type == Requirement.RequirementType.skillLevel) {
+			label.setIcon(new ImageIcon(DefaultIcons.getSkillIcon()));
+		} else if (req.type == Requirement.RequirementType.spentGold) {
+			label.setIcon(new ImageIcon(DefaultIcons.getGoldIcon()));
+		} else if (req.type == Requirement.RequirementType.consumedBonemeals) {
+			label.setIcon(new ImageIcon(DefaultIcons.getBonemealIcon()));
+		} else if (req.type == Requirement.RequirementType.timerElapsed) {
+			label.setIcon(new ImageIcon(DefaultIcons.getTimerIcon()));
+		} else if (req.type == Requirement.RequirementType.factionScore) {
+			label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon()));
+		}
+		if (req.type == null) {
 			label.setText("New, undefined requirement.");
 		}
 	}
@@ -1166,6 +1265,18 @@ public class DialogueEditor extends JSONElementEditor {
 					if (stage != null) stage.addBacklink(dialogue);
 				}
 				rewardsListModel.itemChanged(selectedReward);
+			} else if (source == rewardConditionClear) {
+				selectedReward.reward_value = ActorCondition.MAGNITUDE_CLEAR;
+				rewardValue.setEnabled(false);
+				rewardsListModel.itemChanged(selectedReward);
+			} else if (source == rewardConditionForever) {
+				selectedReward.reward_value = ActorCondition.DURATION_FOREVER;
+				rewardValue.setEnabled(false);
+				rewardsListModel.itemChanged(selectedReward);
+			} else if (source == rewardConditionTimed) {
+				selectedReward.reward_value = (Integer) ((JSpinner)rewardValue).getValue();
+				rewardValue.setEnabled(true);
+				rewardsListModel.itemChanged(selectedReward);
 			} else if (source == replyTypeCombo) {
 				updateRepliesParamsEditorPane(repliesParamsPane, selectedReply, this);
 				repliesListModel.itemChanged(selectedReply);
@@ -1200,6 +1311,15 @@ public class DialogueEditor extends JSONElementEditor {
 					selectedRequirement.required_obj_id = null;
 				}
 				requirementsListModel.itemChanged(selectedRequirement);
+			} else if (source == requirementSkill) {
+				if (selectedRequirement.required_obj != null) {
+					selectedRequirement.required_obj.removeBacklink(dialogue);
+					selectedRequirement.required_obj = null;
+				}
+				if (selectedRequirement.type == Requirement.RequirementType.skillLevel) {
+					selectedRequirement.required_obj_id = value == null ? null : value.toString();
+				}
+				requirementsListModel.itemChanged(selectedRequirement);
 			} else if (source == requirementObjId) {
 				selectedRequirement.required_obj_id = (String) value;
 				selectedRequirement.required_obj = null;

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

@@ -95,6 +95,7 @@ public abstract class JSONElementEditor extends Editor {
 		jsonEditorPane.setText(((JSONElement)target).toJsonString());
 		jsonEditorPane.setEditable(((JSONElement)target).writable);
 		jsonEditorPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JSON);
+		jsonEditorPane.setFont(jsonEditorPane.getFont().deriveFont(ATContentStudio.SCALING * jsonEditorPane.getFont().getSize()));
 		JPanel result = new JPanel();
 		result.setLayout(new BorderLayout());
 		result.add(jsonEditorPane, BorderLayout.CENTER);

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

@@ -206,11 +206,12 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		
 		JScrollPane tmxScroller = new JScrollPane(getTmxEditorPane(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		JScrollPane xmlScroller = new JScrollPane(getXmlEditorPane(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		JScrollPane replScroller = new JScrollPane(getReplacementSimulatorPane(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		//JScrollPane replScroller = new JScrollPane(getReplacementSimulatorPane(), JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		xmlScroller.getVerticalScrollBar().setUnitIncrement(16);
 		editorTabsHolder.add("TMX", tmxScroller);
 		editorTabsHolder.add("XML", xmlScroller);
-		editorTabsHolder.add("Replacements", replScroller);
+		//editorTabsHolder.add("Replacements", replScroller);
+		editorTabsHolder.add("Replacements", getReplacementSimulatorPane());
 		
 	}
 	
@@ -260,7 +261,12 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		addTileLayer.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				layerListModel.addObject(new tiled.core.TileLayer());
+				tiled.core.TileLayer layer = new tiled.core.TileLayer(map.tmxMap.getWidth(), map.tmxMap.getHeight());
+				layerListModel.addObject(layer);
+				map.state = GameDataElement.State.modified;
+				map.childrenChanged(new ArrayList<ProjectTreeNode>());
+				ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+				targetUpdated();
 			}
 		});
 		addObjectGroup = new JButton(new ImageIcon(DefaultIcons.getCreateObjectGroupIcon()));
@@ -270,6 +276,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				layerListModel.addObject(new tiled.core.ObjectGroup());
+				map.state = GameDataElement.State.modified;
+				map.childrenChanged(new ArrayList<ProjectTreeNode>());
+				ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+				targetUpdated();
 			}
 		});
 		deleteLayer = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
@@ -279,6 +289,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				layerListModel.removeObject(selectedLayer);
+				map.state = GameDataElement.State.modified;
+				map.childrenChanged(new ArrayList<ProjectTreeNode>());
+				ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+				targetUpdated();
 			}
 		});
 		JPanel layersButtonsPane = new JPanel();
@@ -363,6 +377,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newMapchange(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addSpawn = new JButton(new ImageIcon(DefaultIcons.getCreateSpawnareaIcon()));
@@ -372,6 +390,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newSpawnArea(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addRest = new JButton(new ImageIcon(DefaultIcons.getCreateRestIcon()));
@@ -381,6 +403,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newRest(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addKey = new JButton(new ImageIcon(DefaultIcons.getCreateKeyIcon()));
@@ -390,6 +416,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newKey(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addReplace = new JButton(new ImageIcon(DefaultIcons.getCreateReplaceIcon()));
@@ -399,6 +429,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newReplace(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addScript = new JButton(new ImageIcon(DefaultIcons.getCreateScriptIcon()));
@@ -408,6 +442,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newScript(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addContainer = new JButton(new ImageIcon(DefaultIcons.getCreateContainerIcon()));
@@ -417,6 +455,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newContainer(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			addSign = new JButton(new ImageIcon(DefaultIcons.getCreateSignIcon()));
@@ -426,6 +468,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.addObject(MapObject.newSign(new tiled.core.MapObject(0, 0, 32, 32), map));
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 			deleteObject = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
@@ -435,6 +481,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					groupObjectsListModel.removeObject(selectedMapObject);
+					map.state = GameDataElement.State.modified;
+					map.childrenChanged(new ArrayList<ProjectTreeNode>());
+					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
+					targetUpdated();
 				}
 			});
 
@@ -474,6 +524,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		if (selected instanceof ContainerArea) {
 			droplistBox = addDroplistBox(pane, ((TMXMap)target).getProject(), "Droplist: ", ((ContainerArea)selected).droplist, ((TMXMap)target).writable, listener);
 		} else if (selected instanceof KeyArea) {
+			areaField = addTextField(pane, "Area ID: ", ((KeyArea)selected).name, ((TMXMap)target).writable, listener);
 			dialogueBox = addDialogueBox(pane, ((TMXMap)target).getProject(), "Message when locked: ", ((KeyArea)selected).dialogue, ((TMXMap)target).writable, listener);
 			requirementTypeCombo = addEnumValueBox(pane, "Requirement type: ", Requirement.RequirementType.values(), ((KeyArea)selected).requirement.type, ((TMXMap)target).writable, listener);
 			requirementParamsPane = new JPanel();
@@ -512,8 +563,8 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			});
 			pane.add(tACPane, JideBoxLayout.FIX);
 		} else if (selected instanceof ReplaceArea) {
-			//Replace areas only use questProgress requirements ATM
-			//requirementTypeCombo = addEnumValueBox(pane, "Requirement type: ", Requirement.RequirementType.values(), ((ReplaceArea)selected).requirement.type, ((TMXMap)target).writable, listener);
+			areaField = addTextField(pane, "Area ID: ", ((ReplaceArea)selected).name, ((TMXMap)target).writable, listener);
+			requirementTypeCombo = addEnumValueBox(pane, "Requirement type: ", Requirement.RequirementType.values(), ((ReplaceArea)selected).requirement.type, ((TMXMap)target).writable, listener);
 			requirementParamsPane = new JPanel();
 			requirementParamsPane.setLayout(new JideBoxLayout(requirementParamsPane, JideBoxLayout.PAGE_AXIS, 6));
 			pane.add(requirementParamsPane, JideBoxLayout.FIX);
@@ -646,8 +697,12 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				requirementValue = addQuestStageBox(pane, project, "Quest stage: ", requirement.required_value, writable, listener, (Quest) requirement.required_obj, requirementObj);
 				break;
 			case skillLevel:
-				requirementObj = null;
-				requirementObjId = addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+				Requirement.SkillID skillId = null;
+				try {
+					skillId = requirement.required_obj_id == null ? null : Requirement.SkillID.valueOf(requirement.required_obj_id);
+				} catch(IllegalArgumentException e) {}
+				requirementObj = addEnumValueBox(pane, "Skill ID:", Requirement.SkillID.values(), skillId, writable, listener);
+				requirementObjId = null;//addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
 				requirementValue = addIntegerField(pane, "Level: ", requirement.required_value, false, writable, listener);
 				break;
 			case timerElapsed:
@@ -655,6 +710,11 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				requirementObjId = addTextField(pane, "Timer ID:", requirement.required_obj_id, writable, listener);
 				requirementValue = addIntegerField(pane, "Timer value: ", requirement.required_value, false, writable, listener);
 				break;
+			case factionScore:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum score: ", requirement.required_value, true, writable, listener);
+				break;
 			case wear:
 				requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener);
 				requirementObjId = null;
@@ -705,6 +765,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		editorPane.setText(((TMXMap)target).toXml());
 		editorPane.setEditable(false);
 		editorPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);
+		editorPane.setFont(editorPane.getFont().deriveFont(ATContentStudio.SCALING * editorPane.getFont().getSize()));
 		pane.add(editorPane, JideBoxLayout.VARY);
 
 		return pane;
@@ -735,7 +796,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		activateAndViewPane.setLayout(new JideBoxLayout(activateAndViewPane, JideBoxLayout.LINE_AXIS));
 		
 		activateAndViewPane.add(areasActivationPane, JideBoxLayout.FIX);
-		activateAndViewPane.add(viewer, JideBoxLayout.VARY);
+		activateAndViewPane.add(new JScrollPane(viewer), JideBoxLayout.VARY);
 
 		replacementSimulator.add(walkableVisibleBox, JideBoxLayout.FIX);
 		replacementSimulator.add(activateAndViewPane, JideBoxLayout.VARY);
@@ -1593,6 +1654,9 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	public void targetUpdated() {
 		this.name = ((TMXMap)target).getDesc();
 		updateMessage();
+		updateXmlViewText(((TMXMap)target).toXml());
+		tmxViewer.repaint();
+		tmxViewer.revalidate();
 	}
 	
 	
@@ -1682,6 +1746,10 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					ATContentStudio.frame.closeEditor(map);
 					map.childrenRemoved(new ArrayList<ProjectTreeNode>());
 					map.delete();
+					GameDataElement newOne = map.getProject().getMap(map.id);
+					for (GameDataElement backlink : map.getBacklinks()) {
+						backlink.elementChanged(map, newOne);
+					}
 				}
 			});
 			savePane.add(delete, JideBoxLayout.FIX);
@@ -1755,6 +1823,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	}
 	
 	
+	private int skipAreaFieldEvents = 0;
 	
 	public class MapFieldUpdater implements FieldUpdateListener {
 		@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1790,8 +1859,22 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				tmxViewer.revalidate();
 				tmxViewer.repaint();
 			} else if (source == areaField) {
-				selectedMapObject.name = (String) value;
-				groupObjectsListModel.objectChanged(selectedMapObject);
+				if (skipAreaFieldEvents > 0) skipAreaFieldEvents--;
+				else {
+					selectedMapObject.name = (String) value;
+					if (selectedMapObject instanceof KeyArea) {
+						KeyArea area = (KeyArea) selectedMapObject;
+						if (area.oldSchoolRequirement) {
+							area.oldSchoolRequirement = false;
+						}
+					} else if (selectedMapObject instanceof ReplaceArea) {
+						ReplaceArea area = (ReplaceArea) selectedMapObject;
+						if (area.oldSchoolRequirement) {
+							area.oldSchoolRequirement = false;
+						}
+					}
+					groupObjectsListModel.objectChanged(selectedMapObject);
+				}
 			} else if (source == spawngroupField) {
 				if (selectedMapObject instanceof SpawnArea) {
 					SpawnArea area = (SpawnArea)selectedMapObject;
@@ -1915,37 +1998,76 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					KeyArea area = (KeyArea) selectedMapObject;
 					area.requirement.changeType((Requirement.RequirementType)requirementTypeCombo.getSelectedItem());
 					updateRequirementParamsPane(requirementParamsPane, area.requirement, this);
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
+				} else if (selectedMapObject instanceof ReplaceArea) {
+					ReplaceArea area = (ReplaceArea) selectedMapObject;
+					area.requirement.changeType((Requirement.RequirementType)requirementTypeCombo.getSelectedItem());
+					updateRequirementParamsPane(requirementParamsPane, area.requirement, this);
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				}
 			} else if (source == requirementObj) {
 				if (selectedMapObject instanceof KeyArea) {
 					KeyArea area = (KeyArea) selectedMapObject;
-					area.requirement.required_obj = (GameDataElement) value;
-					if (area.requirement.required_obj != null) {
-						area.requirement.required_obj_id = area.requirement.required_obj.id; 
+					if (area.requirement.type == Requirement.RequirementType.skillLevel) {
+						area.requirement.required_obj_id = value == null ? null : value.toString();
 					} else {
-						area.requirement.required_obj_id = null;
+						area.requirement.required_obj = (GameDataElement) value;
+						if (area.requirement.required_obj != null) {
+							area.requirement.required_obj_id = area.requirement.required_obj.id; 
+						} else {
+							area.requirement.required_obj_id = null;
+						}
+					}
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
 					}
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
 				} else if (selectedMapObject instanceof ReplaceArea) {
 					ReplaceArea area = (ReplaceArea) selectedMapObject;
-					area.requirement.required_obj = (GameDataElement) value;
-					if (area.requirement.required_obj != null) {
-						area.requirement.required_obj_id = area.requirement.required_obj.id; 
+					if (area.requirement.type == Requirement.RequirementType.skillLevel) {
+						area.requirement.required_obj_id = value == null ? null : value.toString();
 					} else {
-						area.requirement.required_obj_id = null;
+						area.requirement.required_obj = (GameDataElement) value;
+						if (area.requirement.required_obj != null) {
+							area.requirement.required_obj_id = area.requirement.required_obj.id; 
+						} else {
+							area.requirement.required_obj_id = null;
+						}
+					}
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
 					}
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
 				}
 			} else if (source == requirementObjId) {
 				if (selectedMapObject instanceof KeyArea) {
 					KeyArea area = (KeyArea) selectedMapObject;
 					area.requirement.required_obj_id = (String) value;
 					area.requirement.required_obj = null;
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				} else if (selectedMapObject instanceof ReplaceArea) {
 					ReplaceArea area = (ReplaceArea) selectedMapObject;
 					area.requirement.required_obj_id = (String) value;
 					area.requirement.required_obj = null;
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				}
 			} else if (source == requirementValue) {
 				if (selectedMapObject instanceof KeyArea) {
@@ -1964,7 +2086,11 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 						stage = quest.getStage(area.requirement.required_value);
 						if (stage != null) stage.addBacklink(map);
 					}
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				} else if (selectedMapObject instanceof ReplaceArea) {
 					ReplaceArea area = (ReplaceArea) selectedMapObject;
 					Quest quest = null;
@@ -1981,17 +2107,29 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 						stage = quest.getStage(area.requirement.required_value);
 						if (stage != null) stage.addBacklink(map);
 					}
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				}
 			} else if (source == requirementNegated) {
 				if (selectedMapObject instanceof KeyArea) {
 					KeyArea area = (KeyArea) selectedMapObject;
 					area.requirement.negated = (Boolean) value;
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				} else if (selectedMapObject instanceof ReplaceArea) {
 					ReplaceArea area = (ReplaceArea) selectedMapObject;
 					area.requirement.negated = (Boolean) value;
-					if (area.oldSchoolRequirement) area.updateNameFromRequirementChange();
+					if (area.oldSchoolRequirement) {
+						area.updateNameFromRequirementChange();
+						skipAreaFieldEvents+=2;
+						areaField.setText(area.name);
+					}
 				}
 			}  else if (source == sourceLayer) {
 				selectedReplacement.sourceLayer = (String)value;
@@ -2005,11 +2143,9 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			if (modified) {
 				if (map.state != GameDataElement.State.modified) {
 					map.state = GameDataElement.State.modified;
-					TMXMapEditor.this.name = map.getDesc();
-					map.childrenChanged(new ArrayList<ProjectTreeNode>());
 					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
 				}
-				updateXmlViewText(map.toXml());
+				map.childrenChanged(new ArrayList<ProjectTreeNode>());
 			}
 		}
 	}

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

@@ -1,33 +1,47 @@
 package com.gpl.rpg.atcontentstudio.ui.map;
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.swing.ButtonGroup;
+import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSlider;
+import javax.swing.JSplitPane;
+import javax.swing.JTextField;
 import javax.swing.JViewport;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
+import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
@@ -35,16 +49,16 @@ import com.gpl.rpg.atcontentstudio.model.SaveEvent;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
-import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment.NamedArea;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.Editor;
+import com.gpl.rpg.atcontentstudio.ui.FieldUpdateListener;
 import com.gpl.rpg.atcontentstudio.ui.SaveItemsWizard;
-import com.gpl.rpg.atcontentstudio.ui.WorldmapLabelEditionWizard;
 import com.jidesoft.swing.ComboBoxSearchable;
 import com.jidesoft.swing.JideBoxLayout;
 import com.jidesoft.swing.JideTabbedPane;
+import com.jidesoft.swing.ListSearchable;
 
-public class WorldMapEditor extends Editor {
+public class WorldMapEditor extends Editor implements FieldUpdateListener {
 
 	private static final long serialVersionUID = -8358238912588729094L;
 	
@@ -56,18 +70,35 @@ public class WorldMapEditor extends Editor {
 	public enum EditMode {
 		moveViewSelect,
 		moveMaps,
-		deleteMaps,
-		addMap,
-		editLabelCoverage
+		addMap
 	}
 	
 	public String mapBeingAddedID = null;
-	public String selectedLabel = null;
 	WorldMapView mapView = null;
+	WorldmapSegment.NamedArea selectedLabel = null;
+
+	MapSegmentMapsListModel msmListModel = null;
+	ListSelectionModel msmListSelectionModel = null;
+
+	MapSegmentLabelsListModel mslListModel = null;
+	
+	MapSegmentLabelMapsListModel mslmListModel = null;
+	ListSelectionModel mslmListSelectionModel = null;
+	
+	ListModel<TMXMap> currentSelectionListModel = null;
+	ListSelectionModel currentSelectionSelectionModel = null;
+	ListModel<TMXMap> currentHighlightListModel = null;
+	
+	JList<TMXMap> mapsShown;
+	JList<WorldmapSegment.NamedArea> labelList;
+	
+	JTextField labelIdField;
+	JTextField labelNameField;
+	JTextField labelTypeField;
 	
 	public WorldMapEditor(WorldmapSegment worldmap) {
 		target = worldmap;
-		this.name = worldmap.id;
+		this.name = worldmap.getDesc();
 		this.icon = new ImageIcon(worldmap.getIcon());
 		setLayout(new BorderLayout());
 		
@@ -86,8 +117,10 @@ public class WorldMapEditor extends Editor {
 	
 	@Override
 	public void targetUpdated() {
-		// TODO Auto-generated method stub
-
+		this.name = ((GameDataElement)target).getDesc();
+		updateMessage();
+		updateXmlViewText(((WorldmapSegment)target).toXml());
+		mapView.updateFromModel();
 	}
 
 	public JPanel getXmlEditorPane() {
@@ -97,6 +130,7 @@ public class WorldMapEditor extends Editor {
 		editorPane.setText(((WorldmapSegment)target).toXml());
 		editorPane.setEditable(false);
 		editorPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);
+		editorPane.setFont(editorPane.getFont().deriveFont(ATContentStudio.SCALING * editorPane.getFont().getSize()));
 		pane.add(editorPane, JideBoxLayout.VARY);
 
 		return pane;
@@ -128,10 +162,6 @@ public class WorldMapEditor extends Editor {
 		zoomSliderPane.add(zoomSlider, JideBoxLayout.VARY);
 		zoomSliderPane.add(new JLabel(new ImageIcon(DefaultIcons.getZoomIcon())), JideBoxLayout.FIX);
 		
-		final JRadioButton editLabelCoverage = new JRadioButton("Edit label coverage");
-		final JButton editLabel = new JButton("Edit map label");
-		final JButton createLabel = new JButton("Create map label");
-		final JButton deleteLabel = new JButton("Delete map label");
 		
 		if (target.writable) {
 			JPanel mapToolsPane = new JPanel();
@@ -143,9 +173,6 @@ public class WorldMapEditor extends Editor {
 			JRadioButton moveMaps = new JRadioButton("Move selected map(s)");
 			mapToolsGroup.add(moveMaps);
 			mapToolsPane.add(moveMaps, JideBoxLayout.FIX);
-			JRadioButton deleteMaps = new JRadioButton("Delete maps");
-			mapToolsGroup.add(deleteMaps);
-			mapToolsPane.add(deleteMaps, JideBoxLayout.FIX);
 			JRadioButton addMap = new JRadioButton("Add map");
 			mapToolsGroup.add(addMap);
 			mapToolsPane.add(addMap, JideBoxLayout.FIX);
@@ -176,22 +203,6 @@ public class WorldMapEditor extends Editor {
 			moveView.setSelected(true);
 			pane.add(mapToolsPane, JideBoxLayout.FIX);
 			
-			JPanel labelToolsPane = new JPanel();
-			labelToolsPane.setLayout(new JideBoxLayout(labelToolsPane, JideBoxLayout.LINE_AXIS));
-			mapToolsGroup.add(editLabelCoverage);
-			editLabelCoverage.setEnabled(false);
-			labelToolsPane.add(editLabelCoverage, JideBoxLayout.FIX);
-			editLabel.setEnabled(false);
-			labelToolsPane.add(editLabel, JideBoxLayout.FIX);
-			deleteLabel.setEnabled(false);
-			labelToolsPane.add(deleteLabel, JideBoxLayout.FIX);
-			createLabel.setEnabled(false);
-			labelToolsPane.add(createLabel, JideBoxLayout.FIX);
-			
-			labelToolsPane.add(new JPanel(), JideBoxLayout.VARY);
-			pane.add(labelToolsPane, JideBoxLayout.FIX);
-			
-			
 			moveView.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
@@ -220,20 +231,6 @@ public class WorldMapEditor extends Editor {
 				}
 			});
 
-			deleteMaps.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					editMode = EditMode.deleteMaps;
-					mapBox.setEnabled(false);
-					if (mapBeingAddedID != null) {
-						mapView.mapLocations.remove(mapBeingAddedID);
-						mapBeingAddedID = null;
-						mapView.revalidate();
-						mapView.repaint();
-					}
-				}
-			});
-			
 			addMap.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
@@ -268,109 +265,27 @@ public class WorldMapEditor extends Editor {
 				}
 			});
 			
-			editLabelCoverage.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					editMode = EditMode.editLabelCoverage;
-					mapBox.setEnabled(false);
-					mapView.selected.clear();
-					mapView.selected.addAll(((WorldmapSegment)target).labelledMaps.get(selectedLabel));
-					if (mapBeingAddedID != null) {
-						mapView.mapLocations.remove(mapBeingAddedID);
-						mapBeingAddedID = null;
-					}
-					mapView.revalidate();
-					mapView.repaint();
-				}
-			});
-			
-			editLabelCoverage.addItemListener(new ItemListener() {
-				@Override
-				public void itemStateChanged(ItemEvent e) {
-					if (e.getStateChange() == ItemEvent.DESELECTED) {
-						WorldmapSegment map = (WorldmapSegment)target;
-						if (map.labelledMaps.get(selectedLabel) != null) {
-							map.labelledMaps.get(selectedLabel).clear();
-						} else {
-							map.labelledMaps.put(selectedLabel, new ArrayList<String>());
-						}
-						for (String s : mapView.selected) {
-							map.labelledMaps.get(selectedLabel).add(s);
-						}
-						notifyModelModified();
-						mapView.revalidate();
-						mapView.repaint();
-					}
-				}
-			});
-			
-			editLabel.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					mapView.selected.clear();
-					mapView.selected.addAll(((WorldmapSegment)target).labelledMaps.get(selectedLabel));
-					mapView.revalidate();
-					mapView.repaint();
-					WorldmapLabelEditionWizard wiz = new WorldmapLabelEditionWizard(worldmap, worldmap.labels.get(selectedLabel));
-					wiz.addCreationListener(new WorldmapLabelEditionWizard.CreationCompletedListener() {
-						@Override
-						public void labelCreated(NamedArea created) {
-							if (!created.id.equals(selectedLabel)) {
-								worldmap.labelledMaps.put(created.id, worldmap.labelledMaps.get(selectedLabel));
-								worldmap.labelledMaps.remove(selectedLabel);
-								worldmap.labels.put(created.id, created);
-								worldmap.labels.remove(selectedLabel);
-								selectedLabel = created.id;
-								notifyModelModified();
-								mapView.revalidate();
-								mapView.repaint();
-							}
-						}
-					});
-					wiz.setVisible(true);
-				}
-			});
-			
-			deleteLabel.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					worldmap.labelledMaps.remove(selectedLabel);
-					worldmap.labels.remove(selectedLabel);
-					selectedLabel = null;
-					notifyModelModified();
-					mapView.revalidate();
-					mapView.repaint();
-				}
-			});
-			
-			createLabel.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					WorldmapLabelEditionWizard wiz = new WorldmapLabelEditionWizard(worldmap);
-					wiz.addCreationListener(new WorldmapLabelEditionWizard.CreationCompletedListener() {
-						@Override
-						public void labelCreated(NamedArea created) {
-							worldmap.labelledMaps.put(created.id, new ArrayList<String>());
-							worldmap.labelledMaps.get(created.id).addAll(mapView.selected);
-							notifyModelModified();
-							mapView.revalidate();
-							mapView.repaint();
-						}
-					});
-					wiz.setVisible(true);
-				}
-			});
-			
-			
-			
-
 		}
 		
 		JPanel mapZoomPane = new JPanel();
 		mapZoomPane.setLayout(new BorderLayout());
 		mapZoomPane.add(zoomSliderPane, BorderLayout.WEST);
 		mapZoomPane.add(mapScroller, BorderLayout.CENTER);
-		pane.add(mapZoomPane, JideBoxLayout.VARY);
+		
+		JPanel mapPropsPane = new JPanel();
+		buildMapPropsPane(mapPropsPane, worldmap);
+		
+		setCurrentSelectionModel(msmListModel, msmListSelectionModel);
+		
+		
+		final JSplitPane mapAndPropsSplitter = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, mapZoomPane, mapPropsPane);
+		SwingUtilities.invokeLater(new Runnable(){
+			@Override
+			public void run() {
+				mapAndPropsSplitter.setDividerLocation(0.8d);
+			}
+		});
+		pane.add(mapAndPropsSplitter, JideBoxLayout.VARY);
 		
 		zoomSlider.addChangeListener(new ChangeListener() {
 			@Override
@@ -410,39 +325,29 @@ public class WorldMapEditor extends Editor {
 						break;
 					}
 				}
-				if (editMode == EditMode.moveViewSelect || editMode == EditMode.editLabelCoverage) {
+				if (editMode == EditMode.moveViewSelect) {
 					if (selectedMap == null) return;
 					if (e.getButton() == MouseEvent.BUTTON1) {
 						if (e.isControlDown() || e.isShiftDown()) {
-							if (mapView.selected.contains(selectedMap)) {
-								if (editMode != EditMode.editLabelCoverage || mapView.selected.size() > 1) {
-									mapView.selected.remove(selectedMap);
-									mapSelectionChanged();
+							if (mapView.getSelectedMapsIDs().contains(selectedMap)) {
+								if (mapView.getSelectedMapsIDs().size() > 1) {
+									removeFromSelection(selectedMap);
+//									mapView.selected.remove(selectedMap);
 									update = true;
 								}
 							} else {
-								mapView.selected.add(selectedMap);
-								mapSelectionChanged();
+								addToSelection(selectedMap);
+//								mapView.selected.add(selectedMap);
 								update = true;
 							}
 						} else {
-							mapView.selected.clear();
-							mapView.selected.add(selectedMap);
-							mapSelectionChanged();
+							clearSelection();
+//							mapView.selected.clear();
+							addToSelection(selectedMap);
+//							mapView.selected.add(selectedMap);
 							update = true;
 						}
-						if (e.getClickCount() == 2) {
-							ATContentStudio.frame.openEditor(worldmap.getProject().getMap(selectedMap));
-						}
 					}
-				} else if (editMode == EditMode.deleteMaps) {
-					worldmap.mapLocations.remove(selectedMap);
-					worldmap.labels.remove(selectedMap);
-					mapView.selected.remove(selectedMap);
-					mapSelectionChanged();
-					mapView.updateFromModel();
-					notifyModelModified();
-					update = true;
 				} else if (editMode == EditMode.addMap && mapBeingAddedID != null) {
 					if (e.getButton() == MouseEvent.BUTTON1) {
 						mapView.recomputeSize();
@@ -452,10 +357,9 @@ public class WorldMapEditor extends Editor {
 					update = true;
 					mapBeingAddedID = null;
 				}
-				if (update) {
-					mapView.revalidate();
-					mapView.repaint();
-				}
+//				if (update) {
+//					validateSelection();
+//				}
 			}
 			
 			@Override
@@ -515,7 +419,7 @@ public class WorldMapEditor extends Editor {
 					mapDeltaX -= mapDeltaX % WorldMapView.TILE_SIZE;
 					mapDeltaY -= mapDeltaY % WorldMapView.TILE_SIZE;
 					
-					for (String s : mapView.selected) {
+					for (String s : mapView.getSelectedMapsIDs()) {
 						mapView.mapLocations.get(s).x = (worldmap.mapLocations.get(s).x * WorldMapView.TILE_SIZE) + mapDeltaX;
 						mapView.mapLocations.get(s).y = (worldmap.mapLocations.get(s).y * WorldMapView.TILE_SIZE) + mapDeltaY;
 					}
@@ -531,54 +435,441 @@ public class WorldMapEditor extends Editor {
 				}
 			}
 			
-			public void mapSelectionChanged() {
-				if (mapView.selected.isEmpty()) {
-					editLabelCoverage.setEnabled(false);
-					editLabel.setEnabled(false);
-					createLabel.setEnabled(false);
-					selectedLabel = null;
-				} else {
-					String label = null;
-					boolean multiLabel = false;
-					for (String map : mapView.selected) {
-						for (String existingLabel : ((WorldmapSegment)target).labelledMaps.keySet()) {
-							if (((WorldmapSegment)target).labelledMaps.get(existingLabel).contains(map)) {
-								if (label != null && !label.equals(existingLabel)) {
-									multiLabel = true;
-								}
-								label = existingLabel;
-							}
-						}
-					}
-					if (multiLabel) {
-						editLabelCoverage.setEnabled(false);
-						editLabel.setEnabled(false);
-						createLabel.setEnabled(false);
-						deleteLabel.setEnabled(false);
-						selectedLabel = null;
-					} else if (label != null) {
-						editLabelCoverage.setEnabled(true);
-						editLabel.setEnabled(true);
-						deleteLabel.setEnabled(true);
-						createLabel.setEnabled(false);
-						selectedLabel = label;
-					} else {
-						editLabelCoverage.setEnabled(false);
-						editLabel.setEnabled(false);
-						deleteLabel.setEnabled(false);
-						createLabel.setEnabled(true);
-						selectedLabel = null;
-					}
-				}
-			}
+			
 		};
 
 		mapView.addMouseListener(mouseListener);
 		mapView.addMouseMotionListener(mouseListener);
 		
+		mapView.addMapClickListener(new WorldMapView.MapClickListener() {
+			@Override
+			public void mapClicked(MouseEvent e, TMXMap m) {
+				if (e.getClickCount() == 2) {
+					ATContentStudio.frame.openEditor(m);
+				}
+			}
+			
+			@Override
+			public void mapChangeClicked(MouseEvent e, TMXMap m, TMXMap changeTarget) {
+				if (e.getClickCount() == 2) {
+					ATContentStudio.frame.openEditor(changeTarget);
+				}
+			}
+			
+			@Override
+			public void backgroundClicked(MouseEvent e) {
+			}
+		});
+		
 		return pane;
 	}
 	
+	
+
+	private void buildMapPropsPane(JPanel mapPropsPane, final WorldmapSegment worldmap) {
+		JideTabbedPane tabPane = new JideTabbedPane(JideTabbedPane.TOP);
+		
+		JPanel mapListPane = new JPanel();
+		mapListPane.setLayout(new JideBoxLayout(mapListPane, JideBoxLayout.PAGE_AXIS));
+		mapListPane.add(new JLabel("Maps shown here"), JideBoxLayout.FIX);
+		msmListModel = new MapSegmentMapsListModel(worldmap);
+		mapsShown = new JList<TMXMap>(msmListModel);
+		mapsShown.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+		msmListSelectionModel = mapsShown.getSelectionModel();
+		mapsShown.setCellRenderer(new MapCellRenderer());
+		new ListSearchable(mapsShown) {
+			@Override
+			protected String convertElementToString(Object object) {
+				return ((TMXMap)object).id;
+			}
+		};
+		mapListPane.add(new JScrollPane(mapsShown), JideBoxLayout.VARY);
+		mapsShown.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2) {
+					ATContentStudio.frame.openEditor(mapsShown.getSelectedValue());
+					ATContentStudio.frame.selectInTree(mapsShown.getSelectedValue());
+				}
+			}
+		});
+		mapsShown.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+					ATContentStudio.frame.openEditor(mapsShown.getSelectedValue());
+					ATContentStudio.frame.selectInTree(mapsShown.getSelectedValue());
+				}
+			}
+		});
+		mapsShown.addListSelectionListener(new ListSelectionListener() {
+			@Override
+			public void valueChanged(ListSelectionEvent e) {
+				setCurrentSelectionModel(msmListModel, msmListSelectionModel);
+			}
+		});
+		
+		
+		tabPane.addTab("Map list", mapListPane);
+		
+		final JPanel labelEditPane = new JPanel();
+		labelEditPane.setLayout(new JideBoxLayout(labelEditPane, JideBoxLayout.PAGE_AXIS));
+		labelEditPane.add(new JLabel("Labels on the worldmap"), JideBoxLayout.FIX);
+		
+		mslListModel = new MapSegmentLabelsListModel(worldmap);
+		labelList = new JList<WorldmapSegment.NamedArea>(mslListModel);
+		labelList.setCellRenderer(new MapLabelCellRenderer());
+		labelList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		labelEditPane.add(new JScrollPane(labelList), JideBoxLayout.FLEXIBLE);
+		
+		JPanel labelListButtonsPane = new JPanel();
+		labelListButtonsPane.setLayout(new JideBoxLayout(labelListButtonsPane, JideBoxLayout.LINE_AXIS));
+		final JButton createLabel = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
+		labelListButtonsPane.add(createLabel, JideBoxLayout.FIX);
+		final JButton deleteLabel = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
+		labelListButtonsPane.add(deleteLabel, JideBoxLayout.FIX);
+		labelListButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
+		labelEditPane.add(labelListButtonsPane, JideBoxLayout.FIX);
+		
+		final JPanel labelParametersPane = new JPanel();
+		labelEditPane.add(labelParametersPane, JideBoxLayout.FLEXIBLE);
+		
+		labelList.addListSelectionListener(new ListSelectionListener() {
+			@Override
+			public void valueChanged(ListSelectionEvent e) {
+				selectedLabel = labelList.getSelectedValue();
+				updateLabelParamsPane(labelParametersPane, worldmap);
+				labelEditPane.revalidate();
+				labelEditPane.repaint();
+			}
+		});
+		
+		createLabel.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				WorldmapSegment.NamedArea creation = new WorldmapSegment.NamedArea(null, null, null);
+				worldmap.labels.put(WorldmapSegment.TEMP_LABEL_KEY, creation);
+				worldmap.labelledMaps.put(WorldmapSegment.TEMP_LABEL_KEY, new ArrayList<String>());
+				mslListModel.listChanged();
+				labelList.setSelectedValue(creation, true);
+			}
+		});
+		
+		deleteLabel.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (selectedLabel.id != null) {
+					worldmap.labelledMaps.remove(selectedLabel.id);
+					worldmap.labels.remove(selectedLabel.id);
+				} else {
+					worldmap.labelledMaps.remove(WorldmapSegment.TEMP_LABEL_KEY);
+					worldmap.labels.remove(WorldmapSegment.TEMP_LABEL_KEY);
+				}
+				labelList.clearSelection();
+				mslListModel.listChanged();
+				notifyModelModified();
+			}
+		});
+
+		
+		tabPane.addTab("Labels", labelEditPane);
+		
+		mapPropsPane.setLayout(new BorderLayout());
+		mapPropsPane.add(tabPane, BorderLayout.CENTER);
+	}
+	
+	private void updateLabelParamsPane(JPanel labelParametersPane, final WorldmapSegment worldmap) {
+		labelParametersPane.removeAll();
+		if (selectedLabel == null) {
+			setCurrentHighlightModel(null);
+			return;
+		}
+		labelParametersPane.setLayout(new JideBoxLayout(labelParametersPane, JideBoxLayout.PAGE_AXIS));
+		
+		labelIdField = addTextField(labelParametersPane, "Internal ID: ", selectedLabel.id, worldmap.writable, this);
+		labelNameField = addTranslatableTextField(labelParametersPane, "Name: ", selectedLabel.name, worldmap.writable, this);
+		labelTypeField = addTextField(labelParametersPane, "Type: ", selectedLabel.type, worldmap.writable, this);
+		
+		
+		labelParametersPane.add(new JLabel("Label covers the following maps"), JideBoxLayout.FIX);
+		
+		mslmListModel = new MapSegmentLabelMapsListModel(worldmap, selectedLabel);
+		final JList<TMXMap> labelCoverageList = new JList<TMXMap>(mslmListModel);
+		labelCoverageList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+		mslmListSelectionModel = labelCoverageList.getSelectionModel();
+		labelCoverageList.setCellRenderer(new MapCellRenderer());
+		labelParametersPane.add(new JScrollPane(labelCoverageList), JideBoxLayout.VARY);
+		labelCoverageList.addListSelectionListener(new ListSelectionListener() {
+			@Override
+			public void valueChanged(ListSelectionEvent e) {
+				setCurrentHighlightModel(mslmListModel);
+			}
+		});
+		
+		JPanel labelCoverageButtonsPane = new JPanel();
+		labelCoverageButtonsPane.setLayout(new JideBoxLayout(labelCoverageButtonsPane, JideBoxLayout.LINE_AXIS));
+		JButton addCoverage = new JButton("Add on-map selection");
+		labelCoverageButtonsPane.add(addCoverage, JideBoxLayout.FIX);
+		JButton replaceCoverage = new JButton("Replace by on-map selection");
+		labelCoverageButtonsPane.add(replaceCoverage, JideBoxLayout.FIX);
+		JButton removeFromCoverage = new JButton("Remove selected in list");
+		labelCoverageButtonsPane.add(removeFromCoverage, JideBoxLayout.FIX);
+		labelCoverageButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
+		
+		addCoverage.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (selectedLabel == null) return;
+				String labelId = selectedLabel.id;
+				if (labelId == null) labelId = WorldmapSegment.TEMP_LABEL_KEY;
+				
+				List<String> currentCoverage = worldmap.labelledMaps.get(labelId);
+				if (currentCoverage == null) {
+					worldmap.labelledMaps.put(labelId, new ArrayList<String>());
+					currentCoverage = worldmap.labelledMaps.get(labelId);
+				}
+				for (int i = 0; i < msmListModel.getSize(); i++) {
+					if (msmListSelectionModel.isSelectedIndex(i)) {
+						if (!currentCoverage.contains(msmListModel.getElementAt(i).id)) {
+							currentCoverage.add(msmListModel.getElementAt(i).id);
+						}
+					}
+				}
+				mslmListModel.listChanged();
+				repaintMap();
+			}
+		});
+		
+		replaceCoverage.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (selectedLabel == null) return;
+				String labelId = selectedLabel.id;
+				if (labelId == null) labelId = WorldmapSegment.TEMP_LABEL_KEY;
+				
+				List<String> currentCoverage = worldmap.labelledMaps.get(labelId);
+				if (currentCoverage == null) {
+					worldmap.labelledMaps.put(labelId, new ArrayList<String>());
+					currentCoverage = worldmap.labelledMaps.get(labelId);
+				} else {
+					currentCoverage.clear();
+				}
+				for (int i = 0; i < msmListModel.getSize(); i++) {
+					if (msmListSelectionModel.isSelectedIndex(i)) {
+						if (!currentCoverage.contains(msmListModel.getElementAt(i).id)) {
+							currentCoverage.add(msmListModel.getElementAt(i).id);
+						}
+					}
+				}
+				mslmListModel.listChanged();
+				repaintMap();
+			}
+		});
+		
+		removeFromCoverage.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (selectedLabel == null) return;
+				String labelId = selectedLabel.id;
+				if (labelId == null) labelId = WorldmapSegment.TEMP_LABEL_KEY;
+				
+				List<String> currentCoverage = worldmap.labelledMaps.get(labelId);
+				if (currentCoverage == null) return;
+				List<String> toRemove = new ArrayList<String>();
+				for (int i = 0; i < mslmListModel.getSize(); i++) {
+					if (mslmListSelectionModel.isSelectedIndex(i)) {
+						if (currentCoverage.contains(mslmListModel.getElementAt(i).id)) {
+							toRemove.add(mslmListModel.getElementAt(i).id);
+						}
+					}
+				}
+				currentCoverage.removeAll(toRemove);
+				mslmListModel.listChanged();
+				repaintMap();
+			}
+		});
+		
+		labelParametersPane.add(labelCoverageButtonsPane, JideBoxLayout.FIX);
+		setCurrentHighlightModel(mslmListModel);
+		
+	}
+	
+	public class MapSegmentMapsListModel implements ListModel<TMXMap> {
+
+		WorldmapSegment segment;
+		
+		public MapSegmentMapsListModel(WorldmapSegment segment) {
+			this.segment = segment;
+		}
+		
+		@Override
+		public int getSize() {
+			return segment.mapLocations.size();
+		}
+
+		@Override
+		public TMXMap getElementAt(int index) {
+			return segment.getProject().getMap(((String)segment.mapLocations.keySet().toArray()[index]));
+		}
+
+		public void listChanged() {
+			for (ListDataListener l : listeners) {
+				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, 0, getSize() - 1));
+			}
+		}
+		
+		List<ListDataListener> listeners = new ArrayList<ListDataListener>();
+		
+		@Override
+		public void addListDataListener(ListDataListener l) {
+			listeners.add(l);
+		}
+
+		@Override
+		public void removeListDataListener(ListDataListener l) {
+			listeners.remove(l);
+		}
+		
+	}
+	
+	public class MapSegmentLabelMapsListModel implements ListModel<TMXMap> {
+
+		WorldmapSegment segment;
+		WorldmapSegment.NamedArea area;
+		
+		public MapSegmentLabelMapsListModel(WorldmapSegment segment, WorldmapSegment.NamedArea area) {
+			this.segment = segment;
+			this.area = area;
+		}
+		
+		@Override
+		public int getSize() {
+			if (area.id == null) return segment.labelledMaps.get(WorldmapSegment.TEMP_LABEL_KEY).size();
+			return segment.labelledMaps.get(area.id).size();
+		}
+
+		@Override
+		public TMXMap getElementAt(int index) {
+			if (area.id == null) return segment.getProject().getMap(segment.labelledMaps.get(WorldmapSegment.TEMP_LABEL_KEY).get(index));
+			return segment.getProject().getMap(segment.labelledMaps.get(area.id).get(index));
+		}
+
+		public void listChanged() {
+			for (ListDataListener l : listeners) {
+				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, 0, getSize() - 1));
+			}
+		}
+		
+		List<ListDataListener> listeners = new ArrayList<ListDataListener>();
+		
+		@Override
+		public void addListDataListener(ListDataListener l) {
+			listeners.add(l);
+		}
+
+		@Override
+		public void removeListDataListener(ListDataListener l) {
+			listeners.remove(l);
+		}
+		
+	}
+	
+	public class MapSegmentLabelsListModel implements ListModel<WorldmapSegment.NamedArea> {
+
+		WorldmapSegment segment;
+		
+		public MapSegmentLabelsListModel(WorldmapSegment segment) {
+			this.segment = segment;
+		}
+		
+		@Override
+		public int getSize() {
+			return segment.labels.values().size();
+		}
+
+		@Override
+		public WorldmapSegment.NamedArea getElementAt(int index) {
+			return new ArrayList<WorldmapSegment.NamedArea>(segment.labels.values()).get(index);
+		}
+
+		public void listChanged() {
+			for (ListDataListener l : listeners) {
+				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, 0, getSize() - 1));
+			}
+		}
+		
+		List<ListDataListener> listeners = new ArrayList<ListDataListener>();
+		
+		@Override
+		public void addListDataListener(ListDataListener l) {
+			listeners.add(l);
+		}
+
+		@Override
+		public void removeListDataListener(ListDataListener l) {
+			listeners.remove(l);
+		}
+		
+	}
+	
+	public static class MapCellRenderer extends DefaultListCellRenderer {
+
+		private static final long serialVersionUID = 6819681566800482793L;
+
+		
+		public MapCellRenderer() {
+			super();
+		}
+		
+		@SuppressWarnings("rawtypes")
+		@Override
+		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+			JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+			if (value == null) {
+				label.setText("None");
+			} else {
+				label.setText(((GameDataElement)value).getDesc());
+				if (((GameDataElement)value).getIcon() == null) {
+					Notification.addError("Unable to find icon for "+((GameDataElement)value).getDesc());
+				} else {
+					label.setIcon(new ImageIcon(((GameDataElement)value).getIcon()));
+				}
+			}
+			return label;
+		}
+		
+	}
+	
+	public static class MapLabelCellRenderer extends DefaultListCellRenderer {
+
+		private static final long serialVersionUID = 6819681566800482793L;
+
+		
+		public MapLabelCellRenderer() {
+			super();
+		}
+		
+		@SuppressWarnings("rawtypes")
+		@Override
+		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+			JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+			if (value == null) {
+				label.setText("None");
+			} else {
+				WorldmapSegment.NamedArea area = (WorldmapSegment.NamedArea) value;
+				if (area.id != null) {
+					label.setText(area.name+" ("+area.id+")");
+					label.setIcon(new ImageIcon(DefaultIcons.getLabelIcon()));
+				} else {
+					label.setText("Incomplete Label. Enter an ID.");
+					label.setIcon(new ImageIcon(DefaultIcons.getNullifyIcon()));
+				}
+			}
+			return label;
+		}
+		
+	}
+
 	public JPanel createButtonPane(final WorldmapSegment node) {
 		final JButton gdeIcon = new JButton(new ImageIcon(DefaultIcons.getUIMapImage()));
 		JPanel savePane = new JPanel();
@@ -721,14 +1012,108 @@ public class WorldMapEditor extends Editor {
 	
 	public void pushToModel() {
 		mapView.pushToModel();
+		msmListModel.listChanged();
 		notifyModelModified();
+		updateXmlViewText(((WorldmapSegment)target).toXml());
 	}
 	
 	public void notifyModelModified() {
 		target.state = GameDataElement.State.modified;
-		this.name = ((WorldmapSegment)target).getDesc();
 		target.childrenChanged(new ArrayList<ProjectTreeNode>());
 	}
 	
+	ListSelectionListener activeSelectionListSelectionListener = new ListSelectionListener() {
+		public void valueChanged(ListSelectionEvent e) {
+			repaintMap();
+		};
+	};
+	
+	private void setCurrentSelectionModel(ListModel<TMXMap> listModel, ListSelectionModel listSelectionModel) {
+		if (currentSelectionSelectionModel != null) {
+			currentSelectionSelectionModel.removeListSelectionListener(activeSelectionListSelectionListener);
+		}
+		currentSelectionListModel = listModel;
+		currentSelectionSelectionModel = listSelectionModel;
+		mapView.selectedListModel = listModel;
+		mapView.selectedSelectionModel = listSelectionModel;
+		currentSelectionSelectionModel.addListSelectionListener(activeSelectionListSelectionListener);
+		repaintMap();
+	}
+	
+	private void setCurrentHighlightModel(ListModel<TMXMap> listModel) {
+		mapView.highlightedListModel = listModel;
+		repaintMap();
+	}
+	
+	
+	public void clearSelection() {
+		currentSelectionSelectionModel.clearSelection();
+	}
+	
+	public void addToSelection(String mapId) {
+		if (mapId == null) return;
+		int index = -1;
+		for (int i = 0; i < currentSelectionListModel.getSize(); i++) {
+			if (currentSelectionListModel.getElementAt(i).id.equals(mapId)) {
+				index = i;
+				break;
+			}
+		}
+		currentSelectionSelectionModel.addSelectionInterval(index, index);
+	}
+	
+	public void removeFromSelection(String mapId) {
+		if (mapId == null) return;
+		int index = -1;
+		for (int i = 0; i < currentSelectionListModel.getSize(); i++) {
+			if (currentSelectionListModel.getElementAt(i).id.equals(mapId)) {
+				index = i;
+				break;
+			}
+		}
+		currentSelectionSelectionModel.removeSelectionInterval(index, index);
+	}
+	
+	public void repaintMap() {
+		mapView.revalidate();
+		mapView.repaint();
+	}
+	
+	@Override
+	public void valueChanged(JComponent source, Object value) {
+		WorldmapSegment worldmap = (WorldmapSegment)target;
+		boolean changed = false;
+		if (source == labelIdField) {
+			List<String> coverage;
+			if (selectedLabel.id != null) {
+				coverage = worldmap.labelledMaps.get(selectedLabel.id);
+				worldmap.labelledMaps.remove(selectedLabel.id);
+				worldmap.labels.remove(selectedLabel.id);
+			} else {
+				coverage = worldmap.labelledMaps.get(WorldmapSegment.TEMP_LABEL_KEY);
+				worldmap.labels.remove(WorldmapSegment.TEMP_LABEL_KEY);
+			}
+			selectedLabel.id = (String) value;
+			if (value != null) {
+				worldmap.labelledMaps.put(selectedLabel.id, coverage);
+				worldmap.labels.put(selectedLabel.id, selectedLabel);
+			}
+			mslListModel.listChanged();
+			changed = true;
+		} else if (source == labelNameField) {
+			selectedLabel.name = (String) value;
+			mslListModel.listChanged();
+			changed = true;
+			repaintMap();
+		} else if (source == labelTypeField) {
+			selectedLabel.type = (String) value;
+			changed = true;
+		}
+		
+		if (changed) {
+			notifyModelModified();
+			updateXmlViewText(worldmap.toXml());
+		}
+	}
 	
 }

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

@@ -7,10 +7,14 @@ import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.geom.Rectangle2D;
@@ -20,14 +24,21 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.JComponent;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
 import javax.swing.Scrollable;
+import javax.swing.ToolTipManager;
 
 import tiled.view.MapRenderer;
 import tiled.view.OrthogonalRenderer;
 
 import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.maps.MapChange;
+import com.gpl.rpg.atcontentstudio.model.maps.MapObject;
+import com.gpl.rpg.atcontentstudio.model.maps.MapObjectGroup;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
 
@@ -46,26 +57,140 @@ public class WorldMapView extends JComponent implements Scrollable {
 	
 	
 	public Map<String, Rectangle> mapLocations = new LinkedHashMap<String, Rectangle>();
+
+	public ListSelectionModel selectedSelectionModel = null;
+	public ListModel<TMXMap> selectedListModel = null;
 	
-	public Set<String> selected = new HashSet<String>();
+	public ListModel<TMXMap> highlightedListModel = null;
 	
 	public float zoomLevel = 0.1f;
 	int sizeX = 0, sizeY = 0;
 	int offsetX = 0, offsetY = 0;
 	
+
+    
+    static final Color selectOutlineColor = new Color(255, 0, 0);
+    static final Stroke selectOutlineStroke = new BasicStroke(4f);
+    static final Color highlightOutlineColor = Color.CYAN;
+    static final Stroke highlightOutlineStroke = new BasicStroke(4f);
+    static final Color mapIdLabelOutlineColor = Color.BLACK;
+    static final Stroke thinLabelOutlineStroke = new BasicStroke(1.5f);
+    static final Stroke labelOutlineStroke = new BasicStroke(3f);
+	
 	public WorldMapView(WorldmapSegment worldmap) {
 		this.worldmap = worldmap;
 		this.proj = worldmap.getProject();
 		updateFromModel();
+		
+		addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				String selectedMap = null;
+				boolean update = false;
+				int x = (int) (e.getX() / zoomLevel);
+				int y = (int) (e.getY() / zoomLevel);
+				for (String s : mapLocations.keySet()) {
+					if (mapLocations.get(s).contains(x, y)) {
+						selectedMap = s;
+						break;
+					}
+				}
+				if (selectedMap != null) {
+					x = x - mapLocations.get(selectedMap).x;
+					y = y - mapLocations.get(selectedMap).y;
+					//Look for a mapchange there
+					TMXMap map = proj.getMap(selectedMap);
+					
+					boolean mapchangeFound = false;
+					for (MapObjectGroup group : map.groups) {
+						for (MapObject obj : group.mapObjects) {
+							if (obj instanceof MapChange) {
+								if (x >= obj.x && x < obj.x + obj.w && y >= obj.y && y < obj.y + obj.h) {
+									String mapId = ((MapChange)obj).map != null ? ((MapChange)obj).map.id : ((MapChange)obj).map_id;
+									mapChangeClicked(e, proj.getMap(selectedMap), proj.getMap(mapId));
+									mapchangeFound = true;
+								}
+							}
+						}
+					}
+										
+					if (!mapchangeFound) {
+						mapClicked(e, WorldMapView.this.worldmap.getProject().getMap(selectedMap));
+					}
+				} else {
+					backgroundClicked(e);
+				}
+			}
+		});
+		
+		addMouseMotionListener(new MouseAdapter() {
+			@Override
+			public void mouseMoved(MouseEvent e) {
+				String selectedMap = null;
+				int x = (int) (e.getX() / zoomLevel);
+				int y = (int) (e.getY() / zoomLevel);
+				for (String s : mapLocations.keySet()) {
+					if (mapLocations.get(s).contains(x, y)) {
+						selectedMap = s;
+						break;
+					}
+				}
+				if (selectedMap != null) {
+					//Reuse x,y to indicate to tile-within-the-map coordinates.
+					x = x - mapLocations.get(selectedMap).x;
+					y = y - mapLocations.get(selectedMap).y;
+					//Look for a mapchange there
+					TMXMap map = proj.getMap(selectedMap);
+					
+					boolean mapchangeFound = false;
+					for (MapObjectGroup group : map.groups) {
+						for (MapObject obj : group.mapObjects) {
+							if (obj instanceof MapChange) {
+								if (x >= obj.x && x < obj.x + obj.w && y >= obj.y && y < obj.y + obj.h) {
+									String mapId = ((MapChange)obj).map != null ? ((MapChange)obj).map.id : ((MapChange)obj).map_id;
+									setToolTipText(selectedMap+"->"+mapId);
+									mapchangeFound = true;
+								}
+							}
+						}
+					}
+										
+					if (!mapchangeFound) {
+						setToolTipText(selectedMap);
+					}
+					ToolTipManager.sharedInstance().registerComponent(WorldMapView.this);
+    				ToolTipManager.sharedInstance().setEnabled(true);
+				} else {
+    				ToolTipManager.sharedInstance().setEnabled(false);
+					ToolTipManager.sharedInstance().unregisterComponent(WorldMapView.this);
+					setToolTipText(null);
+				}
+			}
+		});
+	}
+	
+	@Override
+	public Point getToolTipLocation(MouseEvent event) {
+		return event.getPoint();
 	}
 	
 	private void paintOnGraphics(Graphics2D g2) {
 		g2.setPaint(new Color(100, 100, 100));
         g2.fillRect(0, 0, sizeX, sizeY);
         
-        g2.setPaint(new Color(255, 0, 0));
-        g2.setStroke(new BasicStroke(4));
+        g2.setPaint(selectOutlineColor);
+        g2.setStroke(selectOutlineStroke);
+        
+        Font areaNameFont = g2.getFont();
+        areaNameFont = areaNameFont.deriveFont(70f).deriveFont(Font.BOLD);
+        
+        Font mapIdFont = g2.getFont();
+        mapIdFont = mapIdFont.deriveFont(50f).deriveFont(Font.BOLD);
 
+        g2.setFont(mapIdFont);
+        FontMetrics mifm = g2.getFontMetrics();
+        int mapIdLabelHeight = mifm.getHeight();
+        
         for (String s : mapLocations.keySet()) {
 
         	int x = mapLocations.get(s).x;
@@ -83,8 +208,8 @@ public class WorldMapView extends JComponent implements Scrollable {
         		if (layer instanceof tiled.core.TileLayer && layer.isVisible()) {
         			if (layer.getName().equalsIgnoreCase("walkable")) continue;
         			renderer.paintTileLayer(g2, (tiled.core.TileLayer) layer);
-        		} else if (layer instanceof tiled.core.ObjectGroup && layer.isVisible()) {
-//        			paintObjectGroup(g2, map, (tiled.core.ObjectGroup) layer);
+        		} else if (layer instanceof tiled.core.ObjectGroup) {
+        			paintObjectGroup(g2, map, (tiled.core.ObjectGroup) layer);
         		}
         	}
         	if (map.colorFilter != null) {
@@ -93,39 +218,119 @@ public class WorldMapView extends JComponent implements Scrollable {
         		MapColorFilters.applyColorfilter(map.colorFilter, g2);
         		g2.setClip(oldClip);
         	}
-        	if (selected.contains(s)) {
-        		g2.drawRect(0, 0, map.tmxMap.getWidth() * TILE_SIZE, map.tmxMap.getHeight() * TILE_SIZE);
-        	}
         	
         	g2.translate(-x, -y);
         	
         }
         
+        if (highlightedListModel != null) {
+        	outlineFromListModel(g2, highlightedListModel, null, highlightOutlineColor, highlightOutlineStroke, mapIdFont, mapIdLabelHeight);
+        }
         
-        Font f = g2.getFont();
-        f = f.deriveFont(70f).deriveFont(Font.BOLD);
-        g2.setFont(f);
-        g2.setStroke(new BasicStroke(3));
+        if (selectedListModel != null && selectedSelectionModel != null) {
+        	outlineFromListModel(g2, selectedListModel, selectedSelectionModel, selectOutlineColor, selectOutlineStroke, mapIdFont, mapIdLabelHeight);
+        }
+        
+        
+        g2.setStroke(labelOutlineStroke);
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setFont(areaNameFont);
         FontMetrics fm = g2.getFontMetrics();
         FontRenderContext frc = g2.getFontRenderContext();
         
         for (String s : worldmap.labels.keySet()) {
         	String label = worldmap.labels.get(s).name;
-        	Rectangle areaCovered = new Rectangle(0, 0, -1, -1);
-        	for (String map : worldmap.labelledMaps.get(s)) {
-        		areaCovered.add(mapLocations.get(map));
+        	if (label != null) {
+        		Rectangle areaCovered = new Rectangle(0, 0, -1, -1);
+        		for (String map : worldmap.labelledMaps.get(s)) {
+        			areaCovered.add(mapLocations.get(map));
+        		}
+
+        		Rectangle2D stringBounds = fm.getStringBounds(label, g2);
+        		GlyphVector gv = areaNameFont.createGlyphVector(frc, label);
+        		g2.setColor(Color.WHITE);
+        		g2.fill(gv.getOutline((int)(areaCovered.getCenterX() - stringBounds.getCenterX()), (int)(areaCovered.getCenterY() - stringBounds.getCenterY())));
+        		g2.setColor(Color.BLACK);
+        		g2.draw(gv.getOutline((int)(areaCovered.getCenterX() - stringBounds.getCenterX()), (int)(areaCovered.getCenterY() - stringBounds.getCenterY())));
         	}
-        	
-        	Rectangle2D stringBounds = fm.getStringBounds(label, g2);
-        	GlyphVector gv = f.createGlyphVector(frc, label);
-        	g2.setColor(Color.WHITE);
-        	g2.fill(gv.getOutline((int)(areaCovered.getCenterX() - stringBounds.getCenterX()), (int)(areaCovered.getCenterY() - stringBounds.getCenterY())));
-        	g2.setColor(Color.BLACK);
-        	g2.draw(gv.getOutline((int)(areaCovered.getCenterX() - stringBounds.getCenterX()), (int)(areaCovered.getCenterY() - stringBounds.getCenterY())));
         }
 	}
 	
+	private void paintObjectGroup(Graphics2D g2d, TMXMap map, tiled.core.ObjectGroup layer) {
+    	for (MapObjectGroup group : map.groups) {
+			if (group.tmxGroup == layer) {
+				for (MapObject object : group.mapObjects) {
+					if (object instanceof MapChange) {
+//						Only show mapchange areas pointing to maps not shown in this worldmap
+						if (((MapChange)object).map != null && !mapLocations.containsKey(((MapChange)object).map.id)) {
+							drawObject(object, g2d, new Color(20, 20, 190));
+						}
+					}
+				}
+				break;
+			}
+		}
+	}
+	
+	private void drawObject(MapObject object, Graphics2D g2d, Color color) {
+    	g2d.setPaint(color);
+		g2d.drawRect(object.x+1, object.y+1, object.w-3, object.h-3);
+		g2d.drawRect(object.x+2, object.y+2, object.w-5, object.h-5);
+		g2d.setPaint(color.darker().darker());
+		g2d.drawLine(object.x, object.y + object.h - 1, object.x + object.w - 1, object.y + object.h - 1);
+		g2d.drawLine(object.x + object.w - 1, object.y, object.x + object.w - 1, object.y + object.h - 1);
+		g2d.drawLine(object.x + 3, object.y + 3, object.x + object.w - 4, object.y + 3);
+		g2d.drawLine(object.x + 3, object.y + 3, object.x + 3, object.y + object.h - 4);
+		g2d.setPaint(color.brighter().brighter().brighter());
+		g2d.drawLine(object.x, object.y, object.x + object.w - 1, object.y);
+		g2d.drawLine(object.x, object.y, object.x, object.y + object.h - 1);
+		g2d.drawLine(object.x + 3, object.y + object.h - 4, object.x + object.w - 4, object.y + object.h - 4);
+		g2d.drawLine(object.x + object.w - 4, object.y + 3, object.x + object.w - 4, object.y + object.h - 4);
+		Image img = object.getIcon();
+		g2d.setColor(new Color(255, 255, 255, 120));
+		g2d.fillRect(object.x + 2, object.y + 2, img.getWidth(null), img.getHeight(null));
+		g2d.drawImage(object.getIcon(), object.x + 2, object.y + 2, null);
+    }
+	
+	private void outlineFromListModel(Graphics2D g2, ListModel<TMXMap> listModel, ListSelectionModel selectionModel, Color outlineColor, Stroke outlineStroke, Font mapIdFont, int mapIdLabelHeight) {
+		for (int i =0; i<listModel.getSize(); i++) {
+			//No selection model ? We want to highlight the whole list.
+        	if (selectionModel == null || selectionModel.isSelectedIndex(i)) {
+        		TMXMap map = listModel.getElementAt(i);
+        		int x = mapLocations.get(map.id).x;
+            	int y = mapLocations.get(map.id).y;
+            	
+            	g2.translate(x, y);
+            	
+            	GlyphVector gv = mapIdFont.createGlyphVector(g2.getFontRenderContext(), map.id);
+            	g2.setStroke(outlineStroke);
+            	g2.setColor(outlineColor);
+            	g2.drawRect(0, 0, map.tmxMap.getWidth() * TILE_SIZE, map.tmxMap.getHeight() * TILE_SIZE);
+
+            	g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            	g2.setStroke(thinLabelOutlineStroke);
+            	g2.fill(gv.getOutline(8, 8 + mapIdLabelHeight));
+            	g2.setColor(mapIdLabelOutlineColor);
+            	g2.draw(gv.getOutline(8, 8 + mapIdLabelHeight));
+
+                g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+                
+                g2.translate(-x, -y);
+        	}
+        }
+	}
+	
+	public List<String> getSelectedMapsIDs() {
+		List<String> result = new ArrayList<String>();
+		for (int i =0; i<selectedListModel.getSize(); i++) {
+        	if (selectedSelectionModel.isSelectedIndex(i)) {
+        		TMXMap map = selectedListModel.getElementAt(i);
+        		result.add(map.id);
+        	}
+		}
+		return result;
+	}
+	
 	@Override
 	protected void paintComponent(Graphics g) {
 		Graphics2D g2 = (Graphics2D)g.create();
@@ -140,6 +345,35 @@ public class WorldMapView extends JComponent implements Scrollable {
 		
 	}
 	
+	
+	public interface MapClickListener {
+		public void mapClicked(MouseEvent e, TMXMap m);
+		public void mapChangeClicked(MouseEvent e, TMXMap m, TMXMap changeTarget);
+		public void backgroundClicked(MouseEvent e);
+	}
+
+	private List<MapClickListener> listeners = new CopyOnWriteArrayList<MapClickListener>();
+	
+	public void addMapClickListener(MapClickListener l) {
+		listeners.add(l);
+	}
+	
+	public void removeMapClickListener(MapClickListener l) {
+		listeners.remove(l);
+	}
+	
+	private void mapClicked(MouseEvent e, TMXMap m) {
+		for (MapClickListener l : listeners) l.mapClicked(e, m);
+	}
+	
+	private void mapChangeClicked(MouseEvent e, TMXMap m, TMXMap changeTarget) {
+		for (MapClickListener l : listeners) l.mapChangeClicked(e, m, changeTarget);
+	}
+	
+	private void backgroundClicked(MouseEvent e) {
+		for (MapClickListener l : listeners) l.backgroundClicked(e);
+	}
+	
 //	private boolean paintObjectGroup(Graphics2D g2d, TMXMap map, tiled.core.ObjectGroup layer) {
 //    	boolean paintSelected = false;
 //    	for (MapObjectGroup group : map.groups) {
@@ -262,6 +496,9 @@ public class WorldMapView extends JComponent implements Scrollable {
 	public void pushToModel() {
 		worldmap.segmentX = offsetX / TILE_SIZE;
 		worldmap.segmentY = offsetY / TILE_SIZE;
+		for (String id : worldmap.mapLocations.keySet()) {
+			worldmap.getProject().getMap(id).removeBacklink(worldmap);
+		}
 		worldmap.mapLocations.clear();
 		for (String s : mapLocations.keySet()) {
 			int x = mapLocations.get(s).x / TILE_SIZE;
@@ -270,6 +507,10 @@ public class WorldMapView extends JComponent implements Scrollable {
 			worldmap.mapLocations.put(s, new Point(x, y));
 		}
 		
+		for (String id : worldmap.mapLocations.keySet()) {
+			worldmap.getProject().getMap(id).addBacklink(worldmap);
+		}
+		
 		List<String> toRemove = new ArrayList<String>();
 		for (String s : worldmap.labels.keySet()) {
 			if (!mapLocations.containsKey(s)) {

src/com/gpl/rpg/atcontentstudio/ui/tools/GDEVisitor.java

@@ -0,0 +1,223 @@
+package com.gpl.rpg.atcontentstudio.ui.tools;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
+import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
+import com.gpl.rpg.atcontentstudio.model.maps.ContainerArea;
+import com.gpl.rpg.atcontentstudio.model.maps.KeyArea;
+import com.gpl.rpg.atcontentstudio.model.maps.MapChange;
+import com.gpl.rpg.atcontentstudio.model.maps.MapObject;
+import com.gpl.rpg.atcontentstudio.model.maps.MapObjectGroup;
+import com.gpl.rpg.atcontentstudio.model.maps.ReplaceArea;
+import com.gpl.rpg.atcontentstudio.model.maps.RestArea;
+import com.gpl.rpg.atcontentstudio.model.maps.ScriptArea;
+import com.gpl.rpg.atcontentstudio.model.maps.SignArea;
+import com.gpl.rpg.atcontentstudio.model.maps.SpawnArea;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
+
+public class GDEVisitor {
+
+	public static List<GameDataElement> findDependencies(GameDataElement origin, boolean includeSource) {
+		List<GameDataElement> visited = new ArrayList<GameDataElement>();
+		visit(origin, visited, includeSource);
+		return visited;
+	}
+	
+	private static void visit(GameDataElement element, List<GameDataElement> visited, boolean includeSource) {
+		if (element == null) return;
+		if (visited.contains(element)) return;
+		if (!(includeSource || element.getDataType() != GameSource.Type.source)) return;
+		
+		visited.add(element);
+		element.link();
+		if (element instanceof ActorCondition) {
+			visitActorCondition((ActorCondition)element, visited, includeSource);
+		} else if (element instanceof Dialogue) {
+			visitDialogue((Dialogue)element, visited, includeSource);
+		} else if (element instanceof Droplist) {
+			visitDroplist((Droplist)element, visited, includeSource);
+		} else if (element instanceof Item) {
+			visitItem((Item)element, visited, includeSource);
+		} else if (element instanceof ItemCategory) {
+			visitItemCategory((ItemCategory)element, visited, includeSource);
+		} else if (element instanceof NPC) {
+			visitNPC((NPC)element, visited, includeSource);
+		} else if (element instanceof Quest) {
+			visitQuest((Quest)element, visited, includeSource);
+		} else if (element instanceof TMXMap) {
+			visitTMXMap((TMXMap)element, visited, includeSource);
+		} else if (element instanceof Spritesheet) {
+			visitSpritesheet((Spritesheet)element, visited, includeSource);
+		}
+		
+	}
+
+	private static void visitActorCondition(ActorCondition element, List<GameDataElement> visited, boolean includeSource) {
+		if (element.icon_id != null) visit(element.getProject().getSpritesheet(element.icon_id.split(":")[0]), visited, includeSource);
+
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitDialogue(Dialogue element, List<GameDataElement> visited, boolean includeSource) {
+		visit(element.switch_to_npc, visited, includeSource);
+		if (element.replies != null) {
+			for (Dialogue.Reply reply : element.replies) {
+				visit(reply.next_phrase, visited, includeSource);
+				if (reply.requirements != null) {
+					for (Requirement req : reply.requirements) {
+						visit(req.required_obj, visited, includeSource);
+					}
+				}
+			}
+		}
+		if (element.rewards != null) {
+			for (Dialogue.Reward reward : element.rewards) {
+				visit(reward.reward_obj, visited, includeSource);
+				visit(reward.map, visited, includeSource);
+			}
+		}
+		
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitDroplist(Droplist element, List<GameDataElement> visited, boolean includeSource) {
+		if (element.dropped_items != null) {
+			for (Droplist.DroppedItem droppedItem : element.dropped_items) {
+				visit(droppedItem.item, visited, includeSource);
+			}
+		}
+		
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitItem(Item element, List<GameDataElement> visited, boolean includeSource) {
+		visit(element.category, visited, includeSource);
+		if (element.icon_id != null) visit(element.getProject().getSpritesheet(element.icon_id.split(":")[0]), visited, includeSource);
+		if (element.equip_effect != null && element.equip_effect.conditions != null) {
+			for (Item.ConditionEffect condEffect : element.equip_effect.conditions) {
+				visit(condEffect.condition, visited, includeSource);
+			}
+		}
+		if (element.hit_effect != null) { 
+			if (element.hit_effect.conditions_source != null) {
+				for (Item.ConditionEffect condEffect : element.hit_effect.conditions_source) {
+					visit(condEffect.condition, visited, includeSource);
+				}
+			}
+			if (element.hit_effect.conditions_target != null) {
+				for (Item.ConditionEffect condEffect : element.hit_effect.conditions_target) {
+					visit(condEffect.condition, visited, includeSource);
+				}
+			}
+		}
+		
+
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitItemCategory(ItemCategory element, List<GameDataElement> visited, boolean includeSource) {
+		//Nothing to visit
+	}
+
+	private static void visitNPC(NPC element, List<GameDataElement> visited, boolean includeSource) {
+		visit(element.dialogue, visited, includeSource);
+		visit(element.droplist, visited, includeSource);
+		if (element.icon_id != null) visit(element.getProject().getSpritesheet(element.icon_id.split(":")[0]), visited, includeSource);
+		if (element.hit_effect != null) {
+			if (element.hit_effect.conditions_source != null) {
+				for (NPC.TimedConditionEffect condEffect : element.hit_effect.conditions_source) {
+					visit(condEffect.condition, visited, includeSource);
+				}
+			}
+			if (element.hit_effect.conditions_target != null) {
+				for (NPC.TimedConditionEffect condEffect : element.hit_effect.conditions_target) {
+					visit(condEffect.condition, visited, includeSource);
+				}
+			}
+		}
+		
+
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitQuest(Quest element, List<GameDataElement> visited, boolean includeSource) {
+		//Nothing to visit
+		
+
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitTMXMap(TMXMap element, List<GameDataElement> visited, boolean includeSource) {
+		// TODO Auto-generated method stub
+		if (element.groups != null) {
+			for (MapObjectGroup group : element.groups) {
+				if (group.mapObjects != null) {
+					for (MapObject obj : group.mapObjects) {
+						if (obj instanceof ContainerArea) {
+							visit(((ContainerArea)obj).droplist, visited, includeSource);
+						} else if (obj instanceof KeyArea) {
+							visit(((KeyArea)obj).dialogue, visited, includeSource);
+							if (((KeyArea)obj).requirement != null) {
+								visit(((KeyArea)obj).requirement.required_obj, visited, includeSource);
+							}
+						} else if (obj instanceof MapChange) {
+							visit(((MapChange)obj).map, visited, includeSource);
+						} else if (obj instanceof ReplaceArea) {
+							if (((ReplaceArea)obj).requirement != null) {
+								visit(((ReplaceArea)obj).requirement.required_obj, visited, includeSource);
+							}
+						} else if (obj instanceof RestArea) {
+							//Nothing to visit
+						} else if (obj instanceof ScriptArea) {
+							visit(((ScriptArea)obj).dialogue, visited, includeSource);
+						} else if (obj instanceof SignArea) {
+							visit(((SignArea)obj).dialogue, visited, includeSource);
+						} else if (obj instanceof SpawnArea) {
+							if (((SpawnArea)obj).spawnGroup != null) {
+								for (NPC npc : ((SpawnArea)obj).spawnGroup) {
+									visit(npc, visited, includeSource);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		for (GameDataElement backlink : element.getBacklinks()) {
+			visit(backlink, visited, includeSource);
+		}
+	}
+
+	private static void visitSpritesheet(Spritesheet element, List<GameDataElement> visited, boolean includeSource) {
+		//Nothing to visit
+		
+		//Not even the backlinks. Makes no sense.
+	}
+	
+	
+	
+}

src/com/gpl/rpg/atcontentstudio/ui/tools/writermode/WriterModeEditor.java

@@ -10,14 +10,18 @@ import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JEditorPane;
 import javax.swing.JInternalFrame;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -57,6 +61,9 @@ import prefuse.visual.EdgeItem;
 import prefuse.visual.VisualItem;
 import prefuse.visual.expression.InGroupPredicate;
 
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData.EmptyReply;
@@ -71,8 +78,19 @@ import com.jidesoft.swing.JideBoxLayout;
 public class WriterModeEditor extends Editor {
 
 	private static final long serialVersionUID = -6591631891278528494L;
+	
+	private static final String HELP_TEXT = 
+			  "<html><body><table>"
+			+ "<tr><td valign=\"middle\">(Esc.)</td><td valign=\"middle\"> Cancel edition</td></tr>"
+			+ "<tr><td valign=\"middle\">(Ctrl+Enter)</td><td valign=\"middle\"> Confirm changes</td></tr>"
+			+ "<tr><td valign=\"middle\">(Shift+Enter)</td><td valign=\"middle\"> Create next of same kind</td></tr>"
+			+ "<tr><td valign=\"middle\">(Alt+Enter)</td><td valign=\"middle\"> Create next of other kind</td></tr>"
+			+ "</table></body></html>";
+	
+
 
 	private JComponent overlay = null;
+	private JComponent helpWindow = null;
     private Display view;
     
     final private WriterModeData data;
@@ -87,12 +105,19 @@ public class WriterModeEditor extends Editor {
     	selected = data.begin;
     	view = new WriterGraphView();
     	view.setLocation(0, 0);
+    	
     	setLayout(new BorderLayout());
     	add(createButtonPane(), BorderLayout.NORTH);
     	add(view, BorderLayout.CENTER);
     }
     
     
+    public void dataAltered() {
+    	data.state = GameDataElement.State.modified;
+    	data.childrenChanged(new ArrayList<ProjectTreeNode>());
+		ATContentStudio.frame.editorChanged(this);
+    }
+    
     public JPanel createButtonPane() {
     	JPanel pane = new JPanel();
     	pane.setLayout(new JideBoxLayout(pane, JideBoxLayout.LINE_AXIS));
@@ -102,6 +127,8 @@ public class WriterModeEditor extends Editor {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				data.save();
+		    	data.childrenChanged(new ArrayList<ProjectTreeNode>());
+				ATContentStudio.frame.editorChanged(WriterModeEditor.this);
 			}
 		});
     	export.addActionListener(new ActionListener() {
@@ -111,6 +138,8 @@ public class WriterModeEditor extends Editor {
 				data.getProject().createElements(created);
 				//data.begin.dialogue.save();
 				data.save();
+		    	data.childrenChanged(new ArrayList<ProjectTreeNode>());
+				ATContentStudio.frame.editorChanged(WriterModeEditor.this);
 			}
 		});
     	pane.add(save, JideBoxLayout.FIX);
@@ -135,6 +164,22 @@ public class WriterModeEditor extends Editor {
     }
 
 
+    private void createHelpWindow() {
+    	JInternalFrame window = new JInternalFrame("Help", true, true);
+    	window.setLayout(new BorderLayout());
+    	JEditorPane area = new JEditorPane();
+    	area.setContentType("text/html");
+    	area.setText(HELP_TEXT);
+    	area.setEditable(false);
+    	
+    	window.add(new JScrollPane(area));
+    	window.setSize(350, 250);
+    	window.setLocation(0, 0);
+		
+    	view.add(window);
+    	helpWindow = window;
+    }
+    
 	public static final String GRAPH = "graph";
     public static final String NODES = "graph.nodes";
     public static final String NULL_NODES = "graph.nullNodes";
@@ -587,6 +632,7 @@ public class WriterModeEditor extends Editor {
     				addEdge(selected, target);
     			}
     		}
+			dataAltered();
     	}
     	
         static final String disposeEditorString = "disposeEditor";
@@ -612,6 +658,7 @@ public class WriterModeEditor extends Editor {
 				revalidate();
 				repaint();
 				disposeOverlay();
+				dataAltered();
 			}
 		}; 
 		
@@ -654,6 +701,7 @@ public class WriterModeEditor extends Editor {
 					revalidate();
 					repaint();
 				}
+				dataAltered();
 			}
 		};
 		
@@ -695,7 +743,7 @@ public class WriterModeEditor extends Editor {
 					revalidate();
 					repaint();
 				} 
-	            
+				dataAltered();
 			}
 		};
 		
@@ -721,7 +769,20 @@ public class WriterModeEditor extends Editor {
 					revalidate();
 					repaint();
 				} 
-	            
+				dataAltered();
+			}
+		};
+		
+		static final String showHelpString = "showHelp";
+		final AbstractAction showHelp = new AbstractAction("Show help window") {
+			private static final long serialVersionUID = 1658086056088672748L;
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (helpWindow == null) {
+					createHelpWindow();
+				}
+				helpWindow.setVisible(true);
 			}
 		};
 		
@@ -812,6 +873,8 @@ public class WriterModeEditor extends Editor {
         	area.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.ALT_DOWN_MASK, true), commitAndCreateNextDefaultNodeString);
         	area.getActionMap().put(commitAndCreateNextDefaultNodeString, commitAndCreateNextDefaultNode);
         	
+        	area.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0, true), showHelpString);
+        	area.getActionMap().put(showHelpString, showHelp);
         	
         	if (selected instanceof WriterDialogue) {
         		area.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK, true), createContinueTalkingNodeString);
@@ -1081,8 +1144,8 @@ public class WriterModeEditor extends Editor {
 
 	@Override
 	public void targetUpdated() {
-		// TODO Auto-generated method stub
-		
+		this.icon = new ImageIcon(((GameDataElement)target).getIcon());
+		this.name = ((GameDataElement)target).getDesc();
 	}
     
 }

src/com/gpl/rpg/atcontentstudio/utils/DesktopIntegration.java

@@ -18,7 +18,7 @@ public class DesktopIntegration {
 			}
 		} else {
 			try {
-				Runtime.getRuntime().exec(Workspace.activeWorkspace.settings.mapEditorCommand.getCurrentValue()+" "+f.getAbsolutePath());
+				Runtime.getRuntime().exec(Workspace.activeWorkspace.settings.mapEditorCommand.getCurrentValue()+" \""+f.getAbsolutePath()+"\"");
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -40,7 +40,7 @@ public class DesktopIntegration {
 			}
 		} else {
 			try {
-				Runtime.getRuntime().exec(Workspace.activeWorkspace.settings.imageEditorCommand.getCurrentValue()+" "+f.getAbsolutePath());
+				Runtime.getRuntime().exec(Workspace.activeWorkspace.settings.imageEditorCommand.getCurrentValue()+" \""+f.getAbsolutePath()+"\"");
 			} catch (IOException e) {
 				e.printStackTrace();
 			}

src/com/gpl/rpg/atcontentstudio/utils/FileUtils.java

@@ -128,13 +128,13 @@ public class FileUtils {
 				case Windows:
 					System.err.println("Trying the Windows way with mklink");
 					try {
-						Runtime.getRuntime().exec("cmd.exe /C mklink "+(targetFile.isDirectory() ? "/J " : "")+linkFile.getAbsolutePath()+" "+targetFile.getAbsolutePath());
+						Runtime.getRuntime().exec("cmd.exe /C mklink "+(targetFile.isDirectory() ? "/J " : "")+"\""+linkFile.getAbsolutePath()+"\" \""+targetFile.getAbsolutePath()+"\"");
 					} catch (IOException e1) {
 						e1.printStackTrace();
 					}
-					System.err.println("Attempting UAC elevation through VBS script.");
 					if (!linkFile.exists()) {
-						runWithUac("cmd.exe /C mklink "+(targetFile.isDirectory() ? "/J " : "")+linkFile.getAbsolutePath()+" "+targetFile.getAbsolutePath(), 3, linkFile);
+						System.err.println("Attempting UAC elevation through VBS script.");
+						runWithUac("cmd.exe /C mklink "+(targetFile.isDirectory() ? "/J " : "")+"\""+linkFile.getAbsolutePath()+"\" \""+targetFile.getAbsolutePath()+"\"", 3, linkFile);
 					}
 					break;
 				case MacOS:

src/com/gpl/rpg/atcontentstudio/utils/WeblateIntegration.java

@@ -60,6 +60,9 @@ public class WeblateIntegration {
 		if (!Workspace.activeWorkspace.settings.useInternet.getCurrentValue()) {
 			unit.status = Status.notAllowed;
 			unit.translatedText = "Allow internet connection in the workspace settings to get translation status";
+		} else if (Workspace.activeWorkspace.settings.translatorLanguage == null) {
+			unit.status = Status.notAllowed;
+			unit.translatedText = "Select a target language in the workspace settings to get translation status";
 		} else {
 			unit.status = Status.absent;
 			unit.translatedText = "Cannot find this on weblate";