Merge branch 'master' into git_integration

Conflicts:
	.classpath
	src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

.classpath

@@ -4,7 +4,8 @@
 	<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="src" path="minify"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_152"/>
 	<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"/>
@@ -14,5 +15,18 @@
 	<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="lib" path="lib/JGit/commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/httpclient-4.3.6.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/httpcore-4.3.3.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/JavaEWAH-1.1.6.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/jsch-0.1.54.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/jzlib-1.0.7.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ATContentStudio/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/JGit/slf4j-api-1.7.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
-</classpath>
+</classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8

ATCS_JAR.jardesc

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jardesc>
+<jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.2.jar"/>
+    <jar path="ATContentStudio/ATCS_v0.6.14.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"/>
+    <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"/>
+    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-    <selectedProjects/>
+    <selectedProjects/>
-    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
+    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-        <sealing sealJar="false">
+        <sealing sealJar="false">
-            <packagesToSeal/>
+            <packagesToSeal/>
-            <packagesToUnSeal/>
+            <packagesToUnSeal/>
-        </sealing>
+        </sealing>
-    </manifest>
+    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
+    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <javaElement handleIdentifier="=ATContentStudio/siphash-zackehh\/src\/main\/java"/>
+        <javaElement handleIdentifier="=ATContentStudio/hacked-libtiled"/>
-        <javaElement handleIdentifier="=ATContentStudio/res"/>
+        <javaElement handleIdentifier="=ATContentStudio/siphash-zackehh\/src\/main\/java"/>
-        <javaElement handleIdentifier="=ATContentStudio/src"/>
+        <javaElement handleIdentifier="=ATContentStudio/src"/>
-        <javaElement handleIdentifier="=ATContentStudio/hacked-libtiled"/>
+        <javaElement handleIdentifier="=ATContentStudio/res"/>
-    </selectedElements>
+    </selectedElements>
-</jardesc>
+</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/core/TileSet.java

@@ -98,27 +98,42 @@ public class TileSet implements Iterable<Tile>
         
         File f = new File(imgFilename);
 
-        Image image = ImageIO.read(f.getCanonicalFile());
+        BufferedImage image = ImageIO.read(f.getCanonicalFile());
         if (image == null) {
-            throw new IOException("Failed to load " + tilebmpFile);
+            throw new IOException("Failed to load " + imgFilename);
         }
 
-        Toolkit tk = Toolkit.getDefaultToolkit();
+        tilebmpFile = f;
+        tileDimensions = new Rectangle(cutter.getTileDimensions());
+        
+//        Toolkit tk = Toolkit.getDefaultToolkit();
+//
+//        if (transparentColor != null) {
+//            int rgb = transparentColor.getRGB();
+//            image = tk.createImage(
+//                    new FilteredImageSource(image.getSource(),
+//                            new TransparentImageFilter(rgb)));
+//        }
+//
+//        BufferedImage buffered = new BufferedImage(
+//                image.getWidth(null),
+//                image.getHeight(null),
+//                BufferedImage.TYPE_INT_ARGB);
+//        buffered.getGraphics().drawImage(image, 0, 0, null);
 
-        if (transparentColor != null) {
+        importTileBitmap(image, cutter);
-            int rgb = transparentColor.getRGB();
+    }
-            image = tk.createImage(
+    
-                    new FilteredImageSource(image.getSource(),
+    public void weakImportTileBitmap(String imgFilename, TileCutter cutter)
-                            new TransparentImageFilter(rgb)));
+            throws IOException
-        }
+    {
+        setTilesetImageFilename(imgFilename);
+        
+        File f = new File(imgFilename);
 
-        BufferedImage buffered = new BufferedImage(
+        tilebmpFile = f;
-                image.getWidth(null),
+        tileDimensions = new Rectangle(cutter.getTileDimensions());
-                image.getHeight(null),
-                BufferedImage.TYPE_INT_ARGB);
-        buffered.getGraphics().drawImage(image, 0, 0, null);
 
-        importTileBitmap(buffered, cutter);
     }
     
     public void loadFromProject(String name, TMXMap tmxMap, int tileWidth, int tileHeight) {

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;

minify/com/whoischarles/util/json/Minify.java

@@ -0,0 +1,405 @@
+/**
+ * ----------------------
+ * Minify.java 2015-10-04
+ * ----------------------
+ *
+ * Copyright (c) 2015 Charles Bihis (www.whoischarles.com)
+ *
+ * This work is an adaptation of JSMin.java published by John Reilly which is a translation from C to Java of jsmin.c
+ * published by Douglas Crockford.  Permission is hereby granted to use this Java version under the same conditions as
+ * the original jsmin.c on which all of these derivatives are based.
+ *
+ *
+ *
+ * ---------------------
+ * JSMin.java 2006-02-13
+ * ---------------------
+ *
+ * Copyright (c) 2006 John Reilly (www.inconspicuous.org)
+ *
+ * This work is a translation from C to Java of jsmin.c published by Douglas Crockford.  Permission is hereby granted to
+ * use the Java version under the same conditions as the jsmin.c on which it is based.
+ *
+ *
+ *
+ * ------------------
+ * jsmin.c 2003-04-21
+ * ------------------
+ *
+ * Copyright (c) 2002 Douglas Crockford (www.crockford.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * The Software shall be used for Good, not Evil.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.whoischarles.util.json;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Minify.java is written by Charles Bihis (www.whoischarles.com) and is adapted from JSMin.java written by John Reilly
+ * (www.inconspicuous.org) which is itself a translation of jsmin.c written by Douglas Crockford (www.crockford.com).
+ *
+ * @see <a href="http://www.unl.edu/ucomm/templatedependents/JSMin.java">http://www.unl.edu/ucomm/templatedependents/JSMin.java</a>
+ * @see <a href="http://www.crockford.com/javascript/jsmin.c">http://www.crockford.com/javascript/jsmin.c</a>
+ */
+public class Minify {
+
+  private static final int EOF = -1;
+
+  private PushbackInputStream in;
+  private OutputStream out;
+  private int currChar;
+  private int nextChar;
+  private int line;
+  private int column;
+
+  public static enum Action {
+    OUTPUT_CURR, DELETE_CURR, DELETE_NEXT
+  }
+
+  public Minify() {
+    this.in = null;
+    this.out = null;
+  }
+
+  /**
+   * Minifies the input JSON string.
+   *
+   * Takes the input JSON string and deletes the characters which are insignificant to JavaScipt.  Comments will be
+   * removed, tabs will be replaced with spaces, carriage returns will be replaced with line feeds, and most spaces
+   * and line feeds will be removed.  The result will be returned.
+   *
+   * @param json The JSON string for which to minify
+   * @return A minified, yet functionally identical, version of the input JSON string
+   */
+  public String minify(String json) {
+    InputStream in = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8));
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+    try {
+      minify(in, out);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+
+    return out.toString().trim();
+  }
+
+  /**
+   * Takes an input stream to a JSON string and outputs minified JSON to the output stream.
+   *
+   * Takes the input JSON via the input stream and deletes the characters which are insignificant to JavaScript.
+   * Comments will be  removed, tabs will be replaced with spaaces, carriage returns will be replaced with line feeds,
+   * and most spaces and line feeds will be removed.  The result is streamed to the output stream.
+   *
+   * @param in The <code>InputStream</code> from which to get the un-minified JSON
+   * @param out The <code>OutputStream</code> where the resulting minified JSON will be streamed to
+   * @throws IOException
+   * @throws UnterminatedRegExpLiteralException
+   * @throws UnterminatedCommentException
+   * @throws UnterminatedStringLiteralException
+   */
+  public void minify(InputStream in, OutputStream out) throws IOException, UnterminatedRegExpLiteralException,
+                                                              UnterminatedCommentException,
+                                                              UnterminatedStringLiteralException {
+
+    // Initialize
+    this.in = new PushbackInputStream(in);
+    this.out = out;
+    this.line = 0;
+    this.column = 0;
+//    currChar = '\n';
+//    action(Action.DELETE_NEXT);
+    currChar = get();
+    nextChar = peek();
+    
+    // Process input
+    while (currChar != EOF) {
+      switch (currChar) {
+
+        case ' ':
+          if (isAlphanum(nextChar)) {
+            action(Action.OUTPUT_CURR);
+          } else {
+            action(Action.DELETE_CURR);
+          }
+          break;
+
+        case '\n':
+          switch (nextChar) {
+            case '{':
+            case '[':
+            case '(':
+            case '+':
+            case '-':
+              action(Action.OUTPUT_CURR);
+              break;
+            case ' ':
+              action(Action.DELETE_NEXT);
+              break;
+            default:
+              if (isAlphanum(nextChar)) {
+                action(Action.OUTPUT_CURR);
+              } else {
+                action(Action.DELETE_CURR);
+              }
+          }
+          break;
+
+        default:
+          switch (nextChar) {
+            case ' ':
+              if (isAlphanum(currChar)) {
+                action(Action.OUTPUT_CURR);
+                break;
+              }
+              action(Action.DELETE_NEXT);
+              break;
+            case '\n':
+              switch (currChar) {
+                case '}':
+                case ']':
+                case ')':
+                case '+':
+                case '-':
+                case '"':
+                case '\'':
+                  action(Action.OUTPUT_CURR);
+                  break;
+                default:
+                  if (isAlphanum(currChar)) {
+                    action(Action.OUTPUT_CURR);
+                  } else {
+                    action(Action.DELETE_NEXT);
+                  }
+              }
+              break;
+            default:
+              action(Action.OUTPUT_CURR);
+              break;
+          }
+      }
+    }
+    out.flush();
+  }
+
+  /**
+   * Process the current character with an appropriate action.
+   *
+   * The action that occurs is determined by the current character.  The options are:
+   *
+   *    1. Output currChar: output currChar, copy nextChar to currChar, get the next character and save it to nextChar
+   *    2. Delete currChar: copy nextChar to currChar, get the next character and save it to nextChar
+   *    3. Delete nextChar: get the next character and save it to nextChar
+   *
+   * This method essentially treats a string as a single character.  Also recognizes regular expressions if they are
+   * preceded by '(', ',', or '='.
+   *
+   * @param action The action to perform
+   * @throws IOException
+   * @throws UnterminatedRegExpLiteralException
+   * @throws UnterminatedCommentException
+   * @throws UnterminatedStringLiteralException
+   */
+  private void action(Action action) throws IOException, UnterminatedRegExpLiteralException, UnterminatedCommentException,
+                                         UnterminatedStringLiteralException {
+
+    // Process action
+    switch (action) {
+
+      case OUTPUT_CURR:
+        out.write(currChar);
+
+      case DELETE_CURR:
+        currChar = nextChar;
+
+        if (currChar == '\'' || currChar == '"') {
+          for ( ; ; ) {
+            out.write(currChar);
+            currChar = get();
+            if (currChar == nextChar) {
+              break;
+            }
+            if (currChar <= '\n') {
+              throw new UnterminatedStringLiteralException(line,
+                                                           column);
+            }
+            if (currChar == '\\') {
+              out.write(currChar);
+              currChar = get();
+            }
+          }
+        }
+
+      case DELETE_NEXT:
+        nextChar = next();
+        if (nextChar == '/'
+            && (currChar == '(' || currChar == ',' || currChar == '=' || currChar == ':')) {
+          out.write(currChar);
+          out.write(nextChar);
+          for ( ; ; ) {
+            currChar = get();
+            if (currChar == '/') {
+              break;
+            } else if (currChar == '\\') {
+              out.write(currChar);
+              currChar = get();
+            } else if (currChar <= '\n') {
+              throw new UnterminatedRegExpLiteralException(line,
+                                                           column);
+            }
+            out.write(currChar);
+          }
+          nextChar = next();
+        }
+    }
+  }
+
+  /**
+   * Determines whether a given character is a letter, digit, underscore, dollar sign, or non-ASCII character.
+   *
+   * @param c The character to compare
+   * @return True if the character is a letter, digit, underscore, dollar sign, or non-ASCII character.  False otherwise.
+   */
+  private boolean isAlphanum(int c) {
+    return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z')
+            || c == '_' || c == '$' || c == '\\' || c > 126);
+  }
+
+  /**
+   * Returns the next character from the input stream.
+   *
+   * Will pop the next character from the input stack.  If the character is a control character, translate it to a space
+   * or line feed.
+   *
+   * @return The next character from the input stream
+   * @throws IOException
+   */
+  private int get() throws IOException {
+    int c = in.read();
+
+    if (c == '\n') {
+      line++;
+      column = 0;
+    } else {
+      column++;
+    }
+
+    if (c >= ' ' || c == '\n' || c == EOF) {
+      return c;
+    }
+
+    if (c == '\r') {
+      column = 0;
+      return '\n';
+    }
+
+    return ' ';
+  }
+
+  /**
+   * Returns the next character from the input stream without popping it from the stack.
+   *
+   * @return The next character from the input stream
+   * @throws IOException
+   */
+  private int peek() throws IOException {
+    int lookaheadChar = in.read();
+    in.unread(lookaheadChar);
+    return lookaheadChar;
+  }
+
+  /**
+   * Get the next character from the input stream, excluding comments.
+   *
+   * Will read from the input stream via the <code>get()</code> method.  Will exclude characters that are part of
+   * comments.  <code>peek()</code> is used to se if a '/' is followed by a '/' or a '*' for the purpose of identifying
+   * comments.
+   *
+   * @return The next character from the input stream, excluding characters from comments
+   * @throws IOException
+   * @throws UnterminatedCommentException
+   */
+  private int next() throws IOException, UnterminatedCommentException {
+    int c = get();
+
+    if (c == '/') {
+      switch (peek()) {
+
+        case '/':
+          for ( ; ; ) {
+            c = get();
+            if (c <= '\n') {
+              return c;
+            }
+          }
+
+        case '*':
+          get();
+          for ( ; ; ) {
+            switch (get()) {
+              case '*':
+                if (peek() == '/') {
+                  get();
+                  return ' ';
+                }
+                break;
+              case EOF:
+                throw new UnterminatedCommentException(line, column);
+            }
+          }
+
+        default:
+          return c;
+      }
+
+    }
+    return c;
+  }
+
+  /**
+   * Exception to be thrown when an unterminated comment appears in the input.
+   */
+  public static class UnterminatedCommentException extends Exception {
+    public UnterminatedCommentException(int line, int column) {
+      super("Unterminated comment at line " + line + " and column " + column);
+    }
+  }
+
+  /**
+   * Exception to be thrown when an unterminated string literal appears in the input.
+   */
+  public static class UnterminatedStringLiteralException extends Exception {
+    public UnterminatedStringLiteralException(int line, int column) {
+      super("Unterminated string literal at line " + line + " and column " + column);
+    }
+  }
+
+  /**
+   * Exception to be thrown when an unterminated regular expression literal appears in the input.
+   */
+  public static class UnterminatedRegExpLiteralException extends Exception {
+    public UnterminatedRegExpLiteralException(int line, int column) {
+      super("Unterminated regular expression at line " + line + " and column " + column);
+    }
+  }
+}

packaging/ATCS_latest

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

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,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.2"
+!define VERSION "0.6.14"
 !define TRAINER_VERSION "0.1.4"
 !define JAVA_BIN "javaw"
 

res/LICENSE.minify

@@ -0,0 +1,43 @@
+
+----------------------
+Minify.java 2015-10-04
+----------------------
+
+Copyright (c) 2015 Charles Bihis (www.whoischarles.com)
+
+This work is an adaptation of JSMin.java published by John Reilly which is a translation from C to Java of jsmin.c
+published by Douglas Crockford.  Permission is hereby granted to use this Java version under the same conditions as
+the original jsmin.c on which all of these derivatives are based.
+
+
+---------------------
+JSMin.java 2006-02-13
+---------------------
+
+Copyright (c) 2006 John Reilly (www.inconspicuous.org)
+
+This work is a translation from C to Java of jsmin.c published by Douglas Crockford.  Permission is hereby granted to
+use the Java version under the same conditions as the jsmin.c on which it is based.
+
+
+
+------------------
+jsmin.c 2003-04-21
+------------------
+
+Copyright (c) 2002 Douglas Crockford (www.crockford.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

res/spritesheets.properties

@@ -84,4 +84,5 @@ atcs.spritesheet.effect_bluetentacle.animate=true
 atcs.spritesheet.effect_heal2.animate=true
 atcs.spritesheet.effect_poison1.animate=true
 atcs.spritesheet.effect_tometik1.animate=true
-atcs.spritesheet.effect_tometik2.animate=true
+atcs.spritesheet.effect_tometik2.animate=true
+atcs.spritesheet.monsters_guynmart.category=monster

siphash-zackehh/src/main/java/com/zackehh/siphash/SipHash.java

@@ -1,6 +1,11 @@
 package com.zackehh.siphash;
 
-import static com.zackehh.siphash.SipHashConstants.*;
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_C;
+import static com.zackehh.siphash.SipHashConstants.DEFAULT_D;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V0;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V1;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V2;
+import static com.zackehh.siphash.SipHashConstants.INITIAL_V3;
 
 /**
  * Main entry point for SipHash, providing a basic hash

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

@@ -1,17 +1,47 @@
 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 javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.plaf.FontUIResource;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.attributes.AttributesNodeProvider;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.lib.ObjectDatabase;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.RefDatabase;
+import org.eclipse.jgit.lib.ReflogReader;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
 
 import prefuse.data.expression.parser.ExpressionParser;
 
@@ -24,9 +54,15 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.2";
+	public static final String APP_VERSION = "v0.6.14";
+	
+	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 +72,30 @@ 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();
+			}
+		}
+		
+//		try {
+//			Git git = new Git(new FileRepository("/home/xxx/git_repos/andors-trail/.git/"));
+//			List<Ref> branches = git.branchList().call();
+//			for (Ref branch : branches) {
+//				System.out.println(branch.getName());
+//			}
+//		} catch (IOException e1) {
+//			e1.printStackTrace();
+//		} catch (GitAPIException e1) {
+//			e1.printStackTrace();
+//		}
+		
 		
 		ConfigCache.init();
 		
@@ -52,6 +112,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 +137,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 +163,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/GameDataElement.java

@@ -11,6 +11,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.tree.TreeNode;
 
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
+
 public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 
 	private static final long serialVersionUID = 2028934451226743389L;
@@ -31,6 +33,8 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	
 	public boolean writable = false;
 	
+	public BookmarkEntry bookmark = null;
+	
 	//List of objects whose transition to "linked" state made them point to this instance.
 	private Map<GameDataElement, Integer> backlinks = new ConcurrentHashMap<GameDataElement, Integer>();
 

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

@@ -1,34 +1,54 @@
 package com.gpl.rpg.atcontentstudio.model;
 
 import java.awt.Image;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Serializable;
+import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 
 import javax.swing.tree.TreeNode;
+import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
 
 import org.json.simple.JSONArray;
+import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
 import com.gpl.rpg.atcontentstudio.io.SettingsSave;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarksRoot;
 import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
@@ -68,6 +88,8 @@ public class Project implements ProjectTreeNode, Serializable {
 	public GameSource referencedContent; //Pointers to base content
 	public transient GameSource alteredContent; //Copied from base content (does not overwrite yet)
 	public transient GameSource createdContent; //Stand-alone.
+	public transient BookmarksRoot bookmarks;
+	
 	
 	public SavedGamesSet saves; //For simulations.
 	
@@ -116,6 +138,7 @@ public class Project implements ProjectTreeNode, Serializable {
 
 		alteredContent = new GameSource(this, GameSource.Type.altered);
 		createdContent = new GameSource(this, GameSource.Type.created);
+		bookmarks = new BookmarksRoot(this);
 		
 		saves = new SavedGamesSet(this);
 
@@ -124,6 +147,7 @@ public class Project implements ProjectTreeNode, Serializable {
 //		v.add(referencedContent);
 		v.add(baseContent);
 		v.add(saves);
+		v.add(bookmarks);
 
 		linkAll();
 		
@@ -222,6 +246,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"));
@@ -241,6 +267,7 @@ public class Project implements ProjectTreeNode, Serializable {
 //		referencedContent.refreshTransients(this);
 		alteredContent = new GameSource(this, GameSource.Type.altered);
 		createdContent = new GameSource(this, GameSource.Type.created);
+		bookmarks = new BookmarksRoot(this);
 		
 		saves.refreshTransients();
 
@@ -250,11 +277,11 @@ public class Project implements ProjectTreeNode, Serializable {
 //		v.add(referencedContent);
 		v.add(baseContent);
 		v.add(saves);
+		v.add(bookmarks);
 		
 
 		linkAll();
 		
-		projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
 	}
 	
 	public void linkAll() {
@@ -950,6 +977,10 @@ public class Project implements ProjectTreeNode, Serializable {
 		fireElementAdded(node, getNodeIndex(node));
 	}
 	
+	public void bookmark(GameDataElement gde) {
+		bookmarks.addBookmark(gde);
+	}
+	
 	
 	@Override
 	public GameDataSet getDataSet() {
@@ -1042,85 +1073,149 @@ public class Project implements ProjectTreeNode, Serializable {
 		}
 	}
 	
-	public void generateExportPackage(final File target) {
+	public void exportProjectAsZipPackage(final File target) {
 		WorkerDialog.showTaskMessage("Exporting project "+name+"...", ATContentStudio.frame, true, new Runnable() {
 			@Override
 			public void run() {
 				Notification.addInfo("Exporting project \""+name+"\" as "+target.getAbsolutePath());
-				File tmpDir = new File(baseFolder, "tmp");
-				FileUtils.deleteDir(tmpDir);
-				tmpDir.mkdir();
-				File tmpJsonDataDir = new File(tmpDir, GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
-				tmpJsonDataDir.mkdirs();
-
-				for (File createdJsonFile : createdContent.gameData.baseFolder.listFiles()) {
-					FileUtils.copyFile(createdJsonFile, new File(tmpJsonDataDir, createdJsonFile.getName()));
-				}
-				writeAltered(alteredContent.gameData.actorConditions, baseContent.gameData.actorConditions, ActorCondition.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.dialogues, baseContent.gameData.dialogues, Dialogue.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.droplists, baseContent.gameData.droplists, Droplist.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.itemCategories, baseContent.gameData.itemCategories, ItemCategory.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.items, baseContent.gameData.items, Item.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.npcs, baseContent.gameData.npcs, NPC.class, tmpJsonDataDir);
-				writeAltered(alteredContent.gameData.quests, baseContent.gameData.quests, Quest.class, tmpJsonDataDir);
-
-				File tmpMapDir = new File(tmpDir, TMXMapSet.DEFAULT_REL_PATH_IN_SOURCE);
-				tmpMapDir.mkdirs();
-				for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
-					FileUtils.copyFile(createdMapFile, new File(tmpMapDir, createdMapFile.getName()));
-				}
-				for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
-					FileUtils.copyFile(alteredMapFile, new File(tmpMapDir, alteredMapFile.getName()));
-				}
 				
-				
+				File tmpDir = exportProjectToTmpDir();
-				if (!createdContent.worldmap.isEmpty() || !alteredContent.worldmap.isEmpty()) {
-					try {
-						Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-						doc.setXmlVersion("1.0");
-						Element root = doc.createElement("worldmap");
-						doc.appendChild(root);
-
-						for (int i = 0; i < getWorldmapSegmentCount(); i++) {
-							root.appendChild(getWorldmapSegment(i).toXmlElement(doc));
-						}
-
-						Worldmap.saveDocToFile(doc, new File(tmpMapDir, "worldmap.xml"));
-					} catch (ParserConfigurationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
 
 				FileUtils.writeToZip(tmpDir, target);
 				FileUtils.deleteDir(tmpDir);
 				Notification.addSuccess("Project \""+name+"\" exported as "+target.getAbsolutePath());
 			}
+
+			
 		});
 	}
 	
-	@SuppressWarnings("rawtypes")
+	public void exportProjectOverGameSource(final File target) {
-	public void writeAltered(GameDataCategory<? extends JSONElement> altered, GameDataCategory<? extends JSONElement> source, Class<? extends JSONElement> gdeClass, File targetFolder) {
+		WorkerDialog.showTaskMessage("Exporting project "+name+"...", ATContentStudio.frame, true, new Runnable() {
-		Set<String> alteredFileNames = new LinkedHashSet<String>();
+			@Override
-		Map<String, List<Map>> toWrite = new LinkedHashMap<String, List<Map>>();
+			public void run() {
-		for (JSONElement gde : altered) {
+				Notification.addInfo("Exporting project \""+name+"\" into "+target.getAbsolutePath());
-			alteredFileNames.add(gde.jsonFile.getName());
+				
+				File tmpDir = exportProjectToTmpDir();
+
+				FileUtils.copyOver(tmpDir, target);
+				FileUtils.deleteDir(tmpDir);
+				Notification.addSuccess("Project \""+name+"\" exported into "+target.getAbsolutePath());
+			}
+
+			
+		});
+	}
+	
+	public File exportProjectToTmpDir() {
+		File tmpDir = new File(baseFolder, "tmp");
+		FileUtils.deleteDir(tmpDir);
+		tmpDir.mkdir();
+		File tmpJsonDataDir = new File(tmpDir, GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
+		tmpJsonDataDir.mkdirs();
+
+//		for (File createdJsonFile : createdContent.gameData.baseFolder.listFiles()) {
+//			FileUtils.copyFile(createdJsonFile, new File(tmpJsonDataDir, createdJsonFile.getName()));
+//		}
+		Map<Class<? extends GameDataElement>, List<String>> writtenFilesPerDataType = new LinkedHashMap<Class<? extends GameDataElement>, List<String>>();
+		List<String> writtenFiles;
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.actorConditions, alteredContent.gameData.actorConditions, baseContent.gameData.actorConditions, ActorCondition.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(ActorCondition.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.dialogues, alteredContent.gameData.dialogues, baseContent.gameData.dialogues, Dialogue.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Dialogue.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.droplists, alteredContent.gameData.droplists, baseContent.gameData.droplists, Droplist.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Droplist.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.itemCategories, alteredContent.gameData.itemCategories, baseContent.gameData.itemCategories, ItemCategory.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(ItemCategory.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.items, alteredContent.gameData.items, baseContent.gameData.items, Item.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Item.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.npcs, alteredContent.gameData.npcs, baseContent.gameData.npcs, NPC.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(NPC.class, writtenFiles);
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.quests, alteredContent.gameData.quests, baseContent.gameData.quests, Quest.class, tmpJsonDataDir);
+		writtenFilesPerDataType.put(Quest.class, writtenFiles);
+
+		File tmpMapDir = new File(tmpDir, TMXMapSet.DEFAULT_REL_PATH_IN_SOURCE);
+		tmpMapDir.mkdirs();
+		writtenFiles = new LinkedList<String>();
+		for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
+			if (createdMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
+			FileUtils.copyFile(createdMapFile, new File(tmpMapDir, createdMapFile.getName()));
+			writtenFiles.add(createdMapFile.getName());
 		}
-		for (String fName : alteredFileNames) {
+		for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
+			if (alteredMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
+			FileUtils.copyFile(alteredMapFile, new File(tmpMapDir, alteredMapFile.getName()));
+			writtenFiles.add(alteredMapFile.getName());
+		}
+		writtenFilesPerDataType.put(TMXMap.class, writtenFiles);
+		
+		if (sourceSetToUse == ResourceSet.gameData) {
+			writeResourceListXml(writtenFilesPerDataType, GameSource.DEFAULT_REL_PATH_FOR_GAME_RESOURCE, baseContent.baseFolder, tmpDir);
+		} else if (sourceSetToUse == ResourceSet.debugData) {
+			writeResourceListXml(writtenFilesPerDataType, GameSource.DEFAULT_REL_PATH_FOR_DEBUG_RESOURCE, baseContent.baseFolder, tmpDir);
+		}
+		
+		
+		if (!createdContent.worldmap.isEmpty() || !alteredContent.worldmap.isEmpty()) {
+			try {
+				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+				doc.setXmlVersion("1.0");
+				Element root = doc.createElement("worldmap");
+				doc.appendChild(root);
+
+				for (int i = 0; i < getWorldmapSegmentCount(); i++) {
+					root.appendChild(getWorldmapSegment(i).toXmlElement(doc));
+				}
+
+				Worldmap.saveDocToFile(doc, new File(tmpMapDir, "worldmap.xml"));
+			} catch (ParserConfigurationException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return tmpDir;
+	}
+	
+	@SuppressWarnings("rawtypes")
+	public List<String> writeDataDeltaForDataType(GameDataCategory<? extends JSONElement> created, GameDataCategory<? extends JSONElement> altered, GameDataCategory<? extends JSONElement> source, Class<? extends JSONElement> gdeClass, File targetFolder) {
+		List<String> filenamesToWrite = new LinkedList<String>();
+		Map<String, List<Map>> dataToWritePerFilename = new LinkedHashMap<String, List<Map>>();
+		for (JSONElement gde : altered) {
+			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
+				filenamesToWrite.add(gde.jsonFile.getName());
+			}
+		}
+		for (JSONElement gde : created) {
+			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
+				filenamesToWrite.add(gde.jsonFile.getName());
+			}
+		}
+		for (String fName : filenamesToWrite) {
 			for (JSONElement gde : source) {
 				if (gde.jsonFile.getName().equals(fName)) {
-					if (toWrite.get(fName) == null) {
+					if (dataToWritePerFilename.get(fName) == null) {
-						toWrite.put(fName, new ArrayList<Map>());
+						dataToWritePerFilename.put(fName, new ArrayList<Map>());
 					}
-					toWrite.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
+					//Automatically fetches altered element over source element.
+					dataToWritePerFilename.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
+				}
+			}
+			for (JSONElement gde : created) {
+				if (gde.jsonFile.getName().equals(fName)) {
+					if (dataToWritePerFilename.get(fName) == null) {
+						dataToWritePerFilename.put(fName, new ArrayList<Map>());
+					}
+					//Add the created elements.
+					dataToWritePerFilename.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
 				}
 			}
 		}
-		for (String fName : toWrite.keySet()) {
+		for (String fName : dataToWritePerFilename.keySet()) {
 			File jsonFile = new File(targetFolder, fName);
 			StringWriter writer = new JsonPrettyWriter();
 			try {
-				JSONArray.writeJSONString(toWrite.get(fName), writer);
+				JSONArray.writeJSONString(dataToWritePerFilename.get(fName), writer);
 			} catch (IOException e) {
 				//Impossible with a StringWriter
 			}
@@ -1135,8 +1230,138 @@ public class Project implements ProjectTreeNode, Serializable {
 				e.printStackTrace();
 			}
 		}
+		return filenamesToWrite;
 	}
 
+	
+	private void writeResourceListXml(Map<Class<? extends GameDataElement>, List<String>> writtenFilesPerDataType, String xmlFileRelPath, File baseFolder, File tmpDir) {
+		File xmlFile =  new File(baseFolder, xmlFileRelPath);
+		File outputFile = new File(tmpDir, xmlFileRelPath);
+
+		Map<String, Class<? extends GameDataElement>> classNamesByArrayNames = new HashMap<String, Class<? extends GameDataElement>>();
+		classNamesByArrayNames.put("loadresource_itemcategories", ItemCategory.class);
+		classNamesByArrayNames.put("loadresource_actorconditions", ActorCondition.class);
+		classNamesByArrayNames.put("loadresource_items", Item.class);
+		classNamesByArrayNames.put("loadresource_droplists", Droplist.class);
+		classNamesByArrayNames.put("loadresource_quests", Quest.class);
+		classNamesByArrayNames.put("loadresource_conversationlists", Dialogue.class);
+		classNamesByArrayNames.put("loadresource_monsters", NPC.class);
+		classNamesByArrayNames.put("loadresource_maps", TMXMap.class);
+		
+		String jsonResPrefix = "@raw/";
+		String tmxResPrefix = "@xml/";
+		String jsonFileSuffix = ".json";
+		String tmxFileSuffix = ".tmx";
+		
+		if (!xmlFile.exists()) return;
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		Document doc;
+		try {
+			factory.setIgnoringElementContentWhitespace(true);
+			factory.setExpandEntityReferences(false);
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			
+			InputSource insrc = new InputSource(new FileInputStream(xmlFile));
+			insrc.setEncoding("UTF-8");
+			doc = builder.parse(insrc);
+
+			Element arrayNode;
+			String name, resPrefix, fileSuffix, resName, resToFile, fileToRes;
+			Class<? extends GameDataElement> clazz;
+			List<String> writtenFiles;
+
+			Element root = (Element) doc.getElementsByTagName("resources").item(0);
+			if (root != null) {
+				NodeList arraysList = root.getElementsByTagName("array");
+				if (arraysList != null) {
+					for (int i = 0; i < arraysList.getLength(); i++) {
+						arrayNode = (Element) arraysList.item(i);
+						name = arrayNode.getAttribute("name");
+						clazz = classNamesByArrayNames.get(name);
+						if (clazz == null) continue;
+						writtenFiles = writtenFilesPerDataType.get(clazz);
+						if (writtenFiles == null) continue;
+						if (clazz == TMXMap.class) {
+							resPrefix = tmxResPrefix;
+							fileSuffix = tmxFileSuffix;
+						} else {
+							resPrefix = jsonResPrefix;
+							fileSuffix = jsonFileSuffix;
+						}
+						NodeList arrayItems = arrayNode.getElementsByTagName("item");
+						if (arrayItems != null) {
+							for (int j = 0; j < arrayItems.getLength(); j++) {
+								resName = ((Element)arrayItems.item(j)).getTextContent();
+								if (resName == null) continue;
+								resToFile = resName.replaceFirst("\\A"+resPrefix, "")+fileSuffix;
+								writtenFiles.remove(resToFile);
+							}
+						}
+						if (!writtenFiles.isEmpty()) {
+							Comment com = doc.createComment("Added by ATCS "+ATContentStudio.APP_VERSION+" for project "+getProject().name);
+							arrayNode.appendChild(com);
+							Collections.sort(writtenFiles);
+							for (String missingRes : writtenFiles) {
+								Element item = doc.createElement("item");
+								fileToRes = resPrefix+missingRes.replaceFirst(fileSuffix+"\\z", "");
+								item.setTextContent(fileToRes);
+								arrayNode.appendChild(item);
+							}
+						}
+					}
+				}
+			}
+			
+			Transformer transformer = TransformerFactory.newInstance().newTransformer();
+			if (!outputFile.getParentFile().exists()) {
+				outputFile.getParentFile().mkdirs();
+			}
+			StringWriter temp = new StringWriter();
+			Result output = new StreamResult(temp);
+			Source input = new DOMSource(doc);
+			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+			transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+			transformer.transform(input, output);
+			
+			String tempString = temp.toString();
+			doc = builder.parse(new ByteArrayInputStream(tempString.getBytes("UTF-8")));
+			input = new DOMSource(doc);
+			transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(new StringReader(
+					"<?xml version=\"1.0\"?>\r\n" + 
+					"<xsl:stylesheet version=\"1.0\"\r\n" + 
+					"                xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\r\n" + 
+					"  <xsl:strip-space elements=\"*\" />\r\n" + 
+					"  <xsl:output method=\"xml\" indent=\"yes\" />\r\n" + 
+					"\r\n" + 
+					"  <xsl:template match=\"node() | @*\" name=\"identity\">\r\n" + 
+					"    <xsl:copy>\r\n" + 
+					"      <xsl:apply-templates select=\"node() | @*\" />\r\n" + 
+					"    </xsl:copy>\r\n" + 
+					"  </xsl:template>\r\n" + 
+					"\r\n" + 
+					"  <xsl:template match=\"array\">\r\n" + 
+					"    <xsl:call-template name=\"identity\"/>\r\n" + 
+					"    <xsl:text>&#xA;&#xA;&#x20;&#x20;&#x20;&#x20;</xsl:text>\r\n" + 
+					"  </xsl:template>\r\n" + 
+					"</xsl:stylesheet>")));
+			output = new StreamResult(new FileOutputStream(outputFile));
+			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+			transformer.transform(input, output);
+			
+			
+		} catch (SAXException e) {
+			e.printStackTrace();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (ParserConfigurationException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (TransformerException e) {
+			e.printStackTrace();
+		}
+	}
 
 	@Override
 	public boolean needsSaving() {

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

@@ -4,6 +4,7 @@ import java.awt.Image;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -332,7 +333,9 @@ public class Workspace implements ProjectTreeNode, Serializable {
 
 	private static boolean delete(File f) {
 		boolean b = true;
-		if (f.isDirectory()) {
+		if (Files.isSymbolicLink(f.toPath())) {
+			b &= f.delete();
+		} else if (f.isDirectory()) {
 			for (File c : f.listFiles())
 				b &= delete(c);
 		}

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

@@ -38,10 +38,12 @@ public class WorkspaceSettings {
 	public static String DEFAULT_IMG_EDITOR_COMMAND = "gimp";
 	public Setting<String> imageEditorCommand = new PrimitiveSetting<String>("imageEditorCommand", DEFAULT_IMG_EDITOR_COMMAND);
 
-	public static String[] LANGUAGE_LIST = new String[]{null, "de", "ru", "pl", "fr", "it", "es", "nl", "uk", "ca", "sv", "pt", "pt_BR", "zh_Hant", "zh_Hans", "ja", "cs", "tr", "ko", "hu", "sl", "bg", "id", "fi", "th", "gl", "ms" ,"pa", "az"};
+	public static String[] LANGUAGE_LIST = new String[]{null, "de", "ru", "pl", "fr", "it", "es", "nl", "uk", "ca", "sv", "pt", "pt_BR", "zh_Hant", "zh_Hans", "ja", "cs", "tr", "ko", "hu", "sl", "bg", "id", "fi", "th", "gl", "ms" ,"pa", "az", "nb"};
 	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);
@@ -155,7 +158,7 @@ public class WorkspaceSettings {
 			value = defaultValue;
 		}
 		
-		public abstract void readFromJson(Map json);
+		public abstract void readFromJson(@SuppressWarnings("rawtypes") Map json);
 		
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		public void saveToJson(Map json) {
@@ -185,6 +188,7 @@ public class WorkspaceSettings {
 			super(id, null);
 		}
 		
+		@SuppressWarnings({ "unchecked", "rawtypes" })
 		@Override
 		public void saveToJson(Map json) {
 			if (value != null) json.put(id,  value);
@@ -198,6 +202,7 @@ public class WorkspaceSettings {
 			this.value = this.defaultValue = defaultValue;
 		}
 		
+		@SuppressWarnings({ "rawtypes", "unchecked" })
 		@Override
 		public void readFromJson(Map json) {
 			value = new ArrayList<X>();

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarkEntry.java

@@ -0,0 +1,155 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
+
+public class BookmarkEntry implements BookmarkNode {
+
+	public GameDataElement bookmarkedElement;
+	public BookmarkFolder parent;
+	
+	public BookmarkEntry(BookmarkFolder parent, GameDataElement target) {
+		this.parent = parent;
+		this.bookmarkedElement = target;
+		target.bookmark = this;
+		parent.contents.add(this);
+	}
+	
+	@Override
+	public Enumeration<ProjectTreeNode> children() {
+		return null;
+	}
+
+	@Override
+	public boolean getAllowsChildren() {
+		return false;
+	}
+
+	@Override
+	public TreeNode getChildAt(int childIndex) {
+		return null;
+	}
+
+	@Override
+	public int getChildCount() {
+		return 0;
+	}
+
+	@Override
+	public int getIndex(TreeNode node) {
+		return 0;
+	}
+
+	@Override
+	public TreeNode getParent() {
+		return parent;
+	}
+
+	@Override
+	public boolean isLeaf() {
+		return true;
+	}
+
+	@Override
+	public void childrenAdded(List<ProjectTreeNode> path) {
+		path.add(0,this);
+		parent.childrenAdded(path);
+	}
+
+	@Override
+	public void childrenChanged(List<ProjectTreeNode> path) {
+		path.add(0,this);
+		parent.childrenChanged(path);
+	}
+
+	@Override
+	public void childrenRemoved(List<ProjectTreeNode> path) {
+		path.add(0,this);
+		parent.childrenRemoved(path);
+	}
+	@Override
+	public void notifyCreated() {
+		childrenAdded(new ArrayList<ProjectTreeNode>());
+	}
+
+	@Override
+	public String getDesc() {
+		if (bookmarkedElement instanceof QuestStage) {
+			String text = ((GameDataElement)bookmarkedElement).getDesc();
+			if (text.length() > 60) {
+				text = text.substring(0, 57)+"...";
+			}
+			return ((GameDataElement)bookmarkedElement).getDataType().toString()+"/"+((Quest)((QuestStage)bookmarkedElement).parent).id+"#"+((QuestStage)bookmarkedElement).progress+":"+text;
+		} else {
+			return ((GameDataElement)bookmarkedElement).getDataType().toString()+"/"+((GameDataElement)bookmarkedElement).getDesc();
+		}
+	}
+
+	@Override
+	public Project getProject() {
+		return parent.getProject();
+	}
+
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+
+	@Override
+	public Image getIcon() {
+		return bookmarkedElement.getIcon();
+	}
+
+	@Override
+	public Image getOpenIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getClosedIcon() {
+		return null;
+	}
+
+	@Override
+	public Image getLeafIcon() {
+		return getIcon();
+	}
+
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return true;
+	}
+
+	@Override
+	public boolean needsSaving() {
+		return false;
+	}
+	
+	public void delete() {
+		bookmarkedElement.bookmark = null;
+		parent.delete(this);
+	}
+	
+	@Override
+	public void save() {
+		parent.save();
+	}
+
+}

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarkFolder.java

@@ -0,0 +1,168 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+public class BookmarkFolder implements BookmarkNode {
+
+	List<BookmarkNode> contents = new LinkedList<BookmarkNode>();
+	BookmarkNode parent;
+	String name;
+	Image closedIcon, openIcon;
+
+	public BookmarkFolder(BookmarkNode parent, String name) {
+		this(parent, name, DefaultIcons.getStdClosedIcon(), DefaultIcons.getStdOpenIcon());
+	}
+	
+	public BookmarkFolder(BookmarkNode parent, String name, Image closedIcon, Image openIcon) {
+		this.parent = parent;
+		this.name = name;
+		this.closedIcon = closedIcon;
+		this.openIcon = openIcon;
+	}
+	
+	@Override
+	public Enumeration<? extends ProjectTreeNode> children() {
+		return Collections.enumeration(contents);
+	}
+
+	@Override
+	public boolean getAllowsChildren() {
+		return true;
+	}
+
+	@Override
+	public TreeNode getChildAt(int childIndex) {
+		return contents.get(childIndex);
+	}
+
+	@Override
+	public int getChildCount() {
+		return contents.size();
+	}
+
+	@Override
+	public int getIndex(TreeNode node) {
+		return contents.indexOf(node);
+	}
+
+	@Override
+	public TreeNode getParent() {
+		return parent;
+	}
+
+	@Override
+	public boolean isLeaf() {
+		return false;
+	}
+	
+	@Override
+	public void childrenAdded(List<ProjectTreeNode> path) {
+		path.add(0,this);
+		parent.childrenAdded(path);
+	}
+
+	@Override
+	public void childrenChanged(List<ProjectTreeNode> path) {
+		path.add(0,this);
+		parent.childrenChanged(path);
+	}
+
+	@Override
+	public void childrenRemoved(List<ProjectTreeNode> path) {
+		if (path.size() == 1 && this.getChildCount() == 1) {
+			childrenRemoved(new ArrayList<ProjectTreeNode>());
+		} else {
+			path.add(0, this);
+			parent.childrenRemoved(path);
+		}
+	}
+	@Override
+	public void notifyCreated() {
+		childrenAdded(new ArrayList<ProjectTreeNode>());
+	}
+
+	@Override
+	public String getDesc() {
+		return name;
+	}
+
+	@Override
+	public Project getProject() {
+		return parent.getProject();
+	}
+
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+
+	@Override
+	public Image getIcon() {
+		return getClosedIcon();
+	}
+
+	@Override
+	public Image getOpenIcon() {
+		return openIcon;
+	}
+
+	@Override
+	public Image getClosedIcon() {
+		return closedIcon;
+	}
+
+	@Override
+	public Image getLeafIcon() {
+		return getClosedIcon();
+	}
+
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return contents.isEmpty();
+	}
+
+	@Override
+	public boolean needsSaving() {
+		return false;
+	}
+
+	public void delete(BookmarkEntry bookmarkEntry) {
+		if (contents.contains(bookmarkEntry)) {
+			bookmarkEntry.childrenRemoved(new ArrayList<ProjectTreeNode>());
+			contents.remove(bookmarkEntry);
+			save();
+		}
+	}
+	
+	public void delete(BookmarkFolder bookmarkFolder) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	public void save() {
+		parent.save();
+	}
+	
+	public void delete() {
+		
+	}
+
+}

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarkNode.java

@@ -0,0 +1,10 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+
+public interface BookmarkNode extends ProjectTreeNode{
+
+	public void save();
+	public void delete();
+	
+}

src/com/gpl/rpg/atcontentstudio/model/bookmarks/BookmarksRoot.java

@@ -0,0 +1,210 @@
+package com.gpl.rpg.atcontentstudio.model.bookmarks;
+
+import java.awt.Image;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.SavedSlotCollection;
+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.GameDataSet;
+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.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
+import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+public class BookmarksRoot implements BookmarkNode {
+
+	SavedSlotCollection v = new SavedSlotCollection();
+
+	public transient Project parent = null;
+	
+	BookmarkFolder ac, diag, dl, it, ic, npc, q, tmx, sp, wm;
+	
+	public BookmarksRoot(Project parent) {
+		this.parent = parent;
+
+		v.add(ac = new BookmarkFolder(this, ActorCondition.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		v.add(diag = new BookmarkFolder(this, Dialogue.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		v.add(dl = new BookmarkFolder(this, Droplist.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		v.add(it = new BookmarkFolder(this, Item.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		v.add(ic = new BookmarkFolder(this, ItemCategory.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		v.add(npc = new BookmarkFolder(this, NPC.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		v.add(q = new BookmarkFolder(this, Quest.getStaticDesc(), DefaultIcons.getJsonClosedIcon(), DefaultIcons.getJsonOpenIcon()));
+		
+		v.add(tmx = new BookmarkFolder(this, "TMX Maps", DefaultIcons.getTmxClosedIcon(), DefaultIcons.getTmxOpenIcon()));
+		v.add(sp = new BookmarkFolder(this, "Spritesheets", DefaultIcons.getSpriteClosedIcon(), DefaultIcons.getSpriteOpenIcon()));
+		v.add(wm = new BookmarkFolder(this, "Worldmap", DefaultIcons.getSpriteClosedIcon(), DefaultIcons.getSpriteOpenIcon()));
+	}
+	
+	@Override
+	public Enumeration<ProjectTreeNode> children() {
+		return v.getNonEmptyElements();
+	}
+
+	@Override
+	public boolean getAllowsChildren() {
+		return true;
+	}
+
+	@Override
+	public TreeNode getChildAt(int arg0) {
+		return v.getNonEmptyElementAt(arg0);
+	}
+
+	@Override
+	public int getChildCount() {
+		return v.getNonEmptySize();
+	}
+
+	@Override
+	public int getIndex(TreeNode arg0) {
+		return v.getNonEmptyIndexOf((ProjectTreeNode) arg0);
+	}
+
+	@Override
+	public TreeNode getParent() {
+		return parent;
+	}
+
+	@Override
+	public boolean isLeaf() {
+		return false;
+	}
+
+	@Override
+	public void childrenAdded(List<ProjectTreeNode> path) {
+		path.add(0, this);
+		parent.childrenAdded(path);
+	}
+	@Override
+	public void childrenChanged(List<ProjectTreeNode> path) {
+		path.add(0, this);
+		parent.childrenChanged(path);
+	}
+	@Override
+	public void childrenRemoved(List<ProjectTreeNode> path) {
+		if (path.size() == 1 && this.v.getNonEmptySize() == 1) {
+			childrenRemoved(new ArrayList<ProjectTreeNode>());
+		} else {
+			path.add(0, this);
+			parent.childrenRemoved(path);
+		}
+	}
+	@Override
+	public void notifyCreated() {
+		childrenAdded(new ArrayList<ProjectTreeNode>());
+		for (ProjectTreeNode node : v.getNonEmptyIterable()) {
+			node.notifyCreated();
+		}
+	}
+
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+"Bookmarks";
+	}
+
+	@Override
+	public Project getProject() {
+		return parent == null ? null : parent.getProject();
+	}
+
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+
+	@Override
+	public Image getIcon() {
+		return getOpenIcon();
+	}
+
+	@Override
+	public Image getOpenIcon() {
+		return DefaultIcons.getBookmarkOpenIcon();
+	}
+
+	@Override
+	public Image getClosedIcon() {
+		return DefaultIcons.getBookmarkClosedIcon();
+	}
+
+	@Override
+	public Image getLeafIcon() {
+		return getClosedIcon();
+	}
+
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return v.isEmpty();
+	}
+
+	@Override
+	public boolean needsSaving() {
+		return false;
+	}
+	
+	public void save() {
+		
+	}
+
+	@Override
+	public void delete() {}
+	
+	public void addBookmark(GameDataElement target) {
+			BookmarkEntry node;
+			BookmarkFolder folder = null;
+			if (target instanceof ActorCondition) {
+				folder = ac;
+			} else if (target instanceof Dialogue) {
+				folder = diag;
+			} else if (target instanceof Droplist) {
+				folder = dl;
+			} else if (target instanceof Item) {
+				folder = it;
+			} else if (target instanceof ItemCategory) {
+				folder = ic;
+			} else if (target instanceof NPC) {
+				folder = npc;
+			} else if (target instanceof Quest) {
+				folder = q;
+			} else if (target instanceof TMXMap) {
+				folder = tmx;
+			} else if (target instanceof Spritesheet) {
+				folder = sp;
+			} else if (target instanceof WorldmapSegment) {
+				folder = wm;
+			} else {
+				return;
+			}
+			ProjectTreeNode higherEmptyParent = folder;
+			while (higherEmptyParent != null) {
+				if (higherEmptyParent.getParent() != null && ((ProjectTreeNode)higherEmptyParent.getParent()).isEmpty()) higherEmptyParent = (ProjectTreeNode)higherEmptyParent.getParent();
+				else break;
+			}
+			if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;
+			
+			node = new BookmarkEntry(folder, target);
+			if (higherEmptyParent != null) higherEmptyParent.notifyCreated();
+			else node.notifyCreated();
+	}
+	
+}

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) fullRoundEffect.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,10 +54,13 @@ public class Dialogue extends JSONElement {
 		
 		public enum RewardType {
 			questProgress,
+			removeQuestProgress,
 			dropList,
 			skillIncrease,
 			actorCondition,
+			actorConditionImmunity,
 			alignmentChange,
+			alignmentSet,
 			giveItem,
 			createTimer,
 			spawnAll,
@@ -249,10 +252,12 @@ 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:
-						//Nothing to do (yet ?).
+					case alignmentSet:
+							//Nothing to do (yet ?).
 						break;
 					case createTimer:
 						//Nothing to do.
@@ -264,6 +269,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
@@ -123,6 +172,7 @@ public class Requirement extends JSONElement {
 		case skillLevel:
 		case spentGold:
 		case timerElapsed:
+		case factionScore:
 			break;
 		}
 		if (this.required_obj != null) this.required_obj.addBacklink((GameDataElement) this.parent);
@@ -141,6 +191,7 @@ public class Requirement extends JSONElement {
 		clone.state = this.state;
 		clone.required_obj_id = this.required_obj_id;
 		clone.required_value = this.required_value;
+		clone.negated = this.negated;
 		clone.required_obj = this.required_obj;
 		clone.type = this.type;
 		if (clone.required_obj != null && parent != null) {

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

@@ -19,26 +19,29 @@ 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) {
+		String requireNegation = obj.getProperties().getProperty("requireNegation");
+		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);
 		requirement.required_obj_id = requireId;
 		if (requireValue != null) requirement.required_value = Integer.parseInt(requireValue);
+		if (requireNegation != null) requirement.negated = Boolean.parseBoolean(requireNegation);
 		requirement.state = GameDataElement.State.parsed;
+		
 	}
 	
 	@Override
@@ -76,7 +79,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 +92,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.negated != null && requirement.negated) ? "NOT " : "" + 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,38 @@ 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) {
+		String requireNegation = obj.getProperties().getProperty("requireNegation");
+		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
+		if (requireType != null) requirement.type = Requirement.RequirementType.valueOf(requireType);
-		//requirement.type = Requirement.RequirementType.valueOf(requireType);
-		requirement.type = Requirement.RequirementType.questProgress;
 		requirement.required_obj_id = requireId;
 		if (requireValue != null) requirement.required_value = Integer.parseInt(requireValue);
+		if (requireNegation != null) requirement.negated = Boolean.parseBoolean(requireNegation);
 		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 +93,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 +104,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 +114,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.negated != null && requirement.negated) ? "NOT " : "" + 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/SpawnArea.java

@@ -13,6 +13,7 @@ public class SpawnArea extends MapObject {
 	public int quantity = 1;
 	public int spawnchance = 10;
 	public boolean active = true;
+	public boolean ignoreAreas = false;
 	public String spawngroup_id;
 	public List<NPC> spawnGroup = new ArrayList<NPC>();
 	
@@ -26,6 +27,9 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("active") != null) {
 			this.active = Boolean.parseBoolean(obj.getProperties().getProperty("active"));
 		}
+		if (obj.getProperties().getProperty("ignoreAreas") != null) {
+			this.ignoreAreas = Boolean.parseBoolean(obj.getProperties().getProperty("ignoreAreas"));
+		}
 		if (obj.getProperties().getProperty("spawngroup") != null) {
 			this.spawngroup_id = obj.getProperties().getProperty("spawngroup");
 		} else if (obj.getName() != null ){
@@ -84,6 +88,9 @@ public class SpawnArea extends MapObject {
 		if (!this.active) {
 			tmxObject.getProperties().setProperty("active", Boolean.toString(active));
 		}
+		if (this.ignoreAreas) {
+			tmxObject.getProperties().setProperty("ignoreAreas", Boolean.toString(ignoreAreas));
+		}
 	}
 	
 }

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

@@ -38,6 +38,7 @@ public class TMXMap extends GameDataElement {
 	public static final String GROUND_LAYER_NAME = "Ground";
 	public static final String OBJECTS_LAYER_NAME = "Objects";
 	public static final String ABOVE_LAYER_NAME = "Above";
+	public static final String TOP_LAYER_NAME = "Top";
 	public static final String WALKABLE_LAYER_NAME = "Walkable";
 	
 	public enum ColorFilter {
@@ -273,11 +274,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;
@@ -397,6 +399,7 @@ public class TMXMap extends GameDataElement {
 		return GROUND_LAYER_NAME.equalsIgnoreCase(name) ||
 				OBJECTS_LAYER_NAME.equalsIgnoreCase(name) ||
 				ABOVE_LAYER_NAME.equalsIgnoreCase(name) ||
+				TOP_LAYER_NAME.equalsIgnoreCase(name) ||
 				WALKABLE_LAYER_NAME.equalsIgnoreCase(name);
 	}
 

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

@@ -15,6 +15,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.swing.tree.TreeNode;
 
@@ -92,29 +93,31 @@ public class TMXMapSet implements ProjectTreeNode {
 		});
 		if (source.type == GameSource.Type.created | source.type == GameSource.Type.altered) {
 			final Path folderPath = Paths.get(mapFolder.getAbsolutePath());
-			Thread watcher = new Thread("Map folder watcher for "+source.type) {
+			Thread watcher = new Thread("Map folder watcher for "+getProject().name+"/"+source.type) {
 				public void run() {
 					WatchService watchService;
 
 					while(getProject().open) {
 						try {
 							watchService = FileSystems.getDefault().newWatchService();
-							WatchKey watchKey = folderPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY);
+							/*WatchKey watchKey = */folderPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY);
 							WatchKey wk;
 							validService: while(getProject().open) {
-								wk = watchService.take();
+								wk = watchService.poll(10, TimeUnit.SECONDS);
-								for (WatchEvent<?> event : wk.pollEvents()) {
+								if (wk != null) {
-									Path changed = (Path) event.context();
+									for (WatchEvent<?> event : wk.pollEvents()) {
-									String name = changed.getFileName().toString();
+										Path changed = (Path) event.context();
-									String id = name.substring(0, name.length() - 4);
+										String name = changed.getFileName().toString();
-									TMXMap map = getMap(id);
+										String id = name.substring(0, name.length() - 4);
-									if (map != null) {
+										TMXMap map = getMap(id);
-										map.mapChangedOnDisk();
+										if (map != null) {
+											map.mapChangedOnDisk();
+										}
+									}
+									if(!wk.reset()) {
+										watchService.close();
+										break validService;
 									}
-								}
-								if(!wk.reset()) {
-									watchService.close();
-									break validService;
 								}
 							}
 						} catch (IOException e) {

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

@@ -23,7 +23,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
+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.SaveEvent;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
@@ -104,8 +106,37 @@ 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;
+			}
+			List<String> deprecatedLabels = new ArrayList<String>();
+			for (String label : labelledMaps.keySet()) { 
+				if (labelledMaps.get(label).contains(oldOne.id)) {
+					labelledMaps.get(label).remove(oldOne.id);
+					modified = true;
+					if (labelledMaps.get(label).isEmpty()) {
+						deprecatedLabels.add(label);
+					}
+				}
+			}
+			for (String label : deprecatedLabels) {
+				labelledMaps.remove(label);
+				labels.remove(label);
+			}
+		}
+		
 		oldOne.removeBacklink(this);
 		if(newOne != null) newOne.addBacklink(this);
+		
+		if (modified) {
+			this.state = GameDataElement.State.modified;
+			childrenChanged(new ArrayList<ProjectTreeNode>());
+			ATContentStudio.frame.editorChanged(this);
+		}
 	}
 
 	@Override

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/i18n/PoPotWriter.java

@@ -0,0 +1,86 @@
+package com.gpl.rpg.atcontentstudio.model.tools.i18n;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public class PoPotWriter {
+
+	Map<String, List<String>> stringsResources = new LinkedHashMap<String, List<String>>();
+	Map<String, String> translations = new LinkedHashMap<String, String>();
+	File f;
+	
+	public static void writePoFile(Map<String, List<String>> stringsResources, Map<String, String> translations, File destination) {
+		try {
+			FileWriter fw = new FileWriter(destination);
+			if (translations.get("") != null) {
+				fw.write(translations.get(""));
+				writeEndOfEntry(fw);
+			}
+			if (translations.get("translator-credits") != null) {
+				List<String> refs = new LinkedList<String>();
+				refs.add("[none]");
+				writeReferences(fw, refs);
+				writeMsgId(fw, "translator-credits");
+				writeMsgStr(fw, translations.get("translator-credits"));
+				writeEndOfEntry(fw);
+			}
+			for (String msg : stringsResources.keySet()) {
+				writeReferences(fw, stringsResources.get(msg));
+				writeMsgId(fw, msg);
+				writeMsgStr(fw, translations.get(msg));
+				writeEndOfEntry(fw);
+			}
+			fw.flush();
+			fw.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public static void writePotFile(Map<String, List<String>> stringsResources, File destination) {
+		try {
+			FileWriter fw = new FileWriter(destination);
+			for (String msg : stringsResources.keySet()) {
+				writeReferences(fw, stringsResources.get(msg));
+				writeMsgId(fw, msg);
+				writeMsgStr(fw, "");
+				writeEndOfEntry(fw);
+			}
+			fw.flush();
+			fw.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private static void writeReferences(Writer w, List<String> references) throws IOException {
+		for (String ref : references) {
+			w.write("#: ");
+			w.write(ref);
+			w.write("\n");
+		}
+	}
+	
+	private static void writeMsgId(Writer w, String msg) throws IOException {
+		w.write("msgid \"");
+		w.write(msg);
+		w.write("\"\n");
+	}
+	
+	private static void writeMsgStr(Writer w, String translation) throws IOException {
+		w.write("msgstr \"");
+		w.write(translation == null ? "" : translation);
+		w.write("\"\n");
+	}
+	
+	private static void writeEndOfEntry(Writer w) throws IOException {
+		w.write("\n");
+	}
+	
+}

src/com/gpl/rpg/atcontentstudio/model/tools/i18n/PotComparator.java

@@ -0,0 +1,310 @@
+package com.gpl.rpg.atcontentstudio.model.tools.i18n;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.swing.JOptionPane;
+
+import com.gpl.rpg.atcontentstudio.model.Project;
+
+import net.launchpad.tobal.poparser.POEntry;
+import net.launchpad.tobal.poparser.POFile;
+import net.launchpad.tobal.poparser.POParser;
+
+
+/**
+ * 
+ * @author Kevin
+ * 
+ * To use this, paste the following script in the beanshell console of ATCS.
+ * Don't forget to change the project number to suit your needs.
+ * 
+import com.gpl.rpg.atcontentstudio.model.Workspace;
+import com.gpl.rpg.atcontentstudio.model.tools.i18n.PotGenerator;
+import com.gpl.rpg.atcontentstudio.model.tools.i18n.PotComparator;
+ 
+proj = Workspace.activeWorkspace.projects.get(7);
+PotGenerator.generatePotFileForProject(proj);
+comp = new PotComparator(proj);
+comp.compare();
+comp.updatePoFiles(proj);
+ * 
+ * 
+ *
+ */
+public class PotComparator {
+
+	Map<String, List<String>> stringsResourcesNew = new LinkedHashMap<String, List<String>>();
+	Map<String, String> resourcesStringsNew = new LinkedHashMap<String, String>();
+	
+	Map<String, List<String>> stringsResourcesOld = new LinkedHashMap<String, List<String>>();
+	Map<String, String> resourcesStringsOld = new LinkedHashMap<String, String>();
+
+	Map<String, String> msgIdToReplace = new LinkedHashMap<String, String>();
+	List<String> msgIdToReview = new LinkedList<String>();
+	List<String> msgIdOutdated = new LinkedList<String>();
+	
+	
+	public PotComparator(Project proj) {
+		POParser parser = new POParser();
+
+		POFile newPot = parser.parseFile(new File(proj.alteredContent.baseFolder.getAbsolutePath()+File.separator+"english.pot"));
+		if (newPot == null) {
+			System.err.println("Cannot locate new english.pot file at "+proj.alteredContent.baseFolder.getAbsolutePath()+File.separator);
+		}
+		extractFromPoFile(newPot, stringsResourcesNew, resourcesStringsNew);
+		
+		POFile oldPot = parser.parseFile(new File(proj.baseContent.baseFolder.getAbsolutePath()+File.separator+"assets"+File.separator+"translation"+File.separator+"english.pot"));
+		if (oldPot == null) {
+			System.err.println("Cannot locate old english.pot file at "+proj.baseContent.baseFolder.getAbsolutePath()+File.separator+"assets"+File.separator+"translations"+File.separator);
+		}
+		extractFromPoFile(oldPot, stringsResourcesOld, resourcesStringsOld);
+	}
+	
+	
+	private void extractFromPoFile(POFile po, Map<String, List<String>> stringsResources, Map<String, String> resourcesStrings) {
+		for (POEntry entry : po.getEntryArray()) {
+			Vector<String> resources = entry.getStringsByType(POEntry.StringType.REFERENCE);
+			Vector<String> msgids = entry.getStringsByType(POEntry.StringType.MSGID);
+			if (resources == null || resources.size() == 0 || msgids == null || msgids.size() == 0) continue;
+			String msgid = msgids.get(0);
+			if (msgids.size() > 1) {
+				for (int i = 1; i < msgids.size(); i++) {
+					msgid += msgids.get(i); 
+				}
+			}
+			if (msgid.contains("\\n")) {
+				msgid = msgid.replaceAll("\\\\n", "\\\\n\"\n\"");
+				msgid = "\"\n\""+msgid;
+			}
+			for (String resLine : resources) {
+				String[] resArray = resLine.split(" ");
+				for (String res : resArray) {
+					resourcesStrings.put(res, msgid);
+					if (stringsResources.get(msgid) == null) {
+						stringsResources.put(msgid, new LinkedList<String>());
+					}
+					stringsResources.get(msgid).add(res);
+				}
+			}
+		}
+	}
+	
+	public void compare() {
+		for (String oldRes : resourcesStringsOld.keySet()) {
+			String newString = resourcesStringsNew.get(oldRes);
+			String oldString = resourcesStringsOld.get(oldRes);
+			if (newString != null) {
+				if (!newString.equals(oldString)) {
+					List<String> allOldResources = stringsResourcesOld.get(oldString);
+					List<String> allNewResources = stringsResourcesNew.get(oldString);
+					StringBuffer sb = new StringBuffer();
+					sb.append("---------------------------------------------\n");
+					sb.append("--- TYPO CHECK ------------------------------\n");
+					sb.append("---------------------------------------------\n");
+					sb.append("String at: "+oldRes+"\n");
+					if (allOldResources.size() > 1) {
+						sb.append("Also present at:\n");
+						for (String res : allOldResources) {
+							if (!res.equals(oldRes)) {
+								sb.append("- "+res+"\n");
+							}
+						}
+					}
+					if (allNewResources != null) {
+						sb.append("Still present at: \n");
+						for (String res : allNewResources) {
+							sb.append("- "+res+"\n");
+						}
+					}
+					sb.append("Was : \""+oldString+"\"\n");
+					sb.append("Now : \""+newString+"\"\n");
+					System.out.println(sb.toString());
+					showTypoDialog(oldString, newString, sb.toString());
+				}
+			} else {
+				List<String> allOldResources = stringsResourcesOld.get(oldString);
+				List<String> allNewResources = stringsResourcesNew.get(oldString);
+				if (allOldResources.size() >= 1) {
+					System.out.println("---------------------------------------------");
+					System.out.println("--- REMOVED RESOURCE ------------------------");
+					System.out.println("---------------------------------------------");
+					System.out.println("String at: "+oldRes);
+					if (allOldResources.size() > 1) {
+						System.out.println("And also at:");
+						for (String res : allOldResources) {
+							if (!res.equals(oldRes)) {
+								System.out.println("- "+res);
+							}
+						}
+					}
+					System.out.println("Was: \""+oldString+"\"");
+					if (allNewResources == null) {
+						System.out.println("Absent from new.");
+					} else {
+						System.out.println("Still present at: ");
+						for (String res : allNewResources) {
+							System.out.println("- "+res);
+						}
+
+					}
+				}
+			}
+		}
+		removedStrings: for (String oldString : stringsResourcesOld.keySet())  {
+			if (stringsResourcesNew.get(oldString) == null) {
+				List<String> allOldResources = stringsResourcesOld.get(oldString);
+				if (allOldResources.size() >= 1) {
+					if (allOldResources.size() > 0) {
+						for (String res : allOldResources) {
+							String newString = resourcesStringsNew.get(res);
+							if (newString != null) {
+								continue removedStrings;
+							}
+						}
+					}
+					System.out.println("---------------------------------------------");
+					System.out.println("--- REMOVED STRING --------------------------");
+					System.out.println("---------------------------------------------");
+					System.out.println("String: \""+oldString+"\"");
+					if (allOldResources.size() > 0) {
+						System.out.println("Was at:");
+						for (String res : allOldResources) {
+							System.out.println("- "+res);
+						}
+					}
+					System.out.println("This string is absent from the new file, and its attached resources are missing too.");
+				}
+			}
+		}
+	}
+	
+	private void showTypoDialog(String oldMsg, String newMsg, String checkReport) {
+		String typo = "Typo";
+		String review = "Review";
+		String outdated = "Outdated";
+		String none = "None";
+		Object[] options = new Object[] {typo, review, outdated, none};
+		
+		int result = JOptionPane.showOptionDialog(null, checkReport, "Choose action", JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, typo);
+		
+		if (result < 0 || result >= options.length) {
+			System.out.println("No decision");
+			return;
+		}
+
+		System.out.println("Decision: "+options[result]);
+		
+		if (options[result] != none) {
+			msgIdToReplace.put(oldMsg, newMsg);
+			if (options[result] == review) {
+				msgIdToReview.add(newMsg);
+			} else if (options[result] == outdated) {
+				msgIdOutdated.add(newMsg);
+			}
+		}
+		
+	}
+	
+	
+	public void updatePoFiles(Project proj) {
+		File poFolder = new File(proj.baseContent.baseFolder.getAbsolutePath()+File.separator+"assets"+File.separator+"translation");
+		File[] poFiles = poFolder.listFiles(new FileFilter() {
+			@Override
+			public boolean accept(File arg0) {
+				return arg0.isFile() && arg0.getName().endsWith(".po");
+			}
+		});
+		
+		for (File f : poFiles) {
+			updatePoFile(proj, f);
+		}
+	}
+	
+	private void updatePoFile(Project proj, File f) {
+		POParser parser = new POParser();
+		POFile poFile = parser.parseFile(f);
+		
+		Map<String, String> translations = new LinkedHashMap<String, String>();
+		
+		//Collect existing translations
+		if (poFile.getHeader() != null) {
+			Vector<String> msgstrs = poFile.getHeader().getStringsByType(POEntry.StringType.HEADER);
+			String header = "";
+			if (!msgstrs.isEmpty()) {
+				if (msgstrs.size() == 1) {
+					header = msgstrs.get(0);
+				} else {
+					for (String msgstr : msgstrs) {
+						header += msgstr;
+						header += "\n";
+					}
+				}
+			}
+			translations.put("", header);
+		}
+		
+		for (POEntry entry : poFile.getEntryArray()) {
+			Vector<String> msgids = entry.getStringsByType(POEntry.StringType.MSGID);
+			Vector<String> msgstrs = entry.getStringsByType(POEntry.StringType.MSGSTR);
+			if (msgids == null || msgids.size() == 0) continue;
+			String msgid = msgids.get(0);
+			if (msgids.size() > 1) {
+				for (int i = 1; i < msgids.size(); i++) {
+					msgid += msgids.get(i); 
+				}
+			}
+			if (msgid.contains("\\n")) {
+				msgid = msgid.replaceAll("\\\\n", "\\\\n\"\n\"");
+				msgid = "\"\n\""+msgid;
+			}
+			String translation = "";
+			if (!msgstrs.isEmpty()) {
+				if (msgstrs.size() == 1) {
+					translation = msgstrs.get(0);
+				} else {
+					for (String msgstr : msgstrs) {
+						translation += msgstr;
+					}
+				}
+				if (translation.contains("\\n")) {
+					translation = translation.replaceAll("\\\\n", "\\\\n\"\n\"");
+					translation = "\"\n\""+translation;
+				}
+			}
+			translations.put(msgid, translation);
+		}
+		
+		//Patch data
+		for (String oldId : msgIdToReplace.keySet()) {
+			String newId = msgIdToReplace.get(oldId);
+			if (translations.containsKey(oldId)) {
+				String trans = translations.get(oldId);
+				translations.remove(oldId);
+				translations.put(newId, trans);
+			}
+		}
+		
+		for (String msgid : msgIdToReview) {
+			if (translations.containsKey(msgid)) {
+				String trans = translations.get(msgid);
+				if (trans != null && trans.length() >= 1) translations.put(msgid, "[REVIEW]"+trans);
+			}
+		}
+
+		for (String msgid : msgIdOutdated) {
+			if (translations.containsKey(msgid)) {
+				String trans = translations.get(msgid);
+				if (trans != null && trans.length() >= 1) translations.put(msgid, "[OUTDATED]"+trans);
+			}
+		}
+		
+		PoPotWriter.writePoFile(stringsResourcesNew, translations, new File(proj.alteredContent.baseFolder.getAbsolutePath()+File.separator+f.getName()));
+	}
+	
+}

src/com/gpl/rpg/atcontentstudio/model/tools/i18n/PotGenerator.java

@@ -0,0 +1,100 @@
+package com.gpl.rpg.atcontentstudio.model.tools.i18n;
+
+import java.io.File;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
+import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
+import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
+import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
+
+public class PotGenerator {
+
+	public static void generatePotFileForProject(Project proj) {
+		Map<String, List<String>> stringsResources = new LinkedHashMap<String, List<String>>();
+		Map<String, String> resourcesStrings = new LinkedHashMap<String, String>();
+		
+		GameSource gsrc = proj.baseContent;
+		
+		for (ActorCondition ac : gsrc.gameData.actorConditions) {
+			pushString(stringsResources, resourcesStrings, ac.display_name, getPotContextComment(ac));
+		}
+		
+		for (Dialogue d : gsrc.gameData.dialogues ) {
+			pushString(stringsResources, resourcesStrings, d.message, getPotContextComment(d));
+			if (d.replies == null) continue;
+			for (Dialogue.Reply r : d.replies) {
+				if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT) ) {
+					pushString(stringsResources, resourcesStrings, r.text, getPotContextComment(d)+":"+d.replies.indexOf(r));
+				}
+			}
+		}
+		
+		for (ItemCategory ic : gsrc.gameData.itemCategories) {
+			pushString(stringsResources, resourcesStrings, ic.name, getPotContextComment(ic));
+		}
+		
+		for (Item i : gsrc.gameData.items) {
+			pushString(stringsResources, resourcesStrings, i.name, getPotContextComment(i));
+			pushString(stringsResources, resourcesStrings, i.description, getPotContextComment(i)+":description");
+		}
+		
+		for (NPC npc : gsrc.gameData.npcs ) {
+			pushString(stringsResources, resourcesStrings, npc.name, getPotContextComment(npc));
+		}
+		
+		for (Quest q : gsrc.gameData.quests) {
+			if (q.visible_in_log != null && q.visible_in_log != 0) {
+				pushString(stringsResources, resourcesStrings, q.name, getPotContextComment(q));
+				for (QuestStage qs : q.stages) {
+					pushString(stringsResources, resourcesStrings, qs.log_text, getPotContextComment(q)+":"+Integer.toString(qs.progress));
+				}
+			}
+		}
+		
+		for (WorldmapSegment ws : gsrc.worldmap) {
+			for (WorldmapSegment.NamedArea area : ws.labels.values()) {
+				pushString(stringsResources, resourcesStrings, area.name, gsrc.worldmap.worldmapFile.getName()+":"+ws.id+":"+area.id);
+			}
+		}
+		
+		File f = new File(proj.alteredContent.baseFolder, "english.pot");
+		PoPotWriter.writePotFile(stringsResources, f);
+		
+	}
+	
+	private static void pushString (Map<String, List<String>> stringsResources, Map<String, String> resourcesStrings, String translatableString, String resourceIdentifier) {
+		if (translatableString == null) return;
+		if (translatableString.length() == 0) return;
+		if (translatableString.contains("\"")) {
+			translatableString = translatableString.replaceAll("\"", "\\\\\"");
+		}
+		if (translatableString.contains("\n")) {
+			translatableString = translatableString.replaceAll("\n", "\\\\n\"\n\"");
+			translatableString = "\"\n\""+translatableString;
+		}
+		resourcesStrings.put(resourceIdentifier, translatableString);
+		List<String> resourceIdentifiers = stringsResources.get(translatableString);
+		if (resourceIdentifiers == null) {
+			resourceIdentifiers = new LinkedList<String>();
+			stringsResources.put(translatableString, resourceIdentifiers);
+		}
+		resourceIdentifiers.add(resourceIdentifier);
+	}
+	
+	private static String getPotContextComment(JSONElement e) {
+		return e.jsonFile.getName()+":"+e.id;
+	}
+
+	
+}

src/com/gpl/rpg/atcontentstudio/model/tools/resoptimizer/ResourcesCompactor.java

@@ -0,0 +1,381 @@
+package com.gpl.rpg.atcontentstudio.model.tools.resoptimizer;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.CharBuffer;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+
+import org.json.simple.JSONArray;
+
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
+import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+import com.gpl.rpg.atcontentstudio.model.sprites.SpriteSheetSet;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
+import com.whoischarles.util.json.Minify;
+import com.whoischarles.util.json.Minify.UnterminatedCommentException;
+import com.whoischarles.util.json.Minify.UnterminatedRegExpLiteralException;
+import com.whoischarles.util.json.Minify.UnterminatedStringLiteralException;
+
+import tiled.core.TileSet;
+import tiled.io.TMXMapWriter;
+
+/**
+ * 
+ * @author Kevin
+ * 
+ * To use this, paste the following script in the beanshell console of ATCS.
+ * Don't forget to change the project number to suit your needs.
+ * 
+import com.gpl.rpg.atcontentstudio.model.tools.resoptimizer.ResourcesCompactor;
+import com.gpl.rpg.atcontentstudio.model.Workspace;
+
+proj = Workspace.activeWorkspace.projects.get(0);
+new ResourcesCompactor(proj).compactData();
+ *
+ */
+public class ResourcesCompactor {
+
+	public static String DEFAULT_REL_PATH_IN_PROJECT = "compressed"+File.separator;
+	
+	private Project proj;
+	private File baseFolder;
+	private List<CompressedSpritesheet> compressedSpritesheets = new LinkedList<CompressedSpritesheet>();
+	private List<File> preservedSpritesheets = new LinkedList<File>();
+	
+	private Map<SpritesheetId, SpritesheetId> spritesRelocationForObjects = new LinkedHashMap<SpritesheetId, SpritesheetId>();
+	private Integer currentSpritesheetIndexForObjects = 0;
+	private CompressedSpritesheet currentSpritesheetForObjects = null;
+
+	private Map<SpritesheetId, SpritesheetId> spritesRelocationForMaps = new LinkedHashMap<SpritesheetId, SpritesheetId>();
+	private Map<SpritesheetId, CompressedSpritesheet> spritesheetsBySidForMaps = new LinkedHashMap<SpritesheetId, CompressedSpritesheet>();
+	private Integer currentSpritesheetIndexForMaps = 0;
+	private CompressedSpritesheet currentSpritesheetForMaps = null;
+	
+	public ResourcesCompactor(Project proj) {
+		this.proj = proj;
+		this.baseFolder = new File(proj.baseFolder, DEFAULT_REL_PATH_IN_PROJECT);
+		if (!baseFolder.exists()) baseFolder.mkdirs();
+	}
+	
+	public void compactData() {
+		compactJsonData();
+		for(CompressedSpritesheet cs : compressedSpritesheets) {
+			cs.drawFile();
+		}
+		for (File preserved : preservedSpritesheets) {
+			FileUtils.copyFile(preserved, new File(baseFolder.getAbsolutePath()+File.separator+DEFAULT_DRAWABLE_REL_PATH+File.separator+preserved.getName()));
+		}
+		compactMaps();
+	}
+	
+	public void compactJsonData() {
+		final List<File> filesCovered = new LinkedList<File>();
+		
+		File folder = new File(baseFolder.getAbsolutePath()+File.separator+GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
+		if (!folder.exists()) folder.mkdirs();
+		
+		for (ActorCondition ac : proj.baseContent.gameData.actorConditions) {
+			if (filesCovered.contains(ac.jsonFile)) continue;
+			File currentFile = ac.jsonFile;
+			filesCovered.add(currentFile);
+			List<Map> dataToSave = new ArrayList<Map>();
+			for (ActorCondition acond : proj.baseContent.gameData.actorConditions) {
+				if (!acond.jsonFile.equals(currentFile)) continue;
+				Map json = acond.toJson();
+				json.put("iconID", convertObjectSprite(acond.icon_id).toStringID());
+				dataToSave.add(json);
+			}
+			File target = new File(folder, ac.jsonFile.getName());
+			writeJson(dataToSave, target);
+		}
+		
+		for (Item it : proj.baseContent.gameData.items) {
+			if (filesCovered.contains(it.jsonFile)) continue;
+			File currentFile = it.jsonFile;
+			filesCovered.add(currentFile);
+			List<Map> dataToSave = new ArrayList<Map>();
+			for (Item item : proj.baseContent.gameData.items) {
+				if (!item.jsonFile.equals(currentFile)) continue;
+				Map json = item.toJson();
+				json.put("iconID", convertObjectSprite(item.icon_id).toStringID());
+				dataToSave.add(json);
+			}
+			File target = new File(folder, it.jsonFile.getName());
+			writeJson(dataToSave, target);
+		}
+		
+
+		for (NPC np : proj.baseContent.gameData.npcs) {
+			if (filesCovered.contains(np.jsonFile)) continue;
+			File currentFile = np.jsonFile;
+			filesCovered.add(currentFile);
+			List<Map> dataToSave = new ArrayList<Map>();
+			for (NPC npc : proj.baseContent.gameData.npcs) {
+				if (!npc.jsonFile.equals(currentFile)) continue;
+				Map json = npc.toJson();
+				if (proj.getImage(npc.icon_id).getWidth(null) == TILE_WIDTH_IN_PIXELS || proj.getImage(npc.icon_id).getHeight(null) == TILE_HEIGHT_IN_PIXELS) {
+					json.put("iconID", convertObjectSprite(npc.icon_id).toStringID());
+				}
+				dataToSave.add(json);
+			}
+			File target = new File(folder, np.jsonFile.getName());
+			writeJson(dataToSave, target);
+		}
+		
+		File[] remainingFiles = proj.baseContent.gameData.baseFolder.listFiles(new FileFilter() {
+			@Override
+			public boolean accept(File arg0) {
+				return arg0.getName().endsWith(".json") && !filesCovered.contains(arg0);
+			}
+		});
+		
+		for (File source : remainingFiles) {
+			File target = new File(folder, source.getName());
+			minifyJson(source, target);
+		}
+	}
+
+	private Minify jsonMinifier = new Minify();
+	
+	private void writeJson(List<Map> dataToSave, File target) {
+		StringWriter writer = new JsonPrettyWriter();
+		try {
+			JSONArray.writeJSONString(dataToSave, writer);
+		} catch (IOException e) {
+			//Impossible with a StringWriter
+		}
+		String toWrite = writer.toString();
+		try {
+			FileWriter w = new FileWriter(target);
+			w.write(jsonMinifier.minify(toWrite));
+			w.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void minifyJson(File source, File target) {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		try {
+			FileInputStream fis = new FileInputStream(source);
+			jsonMinifier.minify(fis, baos);
+			FileWriter w = new FileWriter(target);
+			w.write(baos.toString());
+			w.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} catch (UnterminatedRegExpLiteralException e) {
+			e.printStackTrace();
+		} catch (UnterminatedCommentException e) {
+			e.printStackTrace();
+		} catch (UnterminatedStringLiteralException e) {
+			e.printStackTrace();
+		}
+	}
+	private void compactMaps() {
+		for (TMXMap map : proj.baseContent.gameMaps.tmxMaps) {
+			TMXMap clone = map.clone();
+			for (GameDataElement gde : clone.getBacklinks()) {
+				gde.removeBacklink(clone);
+			}
+			clone.getBacklinks().clear();
+			tiled.core.Map tmx = clone.tmxMap;
+			compactMap(tmx, map.id);
+			clone.tmxMap = null;
+			clone.groups.clear();
+			clone = null;
+		}
+	}
+	
+	private void compactMap(tiled.core.Map tmx, String name) {
+		File target = new File(baseFolder.getAbsolutePath()+File.separator+TMXMapSet.DEFAULT_REL_PATH_IN_SOURCE+File.separator+name+".tmx");
+		if (!target.getParentFile().exists()) target.getParentFile().mkdirs();
+		
+		Map<tiled.core.Tile, SpritesheetId> localConvertions = new LinkedHashMap<tiled.core.Tile, SpritesheetId>();
+		List<CompressedSpritesheet> usedSpritesheets = new LinkedList<CompressedSpritesheet>();
+		
+		List<tiled.core.TileSet> toRemove = new LinkedList<TileSet>();
+		
+		for (tiled.core.TileSet ts : tmx.getTileSets()) {
+			if (!ts.getName().equalsIgnoreCase("map_dynamic_placeholders")) {
+				toRemove.add(ts);
+			}
+		}
+		
+		for (tiled.core.TileLayer layer : tmx.getTileLayers()) {
+			for (int x = 0; x < layer.getWidth(); x++) {
+				for (int y = 0; y < layer.getHeight(); y++) {
+					tiled.core.Tile tile = layer.getTileAt(x, y);
+					if (tile != null && !tile.getTileSet().getName().equalsIgnoreCase("map_dynamic_placeholders")) {
+						SpritesheetId sid = convertMapSprite(SpritesheetId.toStringID(tile.getTileSet().getName(), tile.getId()));
+						localConvertions.put(tile, sid);
+						if (!usedSpritesheets.contains(spritesheetsBySidForMaps.get(sid))) {
+							usedSpritesheets.add(spritesheetsBySidForMaps.get(sid));
+						}
+					}
+				}
+			}
+		}
+		
+		Map<CompressedSpritesheet, tiled.core.TileSet> csToTs = new LinkedHashMap<CompressedSpritesheet, tiled.core.TileSet>();
+		for (CompressedSpritesheet cs : usedSpritesheets) {
+			cs.drawFile();
+			tiled.core.TileSet ts = new tiled.core.TileSet();
+			csToTs.put(cs, ts);
+			tiled.util.BasicTileCutter cutter = new tiled.util.BasicTileCutter(TILE_WIDTH_IN_PIXELS, TILE_HEIGHT_IN_PIXELS, 0, 0);
+			try {
+				ts.importTileBitmap(cs.f.getAbsolutePath(), cutter);
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			ts.setName(cs.prefix+Integer.toString(cs.index));
+			//ts.setSource("../drawable/"+ts.getName()+TILESHEET_SUFFIX);
+			tmx.addTileset(ts);
+		}
+		
+		for (tiled.core.TileLayer layer : tmx.getTileLayers()) {
+			for (tiled.core.Tile tile : localConvertions.keySet()) {
+				SpritesheetId sid = localConvertions.get(tile);
+				layer.replaceTile(tile, csToTs.get(spritesheetsBySidForMaps.get(sid)).getTile(sid.offset));
+			}
+		}
+		
+		for (tiled.core.TileSet ts : toRemove) {
+			tmx.removeTileset(ts);
+		}
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		TMXMapWriter writer = new TMXMapWriter();
+		writer.settings.layerCompressionMethod = TMXMapWriter.Settings.LAYER_COMPRESSION_METHOD_ZLIB;
+		try {
+			writer.writeMap(tmx, baos, target.getAbsolutePath());
+			String xml = baos.toString();
+			FileWriter w = new FileWriter(target);
+			w.write(xml);
+			w.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+	}
+	
+	private SpritesheetId convertObjectSprite(String originalSpriteId) {
+		if (spritesRelocationForObjects.containsKey(SpritesheetId.getInstance(originalSpriteId))) {
+			return spritesRelocationForObjects.get(SpritesheetId.getInstance(originalSpriteId));
+		} else if (currentSpritesheetForObjects == null || !currentSpritesheetForObjects.hasFreeSlot()) {
+			currentSpritesheetForObjects = new CompressedSpritesheet(TILESHEET_PREFIX_FOR_OBJECTS, currentSpritesheetIndexForObjects);
+			compressedSpritesheets.add(currentSpritesheetForObjects);
+			currentSpritesheetIndexForObjects++;
+		}
+		SpritesheetId sid = currentSpritesheetForObjects.addSprite(originalSpriteId);
+		spritesRelocationForObjects.put(SpritesheetId.getInstance(originalSpriteId), sid);
+		return sid;
+	}
+	
+	private SpritesheetId convertMapSprite(String originalSpriteId) {
+		if (spritesRelocationForMaps.containsKey(SpritesheetId.getInstance(originalSpriteId))) {
+			return spritesRelocationForMaps.get(SpritesheetId.getInstance(originalSpriteId));
+		} else if (currentSpritesheetForMaps == null || !currentSpritesheetForMaps.hasFreeSlot()) {
+			currentSpritesheetForMaps = new CompressedSpritesheet(TILESHEET_PREFIX_FOR_MAPS, currentSpritesheetIndexForMaps);
+			compressedSpritesheets.add(currentSpritesheetForMaps);
+			currentSpritesheetIndexForMaps++;
+		}
+		SpritesheetId sid = currentSpritesheetForMaps.addSprite(originalSpriteId);
+		spritesRelocationForMaps.put(SpritesheetId.getInstance(originalSpriteId), sid);
+		spritesheetsBySidForMaps.put(sid, currentSpritesheetForMaps);
+		return sid;
+	}
+	
+	
+	private static final int TILESHEET_WIDTH_IN_SPRITES = 8;
+	private static final int TILESHEET_HEIGHT_IN_SPRITES = 8;
+	private static final int TILE_WIDTH_IN_PIXELS = 32;
+	private static final int TILE_HEIGHT_IN_PIXELS = 32;
+	
+	private static final String TILESHEET_PREFIX_FOR_OBJECTS = "obj_";
+	private static final String TILESHEET_PREFIX_FOR_MAPS = "map_";
+	private static final String TILESHEET_SUFFIX = ".png";
+	
+	private static final String DEFAULT_DRAWABLE_REL_PATH = SpriteSheetSet.DEFAULT_REL_PATH_IN_SOURCE;
+	
+	private class CompressedSpritesheet {
+		String prefix;
+		int index;
+		File f;
+
+		
+		boolean mustDraw = true;
+		int nextFreeSlot = 0;
+		String[] originalSpritesId = new String[TILESHEET_WIDTH_IN_SPRITES * TILESHEET_HEIGHT_IN_SPRITES];
+		
+		public CompressedSpritesheet(String prefix, int index) {
+			this.prefix = prefix;
+			this.index = index;
+			
+			File folder = new File(ResourcesCompactor.this.baseFolder.getAbsolutePath()+File.separator+DEFAULT_DRAWABLE_REL_PATH);
+			if (!folder.exists()) folder.mkdirs();
+			this.f = new File(folder, prefix+Integer.toString(index)+TILESHEET_SUFFIX);
+		}
+		
+		public boolean hasFreeSlot() {
+			return nextFreeSlot < TILESHEET_WIDTH_IN_SPRITES * TILESHEET_HEIGHT_IN_SPRITES;
+		}
+		
+		public SpritesheetId addSprite(String spriteId) {
+			mustDraw = true;
+			originalSpritesId[nextFreeSlot] = spriteId;
+			nextFreeSlot++;
+			return SpritesheetId.getInstance(prefix+Integer.toString(index), nextFreeSlot - 1);
+		}
+		
+		
+		public void drawFile() {
+			if (!mustDraw) return;
+			BufferedImage img = new BufferedImage(TILESHEET_WIDTH_IN_SPRITES * TILE_WIDTH_IN_PIXELS, TILESHEET_HEIGHT_IN_SPRITES * TILE_HEIGHT_IN_PIXELS, BufferedImage.TYPE_INT_ARGB);
+			Graphics2D g = (Graphics2D)img.getGraphics();
+			Color transparent = new Color(0, 0, 0, 0);
+			g.setColor(transparent);
+			g.fillRect(0, 0, img.getWidth(), img.getHeight());
+			for (int i = 0; i < nextFreeSlot; i++) {
+				g.drawImage(
+						proj.getImage(originalSpritesId[i]),
+						(i % TILESHEET_WIDTH_IN_SPRITES) * TILE_WIDTH_IN_PIXELS,
+						(i / TILESHEET_WIDTH_IN_SPRITES) * TILE_HEIGHT_IN_PIXELS,
+						TILE_WIDTH_IN_PIXELS,
+						TILE_HEIGHT_IN_PIXELS,
+						null);
+			}
+			try {
+				ImageIO.write(img, "png", f);
+				mustDraw = false;
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+}
+
+	

src/com/gpl/rpg/atcontentstudio/model/tools/resoptimizer/SpritesheetId.java

@@ -0,0 +1,38 @@
+package com.gpl.rpg.atcontentstudio.model.tools.resoptimizer;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class SpritesheetId {
+	static Map<String, SpritesheetId> instancesCache = new LinkedHashMap<String, SpritesheetId>(); 
+
+	String tileset;
+	int offset;
+
+	static SpritesheetId getInstance(String id) {
+		String[] values = id.split(":");
+		return getInstance(values[0], Integer.parseInt(values[1]));
+	}
+
+	static SpritesheetId getInstance(String tilesetId, int offset) {
+		if (!instancesCache.containsKey(toStringID(tilesetId, offset))) {
+			SpritesheetId instance = new SpritesheetId(tilesetId, offset);
+			instancesCache.put(instance.toStringID(), instance);
+		}
+		return instancesCache.get(toStringID(tilesetId, offset));
+	}
+
+	private SpritesheetId(String tileset, int offset) {
+		this.tileset = tileset;
+		this.offset = offset;
+	}
+
+	public String toStringID() {
+		return toStringID(tileset, offset);
+	}
+
+	static String toStringID(String tileset, int offset) {
+		return tileset+":"+Integer.toString(offset);
+	}
+
+}

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) {
-					if (dialogue.dialogue != null && dialogue.dialogue.replies != null) {
+						List<Dialogue.Reply> linked = new ArrayList<Dialogue.Reply>(dialogue.dialogue.replies.size());
-						//Try to hook to existing replies... not as easy when there's no ID.
+						if (dialogue.dialogue != null && dialogue.dialogue.replies != null) {
-						Dialogue.Reply best = null;
+							//Try to hook to existing replies... not as easy when there's no ID.
-						int score, maxScore = 0;
+							Dialogue.Reply best = null;
-						for (Dialogue.Reply dReply : dialogue.dialogue.replies) {
+							int score, maxScore = 0;
-							//Never link twice to the same...
+							for (Dialogue.Reply dReply : dialogue.dialogue.replies) {
-							if (linked.contains(dReply)) continue;
+								//Never link twice to the same...
-							score = 0;
+								if (linked.contains(dReply)) continue;
-							//Arbitrary values... hopefully this gives good results.
+								score = 0;
-							//Same target gives good hope of preserving at least the structure.
+								//Arbitrary values... hopefully this gives good results.
-							if (dReply.next_phrase_id != null && dReply.next_phrase_id.equals(reply.next_dialogue_id)) score +=50;
+								//Same target gives good hope of preserving at least the structure.
-							//Same text is almost as good as an ID, but there may be duplicates due to requirements system...
+								if (dReply.next_phrase_id != null && dReply.next_phrase_id.equals(reply.next_dialogue_id)) score +=50;
-							if (dReply.text != null && dReply.text.equals(reply.text)) score +=40;
+								//Same text is almost as good as an ID, but there may be duplicates due to requirements system...
-							//Same slot in the list. That's not so bad if all else fails, and could help sort duplicates with same text.
+								if (dReply.text != null && dReply.text.equals(reply.text)) score +=40;
-							if (dialogue.dialogue.replies.indexOf(dReply) == dialogue.replies.indexOf(reply)) score +=20;
+								//Same slot in the list. That's not so bad if all else fails, and could help sort duplicates with same text.
-							//Both have null text. It's not much, but it's something....
+								if (dialogue.dialogue.replies.indexOf(dReply) == dialogue.replies.indexOf(reply)) score +=20;
-							if (dReply.text == null && reply.text == null) score += 10;
+								//Both have null text. It's not much, but it's something....
-							if (score > maxScore) {
+								if (dReply.text == null && reply.text == null) score += 10;
-								maxScore = score;
+								if (score > maxScore) {
-								best = dReply;
+									maxScore = score;
-							}							
+									best = dReply;
-						}
+								}							
-						if (maxScore > 0) {
+							}
-							reply.reply = best;
+							if (maxScore > 0) {
-							linked.add(best);
+								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/AboutEditor.java

@@ -51,6 +51,7 @@ public class AboutEditor extends Editor {
 			"<br/>" +
 			"Contributors: <br/>" +
 			"Quentin Delvallet<br/>" +
+			"<EFBFBD>i<EFBFBD>kin<br/>" +
 			"<br/>" +
 			"This project uses the following libraries:<br/>" +
 			"<a href=\"http://code.google.com/p/json-simple/\">JSON.simple</a> by Yidong Fang & Chris Nokleberg.<br/>" +
@@ -78,6 +79,12 @@ public class AboutEditor extends Editor {
 			"<a href=\"https://jsoup.org/\">jsoup</a> by Jonathan Hedley<br/>" +
 			"License: <a href=\"https://jsoup.org/license\">MIT License</a><br/>" +
 			"<br/>" +
+			"A slightly modified version of <a href=\"https://launchpad.net/po-parser\">General PO Parser</a> by Bal<61>zs T<>th<br/>" +
+			"License: <a href=\"http://www.gnu.org/licenses/gpl-3.0.html\">GPL v3</a><br/>" +
+			"<br/>" +
+			"A slightly modified version of <a href=\"www.whoischarles.com\">Minify.java</a> by Charles Bihis<br/>" +
+			"License: <a href=\"https://github.com/charlesbihis/minify#license\">Douglas Crockford variant of MIT License</a><br/>" +
+			"<br/>" +
 			"See the tabs below to find the full license text for each of these.<br/>" +
 			"<br/>" +
 			"The Windows installer was created with:<br/>" +
@@ -129,6 +136,8 @@ public class AboutEditor extends Editor {
 		editorTabsHolder.add("BeanShell License", getInfoPane(new Scanner(ATContentStudio.class.getResourceAsStream("/LICENSE.LGPLv3.txt"), "UTF-8").useDelimiter("\\A").next(), "text/text"));
 		editorTabsHolder.add("SipHash for Java License", getInfoPane(new Scanner(ATContentStudio.class.getResourceAsStream("/LICENSE.siphash-zackehh.txt"), "UTF-8").useDelimiter("\\A").next(), "text/text"));
 		editorTabsHolder.add("jsoup License", getInfoPane(new Scanner(ATContentStudio.class.getResourceAsStream("/LICENSE.jsoup.txt"), "UTF-8").useDelimiter("\\A").next(), "text/text"));
+		editorTabsHolder.add("General PO Parser License", getInfoPane(new Scanner(ATContentStudio.class.getResourceAsStream("/LICENSE.GPLv3.txt"), "UTF-8").useDelimiter("\\A").next(), "text/text"));
+		editorTabsHolder.add("Minify.java License", getInfoPane(new Scanner(ATContentStudio.class.getResourceAsStream("/LICENSE.minify.txt"), "UTF-8").useDelimiter("\\A").next(), "text/text"));
 		editorTabsHolder.add("ATCS License", getInfoPane(new Scanner(ATContentStudio.class.getResourceAsStream("/LICENSE.GPLv3.txt"), "UTF-8").useDelimiter("\\A").next(), "text/text"));
 		
 	}

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 {
@@ -74,6 +75,14 @@ public class DefaultIcons {
 	private static String FOLDER_AT_OPEN_RES = "/com/gpl/rpg/atcontentstudio/img/folder_at_open.png";
 	public static Image getATOpenImage() { return getImage(FOLDER_AT_OPEN_RES); }
 	public static Image getATOpenIcon() { return getIcon(FOLDER_AT_OPEN_RES); }
+	
+	private static String FOLDER_BOOKMARK_CLOSED_RES = "/com/gpl/rpg/atcontentstudio/img/folder_bookmark_closed.png";
+	public static Image getBookmarkClosedImage() { return getImage(FOLDER_BOOKMARK_CLOSED_RES); }
+	public static Image getBookmarkClosedIcon() { return getIcon(FOLDER_BOOKMARK_CLOSED_RES); }
+
+	private static String FOLDER_BOOKMARK_OPEN_RES = "/com/gpl/rpg/atcontentstudio/img/folder_bookmark_open.png";
+	public static Image getBookmarkOpenImage() { return getImage(FOLDER_BOOKMARK_OPEN_RES); }
+	public static Image getBookmarkOpenIcon() { return getIcon(FOLDER_BOOKMARK_OPEN_RES); }
 
 	private static String TILED_ICON_RES = "/com/gpl/rpg/atcontentstudio/img/tiled-icon.png";
 	public static Image getTiledIconImage() { return getImage(TILED_ICON_RES); }
@@ -107,6 +116,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 +143,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); }
@@ -235,6 +256,14 @@ public class DefaultIcons {
 	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); }
@@ -255,6 +284,14 @@ public class DefaultIcons {
 	public static Image getStatusUnknownImage() { return getImage(STATUS_UNKNOWN_RES); }
 	public static Image getStatusUnknownIcon() { return getIcon(STATUS_UNKNOWN_RES); }
 	
+	private static String BOOKMARK_INACTIVE = "/com/gpl/rpg/atcontentstudio/img/bookmark_inactive.png";
+	public static Image getBookmarkInactiveImage() { return getImage(BOOKMARK_INACTIVE); }
+	public static Image getBookmarkInactiveIcon() { return getIcon(BOOKMARK_INACTIVE); }
+	
+	private static String BOOKMARK_ACTIVE = "/com/gpl/rpg/atcontentstudio/img/bookmark_active.png";
+	public static Image getBookmarkActiveImage() { return getImage(BOOKMARK_ACTIVE); }
+	public static Image getBookmarkActiveIcon() { return getIcon(BOOKMARK_ACTIVE); }
+	
 	
 	private static Image getImage(String res) {
 		if (imageCache.get(res) == null) {
@@ -271,7 +308,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

@@ -39,7 +39,6 @@ import javax.swing.JSpinner.NumberEditor;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.ListModel;
-import javax.swing.Scrollable;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -316,11 +315,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);
@@ -649,7 +652,7 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 		return gdeBox;
 	}
 	
-	public JComboBox<QuestStage> addQuestStageBox(JPanel pane, Project proj, String label, Integer initialValue, boolean writable, final FieldUpdateListener listener, Quest quest, final JComboBox questSelectionBox) {
+	public JComboBox<QuestStage> addQuestStageBox(JPanel pane, Project proj, String label, Integer initialValue, boolean writable, final FieldUpdateListener listener, Quest quest, @SuppressWarnings("rawtypes") final JComboBox questSelectionBox) {
 		JPanel gdePane = new JPanel();
 		gdePane.setLayout(new JideBoxLayout(gdePane, JideBoxLayout.LINE_AXIS, 6));
 		JLabel gdeLabel = new JLabel(label);
@@ -699,7 +702,7 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 	
 	
 	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({ "rawtypes"})
 	public JList addBacklinksList(JPanel pane, GameDataElement gde) {
 		return addBacklinksList(pane, gde, "Elements linking to this one");
 	}
@@ -809,7 +812,7 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 						if (text.length() > 60) {
 							text = text.substring(0, 57)+"...";
 						}
-						label.setText(((GameDataElement)value).getDataType().toString()+"/"+((Quest)((QuestStage)value).parent).id+":"+text);
+						label.setText(((GameDataElement)value).getDataType().toString()+"/"+((Quest)((QuestStage)value).parent).id+"#"+((QuestStage)value).progress+":"+text);
 					} else {
 						label.setText(((GameDataElement)value).getDataType().toString()+"/"+((GameDataElement)value).getDesc());
 					}
@@ -863,7 +866,6 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 			return currentQuest.stages.get(index - 1);
 		}
 		
-		@SuppressWarnings("unchecked")
 		@Override
 		public void setSelectedItem(Object anItem) {
 			selected = (QuestStage) anItem;

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

@@ -0,0 +1,226 @@
+package com.gpl.rpg.atcontentstudio.ui;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+import com.gpl.rpg.atcontentstudio.model.sprites.SpriteSheetSet;
+import com.jidesoft.swing.JideBoxLayout;
+
+public class ExportProjectWizard extends JDialog {
+
+	private static final long serialVersionUID = -8745083621008868612L;
+	
+	JPanel pane;
+	JLabel errorLabel, fileSelectionLabel;
+	JRadioButton asZip, overSources;
+	JComboBox<String> target;
+	JButton browse;
+	JButton okButton, cancelButton;
+	
+	Project proj;
+	
+	public ExportProjectWizard(Project proj) {
+		
+		super(ATContentStudio.frame);
+		setTitle("Export project for inclusion in-game");
+		
+		this.proj = proj;
+		
+		pane = new JPanel();
+		pane.setLayout(new JideBoxLayout(pane, JideBoxLayout.PAGE_AXIS, 6));
+		
+		errorLabel = new JLabel();
+
+		pane.add(errorLabel, JideBoxLayout.FIX);
+		pane.add(new JLabel("Export this ATCS project..."), JideBoxLayout.FIX);
+		
+		ButtonGroup radioGroup = new ButtonGroup();
+		
+		asZip = new JRadioButton("... as a Zip archive");
+		radioGroup.add(asZip);
+		overSources = new JRadioButton("... into a game source folder");
+		radioGroup.add(overSources);
+		asZip.setSelected(true);
+
+		pane.add(asZip, JideBoxLayout.FIX);
+		pane.add(overSources, JideBoxLayout.FIX);
+		
+		ActionListener updateListener = new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				updateState();
+			}
+		};
+		asZip.addActionListener(updateListener);
+		overSources.addActionListener(updateListener);
+		
+		target = new JComboBox<String>();
+		target.setEditable(true);
+		target.addActionListener(updateListener);
+		browse = new JButton("Browse");
+		browse.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				JFileChooser jfc = new JFileChooser(){
+					private static final long serialVersionUID = -3001082967957619011L;
+					@Override
+					public boolean accept(File f) {
+						if (asZip.isSelected()) {
+							if (f.isDirectory() || f.getName().endsWith(".zip") || f.getName().endsWith(".ZIP")) {
+								return super.accept(f);
+							} else {
+								return false;
+							} 
+						} else {
+							return f.isDirectory();
+						}
+					}
+				};
+				jfc.setFileSelectionMode(asZip.isSelected() ? JFileChooser.FILES_AND_DIRECTORIES : JFileChooser.DIRECTORIES_ONLY);
+				jfc.setSelectedFile(new File(target.getSelectedItem() == null ? "" : target.getSelectedItem().toString()));
+				jfc.setMultiSelectionEnabled(false);
+				int result = jfc.showOpenDialog(ATContentStudio.frame);
+				if (result == JFileChooser.APPROVE_OPTION) {
+					File f = jfc.getSelectedFile();
+					if (asZip.isSelected() && !f.getAbsolutePath().substring(f.getAbsolutePath().length() - 4, f.getAbsolutePath().length()).equalsIgnoreCase(".zip")) {
+						f = new File(f.getAbsolutePath()+".zip");
+					}
+					target.setSelectedItem(f.getAbsolutePath());
+					updateState();
+				}
+			}
+		});
+		JPanel fileSelectionPane = new JPanel();
+		fileSelectionPane.setLayout(new JideBoxLayout(fileSelectionPane, JideBoxLayout.LINE_AXIS, 6));
+		fileSelectionLabel = new JLabel("Zip file: ");
+		fileSelectionPane.add(fileSelectionLabel, JideBoxLayout.FIX);
+		fileSelectionPane.add(target, JideBoxLayout.VARY);
+		fileSelectionPane.add(browse, JideBoxLayout.FIX);
+		
+		pane.add(fileSelectionPane, JideBoxLayout.FIX);
+		
+		JPanel buttonPane = new JPanel();
+		buttonPane.setLayout(new JideBoxLayout(buttonPane, JideBoxLayout.LINE_AXIS, 6));
+		buttonPane.add(new JPanel(), JideBoxLayout.VARY);
+		cancelButton = new JButton("Cancel");
+		buttonPane.add(cancelButton, JideBoxLayout.FIX);
+		okButton = new JButton("Ok");
+		buttonPane.add(okButton, JideBoxLayout.FIX);
+		
+		pane.add(new JPanel(), JideBoxLayout.VARY);
+		
+		pane.add(buttonPane, JideBoxLayout.FIX);
+		
+		
+		cancelButton.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				ExportProjectWizard.this.setVisible(false);
+				ExportProjectWizard.this.dispose();
+			}
+		});
+		
+		okButton.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (asZip.isSelected()) {
+					ExportProjectWizard.this.proj.exportProjectAsZipPackage(new File(target.getSelectedItem().toString()));
+				} else {
+					ExportProjectWizard.this.proj.exportProjectOverGameSource(new File(target.getSelectedItem().toString()));
+				}
+				ExportProjectWizard.this.setVisible(false);
+				ExportProjectWizard.this.dispose();
+			}
+		});
+		
+		updateState();
+		
+		getContentPane().setLayout(new BorderLayout());
+		getContentPane().add(pane, BorderLayout.CENTER);
+		
+		setMinimumSize(new Dimension(500,150));
+		pack();
+
+		Dimension sdim = Toolkit.getDefaultToolkit().getScreenSize();
+		Dimension wdim = getSize();
+		setLocation((sdim.width - wdim.width)/2, (sdim.height - wdim.height)/2);
+	}
+	
+	private void updateState() {
+		if (asZip.isSelected()) {
+			fileSelectionLabel.setText("Zip file: ");
+		} else {
+			fileSelectionLabel.setText("Game source folder: ");
+		}
+		
+		
+		File f = new File(target.getSelectedItem() == null ? "" : target.getSelectedItem().toString());
+		if (asZip.isSelected()) {
+			if (target.getSelectedItem() == null || target.getSelectedItem().toString().length() <= 0) {
+				errorLabel.setText("<html><font color=\"#FF0000\">You must select where to save the zip file.</font></html>");
+				okButton.setEnabled(false);
+			} else if (f.isDirectory()) {
+				errorLabel.setText("<html><font color=\"#FF0000\">The selected target is a directory. It should be a zip file.</font></html>");
+				okButton.setEnabled(false);
+			} else if (!(f.getName().toLowerCase().endsWith(".zip"))) {
+				errorLabel.setText("<html><font color=\"#FF0000\">The selected target is not a zip file. It should be a zip file.</font></html>");
+				okButton.setEnabled(false);
+			} else if (f.exists()) {
+				errorLabel.setText("<html><font color=\"#FF9000\">The selected target is an existing zip file. It will be overwritten.</font></html>");
+				okButton.setEnabled(true);
+			} else {
+				errorLabel.setText("<html><font color=\"#00AA00\">Everything looks good !</font></html>");
+				okButton.setEnabled(true);
+			}
+		} else {
+			if (target.getSelectedItem() == null || target.getSelectedItem().toString().length() <= 0) {
+				errorLabel.setText("<html><font color=\"#FF0000\">You must select an AT source root folder.</font></html>");
+				okButton.setEnabled(false);
+			} else if (!f.isDirectory() || !f.exists()) {
+				errorLabel.setText("<html><font color=\"#FF0000\">The selected AT source is not a folder. It should be an existing AT source root folder.</font></html>");
+				okButton.setEnabled(false);
+			} else {
+				File res = new File(f, GameDataSet.DEFAULT_REL_PATH_IN_SOURCE);
+				File drawable = new File(f, SpriteSheetSet.DEFAULT_REL_PATH_IN_SOURCE);
+				File xml = new File(f, TMXMapSet.DEFAULT_REL_PATH_IN_SOURCE);
+				if (!res.exists()) {
+					errorLabel.setText("<html><font color=\"#FF9000\">The selected AT source root folder does not contain the \"res\" folder.</font></html>");
+					okButton.setEnabled(true);
+				} else if (!drawable.exists()) {
+					errorLabel.setText("<html><font color=\"#FF9000\">The selected AT source root folder does not contain the \"drawable\" folder.</font></html>");
+					okButton.setEnabled(true);
+				} else if (!xml.exists()) {
+					errorLabel.setText("<html><font color=\"#FF9000\">The selected AT source root folder does not contain the \"xml\" folder.</font></html>");
+					okButton.setEnabled(true);
+				} else {
+					errorLabel.setText("<html><font color=\"#00AA00\">Everything looks good !</font></html>");
+					okButton.setEnabled(true);
+				}
+			}
+		}
+		revalidate();
+		repaint();
+
+	}
+	
+
+}

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

@@ -33,6 +33,7 @@ import com.gpl.rpg.andorstrainer.AndorsTrainer;
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.Workspace;
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
 import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
@@ -140,14 +141,14 @@ public class ProjectsTree extends JPanel {
 		projectsTree.addTreeSelectionListener(new TreeSelectionListener() {
 			@Override
 			public void valueChanged(TreeSelectionEvent e) {
-				List<TreePath> newPaths = new ArrayList<TreePath>();
+//				List<TreePath> newPaths = new ArrayList<TreePath>();
-				for (TreePath path : e.getPaths()) {
+//				for (TreePath path : e.getPaths()) {
-					if (e.isAddedPath(path)) newPaths.add(path);
+//					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 +243,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());
@@ -595,6 +596,8 @@ public class ProjectsTree extends JPanel {
 			ATContentStudio.frame.openEditor((WorldmapSegment)node);
 		}  else if (node instanceof WriterModeData) {
 			ATContentStudio.frame.openEditor((WriterModeData)node);
+		}  else if (node instanceof BookmarkEntry) {
+			ATContentStudio.frame.openEditor(((BookmarkEntry)node).bookmarkedElement);
 		} else if (node instanceof SavedGame) {
 			if (konamiCodeEntered) {
 				ATContentStudio.frame.openEditor((SavedGame)node);

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) {
@@ -212,6 +213,8 @@ public class StudioFrame extends JFrame {
 			openEditor((Spritesheet) node);
 		} else if (node instanceof TMXMap) {
 			openEditor((TMXMap) node);
+		} else if (node instanceof WorldmapSegment) {
+			openEditor((WorldmapSegment) node);
 		} else if (node instanceof WriterModeData) {
 			openEditor((WriterModeData) node);
 		}

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,11 @@ 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;
@@ -56,6 +59,7 @@ public class WorkspaceActions {
 		public void actionPerformed(ActionEvent e) {
 			if (!(selectedNode instanceof Project)) return;
 			Workspace.closeProject((Project) selectedNode);
+			selectedNode = null;
 		};
 		public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
 			setEnabled(selectedNode instanceof Project);
@@ -122,19 +126,45 @@ public class WorkspaceActions {
 					ATContentStudio.frame.closeEditor(element);
 					element.childrenRemoved(new ArrayList<ProjectTreeNode>());
 					if (element instanceof JSONElement) {
-						@SuppressWarnings("unchecked")
+						if (element.getParent() instanceof GameDataCategory<?>) {
-						GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
+							@SuppressWarnings("unchecked")
-						category.remove(element);
+							GameDataCategory<JSONElement> category = (GameDataCategory<JSONElement>) element.getParent();
-						if (impactedCategories.get(category) == null) {
+							category.remove(element);
-							impactedCategories.put(category, new HashSet<File>());
+							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();
+						((TMXMap)element).delete();
-						parent.tmxMaps.remove(element);
+						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<?>) {
+						if (node instanceof JSONElement) {
-							((GameDataCategory<?>)node.getParent()).remove(node);
+							if (node.getParent() instanceof GameDataCategory<?>) {
-							List<SaveEvent> events = node.attemptSave();
+								((GameDataCategory<?>)node.getParent()).remove(node);
-							if (events == null || events.isEmpty()) {
+								List<SaveEvent> events = node.attemptSave();
-								node.save();
+								if (events == null || events.isEmpty()) {
-							} else {
+									node.save();
-								new SaveItemsWizard(events, null).setVisible(true);
+								} 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();
+							((TMXMap)node).delete();
-							parent.tmxMaps.remove(node);
+							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) {
@@ -294,21 +353,7 @@ public class WorkspaceActions {
 	public ATCSAction exportProject = new ATCSAction("Export project", "Generates a zip file containing all the created & altered resources of the project, ready to merge with the game source."){
 		public void actionPerformed(ActionEvent e) {
 			if (selectedNode == null || selectedNode.getProject() == null) return;
-			JFileChooser chooser = new JFileChooser() {
+			new ExportProjectWizard(selectedNode.getProject()).setVisible(true);
-				private static final long serialVersionUID = 8039332384370636746L;
-				public boolean accept(File f) {
-					return f.isDirectory() || f.getName().endsWith(".zip") || f.getName().endsWith(".ZIP"); 
-				}
-			};
-			chooser.setMultiSelectionEnabled(false);
-			int result = chooser.showSaveDialog(ATContentStudio.frame);
-			if (result == JFileChooser.APPROVE_OPTION) {
-				File f = chooser.getSelectedFile();
-				if (!f.getAbsolutePath().substring(f.getAbsolutePath().length() - 4, f.getAbsolutePath().length()).equalsIgnoreCase(".zip")) {
-					f = new File(f.getAbsolutePath()+".zip");
-				}
-				selectedNode.getProject().generateExportPackage(f);
-			}
 		};
 		public void selectionChanged(ProjectTreeNode selectedNode, TreePath[] selectedPaths) {
 			setEnabled(selectedNode != null && selectedNode.getProject() != null);
@@ -340,7 +385,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 +420,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 +458,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() {
+	public JPanel getInternetPane() {
-		CollapsiblePanel pane = new CollapsiblePanel("Translator options");
+		
+		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,22 @@ 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.");
+		checkUpdatesBox = new JCheckBox("Check for ATCS updates at startup");
-		pane.add(useInternetBox, JideBoxLayout.FIX);
+		pane.add(checkUpdatesBox, JideBoxLayout.FIX);
+		
+		useInternetBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				translatorLanguagesBox.setEnabled(useInternetBox.isSelected() && translatorModeBox.isSelected());
+				translatorModeBox.setEnabled(useInternetBox.isSelected());
+				checkUpdatesBox.setEnabled(useInternetBox.isSelected());
+			}
+		});
 		
 		translatorModeBox.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				translatorLanguagesBox.setEnabled(translatorModeBox.isSelected());
-				useInternetBox.setEnabled(translatorModeBox.isSelected());
 			}
 		});
 		
@@ -196,19 +209,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);
+			translatorLanguagesBox.setEnabled(useInternetBox.isSelected());
-			useInternetBox.setEnabled(true);
 		} 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 +233,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,17 @@ public class ActorConditionEditor extends JSONElementEditor {
 	private IntegerBasedCheckBox positiveBox;
 	private IntegerBasedCheckBox stackingBox;
 	
-	private JTextField roundVisualField;
+	//private JTextField roundVisualField;
+	@SuppressWarnings("rawtypes")
+	private JComboBox roundVisualField;
 	private JSpinner roundHpMinField;
 	private JSpinner roundHpMaxField;
 	private JSpinner roundApMinField;
 	private JSpinner roundApMaxField;
 	
-	private JTextField fullRoundVisualField;
+	//private JTextField fullRoundVisualField;
+	@SuppressWarnings("rawtypes")
+	private JComboBox fullRoundVisualField;
 	private JSpinner fullRoundHpMinField;
 	private JSpinner fullRoundHpMaxField;
 	private JSpinner fullRoundApMinField;
@@ -82,7 +86,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 +94,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 +103,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 +111,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 +198,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 +268,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;
 
@@ -93,9 +96,13 @@ public class DialogueEditor extends JSONElementEditor {
 	private JPanel rewardsParamsPane;
 	private MyComboBox rewardMap;
 	private JTextField rewardObjId;
+	@SuppressWarnings("rawtypes")
 	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 +121,8 @@ public class DialogueEditor extends JSONElementEditor {
 	private JComboBox requirementTypeCombo;
 	private JPanel requirementParamsPane;
 	private MyComboBox requirementObj;
+	@SuppressWarnings("rawtypes")
+	private JComboBox requirementSkill;
 	private JTextField requirementObjId;
 	private JComponent requirementValue;
 	private BooleanBasedCheckBox requirementNegated;
@@ -357,6 +366,7 @@ public class DialogueEditor extends JSONElementEditor {
 		if (rewardObj != null) {
 			removeElementListener(rewardObj);
 		}
+		boolean immunity = false;
 		if (reward.type != null) {
 			switch (reward.type) {
 			case activateMapObjectGroup:
@@ -383,14 +393,62 @@ 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:
+			case alignmentSet:
 				rewardMap = null;
 				rewardObjId = addTextField(pane, "Faction: ", reward.reward_obj_id, writable, listener);
 				rewardObjIdCombo = null;
@@ -415,8 +473,9 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardMap = null;
 				rewardObjId = null;
 				rewardObj = addItemBox(pane, ((Dialogue)target).getProject(), "Item: ", (Item) reward.reward_obj, writable, listener);
-				rewardValue = addIntegerField(pane, "Quantity: ", reward.reward_value, false, writable, listener);
+				rewardValue = addIntegerField(pane, "Quantity: ", reward.reward_value, true, writable, listener);
 				break;
+			case removeQuestProgress:
 			case questProgress:
 				rewardMap = null;
 				rewardObjId = null;
@@ -425,9 +484,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);
+				rewardObjId = null;// addTextField(pane, "Skill ID: ", reward.reward_obj_id, writable, listener);
-				rewardObjIdCombo = null;
+				rewardObjIdCombo = addEnumValueBox(pane, "Skill ID: ", Requirement.SkillID.values(), skillId, writable, listener);
 				rewardObj = null;
 				rewardValue = null;
 				break;
@@ -634,7 +697,7 @@ public class DialogueEditor extends JSONElementEditor {
 			removeElementListener(requirementObj);
 		}
 		
-		requirementTypeCombo = addEnumValueBox(pane, "Requirement type: ", Requirement.RequirementType.values(), requirement.type, writable, listener);
+		requirementTypeCombo = addEnumValueBox(pane, "Requirement type: ", Requirement.RequirementType.values(), requirement == null ? null : requirement.type, writable, listener);
 		requirementParamsPane = new JPanel();
 		requirementParamsPane.setLayout(new JideBoxLayout(requirementParamsPane, JideBoxLayout.PAGE_AXIS));
 		updateRequirementParamsEditorPane(requirementParamsPane, requirement, listener);
@@ -651,7 +714,7 @@ public class DialogueEditor extends JSONElementEditor {
 			removeElementListener(requirementObj);
 		}
 		
-		if (requirement.type != null) {
+		if (requirement != null && requirement.type != null) {
 			switch (requirement.type) {
 			case consumedBonemeals:
 			case spentGold:
@@ -683,8 +746,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 +760,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 +870,31 @@ 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 alignmentSet:
+				label.setText("Set 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 +916,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 +1161,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 +1272,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 +1318,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

@@ -44,7 +44,6 @@ import com.gpl.rpg.atcontentstudio.ui.ScrollablePanel;
 import com.gpl.rpg.atcontentstudio.ui.ScrollablePanel.ScrollableSizeHint;
 import com.gpl.rpg.atcontentstudio.ui.sprites.SpriteChooser;
 import com.jidesoft.swing.JideBoxLayout;
-import com.jidesoft.swing.JideScrollPane;
 import com.jidesoft.swing.JideTabbedPane;
 
 public abstract class JSONElementEditor extends Editor {
@@ -95,6 +94,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);
@@ -204,6 +204,7 @@ public abstract class JSONElementEditor extends Editor {
 				}
 			});
 			savePane.add(delete, JideBoxLayout.FIX);
+			
 		} else {
 			if (proj.alteredContent.gameData.getGameDataElement(concreteNodeClass, node.id) != null) {
 				savePane.add(message = new JLabel(ALTERED_EXISTS_MESSAGE), JideBoxLayout.FIX);
@@ -242,8 +243,10 @@ public abstract class JSONElementEditor extends Editor {
 		}
 		JButton prev = new JButton(new ImageIcon(DefaultIcons.getArrowLeftIcon()));
 		JButton next = new JButton(new ImageIcon(DefaultIcons.getArrowRightIcon()));
+		final JButton bookmark = new JButton(new ImageIcon(node.bookmark != null ? DefaultIcons.getBookmarkActiveIcon() : DefaultIcons.getBookmarkInactiveIcon()));
 		savePane.add(prev, JideBoxLayout.FIX);
 		savePane.add(next, JideBoxLayout.FIX);
+		savePane.add(bookmark, JideBoxLayout.FIX);
 		if (node.getParent().getIndex(node) == 0) {
 			prev.setEnabled(false);
 		}
@@ -268,6 +271,20 @@ public abstract class JSONElementEditor extends Editor {
 				}
 			}
 		});
+		bookmark.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				if (node.bookmark == null) {
+					node.getProject().bookmark(node);
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkActiveIcon()));
+				} else {
+					node.bookmark.delete();
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkInactiveIcon()));
+				}
+			}
+		});
+
+		
 		//Placeholder. Fills the eventual remaining space.
 		savePane.add(new JPanel(), JideBoxLayout.VARY);
 		pane.add(savePane, JideBoxLayout.FIX);
@@ -302,6 +319,7 @@ public abstract class JSONElementEditor extends Editor {
 	}
 	
 
+	@SuppressWarnings("unchecked")
 	public boolean idChanging() {
 		JSONElement node = (JSONElement) target;
 		List<GameDataElement> toModify = new LinkedList<GameDataElement>();

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

@@ -40,8 +40,6 @@ public class QuestEditor extends JSONElementEditor {
 
 	private static final long serialVersionUID = 5701667955210615366L;
 
-	private static final Integer one = 1;
-	
 	private static final String form_view_id = "Form";
 	private static final String json_view_id = "JSON";
 	

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

@@ -49,11 +49,14 @@ import prefuse.visual.expression.InGroupPredicate;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.DialogueEditor;
+import com.gpl.rpg.atcontentstudio.utils.WeblateIntegration;
+import com.gpl.rpg.atcontentstudio.utils.WeblateIntegration.WeblateTranslationUnit;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class DialogueGraphView extends Display {
@@ -72,11 +75,16 @@ public class DialogueGraphView extends Display {
     public static final String HIDDEN_REPLY = "hidden_reply";
     public static final String HAS_REQS = "has_reqs";
     
+    private static final String TRANSLATION_LOADING="Loading translation...";
+    private String translationHeader="\n---[ Translation from weblate ]---\n";
+	
+    
     private static final Schema DECORATOR_SCHEMA = PrefuseLib.getVisualItemSchema(); 
     
 	private Dialogue dialogue;
 	private Image npcIcon;
 	private Graph graph;
+	private Boolean translatorMode;
 
 	private Map<Dialogue, Node> cells = new HashMap<Dialogue, Node>();
 
@@ -88,6 +96,10 @@ public class DialogueGraphView extends Display {
 		} else {
 			npcIcon = DefaultIcons.getNPCIcon();
 		}
+		translatorMode = Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() != null;
+		if (translatorMode) {
+			translationHeader = "\n---[ Translation in "+Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue()+" ]---\n";
+		}
 		loadGraph();
 
 		 // add visual data groups
@@ -148,7 +160,7 @@ public class DialogueGraphView extends Display {
         
         // now create the main layout routine
         ActionList layout = new ActionList();//Activity.INFINITY);
-        NodeLinkTreeLayout treeLayout = new NodeLinkTreeLayout(GRAPH, prefuse.Constants.ORIENT_LEFT_RIGHT, 120, 40, 40);
+        NodeLinkTreeLayout treeLayout = new NodeLinkTreeLayout(GRAPH, prefuse.Constants.ORIENT_LEFT_RIGHT, 120, translatorMode ? 80 : 40, translatorMode ? 80 : 40);
         treeLayout.setLayoutAnchor(new Point2D.Double(25,300));
         layout.add(treeLayout);
         layout.add(new EdgesLabelDecoratorLayout(EDGES_LABELS));
@@ -186,9 +198,26 @@ public class DialogueGraphView extends Display {
 			if (dialogue.switch_to_npc != null) {
 				npcIcon = dialogue.switch_to_npc.getIcon();
 			}
-			Node dNode = graph.addNode();
+			final Node dNode = graph.addNode();
 			cells.put(dialogue, dNode);
-			dNode.setString(LABEL, dialogue.message != null ? dialogue.message : "[Selector]");
+			String label;
+			Thread t = null;
+			if (dialogue.message == null) {
+				label = "[Selector]";
+			} else if (translatorMode) {
+				label = dialogue.message+translationHeader+TRANSLATION_LOADING;
+				final String message = dialogue.message;
+				t = new Thread("Get weblate translation for "+message) {
+					public void run() {
+						WeblateTranslationUnit unit = WeblateIntegration.getTranslationUnit(message);
+						dNode.setString(LABEL, message+translationHeader+unit.translatedText);
+					};
+				};
+			} else {
+				label = dialogue.message;
+			}
+			dNode.setString(LABEL, label);
+			if (t != null) t.start();
 			dNode.set(ICON, npcIcon);
 			dNode.set(TARGET, dialogue);
 			if (dialogue.replies != null) {
@@ -206,11 +235,27 @@ public class DialogueGraphView extends Display {
 	}
 	
 	public Node addReply(Dialogue d, Dialogue.Reply r, Image npcIcon) {
-		Node rNode;
+		final Node rNode;
 		if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT)) {
 			//Normal reply...
 			rNode = graph.addNode();
-			rNode.setString(LABEL, r.text);
+//			rNode.setString(LABEL, translatorMode ? r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText : r.text);
+			String label;
+			Thread t = null;
+			if (translatorMode) {
+				label = r.text+translationHeader+TRANSLATION_LOADING;
+				final String message = r.text;
+				t = new Thread("Get weblate translation for "+message) {
+					public void run() {
+						WeblateTranslationUnit unit = WeblateIntegration.getTranslationUnit(message);
+						rNode.setString(LABEL, message+translationHeader+unit.translatedText);
+					};
+				};
+			} else {
+				label = r.text;
+			}
+			rNode.setString(LABEL, label);
+			if (t != null) t.start();
 			rNode.set(ICON, DefaultIcons.getHeroIcon());
 			rNode.set(TARGET, d);
 			rNode.set(REPLY, r);

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

@@ -162,6 +162,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	private JComboBox evaluateTriggerBox;
 	private JSpinner quantityField;
 	private JCheckBox spawnActiveForNewGame;
+	private JCheckBox spawnIgnoreAreas;
 	private JTextField spawngroupField;
 	@SuppressWarnings("rawtypes")
 	private JList npcList;
@@ -206,11 +207,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("Testing", getReplacementSimulatorPane());
 		
 	}
 	
@@ -260,7 +262,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 +277,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 +290,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 +378,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 +391,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 +404,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 +417,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 +430,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 +443,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 +456,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 +469,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 +482,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 +525,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 +564,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
+			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);
+			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);
@@ -578,6 +630,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			spawngroupField = addTextField(pane, "Spawn group ID: ", ((SpawnArea)selected).spawngroup_id, ((TMXMap)target).writable, listener);
 			quantityField = addIntegerField(pane, "Number of spawned NPCs: ", ((SpawnArea)selected).quantity, false, ((TMXMap)target).writable, listener);
 			spawnActiveForNewGame = addBooleanBasedCheckBox(pane, "Active in a new game: ", ((SpawnArea)selected).active, ((TMXMap)target).writable, listener);
+			spawnIgnoreAreas = addBooleanBasedCheckBox(pane, "Monsters can walk on other game objects: ", ((SpawnArea)selected).ignoreAreas, ((TMXMap)target).writable, listener);
 			npcListModel = new SpawnGroupNpcListModel((SpawnArea) selected);
 			npcList = new JList(npcListModel);
 			npcList.setCellRenderer(new GDERenderer(true, ((TMXMap)target).writable));
@@ -646,8 +699,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;
+				Requirement.SkillID skillId = null;
-				requirementObjId = addTextField(pane, "Skill ID:", requirement.required_obj_id, writable, listener);
+				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 +712,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 +767,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;
@@ -719,7 +782,11 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	public JPanel getReplacementSimulatorPane() {
 		JPanel replacementSimulator = new JPanel();
 		replacementSimulator.setLayout(new JideBoxLayout(replacementSimulator, JideBoxLayout.PAGE_AXIS));
+		JPanel toolsPane = new JPanel();
+		toolsPane.setLayout(new JideBoxLayout(toolsPane, JideBoxLayout.LINE_AXIS));
 		final JCheckBox walkableVisibleBox = new JCheckBox("Show \""+TMXMap.WALKABLE_LAYER_NAME+"\" layer.");
+		final JCheckBox showHeroBox = new JCheckBox("Show hero on walkable tiles under the mouse pointer.");
+		final JCheckBox showTooltipBox = new JCheckBox("Show tooltip with stack of tiles.");
 		JPanel areasActivationPane = new JPanel();
 		areasActivationPane.setLayout(new JideBoxLayout(areasActivationPane, JideBoxLayout.PAGE_AXIS));
 		TreeModel areasTreeModel = new ReplaceAreasActivationTreeModel();
@@ -735,12 +802,17 @@ 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);
+		toolsPane.add(walkableVisibleBox, JideBoxLayout.FIX);
+		toolsPane.add(showTooltipBox, JideBoxLayout.FIX);
+		toolsPane.add(showHeroBox, JideBoxLayout.FIX);
+		toolsPane.add(new JPanel(), JideBoxLayout.VARY);
+		
+		replacementSimulator.add(toolsPane, JideBoxLayout.FIX);
 		replacementSimulator.add(activateAndViewPane, JideBoxLayout.VARY);
 		
-		walkableVisibleBox.setSelected(true);
+		walkableVisibleBox.setSelected(viewer.showWalkable);
 		walkableVisibleBox.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -749,6 +821,21 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				viewer.repaint();
 			}
 		});
+
+		showHeroBox.setSelected(viewer.showHeroWithMouse);
+		showHeroBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				viewer.showHeroWithMouse = showHeroBox.isSelected();
+			}
+		});
+		showTooltipBox.setSelected(viewer.showTooltip);
+		showTooltipBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				viewer.showTooltip = showTooltipBox.isSelected();
+			}
+		});
 		activate.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -1593,6 +1680,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,9 +1772,27 @@ 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);
+			final JButton bookmark = new JButton(new ImageIcon(map.bookmark != null ? DefaultIcons.getBookmarkActiveIcon() : DefaultIcons.getBookmarkInactiveIcon()));
+			savePane.add(bookmark, JideBoxLayout.FIX);
+			bookmark.addActionListener(new ActionListener() {
+				@Override
+				public void actionPerformed(ActionEvent arg0) {
+					if (map.bookmark == null) {
+						map.getProject().bookmark(map);
+						bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkActiveIcon()));
+					} else {
+						map.bookmark.delete();
+						bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkInactiveIcon()));
+					}
+				}
+			});
 		} else {
 			if (proj.getMap(map.id) != map) {
 				savePane.add(message = new JLabel(ALTERED_EXISTS_MESSAGE), JideBoxLayout.FIX);
@@ -1748,6 +1856,20 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				}
 			}
 		});
+		final JButton bookmark = new JButton(new ImageIcon(map.bookmark != null ? DefaultIcons.getBookmarkActiveIcon() : DefaultIcons.getBookmarkInactiveIcon()));
+		savePane.add(bookmark, JideBoxLayout.FIX);
+		bookmark.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				if (map.bookmark == null) {
+					map.getProject().bookmark(map);
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkActiveIcon()));
+				} else {
+					map.bookmark.delete();
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkInactiveIcon()));
+				}
+			}
+		});
 		//Placeholder. Fills the eventual remaining space.
 		savePane.add(new JPanel(), JideBoxLayout.VARY);
 		pane.add(savePane, JideBoxLayout.FIX);
@@ -1755,6 +1877,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	}
 	
 	
+	private int skipAreaFieldEvents = 0;
 	
 	public class MapFieldUpdater implements FieldUpdateListener {
 		@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1790,8 +1913,22 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				tmxViewer.revalidate();
 				tmxViewer.repaint();
 			} else if (source == areaField) {
-				selectedMapObject.name = (String) value;
+				if (skipAreaFieldEvents > 0) skipAreaFieldEvents--;
-				groupObjectsListModel.objectChanged(selectedMapObject);
+				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;
@@ -1910,42 +2047,86 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					SpawnArea area = (SpawnArea) selectedMapObject;
 					area.active = (Boolean) value;
 				}
+			} else if (source == spawnIgnoreAreas) {
+				if (selectedMapObject instanceof SpawnArea) {
+					SpawnArea area = (SpawnArea) selectedMapObject;
+					area.ignoreAreas = (Boolean) value;
+				}
 			} else if (source == requirementTypeCombo) {
 				if (selectedMapObject instanceof KeyArea) {
 					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.type == Requirement.RequirementType.skillLevel) {
-					if (area.requirement.required_obj != null) {
+						area.requirement.required_obj_id = value == null ? null : value.toString();
-						area.requirement.required_obj_id = area.requirement.required_obj.id; 
 					} 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.type == Requirement.RequirementType.skillLevel) {
-					if (area.requirement.required_obj != null) {
+						area.requirement.required_obj_id = value == null ? null : value.toString();
-						area.requirement.required_obj_id = area.requirement.required_obj.id; 
 					} 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 +2145,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 +2166,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 +2202,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>());
 			}
 		}
 	}
@@ -2040,11 +2235,13 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		private TMXMap map;
 		public ReplaceArea highlighted = null;
 		public boolean showWalkable = true;
+		public boolean showHeroWithMouse = true;
+		public boolean showTooltip = true;
 	    private OrthogonalRenderer renderer;
 	    
-	    private String groundName, objectsName, aboveName, walkableName;
+	    private String groundName, objectsName, aboveName, topName, walkableName;
 	    private Map<String, tiled.core.TileLayer> layersByName = new LinkedHashMap<String, tiled.core.TileLayer>();
-	    private tiled.core.TileLayer ground, objects, above, walkable;
+	    private tiled.core.TileLayer ground, objects, above, top, walkable;
 	    
 	    private Map<String, List<ReplaceArea>> replacementsForLayer = new LinkedHashMap<String, List<ReplaceArea>>();
 	    public Map<ReplaceArea, Boolean> activeReplacements = new LinkedHashMap<ReplaceArea, Boolean>();
@@ -2063,8 +2260,9 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	        addMouseMotionListener(new MouseMotionAdapter() {
 	        	@Override
 	        	public void mouseMoved(MouseEvent e) {
+	        		Point oldTooltippedTile = new Point(tooltippedTile);
 	        		tooltippedTile.setLocation(e.getX() / 32, e.getY() / 32);
-	        		if (!((TMXMap)target).tmxMap.contains(tooltippedTile.x, tooltippedTile.y)) {
+	        		if (!showTooltip || !((TMXMap)target).tmxMap.contains(tooltippedTile.x, tooltippedTile.y)) {
 	        			if (tooltipActivated) {
 	        				//Hides the tooltip...
 	        				ToolTipManager.sharedInstance().setEnabled(false);
@@ -2072,12 +2270,16 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	        				tooltipActivated = false;
 	        			}
 	        		} else {
-	        			if (!tooltipActivated) {
+	        			if (showTooltip && !tooltipActivated) {
 	        				ToolTipManager.sharedInstance().registerComponent(TMXReplacementViewer.this);
 	        				ToolTipManager.sharedInstance().setEnabled(true);
 	        				tooltipActivated = true;
 	        			}
 	        		}
+	        		if (showHeroWithMouse && (oldTooltippedTile.x != tooltippedTile.x || oldTooltippedTile.y != tooltippedTile.y) ) {
+	        			TMXReplacementViewer.this.revalidate();
+	        			TMXReplacementViewer.this.repaint();
+	        		}
 	        	}
 			});
 	        
@@ -2087,9 +2289,9 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    }
 	    
 	    public void init() {
-	    	groundName = objectsName = aboveName = walkableName = null;
+	    	groundName = objectsName = aboveName = walkableName = topName = null;
 	    	layersByName.clear();
-	    	ground = objects = above = walkable = null;
+	    	ground = objects = above = walkable = top = null;
 	    	replacementsForLayer.clear();
 	    	
 	    	for (tiled.core.MapLayer layer : map.tmxMap.getLayers()) {
@@ -2101,6 +2303,8 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	        			objectsName = layer.getName();
 	        		} else if (TMXMap.ABOVE_LAYER_NAME.equalsIgnoreCase(layer.getName())) {
 	        			aboveName = layer.getName();
+	        		} else if (TMXMap.TOP_LAYER_NAME.equalsIgnoreCase(layer.getName())) {
+	        			topName = layer.getName();
 	        		} else if (TMXMap.WALKABLE_LAYER_NAME.equalsIgnoreCase(layer.getName())) {
 	        			walkableName = layer.getName();
 	        		}
@@ -2130,6 +2334,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    	ground = mergeReplacements(groundName);
 	    	objects = mergeReplacements(objectsName);
 	    	above = mergeReplacements(aboveName);
+	    	top = mergeReplacements(topName);
 	    	walkable = mergeReplacements(walkableName);
 	    }
 	    
@@ -2185,10 +2390,18 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	        	renderer.paintTileLayer(g2d, objects);
 	        }
 	        
+	        if (showHeroWithMouse && tooltippedTile != null && ((TMXMap)target).tmxMap.contains(tooltippedTile.x, tooltippedTile.y) && 
+	        		walkable != null && walkable.getTileAt(tooltippedTile.x, tooltippedTile.y) == null) {
+	        	g2d.drawImage(DefaultIcons.getHeroImage(), tooltippedTile.x * 32, tooltippedTile.y * 32, 32, 32, null);
+	        }
+	        
 	        if (above != null) {
 	        	renderer.paintTileLayer(g2d, above);
 	        }
-	        
+
+	        if (top != null) {
+	        	renderer.paintTileLayer(g2d, top);
+	        }
 	        if (walkable != null && showWalkable) {
 	        	renderer.paintTileLayer(g2d, walkable);
 	        }
@@ -2245,10 +2458,12 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    JLabel noTileGround = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
 	    JLabel noTileObjects = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
 	    JLabel noTileAbove = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
+	    JLabel noTileTop = new JLabel(new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)));
 	    {
 	    	noTileGround.setPreferredSize(new Dimension(32, 32));
 	    	noTileObjects.setPreferredSize(new Dimension(32, 32));
 	    	noTileAbove.setPreferredSize(new Dimension(32, 32));
+	    	noTileTop.setPreferredSize(new Dimension(32, 32));
 	    }
 	    Point tooltippedTile = new Point();
 	    JToolTip tt = null;
@@ -2270,6 +2485,20 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    	if (tooltippedTile != null) {
 	    		Image tile;
 	    		JLabel label;
+
+	    		if (top != null && top.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
+	    			tile = top.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
+	    		} else {
+	    			tile = null;
+	    		}
+	    		if (tile != null) {
+	    			label = new JLabel(new ImageIcon(tile));
+	    			label.setPreferredSize(new Dimension(32,32));
+	    			content.add(label, JideBoxLayout.FIX);
+	    			//Fix when (if?) Top is advertised publicly. 
+//	    		} else {
+//	    			content.add(noTileTop, JideBoxLayout.FIX);
+	    		}
 	    		
 	    		if (above != null && above.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
 	    			tile = above.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();

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

@@ -98,7 +98,7 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 	
 	public WorldMapEditor(WorldmapSegment worldmap) {
 		target = worldmap;
-		this.name = worldmap.id;
+		this.name = worldmap.getDesc();
 		this.icon = new ImageIcon(worldmap.getIcon());
 		setLayout(new BorderLayout());
 		
@@ -117,8 +117,10 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 	
 	@Override
 	public void targetUpdated() {
-		// TODO Auto-generated method stub
+		this.name = ((GameDataElement)target).getDesc();
-
+		updateMessage();
+		updateXmlViewText(((WorldmapSegment)target).toXml());
+		mapView.updateFromModel();
 	}
 
 	public JPanel getXmlEditorPane() {
@@ -128,6 +130,7 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 		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;
@@ -313,7 +316,7 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				String selectedMap = null;
-				boolean update = false;
+//				boolean update = false;
 				int x = (int) (e.getX() / mapView.zoomLevel);
 				int y = (int) (e.getY() / mapView.zoomLevel);
 				for (String s : mapView.mapLocations.keySet()) {
@@ -330,19 +333,19 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 								if (mapView.getSelectedMapsIDs().size() > 1) {
 									removeFromSelection(selectedMap);
 //									mapView.selected.remove(selectedMap);
-									update = true;
+//									update = true;
 								}
 							} else {
 								addToSelection(selectedMap);
 //								mapView.selected.add(selectedMap);
-								update = true;
+//								update = true;
 							}
 						} else {
 							clearSelection();
 //							mapView.selected.clear();
 							addToSelection(selectedMap);
 //							mapView.selected.add(selectedMap);
-							update = true;
+//							update = true;
 						}
 					}
 				} else if (editMode == EditMode.addMap && mapBeingAddedID != null) {
@@ -351,7 +354,7 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 						pushToModel();
 					}
 					mapView.updateFromModel();
-					update = true;
+//					update = true;
 					mapBeingAddedID = null;
 				}
 //				if (update) {
@@ -983,6 +986,20 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 				}
 			}
 		});
+		final JButton bookmark = new JButton(new ImageIcon(node.bookmark != null ? DefaultIcons.getBookmarkActiveIcon() : DefaultIcons.getBookmarkInactiveIcon()));
+		savePane.add(bookmark, JideBoxLayout.FIX);
+		bookmark.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				if (node.bookmark == null) {
+					node.getProject().bookmark(node);
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkActiveIcon()));
+				} else {
+					node.bookmark.delete();
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkInactiveIcon()));
+				}
+			}
+		});
 		//Placeholder. Fills the eventual remaining space.
 		savePane.add(new JPanel(), JideBoxLayout.VARY);
 		return savePane;
@@ -1016,7 +1033,6 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 	
 	public void notifyModelModified() {
 		target.state = GameDataElement.State.modified;
-		this.name = ((WorldmapSegment)target).getDesc();
 		target.childrenChanged(new ArrayList<ProjectTreeNode>());
 	}
 	

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

@@ -23,7 +23,6 @@ import java.util.HashSet;
 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;
@@ -86,7 +85,7 @@ public class WorldMapView extends JComponent implements Scrollable {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				String selectedMap = null;
-				boolean update = false;
+//				boolean update = false;
 				int x = (int) (e.getX() / zoomLevel);
 				int y = (int) (e.getY() / zoomLevel);
 				for (String s : mapLocations.keySet()) {
@@ -191,7 +190,7 @@ public class WorldMapView extends JComponent implements Scrollable {
         FontMetrics mifm = g2.getFontMetrics();
         int mapIdLabelHeight = mifm.getHeight();
         
-        for (String s : mapLocations.keySet()) {
+        for (String s : new HashSet<String>(mapLocations.keySet())) {
 
         	int x = mapLocations.get(s).x;
         	int y = mapLocations.get(s).y;
@@ -481,6 +480,10 @@ public class WorldMapView extends JComponent implements Scrollable {
 		offsetX = worldmap.segmentX * TILE_SIZE;
 		offsetY = worldmap.segmentY * TILE_SIZE;
 		for (String s : worldmap.mapLocations.keySet()) {
+			if (proj.getMap(s) == null) {
+				System.err.println("Warning. Worldmap "+worldmap.id+" references map "+s+" but it doesn't exist in this project");
+				continue;
+			}
 			int x = worldmap.mapLocations.get(s).x * TILE_SIZE;
 			int w = proj.getMap(s).tmxMap.getWidth() * TILE_SIZE;
 			int y = worldmap.mapLocations.get(s).y * TILE_SIZE;
@@ -496,6 +499,13 @@ 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()) {
+			if (worldmap.getProject().getMap(id) == null) {
+				System.err.println("Warning. Worldmap "+worldmap.id+" references map "+id+" but it doesn't exist in this project");
+				continue;
+			}
+			worldmap.getProject().getMap(id).removeBacklink(worldmap);
+		}
 		worldmap.mapLocations.clear();
 		for (String s : mapLocations.keySet()) {
 			int x = mapLocations.get(s).x / TILE_SIZE;
@@ -504,6 +514,14 @@ public class WorldMapView extends JComponent implements Scrollable {
 			worldmap.mapLocations.put(s, new Point(x, y));
 		}
 		
+		for (String id : worldmap.mapLocations.keySet()) {
+			if (worldmap.getProject().getMap(id) == null) {
+				System.err.println("Warning. Worldmap "+worldmap.id+" references map "+id+" but it doesn't exist in this project");
+				continue;
+			}
+			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/sprites/SpritesheetEditor.java

@@ -100,6 +100,20 @@ public class SpritesheetEditor extends Editor {
 		});
 		buttonPane.add(openImage, JideBoxLayout.FIX);
 		buttonPane.add(getWarningLabel(), JideBoxLayout.FIX);
+		final JButton bookmark = new JButton(new ImageIcon(sheet.bookmark != null ? DefaultIcons.getBookmarkActiveIcon() : DefaultIcons.getBookmarkInactiveIcon()));
+		buttonPane.add(bookmark, JideBoxLayout.FIX);
+		bookmark.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				if (target.bookmark == null) {
+					target.getProject().bookmark(target);
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkActiveIcon()));
+				} else {
+					target.bookmark.delete();
+					bookmark.setIcon(new ImageIcon(DefaultIcons.getBookmarkInactiveIcon()));
+				}
+			}
+		});
 		buttonPane.add(new JPanel(), JideBoxLayout.VARY);
 		pane.add(buttonPane, JideBoxLayout.FIX);
 		addLabelField(pane, "Spritesheet ID: ", sheet.id);

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

@@ -22,6 +22,7 @@ import bsh.EvalError;
 import bsh.Interpreter;
 
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class BeanShellView extends JFrame {
@@ -85,17 +86,29 @@ public class BeanShellView extends JFrame {
 		run.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				Interpreter shInt = new Interpreter();
+				final Interpreter shInt = new Interpreter();
-				PrintStream printOut = new PrintStream(new AreaOutputStream(outArea));
+				final PrintStream printOut = new PrintStream(new AreaOutputStream(outArea));
 				shInt.setOut(printOut);
-				PrintStream printErr = new PrintStream(new AreaOutputStream(errArea));
+				final PrintStream printErr = new PrintStream(new AreaOutputStream(errArea));
 				shInt.setErr(printErr);
 				
-				try {
+				WorkerDialog.showTaskMessage("Running your script...", null, new Runnable() {
-					shInt.eval(shArea.getText());
+					@Override
-				} catch (EvalError e1) {
+					public void run() {
-					e1.printStackTrace(printErr);
+						
-				}
+						try {
+							shInt.eval(shArea.getText());
+						} catch (EvalError e1) {
+							e1.printStackTrace(printErr);
+						}
+						printOut.flush();
+						printErr.flush();
+						printOut.close();
+						printErr.close();
+						
+					}
+				});
+				
 			}
 		});
 		

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,6 +10,7 @@ import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,7 @@ 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 +59,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 +76,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 +103,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 +125,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 +136,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 +162,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";
@@ -298,12 +341,12 @@ public class WriterModeEditor extends Editor {
     			}
     			
    				Node rNode;
-   				int i = 1;
+//   			int i = 1;
    				for (WriterModeData.WriterReply reply : dialogue.replies) {
    					if (reply instanceof EmptyReply && reply.next_dialogue != null) {
    						if (cells.get(reply.next_dialogue) == null) {
    							rNode = addDialogueNode(reply.next_dialogue);
-   							Edge e = graph.addEdge(dNode, rNode);
+   							/*Edge e = */graph.addEdge(dNode, rNode);
    						} else {
    							rNode = cells.get(reply.next_dialogue);
    							Edge e = graph.addEdge(dNode, rNode);
@@ -312,7 +355,7 @@ public class WriterModeEditor extends Editor {
    					} else {
    						if (cells.get(reply) == null) {
    							rNode = addReplyNode(reply);
-   							Edge e = graph.addEdge(dNode, rNode);
+   							/*Edge e = */graph.addEdge(dNode, rNode);
 //   						e.setString(LABEL, "#"+i++);
    						} else {
    							rNode = cells.get(reply);
@@ -337,7 +380,7 @@ public class WriterModeEditor extends Editor {
     				if (reply.next_dialogue != null) {
     					if (cells.get(reply.next_dialogue) == null) {
     						Node dNode = addDialogueNode(reply.next_dialogue);
-    						Edge e = graph.addEdge(rNode, dNode);
+    						/*Edge e = */graph.addEdge(rNode, dNode);
     					} else {
     						Node dNode = cells.get(reply.next_dialogue);
     						Edge e = graph.addEdge(rNode, dNode);
@@ -587,6 +630,7 @@ public class WriterModeEditor extends Editor {
     				addEdge(selected, target);
     			}
     		}
+			dataAltered();
     	}
     	
         static final String disposeEditorString = "disposeEditor";
@@ -612,6 +656,7 @@ public class WriterModeEditor extends Editor {
 				revalidate();
 				repaint();
 				disposeOverlay();
+				dataAltered();
 			}
 		}; 
 		
@@ -620,7 +665,7 @@ public class WriterModeEditor extends Editor {
 			cells.get(selected).set(LABEL, selected.text);
 		}
 
-        static final String createNextDefaultNodeString = "createNextDefaultNode";
+//        static final String createNextDefaultNodeString = "createNextDefaultNode";
 		final AbstractAction createNextDefaultNode = new AbstractAction("Create next default") {
 			private static final long serialVersionUID = 1658086056088672748L;
 
@@ -644,7 +689,7 @@ public class WriterModeEditor extends Editor {
 					}
 				}
 				if (newNode!= null) {
-					Edge edge = graph.addEdge(cells.get(selected), newNode);
+					/*Edge edge = */graph.addEdge(cells.get(selected), newNode);
 					setSelected(newWrNode);
 
 					m_vis.run("colors");
@@ -654,6 +699,7 @@ public class WriterModeEditor extends Editor {
 					revalidate();
 					repaint();
 				}
+				dataAltered();
 			}
 		};
 		
@@ -686,7 +732,7 @@ public class WriterModeEditor extends Editor {
 					temp.next_dialogue = newWrNode;
 					
 					newNode = addDialogueNode(newWrNode);
-					Edge edge = graph.addEdge(cells.get(selected), newNode);
+					/*Edge edge = */graph.addEdge(cells.get(selected), newNode);
 					setSelected(newWrNode);
 
 					m_vis.run("colors");
@@ -695,7 +741,7 @@ public class WriterModeEditor extends Editor {
 					revalidate();
 					repaint();
 				} 
-	            
+				dataAltered();
 			}
 		};
 		
@@ -712,7 +758,7 @@ public class WriterModeEditor extends Editor {
 				if (selected instanceof WriterReply) {
 					newWrNode = data.new WriterReply(((WriterReply) selected).parent);
 					newNode = addReplyNode(newWrNode);
-					Edge edge = graph.addEdge(cells.get(((WriterReply) selected).parent), newNode);
+					/*Edge edge = */graph.addEdge(cells.get(((WriterReply) selected).parent), newNode);
 					setSelected(newWrNode);
 
 					m_vis.run("colors");
@@ -721,7 +767,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 +871,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);
@@ -842,18 +903,18 @@ public class WriterModeEditor extends Editor {
 				}
 		}
         
-        public void selectScrollAndEdit(WriterNode node) {
+//        public void selectScrollAndEdit(WriterNode node) {
-			if (node != null) {
+//			if (node != null) {
-					setSelected(node);
+//					setSelected(node);
-
+//
-					m_vis.run("colors");
+//					m_vis.run("colors");
-					m_vis.run("layout");
+//					m_vis.run("layout");
-					m_vis.run("scrollToSelectedAndEdit");
+//					m_vis.run("scrollToSelectedAndEdit");
-
+//
-					revalidate();
+//					revalidate();
-					repaint();
+//					repaint();
-				}
+//				}
-		}
+//		}
         
         
         
@@ -1081,8 +1142,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

@@ -3,6 +3,9 @@ package com.gpl.rpg.atcontentstudio.utils;
 import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 import com.gpl.rpg.atcontentstudio.model.Workspace;
@@ -18,7 +21,7 @@ public class DesktopIntegration {
 			}
 		} else {
 			try {
-				Runtime.getRuntime().exec(Workspace.activeWorkspace.settings.mapEditorCommand.getCurrentValue()+" "+f.getAbsolutePath());
+				Runtime.getRuntime().exec(tokenize(Workspace.activeWorkspace.settings.mapEditorCommand.getCurrentValue()+" \""+f.getAbsolutePath()+"\""));
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -40,7 +43,7 @@ public class DesktopIntegration {
 			}
 		} else {
 			try {
-				Runtime.getRuntime().exec(Workspace.activeWorkspace.settings.imageEditorCommand.getCurrentValue()+" "+f.getAbsolutePath());
+				Runtime.getRuntime().exec(tokenize(Workspace.activeWorkspace.settings.imageEditorCommand.getCurrentValue()+" \""+f.getAbsolutePath()+"\""));
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -63,5 +66,43 @@ public class DesktopIntegration {
 		return OSType.Other;
 	}
 	
+	
+	private static List<Character> quotes = Arrays.asList(new Character[]{'\'', '"'});
+	private static List<Character> delims = Arrays.asList(new Character[]{' ', '\r', '\n', '\t'});
+	
+	private static String[] tokenize(String command) {
+		List<String> tokens = new ArrayList<String>();
+		boolean inQuote = false;
+		char usedQuote = '\0';
+		StringBuilder sb = new StringBuilder();
+		
+		for (char c : command.toCharArray()) {
+			if (inQuote) {
+				if (c == usedQuote) {
+					inQuote = false;
+					continue;
+				} else {
+					sb.append(c);
+				}
+			} else {
+				if (quotes.contains(c)) {
+					inQuote = true;
+					usedQuote = c;
+				} else if (delims.contains(c)) {
+					if (sb.length() > 0) {
+						tokens.add(sb.toString());
+						sb = new StringBuilder();
+					}
+				} else {
+					sb.append(c);
+				}
+			}
+		}
+		if (sb.length() > 0) {
+			tokens.add(sb.toString());
+		}
+		return tokens.toArray(new String[tokens.size()]);
+	}
+	
 
 }

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

@@ -78,16 +78,42 @@ public class FileUtils {
 
 	}
 	
+	/**
+	 * cp sourceFolder/* targetFolder/
+	 * @param sourceFolder
+	 * @param targetFolder
+	 */
+	public static void copyOver(File sourceFolder, File targetFolder) {
+		if (!sourceFolder.isDirectory() || !targetFolder.isDirectory()) return;
+		for (File f : sourceFolder.listFiles()) {
+			if (Files.isSymbolicLink(f.toPath())) {
+				//Skip symlinks
+				continue;
+			} else if (f.isDirectory()) {
+				File dest = new File(targetFolder, f.getName());
+				if (!dest.exists()) {
+					dest.mkdir();
+				}
+				copyOver(f, dest);
+			} else {
+				copyFile(f, new File(targetFolder, f.getName()));
+			}
+		}
+	}
+	
 	private static void zipDir(File dir, String prefix, ZipOutputStream zos) {
+		if (prefix != "") {
+			prefix = prefix + File.separator;
+		}
 		for (File f : dir.listFiles()) {
 			if (f.isDirectory()) {
-				zipDir(f, prefix+File.separator+f.getName(), zos);
+				zipDir(f, prefix+f.getName(), zos);
 			} else {
 				FileInputStream fis;
 				try {
 					fis = new FileInputStream(f);
 					BufferedInputStream origin = new BufferedInputStream(fis, BUFFER);
-					ZipEntry entry = new ZipEntry(prefix+File.separator+f.getName());
+					ZipEntry entry = new ZipEntry(prefix+f.getName());
 					try {
 						zos.putNextEntry(entry);
 						int count;
@@ -128,13 +154,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";

src/net/launchpad/tobal/poparser/POEntry.java

@@ -0,0 +1,100 @@
+/**
+ *
+ * @author Balázs Tóth (tobal17@gmail.com)
+ * 
+ * Modified by Kevin POCHAT for ATCS
+ */
+package net.launchpad.tobal.poparser;
+
+import java.util.Vector;
+
+public class POEntry
+{
+    private POLine[] Lines;
+    
+    public enum StringType
+    {
+        /**translator comments*/
+        TRLCMNT,
+        /**extracted comments*/
+        EXTCMNT,
+        /**reference*/
+        REFERENCE,
+        /**flag*/
+        FLAG,
+        /**previous context*/
+        PREVCTXT,
+        /**previous untranslated string singular*/
+        PREVUNTRSTRSING,
+        /**previous untranslated string plural*/
+        PREVUNTRSTRPLUR,
+        /**untranslated string singular*/
+        MSGID,
+        /**translated string*/
+        MSGSTR,
+        /**context*/
+        MSGCTXT,
+        /**header line*/
+        HEADER
+
+        // TODO: support for plural untranslated strings,
+        // and translated string cases
+    }
+
+    POEntry()
+    {
+        Lines = new POLine[0];
+    }
+
+    public void addLine(StringType type, String string)
+    {
+        boolean hasType = false;
+        POLine line = null;
+        for(int i = 0; i < Lines.length; i++)
+        {
+            if(Lines[i].getType() == type)
+            {
+                hasType = true;
+                line = Lines[i];
+                break;
+            }
+        }
+        if(hasType)
+        {
+            line.addString(string);
+        }
+        else
+        {
+            line = new POLine(type, string);
+            POLine[] templines = Lines.clone();
+            Lines = new POLine[Lines.length+1];
+            for(int i = 0; i < Lines.length-1; i++)
+            {
+                Lines[i] = templines[i];
+            }
+            Lines[Lines.length-1] = line;
+        }
+    }
+
+    public POLine[] getLines()
+    {
+        return Lines;
+    }
+
+    public Vector<String> getStringsFromLine(int index)
+    {
+        return Lines[index].getStrings();
+    }
+
+    public Vector<String> getStringsByType(POEntry.StringType type)
+    {
+        for(int i = 0; i < Lines.length; i++)
+        {
+            if(Lines[i].getType() == type)
+            {
+                return Lines[i].getStrings();
+            }
+        }
+        return null;
+    }
+}

src/net/launchpad/tobal/poparser/POFile.java

@@ -0,0 +1,143 @@
+/**
+ *
+ * @author Balázs Tóth (tobal17@gmail.com)
+ * 
+ * Modified by Kevin POCHAT for ATCS
+ */
+package net.launchpad.tobal.poparser;
+
+import java.io.File;
+import java.util.Vector;
+
+public class POFile
+{
+    private POEntry[] entries;
+    private POEntry header;
+    private File file;
+
+    POFile(POEntry[] entries, POEntry header, File file)
+    {
+        this.entries = entries;
+        this.header = header;
+        this.file = file;
+    }
+
+    /**
+     * Returns with the name of the po file
+     * @return name of po file
+     */
+    public String getFileName()
+    {
+        return file == null ? null : file.getAbsolutePath();
+    }
+
+    /**
+     * Returns with the POEntry object array
+     * @return POEntry array
+     */
+    public POEntry[] getEntryArray()
+    {
+        return entries;
+    }
+
+    /**
+     * Gets the POEntry object specified by the index
+     * @param index, index of the entry
+     * @return one POEntry object
+     */
+    public POEntry getEntry(int index)
+    {
+        return entries[index];
+    }
+
+    /**
+     * Returns how many entries are there in the po file
+     * @return count of entries
+     */
+    public int getEntryLength()
+    {
+        return entries.length;
+    }
+    
+    public POEntry getHeader() {
+    	return header;
+    }
+
+    /**
+     * Checks if the specified flag is set in the entry,
+     * given by the entry index.
+     * @param flag, string representing the flag
+     * @param entryIndex, index of the entry to examine
+     * @return true, if the flag is set, false otherwise
+     */
+    public boolean checkFlag(String flag, int entryIndex)
+    {
+        boolean status = false;
+        Vector<String> strings = new Vector<String>();
+        strings = entries[entryIndex].getStringsByType(POEntry.StringType.FLAG);
+        if (strings != null)
+        {
+            for(int i = 0; i < strings.size(); i++)
+            {
+                if (strings.get(i).contains(flag))
+                {
+                    status = true;
+                }
+            }
+        }
+        return status;
+    }
+
+    /**
+     * Returns with all the strings of the given type, from
+     * the specified entry.
+     * @param entryIndex
+     * @param type
+     * @return String array of specified type
+     */
+    public String[] getStringsFromEntryByType(int entryIndex, POEntry.StringType type)
+    {
+        Vector<String> vector = entries[entryIndex].getStringsByType(type);
+        String[] str = new String[vector.size()];
+        for(int i = 0; i < str.length; i++)
+        {
+            str[i] = vector.get(i);
+        }
+        return str;
+    }
+
+    /**
+     * For debug purposes
+     */
+    public void printFile()
+    {
+        for(int i = 0; i < entries.length; i++)
+        {
+            POLine[] lines = entries[i].getLines();
+            for(int j = 0; j < lines.length; j++)
+            {
+                Vector<String> strings = lines[j].getStrings();
+                for(int k = 0; k < strings.size(); k++)
+                {
+                    System.out.println(strings.get(k));
+                }
+            }
+        }
+    }
+
+    /**
+     * For debug purposes
+     */
+    public void printHeader()
+    {
+        POLine[] lines = header.getLines();
+        for(int j = 0; j < lines.length; j++)
+        {
+            Vector<String> strings = lines[j].getStrings();
+            for(int k = 0; k < strings.size(); k++)
+            {
+                System.out.println(strings.get(k));
+            }
+        }
+    }
+}

src/net/launchpad/tobal/poparser/POLine.java

@@ -0,0 +1,42 @@
+/**
+ *
+ * @author Balázs Tóth (tobal17@gmail.com)
+ * 
+ * Modified by Kevin POCHAT for ATCS
+ */
+package net.launchpad.tobal.poparser;
+
+import java.util.Vector;
+
+public class POLine
+{
+    private POEntry.StringType type;
+    private Vector<String> strings;
+
+    POLine(POEntry.StringType type, String string)
+    {
+        this.type = type;
+        this.strings = new Vector<String>();
+        this.strings.add(string);
+    }
+
+    public void addString(String string)
+    {
+        strings.add(string);
+    }
+
+    public Vector<String> getStrings()
+    {
+        return strings;
+    }
+
+    public POEntry.StringType getType()
+    {
+        return type;
+    }
+
+    public int getVectorSize()
+    {
+        return strings.size();
+    }
+}

src/net/launchpad/tobal/poparser/POParser.java

@@ -0,0 +1,274 @@
+/**
+ *
+ * @author Balázs Tóth (tobal17@gmail.com)
+ *
+ * Based on the work of István Nyitrai
+ * 
+ * Modified by Kevin POCHAT for ATCS
+ */
+package net.launchpad.tobal.poparser;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Vector;
+
+public class POParser
+{
+    private POEntry[] entries;
+    private POEntry header;
+//    private File file;
+    private POEntry.StringType parserMode;
+
+    /**
+     * Creates a POParser object. Use getPOFile() method,
+     * to access parsed data.
+     * @param file, File object of the PO file
+     */
+    public POParser()
+    {
+        parserMode = null;
+    }
+
+    public POFile parseFile(File file)
+    {
+        return parse(file);
+    }
+    
+    public POFile parseStream(BufferedReader br) throws IOException {
+    	return parse(br);
+    }
+
+    private String unQuote(String string)
+    {
+        String str = new String();
+        if(string.startsWith("\""))
+        {
+            str = string.substring(1);
+            string = str;
+        }
+        if(string.endsWith("\""))
+        {
+            str = string.substring(0, string.length()-1);
+        }
+        return str;
+    }
+
+    private POFile parse(File file)
+    {
+    	POFile result = null;
+        try
+        {
+            FileReader fr = new FileReader(file);
+            BufferedReader br = new BufferedReader(fr);
+            result = parse(br);
+            br.close();
+            fr.close();
+        }
+        catch (java.io.FileNotFoundException e)
+        {
+            System.out.println(e.toString());
+        }
+        catch (java.io.IOException e) {
+            System.out.println(e.toString());
+        }
+
+        return result;
+    }
+    
+    private POFile parse(BufferedReader br) throws IOException {
+    	Vector<String> rawentry = new Vector<String>(1, 1);
+        Vector<Vector<String>> rawentries = new Vector<Vector<String>>();
+        String line;
+        int id = 0;
+        while((line = br.readLine()) != null)
+        {
+            if(!line.equals(""))
+            {
+                if(!line.startsWith("#~")) // ignore
+                {
+                    rawentry.add(line);
+                }
+            }
+            else
+            {
+                if(rawentry.size() > 0)
+                {
+                    rawentry.add(0, String.valueOf(id));
+                    id++;
+                    rawentries.add(new Vector<String>(rawentry));
+                    rawentry = new Vector<String>(1, 1);
+                }
+            }
+        }
+
+        if(!rawentry.equals(rawentries.lastElement()) && rawentry.size() > 0)
+        {
+            rawentry.add(0, String.valueOf(id));
+            rawentries.add(new Vector<String>(rawentry));
+        }
+        this.header = parseHeader(rawentries);
+        this.entries = parseEntries(rawentries);
+        
+        return new POFile(entries, header, null);
+    }
+
+    private POEntry parseHeader(Vector<Vector<String>> vectors)
+    {
+        POEntry tempheader = new POEntry();
+
+        // is this header?
+        Vector<String> rawentry = vectors.get(0);
+        if(new Integer(rawentry.get(0)) == 0 && rawentry.contains("msgid \"\""))
+        {
+            for(int i = 1; i < rawentry.size(); i++)
+            {
+                String str = rawentry.get(i);
+                tempheader.addLine(POEntry.StringType.HEADER, str);
+                str = new String();
+            }
+            return tempheader;
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    private POEntry[] parseEntries(Vector<Vector<String>> vectors)
+    {
+        String line = new String();
+        boolean thereIsHeader = false;
+
+        // is this header
+        Vector<String> rawentry = vectors.get(0);
+        if(new Integer(rawentry.get(0)) == 0 && rawentry.contains("msgid \"\""))
+        {
+            thereIsHeader = true;
+        }
+
+        int size;
+        if(thereIsHeader)
+        {
+            size = vectors.size()-1;
+        }
+        else
+        {
+            size = vectors.size();
+        }
+
+        POEntry[] tempentries = new POEntry[size];
+
+        for(int i = 0; i < size; i++)
+        {
+            POEntry entry = new POEntry();
+
+            if(thereIsHeader)
+                rawentry = vectors.get(i+1);
+            else
+                rawentry = vectors.get(i);
+            
+            rawentry.remove(0);
+            for(int j = 0; j < rawentry.size(); j++)
+            {
+                line = rawentry.get(j);
+                POEntry.StringType strType = null;
+                int subStrIndex = 0;
+                if(line.startsWith("#"))
+                {
+                    parserMode = null;
+                    if(line.startsWith("# "))
+                    {
+                        strType = POEntry.StringType.TRLCMNT;
+                        if (line.startsWith("#  "))
+                        {
+                            subStrIndex = 3;
+                        }
+                        else
+                        {
+                            subStrIndex = 2;
+                        }
+                    }
+                    if(line.startsWith("#."))
+                    {
+                        strType = POEntry.StringType.EXTCMNT;
+                        subStrIndex = 3;
+                    }
+                    if(line.startsWith("#:"))
+                    {
+                        strType = POEntry.StringType.REFERENCE;
+                        subStrIndex = 3;
+                    }
+                    if(line.startsWith("#,"))
+                    {
+                        strType = POEntry.StringType.FLAG;
+                        subStrIndex = 3;
+                    }
+                    if(line.startsWith("#|"))
+                    {
+                        // TODO: can these comments be multi line? if no,
+                        // drop support for it
+                        if(line.startsWith("#| msgctxt "))
+                        {
+                            strType = POEntry.StringType.PREVCTXT;
+                            parserMode = strType;
+                            subStrIndex = 11;
+                        }
+                        if(line.startsWith("#| msgid "))
+                        {
+                            strType = POEntry.StringType.PREVUNTRSTRSING;
+                            parserMode = strType;
+                            subStrIndex = 9;
+                        }
+                        if(line.startsWith("#| msgid_plural "))
+                        {
+                            strType = POEntry.StringType.PREVUNTRSTRPLUR;
+                            parserMode = strType;
+                            subStrIndex = 16;
+                        }
+                    }
+                    String str = new String();
+                    str = line.substring(subStrIndex);
+                    entry.addLine(strType, str);
+                }
+                else if(line.startsWith("msg"))
+                {
+                    parserMode = null;
+                    if(line.startsWith("msgctxt "))
+                    {
+                        strType = POEntry.StringType.MSGCTXT;
+                        parserMode = strType;
+                        subStrIndex = 8;
+                    }
+                    if(line.startsWith("msgid "))
+                    {
+                        strType = POEntry.StringType.MSGID;
+                        parserMode = strType;
+                        subStrIndex = 6;
+                    }
+                    if(line.startsWith("msgstr "))
+                    {
+                        strType = POEntry.StringType.MSGSTR;
+                        parserMode = strType;
+                        subStrIndex = 7;
+                    }
+                    String str = new String();
+                    // TODO: is unquoting nessessary?
+                    str = unQuote(line.substring(subStrIndex));
+                    entry.addLine(strType, str);
+                }
+                else
+                {
+                    if(parserMode != null)
+                    {
+                        entry.addLine(parserMode, unQuote(line));
+                    }
+                }
+            }
+            tempentries[i] = entry;
+        }
+
+        return tempentries;
+    }
+}