refactor: improve bounds checking in getElementAt method in CommonEditor

and use that for moving elements up and down

.classpath

@@ -4,6 +4,7 @@
 	<classpathentry kind="src" path="res"/>
 	<classpathentry kind="src" path="hacked-libtiled"/>
 	<classpathentry kind="src" path="siphash-zackehh/src/main/java"/>
+	<classpathentry kind="src" path="minify"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/jide-oss.jar"/>
 	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
@@ -13,6 +14,6 @@
 	<classpathentry kind="lib" path="lib/ui.jar"/>
 	<classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar" sourcepath="lib/jsoup-1.10.2-sources.jar"/>
-	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.4.jar"/>
+	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -1,3 +1,14 @@
 /ATCS_v*.jar
 /Project
 /bin
+/packaging/tmp/
+/out
+packaging/common/lib
+packaging/common/ATCS.jar
+packaging/ATCS_*.zip
+ATCS_v*.tar.gz
+ATCS.jar
+/packaging/common/ATCS.env.bat
+/packaging/common/ATCS.env
+/packaging/common/ATCS_v*.zip
+/.output.txt

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/artifacts/ATContentStudio_jar.xml

@@ -0,0 +1,18 @@
+<component name="ArtifactManager">
+  <artifact name="ATContentStudio:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/ATContentStudio_jar</output-path>
+    <root id="root">
+      <element id="archive" name="ATContentStudio.jar">
+        <element id="module-output" name="ATContentStudio" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/bsh-2.0b4.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/rsyntaxtextarea.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/prefuse.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsoup-1.10.2.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/json_simple-1.1.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/ui.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/AndorsTrainer_v0.1.5.jar" path-in-jar="/" />
+        <element id="extracted-dir" path="$PROJECT_DIR$/lib/jide-oss.jar" path-in-jar="/" />
+      </element>
+    </root>
+  </artifact>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" default="true" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ATContentStudio.iml" filepath="$PROJECT_DIR$/ATContentStudio.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

ATCS_JAR.jardesc

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.10.jar"/>
+    <jar path="ATContentStudio/ATCS_v0.6.20.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>

ATContentStudio.iml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <libelement value="jar://$MODULE_DIR$/lib/jide-oss.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/json_simple-1.1.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/junit-4.10.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/prefuse.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/rsyntaxtextarea.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/ui.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/bsh-2.0b4.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/jsoup-1.10.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/lib/AndorsTrainer_v0.1.5.jar!/" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/res" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/hacked-libtiled" expected_position="2" />
+      <src_folder value="file://$MODULE_DIR$/siphash-zackehh/src/main/java" expected_position="3" />
+      <src_folder value="file://$MODULE_DIR$/minify" expected_position="4" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/hacked-libtiled" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/minify" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/siphash-zackehh/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library name="jide-oss.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jide-oss.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="json_simple-1.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/json_simple-1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="junit-4.10.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/junit-4.10.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="prefuse.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/prefuse.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="rsyntaxtextarea.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="ui.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/ui.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="bsh-2.0b4.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/bsh-2.0b4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="jsoup-1.10.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/jsoup-1.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/lib/jsoup-1.10.2-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="AndorsTrainer_v0.1.5.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/AndorsTrainer_v0.1.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>

createProject.bat

@@ -0,0 +1,127 @@
+@echo off
+echo.
+echo ***
+echo *** createProject v1.0 (2024-08-24)
+echo ***
+echo *** This script will help to setup an ATCS project
+echo *** and connect it to a repo on Github
+echo ***
+echo.
+rem  Save this script anywhere on your PC  (e.g. C:\AT\createProject.bat)
+rem  Then open a command shell:  CMD
+rem  and call the script in the shell.
+
+if "%1"=="" goto :noParamError
+
+echo You have entered:
+echo.
+echo ATCS-project: %1  
+echo in Directory: %2
+echo Github user:  %3
+echo.
+pause
+if "%3"=="" goto :help
+if not "%4"=="" goto :help
+
+if not exist %2 md %2
+
+rem --- Create ATCS project (if not already done)
+:atcs
+if not exist %2\%1\created\drawable\char_hero.png (
+    echo.
+    echo Do the following steps:
+    echo.
+    echo 1.  Start ATCS
+    echo 2.  Create your ATCS workspace in  %2
+    echo 3.  Add the new project  %1
+    echo 4.  Exit ATCS
+    echo.
+    pause
+    goto :atcs
+) else (
+    echo ATCS Project exists
+)
+
+rem --- Create git repository
+rem     This is the really important part :)
+rem -- go into project dir (even if we do not need to create the git repo)
+echo cd %2\%1
+cd %2\%1
+
+if not exist %2\%1\readme.md (
+    echo creating readme
+
+    echo # %1 > readme.md
+) else (
+    echo readme already exists
+)
+
+if not exist %2\%1\.gitignore (
+    echo creating gitignore
+
+    echo .workspace > .gitignore
+    echo .project >> .gitignore
+    echo altered/drawable >> .gitignore
+    echo altered/drawable/* >> .gitignore
+    echo created/drawable >> .gitignore
+    echo created/drawable/* >> .gitignore
+    echo tmp/res/values/loadresources.xml >> .gitignore
+) else (
+    echo gitignore already existed
+)
+
+:git
+if not exist %2\%1\.git (
+    echo Initializing git
+    git init -b main || (
+        echo "failed to init git. Please make sure it is installed"
+        pause
+        goto :git
+    )
+    :git_commit
+    git add readme.md
+    git add .gitignore
+    git commit -m "Init project" || (
+        echo "failed to create the initial commit."
+        pause
+        goto :git_commit
+    )
+    echo Done initializing git
+) else (
+    echo git was already initialized
+)
+
+echo.
+echo Now create your repo %1 on https://github.com/%3  (if not already done)
+echo.
+pause
+echo pushing to git repo https://github.com/%3/%1.git
+git remote add origin https://github.com/%3/%1.git
+git push -u origin main
+
+echo.
+echo At last you have to find the repo in your git client:
+echo - In Smartgit: Menu option: Repository / Search for repository
+echo.
+goto :end
+
+:noParamError
+echo.
+echo You have given no parameter. 
+echo Maybe you have just double clicked it? That won't work.
+echo I have opened a CMD shell for you. Enter the command in that shell.
+start cmd
+echo Please switch to the CMD shell
+
+:help
+echo.
+echo Enter the command with 3 parameters:
+echo %0  project  path  git-user
+echo.
+echo Example:  %0  feygard_1  c:\AT\ATCS  NutAndor
+echo.
+
+:end
+echo.
+echo *** End ***
+pause

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());
         
-        if (transparentColor != null) {
-            int rgb = transparentColor.getRGB();
-            image = tk.createImage(
-                    new FilteredImageSource(image.getSource(),
-                            new TransparentImageFilter(rgb)));
-        }
+//        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);
 
-        BufferedImage buffered = new BufferedImage(
-                image.getWidth(null),
-                image.getHeight(null),
-                BufferedImage.TYPE_INT_ARGB);
-        buffered.getGraphics().drawImage(image, 0, 0, null);
+        importTileBitmap(image, cutter);
+    }
+    
+    public void weakImportTileBitmap(String imgFilename, TileCutter cutter)
+            throws IOException
+    {
+        setTilesetImageFilename(imgFilename);
+        
+        File f = new File(imgFilename);
+
+        tilebmpFile = f;
+        tileDimensions = new Rectangle(cutter.getTileDimensions());
 
-        importTileBitmap(buffered, cutter);
     }
     
     public void loadFromProject(String name, TMXMap tmxMap, int tileWidth, int tileHeight) {

hacked-libtiled/tiled/io/TMXMapReader.java

@@ -913,7 +913,8 @@ public class TMXMapReader
     private class MapEntityResolver implements EntityResolver
     {
         public InputSource resolveEntity(String publicId, String systemId) {
-            if (systemId.equals("http://mapeditor.org/dtd/1.0/map.dtd")) {
+            if (systemId.equals("http://mapeditor.org/dtd/1.0/map.dtd") ||
+            	systemId.equals("https://mapeditor.org/dtd/1.0/map.dtd")) {
                 return new InputSource(TMXMapReader.class.getResourceAsStream(
                         "resources/map.dtd"));
             }

hacked-libtiled/tiled/io/TMXMapWriter.java

@@ -47,6 +47,9 @@ import java.util.Vector;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+
 import tiled.core.AnimatedTile;
 import tiled.core.Map;
 import tiled.core.MapLayer;
@@ -150,7 +153,7 @@ public class TMXMapWriter
     }
 
     private void writeMap(Map map, XMLWriter w, String wp) throws IOException {
-        w.writeDocType("map", null, "http://mapeditor.org/dtd/1.0/map.dtd");
+        w.writeDocType("map", null, "https://mapeditor.org/dtd/1.0/map.dtd");
         w.startElement("map");
 
         w.writeAttribute("version", "1.0");
@@ -238,7 +241,15 @@ public class TMXMapWriter
         } else {
             w.startElement("tileset");
             w.writeAttribute("firstgid", getFirstGidForTileset(set));
-            w.writeAttribute("source", getRelativePath(wp, source));
+			if (set.sheet != null && set.sheet.parent.getDataType() == Type.source) {
+				String fileName = set.getName();
+				if (fileName.length() > 3 && !(fileName.substring(fileName.length() - 4).equalsIgnoreCase(".png"))) {
+					fileName += ".png";
+				}				
+				w.writeAttribute("source", (TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE + fileName).replace("\\", "/"));
+			} else {
+				w.writeAttribute("source", getRelativePath(wp, source));
+			}
             if (set.getBaseDir() != null) {
                 w.writeAttribute("basedir", set.getBaseDir());
             }
@@ -279,7 +290,15 @@ public class TMXMapWriter
 
         if (tileBitmapFile != null) {
             w.startElement("image");
-            w.writeAttribute("source", getRelativePath(wp, tileBitmapFile));
+			if (set.sheet != null && set.sheet.parent.getDataType() == Type.source) {
+				String fileName = set.getName();
+				if (fileName.length() > 3 && !(fileName.substring(fileName.length() - 4).equalsIgnoreCase(".png"))) {
+					fileName += ".png";
+				}		
+				w.writeAttribute("source", (TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE + fileName).replace("\\", "/"));
+			} else {
+				w.writeAttribute("source", getRelativePath(wp, tileBitmapFile));
+			}            
             if (set.sheetDimensions != null) {
             	w.writeAttribute("width", set.sheetDimensions.width);
             	w.writeAttribute("height", set.sheetDimensions.height);

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

@@ -1 +1 @@
-v0.6.10
+v0.6.21

packaging/Manifest.txt

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: com.gpl.rpg.atcontentstudio.ATContentStudio

packaging/Windows/ATCS_Installer.nsi

@@ -1,8 +1,9 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.10"
-!define TRAINER_VERSION "0.1.4"
-!define JAVA_BIN "javaw"
+!define VERSION "0.6.21"
+!define TRAINER_VERSION "0.1.5"
+!define JAVA_BIN "java"
+!define ATCS_SOURCE_DIR "C:\ATCS"
 
 Name "Andor's Trail Content Studio v${VERSION}"
 OutFile "ATCS_v${VERSION}_Setup.exe"
@@ -13,8 +14,8 @@ InstallDir "$PROGRAMFILES\ATCS\"
 Var StartMenuFolder
 
 !define MUI_WELCOMEPAGE_TITLE "Welcome to Andor's Trail Content Studio installer"
-!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION} installer"
-!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio v${VERSION} install completed !"
+!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION}"
+!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio v${VERSION} - Install completed !"
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Andor's Trail Content Studio"
 !define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio v${VERSION}"
 
@@ -46,24 +47,26 @@ Var StartMenuFolder
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
-
 !insertmacro MUI_LANGUAGE "English"
 
+
+;------------------------------------------------------------------------------------
 Section install
 
-
+  ;--- Create in ...\packaging\common\   ATCS.cmd  ATCT.ico  ATCS.jar
   SetOutPath $INSTDIR
   file "ATCS.ico"
-  
-  Delete "$INSTDIR\lib\*"
+  file "${ATCS_SOURCE_DIR}\packaging\common\ATCS.jar"
 
   Call GetJRE
   Pop $R0
+;  file "${ATCS_SOURCE_DIR}\packaging\common\ATCS.cmd"
+;  !insertmacro _ReplaceInFile "ATCS.cmd" "java.exe" "$R0"  (It was too much work this way)
   FileOpen $9 "ATCS.cmd" w
   FileWrite $9 '@echo off$\r$\n'
   FileWrite $9 '$\r$\n'
   FileWrite $9 'set "ATCS_DIR=%~dp0"$\r$\n'
-  FileWrite $9 'set "MAX_MEM=512M"$\r$\n'
+  FileWrite $9 'set "MAX_MEM=1024M"$\r$\n'
   FileWrite $9 'set "CP=%ATCS_DIR%lib\*"$\r$\n'
   FileWrite $9 'set "JAVA=$R0"$\r$\n'
   FileWrite $9 'set "JAVA_OPTS="$\r$\n'
@@ -79,29 +82,15 @@ Section install
   FileWrite $9 '  echo.>>"%ENV_FILE%"$\r$\n'
   FileWrite $9 ')$\r$\n'
   FileWrite $9 '$\r$\n'
-  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%$\r$\n'
+  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar ATCS.jar$\r$\n'
   FileClose $9
 
-  SetOutPath "$INSTDIR\lib\"
-  file "jide-oss.jar"
-  file "ui.jar"
-  file "AndorsTrainer_v${TRAINER_VERSION}.jar"
-  file "junit-4.10.jar"
-  file "json_simple-1.1.jar"
-  file "ATCS_v${VERSION}.jar"
-  file "rsyntaxtextarea.jar"
-  file "prefuse.jar"
-  file "bsh-2.0b4.jar"
-  file "jsoup-1.10.2.jar"
-
-  SetOutPath $INSTDIR
-  
   WriteUninstaller "$INSTDIR\Uninstall.exe"
   
   
   !insertmacro MUI_STARTMENU_WRITE_BEGIN "ATCS"
     
-    ;Create shortcuts
+    ;--- Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
     CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Andor's Trail Content Studio.lnk" "$INSTDIR\ATCS.cmd" "" "$INSTDIR\ATCS.ico"
     CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
@@ -110,6 +99,8 @@ Section install
   
 SectionEnd
 
+
+;------------------------------------------------------------------------------------
 Section uninstall
   
   Delete "$INSTDIR\lib\jide-oss.jar"
@@ -117,18 +108,17 @@ Section uninstall
   Delete "$INSTDIR\lib\junit-4.10.jar"
   Delete "$INSTDIR\lib\json_simple-1.1.jar"
   Delete "$INSTDIR\lib\AndorsTrainer_v${TRAINER_VERSION}.jar"
-  Delete "$INSTDIR\lib\ATCS_v${VERSION}.jar"
   Delete "$INSTDIR\lib\rsyntaxtextarea.jar"
   Delete "$INSTDIR\lib\prefuse.jar"
   Delete "$INSTDIR\lib\bsh-2.0b4.jar"
   Delete "$INSTDIR\lib\jsoup-1.10.2.jar"
   RMDir "$INSTDIR\lib\"
+
   Delete "$INSTDIR\ATCS.ico"
   Delete "$INSTDIR\ATCS.cmd"
   Delete "$INSTDIR\ATCS.env.bat"
-  
+  Delete "$INSTDIR\ATCS.jar"
   Delete "$INSTDIR\Uninstall.exe"
-
   RMDir "$INSTDIR"
   
   !insertmacro MUI_STARTMENU_GETFOLDER "ATCS" $StartMenuFolder
@@ -140,19 +130,20 @@ Section uninstall
 SectionEnd
 
 
+;------------------------------------------------------------------------------------
 Function GetJRE
 ;
-;  Find JRE (javaw.exe)
+;  Find JRE (java.exe)
 ;  DISABLED 1 - in .\jre directory (JRE Installed with application)
 ;  2 - in JAVA_HOME environment variable
 ;  3 - in the registry
-;  4 - assume javaw.exe in current dir or PATH
+;  4 - assume java.exe in current dir or PATH
  
   Push $R0
   Push $R1
  
   ;ClearErrors
-  ;StrCpy $R0 "$EXEDIR\jre\bin\javaw.exe"
+  ;StrCpy $R0 "$EXEDIR\jre\bin\java.exe"
   ;IfFileExists $R0 JreFound
   ;StrCpy $R0 ""
  

packaging/common/ATCS.cmd

@@ -0,0 +1,18 @@
+@echo off
+
+set "ATCS_DIR=%~dp0"
+set "MAX_MEM=1024M"
+set "JAVA=java.exe"
+set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
+set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
+
+if exist "%ENV_FILE%" (
+  call "%ENV_FILE%"
+) else (
+  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
+  echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"
+  echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"
+  echo.>>"%ENV_FILE%"
+)
+
+start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar "%ATCS_DIR%\ATCS.jar"

packaging/common/ATCS.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+ATCS_DIR=$(dirname $(readlink -f "$0" || greadlink -f "$0" || stat -f "$0"))
+
+MAX_MEM=512M
+
+JAVA=java
+JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
+ENV_FILE=${ATCS_DIR}/ATCS.env
+
+if [ -f ${ENV_FILE} ]; then
+	source ${ENV_FILE}
+else
+	echo "#MAX_MEM=${MAX_MEM}" >${ENV_FILE}
+	echo "#JAVA=${JAVA}" >>${ENV_FILE}
+	echo "#JAVA_OPTS=${JAVA_OPTS}" >>${ENV_FILE}
+	echo "" >>${ENV_FILE}
+fi
+
+export ENV_FILE
+
+$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar ${ATCS_DIR}/ATCS.jar

packaging/package-windows.sh

@@ -0,0 +1 @@
+sh ./package.sh -windows

packaging/package.sh

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Script to build ATCS.jar, replicating IntelliJ artifact definition
+# Linux and Windows compatible
+
+# --- Platform Detection ---
+if [ "$1" = "-windows" ]; then
+    echo "Got '-windows' flag. Running Windows version"
+    PLATFORM="WINDOWS"
+else
+    echo "No '-windows' flag. Running Linux version"
+    PLATFORM="LINUX"
+fi
+
+# --- Configuration ---
+PACKAGING_DIR=$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")
+ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}")
+TEMP_DIR="${PACKAGING_DIR}/tmp"
+JAR_LOCATION="${PACKAGING_DIR}/ATCS.jar" # Output JAR location as per script
+MANIFEST_LOCATION="${PACKAGING_DIR}/Manifest.txt"
+VERSION_FILE="${PACKAGING_DIR}/ATCS_latest"
+SOURCE_BASE_DIR="${ATCS_SOURCE_DIR}/src" # Base directory for standard source code
+LIB_BASE_DIR="${ATCS_SOURCE_DIR}/lib"     # Base directory for libraries
+OUTPUT_JAR_DIR="${PACKAGING_DIR}"  # Directory where the final JAR will be placed - as per script
+
+# --- **ADDITIONAL SOURCE CODE FOLDERS** ---
+EXTRA_SOURCE_DIRS=(
+  "hacked-libtiled"
+  "minify"
+  "siphash-zackehh/src/main/java"
+)
+
+# --- Libraries to include (from IntelliJ artifact definition) ---
+LIBRARIES=(
+  "AndorsTrainer_v0.1.5.jar"
+  "bsh-2.0b4.jar"
+  "jide-oss.jar"
+  "json_simple-1.1.jar"
+  "jsoup-1.10.2.jar"
+  "junit-4.10.jar"
+  "prefuse.jar"
+  "rsyntaxtextarea.jar"
+  "ui.jar"
+)
+
+# --- Get version ---
+echo "Getting version"
+VERSION=$(cat "${VERSION_FILE}")
+echo "Got version ${VERSION}"
+
+# --- Prepare temporary directory ---
+echo "Removing tmp folder"
+rm -rf "${TEMP_DIR}"
+echo "Recreating tmp folder"
+mkdir -p "${TEMP_DIR}"
+
+# --- **EXTRACT lib files directly to TEMP_DIR** ---
+echo 'Extracting lib files to TEMP_DIR'
+for LIB in "${LIBRARIES[@]}"; do
+    echo "Extracting library: ${LIB}"
+    unzip -qo "${LIB_BASE_DIR}/${LIB}" -d "${TEMP_DIR}" # Extract JAR contents to TEMP_DIR root
+done
+
+# --- Set ClassPath ---
+echo "Getting source files"
+# Find all java files in source directories and compile them
+SOURCE_FILES=$(find "${SOURCE_BASE_DIR}" "${EXTRA_SOURCE_DIRS[@]/#/${ATCS_SOURCE_DIR}/}" -name "*.java" -print)
+#echo "SourceFiles: ${SOURCE_FILES}"
+echo ""
+
+# --- Build Java classes ---
+echo 'Building java classes'
+
+javac -cp "${TEMP_DIR}" -d "${TEMP_DIR}" ${SOURCE_FILES}
+if [ $? -ne 0 ]; then
+    echo "Compilation failed. Please check errors above."
+    exit 1
+fi
+echo "Compilation successful"
+
+# --- Copy res stuff to temp folder ---
+echo "Copying some stuff to temp folder"
+cp -r "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/"
+mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img"
+mkdir -p "${TEMP_DIR}/tiled/io/resources/"
+cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/" # some icons
+cp -r "${ATCS_SOURCE_DIR}"/hacked-libtiled/tiled/io/resources/* "${TEMP_DIR}/tiled/io/resources/" # dtd file for tmx maps
+
+# --- Create JAR file ---
+echo ""
+echo "Creating jar at location: ${JAR_LOCATION}"
+
+cd "${TEMP_DIR}" || exit # Change to temp dir for JAR command
+
+# JAR command WITHOUT lib directory
+jar cfm "${JAR_LOCATION}" "${MANIFEST_LOCATION}"  -C . .
+if [ $? -ne 0 ]; then
+    echo "JAR creation failed."
+    exit 1
+fi
+
+cd "${PACKAGING_DIR}" || exit # Go back to packaging dir
+
+echo ''
+echo "Done creating jar at ${JAR_LOCATION}"
+cp -f "${JAR_LOCATION}" "${OUTPUT_JAR_DIR}/common/ATCS.jar" # Copy JAR to versioned name
+
+# --- Create archive ---
+if [ "$PLATFORM" = "LINUX" ]; then
+    cd "${OUTPUT_JAR_DIR}" || exit
+    echo "Creating archive"
+    tar caf "ATCS_${VERSION}.tar.gz" common/* # archive the 'common' folder which now contains the JAR and libs
+    echo "Created archive at ${OUTPUT_JAR_DIR}/ATCS_${VERSION}.tar.gz"
+    cd "${PACKAGING_DIR}" || exit
+else
+  echo "Can't create zip files on windows yet. Please pack the content of the '${OUTPUT_JAR_DIR}/common/' folder yourself"
+fi
+
+echo "Script finished."

res/LICENSE.minify.txt

@@ -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

@@ -1,64 +1,94 @@
 atcs.spritesheet.actorconditions_1.category=actorcondition
 atcs.spritesheet.actorconditions_2.category=actorcondition
 atcs.spritesheet.actorconditions_japozero.category=actorcondition
+atcs.spritesheet.actorconditions_newb.category=actorcondition
+atcs.spritesheet.actorconditions_omi1.category=actorcondition
+atcs.spritesheet.actorconditions_omi2.category=actorcondition
+
+atcs.spritesheet.effect_blood3.animate=true
+atcs.spritesheet.effect_blood4.animate=true
+atcs.spritesheet.effect_bluetentacle.animate=true
+atcs.spritesheet.effect_heal2.animate=true
+atcs.spritesheet.effect_miss1.animate=true
+atcs.spritesheet.effect_poison1.animate=true
+atcs.spritesheet.effect_tometik1.animate=true
+atcs.spritesheet.effect_tometik2.animate=true
+
 atcs.spritesheet.items_armours.category=item
 atcs.spritesheet.items_armours_2.category=item
 atcs.spritesheet.items_armours_3.category=item
-atcs.spritesheet.items_weapons.category=item
-atcs.spritesheet.items_weapons_2.category=item
-atcs.spritesheet.items_weapons_3.category=item
-atcs.spritesheet.items_jewelry.category=item
-atcs.spritesheet.items_rings_1.category=item
-atcs.spritesheet.items_necklaces_1.category=item
-atcs.spritesheet.items_consumables.category=item
-atcs.spritesheet.items_japozero.category=item
 atcs.spritesheet.items_books.category=item
+atcs.spritesheet.items_consumables.category=item
+atcs.spritesheet.items_consumables_omi1.category=item
+atcs.spritesheet.items_feygard1.category=item
+atcs.spritesheet.items_g03_package_omi1.category=item
+atcs.spritesheet.items_japozero.category=item
+atcs.spritesheet.items_jewelry.category=item
 atcs.spritesheet.items_misc.category=item
 atcs.spritesheet.items_misc_2.category=item
 atcs.spritesheet.items_misc_3.category=item
 atcs.spritesheet.items_misc_4.category=item
 atcs.spritesheet.items_misc_5.category=item
 atcs.spritesheet.items_misc_6.category=item
+atcs.spritesheet.items_necklaces_1.category=item
+atcs.spritesheet.items_newb.category=item
+atcs.spritesheet.items_omgeeky.category=item
+atcs.spritesheet.items_omi2.category=item
+atcs.spritesheet.items_phoenix01.category=item
 atcs.spritesheet.items_reterski_1.category=item
+atcs.spritesheet.items_rijackson_1.category=item
+atcs.spritesheet.items_rings_1.category=item
 atcs.spritesheet.items_tometik1.category=item
 atcs.spritesheet.items_tometik2.category=item
 atcs.spritesheet.items_tometik3.category=item
+atcs.spritesheet.items_weapons.category=item
+atcs.spritesheet.items_weapons_2.category=item
+atcs.spritesheet.items_weapons_3.category=item
+
 atcs.spritesheet.monsters_armor1.category=monster
+atcs.spritesheet.monsters_arulirs.category=monster
+
+atcs.spritesheet.monsters_cats.category=monster
 atcs.spritesheet.monsters_dogs.category=monster
 atcs.spritesheet.monsters_eye1.category=monster
 atcs.spritesheet.monsters_eye2.category=monster
 atcs.spritesheet.monsters_eye3.category=monster
 atcs.spritesheet.monsters_eye4.category=monster
+atcs.spritesheet.monsters_fatboy73.category=monster
 atcs.spritesheet.monsters_ghost1.category=monster
-atcs.spritesheet.monsters_hydra1.category=monster
-atcs.spritesheet.monsters_hydra1.sizex=64
-atcs.spritesheet.monsters_hydra1.sizey=64
+
+atcs.spritesheet.monsters_gisons.category=monster
+atcs.spritesheet.monsters_guynmart.category=monster
+
 atcs.spritesheet.monsters_insects.category=monster
+atcs.spritesheet.monsters_johny.category=monster
+atcs.spritesheet.monsters_karvis1.category=monster
+atcs.spritesheet.monsters_karvis2.category=monster
+atcs.spritesheet.monsters_ld1.category=monster
+atcs.spritesheet.monsters_ld2.category=monster
 atcs.spritesheet.monsters_liches.category=monster
 atcs.spritesheet.monsters_mage.category=monster
 atcs.spritesheet.monsters_mage2.category=monster
+atcs.spritesheet.monsters_maksiu1.category=monster
 atcs.spritesheet.monsters_man1.category=monster
 atcs.spritesheet.monsters_men.category=monster
 atcs.spritesheet.monsters_men2.category=monster
 atcs.spritesheet.monsters_misc.category=monster
+atcs.spritesheet.monsters_newb_1.category=monster
+atcs.spritesheet.monsters_omi1.category=monster
+atcs.spritesheet.monsters_omi1_b.category=monster
+atcs.spritesheet.monsters_omi2.category=monster
+atcs.spritesheet.monsters_phoenix01.category=monster
 atcs.spritesheet.monsters_rats.category=monster
-atcs.spritesheet.monsters_rogue1.category=monster
-atcs.spritesheet.monsters_skeleton1.category=monster
-atcs.spritesheet.monsters_skeleton2.category=monster
-atcs.spritesheet.monsters_snakes.category=monster
-atcs.spritesheet.monsters_warrior1.category=monster
-atcs.spritesheet.monsters_wraiths.category=monster
-atcs.spritesheet.monsters_zombie1.category=monster
-atcs.spritesheet.monsters_zombie2.category=monster
-atcs.spritesheet.monsters_karvis1.category=monster
-atcs.spritesheet.monsters_karvis2.category=monster
+atcs.spritesheet.monsters_redshrike1.category=monster
 atcs.spritesheet.monsters_rltiles1.category=monster
 atcs.spritesheet.monsters_rltiles2.category=monster
 atcs.spritesheet.monsters_rltiles3.category=monster
 atcs.spritesheet.monsters_rltiles4.category=monster
-atcs.spritesheet.monsters_redshrike1.category=monster
-atcs.spritesheet.monsters_ld1.category=monster
-atcs.spritesheet.monsters_ld2.category=monster
+atcs.spritesheet.monsters_rogue1.category=monster
+atcs.spritesheet.monsters_skeleton1.category=monster
+atcs.spritesheet.monsters_skeleton2.category=monster
+atcs.spritesheet.monsters_snakes.category=monster
 atcs.spritesheet.monsters_tometik1.category=monster
 atcs.spritesheet.monsters_tometik2.category=monster
 atcs.spritesheet.monsters_tometik3.category=monster
@@ -69,20 +99,36 @@ atcs.spritesheet.monsters_tometik7.category=monster
 atcs.spritesheet.monsters_tometik8.category=monster
 atcs.spritesheet.monsters_tometik9.category=monster
 atcs.spritesheet.monsters_tometik10.category=monster
+atcs.spritesheet.monsters_warrior1.category=monster
+atcs.spritesheet.monsters_unknown.category=monster
+atcs.spritesheet.monsters_wraiths.category=monster
+atcs.spritesheet.monsters_zombie1.category=monster
+atcs.spritesheet.monsters_zombie2.category=monster
+
+atcs.spritesheet.monsters_bosses_2x2.category=monster
+atcs.spritesheet.monsters_bosses_2x2.sizex=64
+atcs.spritesheet.monsters_bosses_2x2.sizey=64
+atcs.spritesheet.monsters_cyclops.category=monster
+atcs.spritesheet.monsters_cyclops.sizex=64
+atcs.spritesheet.monsters_cyclops.sizey=96
 atcs.spritesheet.monsters_demon1.category=monster
 atcs.spritesheet.monsters_demon1.sizex=64
 atcs.spritesheet.monsters_demon1.sizey=64
 atcs.spritesheet.monsters_demon2.category=monster
 atcs.spritesheet.monsters_demon2.sizex=64
 atcs.spritesheet.monsters_demon2.sizey=64
-atcs.spritesheet.monsters_cyclops.category=monster
-atcs.spritesheet.monsters_cyclops.sizex=64
-atcs.spritesheet.monsters_cyclops.sizey=96
-atcs.spritesheet.effect_blood3.animate=true
-atcs.spritesheet.effect_blood4.animate=true
-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.monsters_guynmart.category=monster
+atcs.spritesheet.monsters_giantbasilisk.category=monster
+atcs.spritesheet.monsters_giantbasilisk.sizex=64
+atcs.spritesheet.monsters_giantbasilisk.sizey=64
+atcs.spritesheet.monsters_hydra1.category=monster
+atcs.spritesheet.monsters_hydra1.sizex=64
+atcs.spritesheet.monsters_hydra1.sizey=64
+atcs.spritesheet.monsters_newb_2.category=monster
+atcs.spritesheet.monsters_newb_2.sizex=64
+atcs.spritesheet.monsters_newb_2.sizey=32
+atcs.spritesheet.monsters_newb_3.category=monster
+atcs.spritesheet.monsters_newb_3.sizex=64
+atcs.spritesheet.monsters_newb_3.sizey=64
+atcs.spritesheet.monsters_newb_4.category=monster
+atcs.spritesheet.monsters_newb_4.sizex=32
+atcs.spritesheet.monsters_newb_4.sizey=64

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/META-INF/MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Main-Class: com.gpl.rpg.atcontentstudio.ATContentStudio
+Class-Path: jide-oss.jar jsoup-1.10.2.jar ui.jar junit-4.10.jar AndorsTr
+ ainer_v0.1.5.jar prefuse.jar rsyntaxtextarea.jar bsh-2.0b4.jar json_sim
+ ple-1.1.jar
+

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

@@ -32,18 +32,17 @@ import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import javax.swing.plaf.FontUIResource;
 
+import prefuse.data.expression.parser.ExpressionParser;
+
 import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
 import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 
-import prefuse.data.expression.parser.ExpressionParser;
-
-
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.10";
+	public static final String APP_VERSION = "v0.6.21";
 
 	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";
@@ -51,10 +50,11 @@ public class ATContentStudio {
 	public static final String FONT_SCALE_ENV_VAR_NAME = "FONT_SCALE";
 
 	public static boolean STARTED = false;
-	public static float SCALING=1.0f;
+	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.
+	// Need to keep a strong reference to it, to avoid garbage collection that'll
+	// reset these loggers.
 	public static final List<Logger> configuredLoggers = new LinkedList<Logger>();
 
 	/**
@@ -66,7 +66,7 @@ public class ATContentStudio {
 		if (fontScaling != null) {
 			try {
 				fontScale = Float.parseFloat(fontScaling);
-				SCALING=fontScale;
+				SCALING = fontScale;
 			} catch (NumberFormatException e) {
 				System.err.println("Failed to parse font scaling parameter. Using default.");
 				e.printStackTrace();
@@ -77,7 +77,8 @@ public class ATContentStudio {
 
 		try {
 			String laf = ConfigCache.getFavoriteLaFClassName();
-			if (laf == null) laf = UIManager.getSystemLookAndFeelClassName();
+			if (laf == null)
+				laf = UIManager.getSystemLookAndFeelClassName();
 			UIManager.setLookAndFeel(laf);
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
@@ -89,10 +90,10 @@ public class ATContentStudio {
 			e.printStackTrace();
 		}
 
-		
 		scaleUIFont();
 
-		//Need to keep a strong reference to it, to avoid garbage collection that'll reset this setting.
+		// Need to keep a strong reference to it, to avoid garbage collection that'll
+		// reset this setting.
 		Logger l = Logger.getLogger(ExpressionParser.class.getName());
 		l.setLevel(Level.OFF);
 		configuredLoggers.add(l);
@@ -101,7 +102,7 @@ public class ATContentStudio {
 		wsSelect.pack();
 		Dimension sdim = Toolkit.getDefaultToolkit().getScreenSize();
 		Dimension wdim = wsSelect.getSize();
-		wsSelect.setLocation((sdim.width - wdim.width)/2, (sdim.height - wdim.height)/2);
+		wsSelect.setLocation((sdim.width - wdim.width) / 2, (sdim.height - wdim.height) / 2);
 		wsSelect.setVisible(true);
 
 		wsSelect.addWindowListener(new WindowAdapter() {
@@ -110,15 +111,18 @@ public class ATContentStudio {
 				if (wsSelect.selected != null && !STARTED) {
 					ATContentStudio.STARTED = true;
 					final File workspaceRoot = new File(wsSelect.selected);
-					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable(){
+					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()) {
+							if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue()
+									&& Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
 								new Thread() {
-									public void run() {checkUpdate();}
+									public void run() {
+										checkUpdate();
+									}
 								}.start();
 							}
-							frame = new StudioFrame(APP_NAME+" "+APP_VERSION);
+							frame = new StudioFrame(APP_NAME + " " + APP_VERSION);
 							frame.setVisible(true);
 							frame.setDefaultCloseOperation(StudioFrame.DO_NOTHING_ON_CLOSE);
 						};
@@ -146,26 +150,28 @@ public class ATContentStudio {
 			in = new BufferedReader(new InputStreamReader(url.openStream()));
 
 			String inputLine, lastLine = null;
-			while ((inputLine = in.readLine()) != null) {lastLine = inputLine;}
+			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();
+				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()+");");
+				// 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>");
+				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);
@@ -194,7 +200,8 @@ public class ATContentStudio {
 			e.printStackTrace();
 		} finally {
 			try {
-				if (in != null) in.close();
+				if (in != null)
+					in.close();
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -203,7 +210,7 @@ public class ATContentStudio {
 
 	public static void scaleUIFont() {
 		if (SCALING != 1.0f) {
-			System.out.println("Scaling fonts to "+SCALING);
+			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();) {
@@ -211,7 +218,7 @@ public class ATContentStudio {
 				Object value = defaults.get(key);
 				if (value instanceof Font) {
 					Font font = (Font) value;
-					int newSize = (int)(font.getSize() * SCALING);
+					int newSize = (int) (font.getSize() * SCALING);
 					if (value instanceof FontUIResource) {
 						newDefaults.put(key, new FontUIResource(font.getName(), font.getStyle(), newSize));
 					} else {

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>();
 
@@ -186,4 +190,30 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 
 	public abstract List<SaveEvent> attemptSave();
 
+	/**
+	 * Checks if the current state indicates that parsing/linking should be skipped.
+	 * @return true if the operation should be skipped, false otherwise
+	 */
+	protected boolean shouldSkipParseOrLink() {
+		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
+			//This type of state is unrelated to parsing/linking.
+			return true;
+		}
+		if (this.state == State.linked) {
+			//Already linked.
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Ensures the element is parsed if needed based on its current state.
+	 */
+	protected void ensureParseIfNeeded() {
+		if (this.state == State.init) {
+			//Not parsed yet.
+			this.parse();
+		}
+	}
+
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -8,20 +9,21 @@ import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.StringBufferInputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 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;
@@ -50,6 +52,7 @@ 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;
@@ -75,6 +78,8 @@ import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 public class Project implements ProjectTreeNode, Serializable {
 
 	private static final long serialVersionUID = 4807454973303366758L;
+	private static final String drawablePath = TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE.replace("\\", "/");
+
 	
 	//Every instance field that is not transient will be saved in this file.
 	public static final String SETTINGS_FILE = ".project";
@@ -89,6 +94,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.
 	
@@ -137,6 +144,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);
 
@@ -145,6 +153,7 @@ public class Project implements ProjectTreeNode, Serializable {
 //		v.add(referencedContent);
 		v.add(baseContent);
 		v.add(saves);
+		v.add(bookmarks);
 
 		linkAll();
 		
@@ -264,6 +273,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();
 
@@ -273,6 +283,7 @@ public class Project implements ProjectTreeNode, Serializable {
 //		v.add(referencedContent);
 		v.add(baseContent);
 		v.add(saves);
+		v.add(bookmarks);
 		
 
 		linkAll();
@@ -972,6 +983,10 @@ public class Project implements ProjectTreeNode, Serializable {
 		fireElementAdded(node, getNodeIndex(node));
 	}
 	
+	public void bookmark(GameDataElement gde) {
+		bookmarks.addBookmark(gde);
+	}
+	
 	
 	@Override
 	public GameDataSet getDataSet() {
@@ -1070,10 +1085,16 @@ public class Project implements ProjectTreeNode, Serializable {
 			public void run() {
 				Notification.addInfo("Exporting project \""+name+"\" as "+target.getAbsolutePath());
 				
-				File tmpDir = exportProjectToTmpDir();
+				File tmpDir;
+				try {
+					tmpDir = exportProjectToTmpDir();
+					FileUtils.writeToZip(tmpDir, target);
+					FileUtils.deleteDir(tmpDir);					
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 
-				FileUtils.writeToZip(tmpDir, target);
-				FileUtils.deleteDir(tmpDir);
 				Notification.addSuccess("Project \""+name+"\" exported as "+target.getAbsolutePath());
 			}
 
@@ -1087,10 +1108,16 @@ public class Project implements ProjectTreeNode, Serializable {
 			public void run() {
 				Notification.addInfo("Exporting project \""+name+"\" into "+target.getAbsolutePath());
 				
-				File tmpDir = exportProjectToTmpDir();
+				File tmpDir;
+				try {					
+					tmpDir = exportProjectToTmpDir();
+					FileUtils.copyOver(tmpDir, target);
+					FileUtils.deleteDir(tmpDir);					
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 
-				FileUtils.copyOver(tmpDir, target);
-				FileUtils.deleteDir(tmpDir);
 				Notification.addSuccess("Project \""+name+"\" exported into "+target.getAbsolutePath());
 			}
 
@@ -1098,7 +1125,7 @@ public class Project implements ProjectTreeNode, Serializable {
 		});
 	}
 	
-	public File exportProjectToTmpDir() {
+	public File exportProjectToTmpDir() throws IOException {
 		File tmpDir = new File(baseFolder, "tmp");
 		FileUtils.deleteDir(tmpDir);
 		tmpDir.mkdir();
@@ -1129,11 +1156,13 @@ public class Project implements ProjectTreeNode, Serializable {
 		tmpMapDir.mkdirs();
 		writtenFiles = new LinkedList<String>();
 		for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
-			FileUtils.copyFile(createdMapFile, new File(tmpMapDir, createdMapFile.getName()));
+			if (createdMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
+			copyTmxConverted(createdMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), createdMapFile.getName()));
 			writtenFiles.add(createdMapFile.getName());
 		}
 		for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
-			FileUtils.copyFile(alteredMapFile, new File(tmpMapDir, alteredMapFile.getName()));
+			if (alteredMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
+			copyTmxConverted(alteredMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), alteredMapFile.getName()));
 			writtenFiles.add(alteredMapFile.getName());
 		}
 		writtenFilesPerDataType.put(TMXMap.class, writtenFiles);
@@ -1166,12 +1195,24 @@ public class Project implements ProjectTreeNode, Serializable {
 		return tmpDir;
 	}
 	
+	private void copyTmxConverted(Path from, Path to) throws IOException {
+		String xml = new String(Files.readAllBytes(from), StandardCharsets.UTF_8);
+		xml = xml.replace("../../altered/spritesheets/", drawablePath);
+		xml = xml.replace("../../created/spritesheets/", drawablePath);
+		xml = xml.replace("../spritesheets/", drawablePath);
+		xml = xml.replace("../spritesheets/", drawablePath);
+		Files.write(to, xml.getBytes(StandardCharsets.UTF_8));
+	}
+
+
 	@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) {
-			filenamesToWrite.add(gde.jsonFile.getName());
+			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
+				filenamesToWrite.add(gde.jsonFile.getName());
+			}
 		}
 		for (JSONElement gde : created) {
 			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
@@ -1311,7 +1352,7 @@ public class Project implements ProjectTreeNode, Serializable {
 			transformer.transform(input, output);
 			
 			String tempString = temp.toString();
-			doc = builder.parse(new StringBufferInputStream(tempString));
+			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" + 

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

@@ -38,7 +38,7 @@ 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);
@@ -158,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) {
@@ -188,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);
@@ -201,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

@@ -29,6 +29,7 @@ public class ActorCondition extends JSONElement {
 	//public String id; inherited.
 	public String icon_id;
 	public String display_name;
+	public String description;
 
 	// Available from parsed state
 	public ACCategory category = null;
@@ -157,6 +158,7 @@ public class ActorCondition extends JSONElement {
 	@Override
 	public void parse(Map aCondJson) {
 
+		if (aCondJson.get("description") != null) this.description = (String) aCondJson.get("description");
 		if (aCondJson.get("category") != null) this.category = ACCategory.valueOf((String) aCondJson.get("category"));
 		this.positive = JSONElement.getInteger((Number) aCondJson.get("isPositive"));
 		Map abilityEffect = (Map) aCondJson.get("abilityEffect");
@@ -222,21 +224,19 @@ public class ActorCondition extends JSONElement {
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 		if (this.icon_id != null) {
 			String spritesheetId = this.icon_id.split(":")[0];
 			if (getProject().getSpritesheet(spritesheetId) == null) {
+				System.out.println("Actor Condition");
 				System.out.println(this.id);
+				System.out.println("failed to load spritesheet:");
+				System.out.println(spritesheetId);
+				System.out.println("while creating backlink for icon_id:");
+				System.out.println(this.icon_id);
 			}
 			getProject().getSpritesheet(spritesheetId).addBacklink(this);
 		}
@@ -266,6 +266,7 @@ public class ActorCondition extends JSONElement {
 		clone.state = this.state;
 		clone.id = this.id;
 		clone.display_name = this.display_name;
+		clone.description = this.description;
 		clone.icon_id = this.icon_id;
 		clone.category = this.category;
 		clone.positive = this.positive;
@@ -294,6 +295,7 @@ public class ActorCondition extends JSONElement {
 		jsonAC.put("id", this.id);
 		if (this.icon_id != null) jsonAC.put("iconID", this.icon_id);
 		if (this.display_name != null) jsonAC.put("name", this.display_name);
+		if (this.description != null) jsonAC.put("description", this.description);
 		if (this.category != null) jsonAC.put("category", this.category.toString());
 		if (this.positive != null && this.positive == 1) jsonAC.put("isPositive", this.positive);
 		if (this.stacking != null && this.stacking == 1) jsonAC.put("isStacking", this.stacking);

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

@@ -0,0 +1,184 @@
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.Project;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public final class Common {
+
+    public static void linkConditions(List<?extends ConditionEffect> conditions, Project proj, GameDataElement backlink) {
+        if (conditions != null) {
+            for (ConditionEffect ce : conditions) {
+                if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+                if (ce.condition != null) ce.condition.addBacklink(backlink);
+            }
+        }
+    }
+    public static class TimedConditionEffect extends ConditionEffect {
+        //Available from parsed state
+        public Integer duration = null;
+        public Double chance = null;
+
+        public TimedConditionEffect createClone() {
+            TimedConditionEffect cclone = new TimedConditionEffect();
+            cclone.magnitude = this.magnitude;
+            cclone.condition_id = this.condition_id;
+            cclone.condition = this.condition;
+            cclone.chance = this.chance;
+            cclone.duration = this.duration;
+            return cclone;
+        }
+    }
+
+    public static class ConditionEffect {
+        //Available from parsed state
+        public Integer magnitude = null;
+        public String condition_id = null;
+
+        //Available from linked state
+        public ActorCondition condition = null;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static ArrayList<TimedConditionEffect> parseTimedConditionEffects(List conditionsSourceJson) {
+        ArrayList<TimedConditionEffect> conditions_source;
+        if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+            conditions_source = new ArrayList<>();
+            for (Object conditionJsonObj : conditionsSourceJson) {
+                Map conditionJson = (Map) conditionJsonObj;
+                TimedConditionEffect condition = new TimedConditionEffect();
+                readConditionEffect(condition, conditionJson);
+                condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+                if (conditionJson.get("chance") != null)
+                    condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+                conditions_source.add(condition);
+            }
+        } else {
+            conditions_source = null;
+        }
+        return conditions_source;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static void readConditionEffect(ConditionEffect condition, Map conditionJson) {
+        condition.condition_id = (String) conditionJson.get("condition");
+        condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static Common.DeathEffect parseDeathEffect(Map killEffect) {
+        Common.DeathEffect kill_effect = new Common.DeathEffect();
+        readDeathEffect(killEffect, kill_effect);
+        return kill_effect;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static HitEffect parseHitEffect(Map hitEffect) {
+        Common.HitEffect hit_effect = new Common.HitEffect();
+        readHitEffect(hitEffect, hit_effect);
+        return hit_effect;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static HitReceivedEffect parseHitReceivedEffect(Map hitReceivedEffect) {
+        HitReceivedEffect hit_received_effect = new Common.HitReceivedEffect();
+        readHitEffect(hitReceivedEffect, hit_received_effect);
+        if (hitReceivedEffect.get("increaseAttackerCurrentHP") != null) {
+            hit_received_effect.hp_boost_max_target = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentHP")).get("max")));
+            hit_received_effect.hp_boost_min_target = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentHP")).get("min")));
+        }
+        if (hitReceivedEffect.get("increaseAttackerCurrentAP") != null) {
+            hit_received_effect.ap_boost_max_target = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentAP")).get("max")));
+            hit_received_effect.ap_boost_min_target = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentAP")).get("min")));
+        }
+        return hit_received_effect;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static void readDeathEffect(Map killEffect, DeathEffect kill_effect) {
+        if (killEffect.get("increaseCurrentHP") != null) {
+            kill_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map) killEffect.get("increaseCurrentHP")).get("min")));
+            kill_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map) killEffect.get("increaseCurrentHP")).get("max")));
+        }
+        if (killEffect.get("increaseCurrentAP") != null) {
+            kill_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map) killEffect.get("increaseCurrentAP")).get("min")));
+            kill_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map) killEffect.get("increaseCurrentAP")).get("max")));
+        }
+        List conditionsSourceJson = (List) killEffect.get("conditionsSource");
+        kill_effect.conditions_source = parseTimedConditionEffects(conditionsSourceJson);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static void readHitEffect(Map hitEffect, HitEffect hit_effect) {
+        readDeathEffect(hitEffect, hit_effect);
+        List conditionsTargetJson = (List) hitEffect.get("conditionsTarget");
+        hit_effect.conditions_target = parseTimedConditionEffects(conditionsTargetJson);
+    }
+
+
+    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 Common.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 void copyDeathEffectValues(Common.DeathEffect target, Common.DeathEffect source, GameDataElement backlink) {
+        target.ap_boost_max = source.ap_boost_max;
+        target.ap_boost_min = source.ap_boost_min;
+        target.hp_boost_max = source.hp_boost_max;
+        target.hp_boost_min = source.hp_boost_min;
+        if (source.conditions_source != null) {
+            target.conditions_source = new ArrayList<>();
+            for (Common.TimedConditionEffect c : source.conditions_source) {
+                Common.TimedConditionEffect cclone = c.createClone();
+                if (cclone.condition != null) {
+                    cclone.condition.addBacklink(backlink);
+                }
+                target.conditions_source.add(cclone);
+            }
+        }
+    }
+
+    public static void copyHitEffectValues(Common.HitEffect target, Common.HitEffect source, GameDataElement backlink) {
+        copyDeathEffectValues(target, source, backlink);
+        if (source.conditions_target != null) {
+            target.conditions_target = new ArrayList<>();
+            for (Common.TimedConditionEffect c : source.conditions_target) {
+                Common.TimedConditionEffect cclone = c.createClone();
+                if (cclone.condition != null) {
+                    cclone.condition.addBacklink(backlink);
+                }
+                target.conditions_target.add(cclone);
+            }
+        }
+    }
+
+    public static void copyHitReceivedEffectValues(Common.HitReceivedEffect target, Common.HitReceivedEffect source, GameDataElement backlink) {
+        copyHitEffectValues(target, source, backlink);
+        target.ap_boost_max_target = source.ap_boost_max_target;
+        target.ap_boost_min_target = source.ap_boost_min_target;
+        target.hp_boost_max_target = source.hp_boost_max_target;
+        target.hp_boost_min_target = source.hp_boost_min_target;
+    }
+
+}

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

@@ -68,7 +68,8 @@ public class Dialogue extends JSONElement {
 			deactivateSpawnArea,
 			activateMapObjectGroup,
 			deactivateMapObjectGroup,
-			changeMapFilter
+			changeMapFilter,
+			mapchange
 		}
 	}
 
@@ -205,17 +206,10 @@ public class Dialogue extends JSONElement {
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking dialogue "+id+". No parent project found.");
@@ -249,6 +243,7 @@ public class Dialogue extends JSONElement {
 					case removeSpawnArea:
 					case deactivateSpawnArea:
 					case changeMapFilter:
+					case mapchange:
 						reward.map = reward.map_name != null ? proj.getMap(reward.map_name) : null;
 						break;
 					case actorCondition:

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

@@ -36,7 +36,7 @@ public class Droplist extends JSONElement {
 	public static class DroppedItem {
 		//Available from parsed state;
 		public String item_id = null;
-		public Double chance = null;
+		public String chance = null;
 		public Integer quantity_min = null;
 		public Integer quantity_max = null;
 
@@ -114,7 +114,8 @@ public class Droplist extends JSONElement {
 				Map droppedItemJson = (Map)droppedItemJsonObj;
 				DroppedItem droppedItem = new DroppedItem();
 				droppedItem.item_id = (String) droppedItemJson.get("itemID");
-				if (droppedItemJson.get("chance") != null) droppedItem.chance = JSONElement.parseChance(droppedItemJson.get("chance").toString());
+				//if (droppedItemJson.get("chance") != null) droppedItem.chance = JSONElement.parseChance(droppedItemJson.get("chance").toString());
+				droppedItem.chance = (String) droppedItemJson.get("chance");
 				Map droppedItemQtyJson = (Map) droppedItemJson.get("quantity");
 				if (droppedItemQtyJson != null) {
 					droppedItem.quantity_min = JSONElement.getInteger((Number) droppedItemQtyJson.get("min"));
@@ -128,17 +129,10 @@ public class Droplist extends JSONElement {
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking droplist "+id+". No parent project found.");
@@ -217,7 +211,8 @@ public class Droplist extends JSONElement {
 				} else if (droppedItem.item_id != null) {
 					droppedItemJson.put("itemID", droppedItem.item_id);
 				}
-				if (droppedItem.chance != null) droppedItemJson.put("chance", JSONElement.printJsonChance(droppedItem.chance));
+				//if (droppedItem.chance != null) droppedItemJson.put("chance", JSONElement.printJsonChance(droppedItem.chance));
+				if (droppedItem.chance != null) droppedItemJson.put("chance", droppedItem.chance);
 				if (droppedItem.quantity_min != null || droppedItem.quantity_max != null) {
 					Map quantityJson = new LinkedHashMap();
 					droppedItemJson.put("quantity", quantityJson);

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

@@ -18,6 +18,8 @@ import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.Project;
 
+import static com.gpl.rpg.atcontentstudio.model.gamedata.Common.*;
+
 public class Item extends JSONElement {
 
 	private static final long serialVersionUID = -516874303672548638L;
@@ -35,38 +37,13 @@ public class Item extends JSONElement {
 	public String description = null;
 	public HitEffect hit_effect = null;
 	public HitReceivedEffect hit_received_effect = null;
-	public KillEffect kill_effect = null;
+	public DeathEffect kill_effect = null;
 	public EquipEffect equip_effect = null;
 
 	//Available from linked state
 	public ItemCategory category = null;
 
 
-	
-	public static class KillEffect {
-		//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;
-		
-	}
-	
-	//Inheritance for code compactness, not semantically correct.
-	public static class HitEffect extends KillEffect {
-		//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 EquipEffect {
 		//Available from parsed state
 		public Integer damage_boost_min = null;
@@ -83,22 +60,9 @@ public class Item extends JSONElement {
 		public Integer increase_block_chance = null;
 		public Integer increase_damage_resistance = null;
 		public Double critical_multiplier = null;
+		public Integer damage_modifier = null;
 	}
 
-	public static class ConditionEffect {
-		//Available from parsed state
-		public Integer magnitude = null;
-		public String condition_id = null;
-		
-		//Available from linked state
-		public ActorCondition condition = null; 
-	}
-	
-	public static class TimedConditionEffect extends ConditionEffect {
-		//Available from parsed state
-		public Integer duration = null;
-		public Double chance = null;
-	}
 
 	public static enum DisplayType {
 		ordinary,
@@ -202,10 +166,11 @@ public class Item extends JSONElement {
 			//TODO correct game data, to unify format.
 //			this.equip_effect.critical_multiplier = JSONElement.getDouble((Number) equipEffect.get("setCriticalMultiplier"));
 			if (equipEffect.get("setCriticalMultiplier") != null) this.equip_effect.critical_multiplier = JSONElement.getDouble(Double.parseDouble(equipEffect.get("setCriticalMultiplier").toString()));
+			this.equip_effect.damage_modifier = JSONElement.getInteger((Number) equipEffect.get("setNonWeaponDamageModifier"));
 
 			List conditionsJson = (List) equipEffect.get("addedConditions");
 			if (conditionsJson != null && !conditionsJson.isEmpty()) {
-				this.equip_effect.conditions = new ArrayList<Item.ConditionEffect>();
+				this.equip_effect.conditions = new ArrayList<>();
 				for (Object conditionJsonObj : conditionsJson) {
 					Map conditionJson = (Map)conditionJsonObj;
 					ConditionEffect condition = new ConditionEffect();
@@ -216,90 +181,15 @@ public class Item extends JSONElement {
 			}
 		}
 
+
 		Map hitEffect = (Map) itemJson.get("hitEffect");
 		if (hitEffect != null) {
-			this.hit_effect = new HitEffect();
-			if (hitEffect.get("increaseCurrentHP") != null) {
-				this.hit_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentHP")).get("min")));
-				this.hit_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentHP")).get("max")));
-			}
-			if (hitEffect.get("increaseCurrentAP") != null) {
-				this.hit_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("min")));
-				this.hit_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("max")));
-			}
-			List conditionsSourceJson = (List) hitEffect.get("conditionsSource");
-			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
-				this.hit_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_effect.conditions_source.add(condition);
-				}
-			}
-			List conditionsTargetJson = (List) hitEffect.get("conditionsTarget");
-			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
-				this.hit_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_effect.conditions_target.add(condition);
-				}
-			}
+			this.hit_effect = parseHitEffect(hitEffect);
 		}
 
 		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);
-				}
-			}
+			this.hit_received_effect = parseHitReceivedEffect(hitReceivedEffect);
 		}
 
 		Map killEffect = (Map) itemJson.get("killEffect");
@@ -307,46 +197,19 @@ public class Item extends JSONElement {
 			killEffect = (Map) itemJson.get("useEffect");
 		}
 		if (killEffect != null) {
-			this.kill_effect = new KillEffect();
-			if (killEffect.get("increaseCurrentHP") != null) {
-				this.kill_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentHP")).get("min")));
-				this.kill_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentHP")).get("max")));
-			}
-			if (killEffect.get("increaseCurrentAP") != null) {
-				this.kill_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentAP")).get("min")));
-				this.kill_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentAP")).get("max")));
-			}
-			List conditionsSourceJson = (List) killEffect.get("conditionsSource");
-			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
-				this.kill_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.kill_effect.conditions_source.add(condition);
-				}
-			}
+            this.kill_effect = parseDeathEffect(killEffect);
 		}
 		this.state = State.parsed;
 	}
 
 
+
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking item "+id+". No parent project found.");
@@ -360,40 +223,21 @@ public class Item extends JSONElement {
 		if (this.category_id != null) this.category = proj.getItemCategory(this.category_id);
 		if (this.category != null) this.category.addBacklink(this);
 		if (this.equip_effect != null && this.equip_effect.conditions != null) {
-			for (ConditionEffect ce : this.equip_effect.conditions) {
-				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
-				if (ce.condition != null) ce.condition.addBacklink(this);
-			}
+			linkConditions(this.equip_effect.conditions, proj, this);
 		}
-		if (this.hit_effect != null && this.hit_effect.conditions_source != null) {
-			for (TimedConditionEffect ce : this.hit_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_effect != null) {
+			linkConditions(this.hit_effect.conditions_source, proj, this);
+			linkConditions(this.hit_effect.conditions_target, proj, this);
 		}
-		if (this.hit_effect != null && this.hit_effect.conditions_target != null) {
-			for (TimedConditionEffect ce : this.hit_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.hit_received_effect != null) {
+			linkConditions(this.hit_received_effect.conditions_source, proj, this);
+			linkConditions(this.hit_received_effect.conditions_target, proj, 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);
-				if (ce.condition != null) ce.condition.addBacklink(this);
-			}
+
+		if (this.kill_effect != null) {
+			linkConditions(this.kill_effect.conditions_source, proj, this);
 		}
 		this.state = State.linked;
 	}
@@ -426,6 +270,7 @@ public class Item extends JSONElement {
 		clone.has_manual_price = this.has_manual_price;
 		if (this.equip_effect != null) {
 			clone.equip_effect = new EquipEffect();
+			clone.equip_effect.damage_modifier = this.equip_effect.damage_modifier;
 			clone.equip_effect.critical_multiplier = this.equip_effect.critical_multiplier;
 			clone.equip_effect.damage_boost_max = this.equip_effect.damage_boost_max;
 			clone.equip_effect.damage_boost_min = this.equip_effect.damage_boost_min;
@@ -440,7 +285,7 @@ public class Item extends JSONElement {
 			clone.equip_effect.max_ap_boost = this.equip_effect.max_ap_boost;
 			clone.equip_effect.max_hp_boost = this.equip_effect.max_hp_boost;
 			if (this.equip_effect.conditions != null) {
-				clone.equip_effect.conditions = new ArrayList<Item.ConditionEffect>();
+				clone.equip_effect.conditions = new ArrayList<>();
 				for (ConditionEffect c : this.equip_effect.conditions) {
 					ConditionEffect cclone = new ConditionEffect();
 					cclone.magnitude = c.magnitude;
@@ -455,103 +300,15 @@ public class Item extends JSONElement {
 		}
 		if (this.hit_effect != null) {
 			clone.hit_effect = new HitEffect();
-			clone.hit_effect.ap_boost_max = this.hit_effect.ap_boost_max;
-			clone.hit_effect.ap_boost_min = this.hit_effect.ap_boost_min;
-			clone.hit_effect.hp_boost_max = this.hit_effect.hp_boost_max;
-			clone.hit_effect.hp_boost_min = this.hit_effect.hp_boost_min;
-			if (this.hit_effect.conditions_source != null) {
-				clone.hit_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
-				for (TimedConditionEffect c : this.hit_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_effect.conditions_source.add(cclone);
-				}
-			}
-			if (this.hit_effect.conditions_target != null) {
-				clone.hit_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
-				for (TimedConditionEffect c : this.hit_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_effect.conditions_target.add(cclone);
-				}
-			}
+			copyHitEffectValues(clone.hit_effect, this.hit_effect, clone);
 		}
 		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);
-				}
-			}
+			copyHitReceivedEffectValues(clone.hit_received_effect, this.hit_received_effect, clone);
 		}
 		if (this.kill_effect != null) {
-			clone.kill_effect = new KillEffect();
-			clone.kill_effect.ap_boost_max = this.kill_effect.ap_boost_max;
-			clone.kill_effect.ap_boost_min = this.kill_effect.ap_boost_min;
-			clone.kill_effect.hp_boost_max = this.kill_effect.hp_boost_max;
-			clone.kill_effect.hp_boost_min = this.kill_effect.hp_boost_min;
-			if (this.kill_effect.conditions_source != null) {
-				clone.kill_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
-				for (TimedConditionEffect c : this.kill_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.kill_effect.conditions_source.add(cclone);
-				}
-			}
+			clone.kill_effect = new DeathEffect();
+			copyDeathEffectValues(clone.kill_effect, this.kill_effect, clone);
 		}
 		return clone;
 	}
@@ -642,6 +399,7 @@ public class Item extends JSONElement {
 			if (this.equip_effect.increase_block_chance != null) equipEffectJson.put("increaseBlockChance", this.equip_effect.increase_block_chance);
 			if (this.equip_effect.increase_damage_resistance != null) equipEffectJson.put("increaseDamageResistance", this.equip_effect.increase_damage_resistance);
 			if (this.equip_effect.critical_multiplier != null) equipEffectJson.put("setCriticalMultiplier", this.equip_effect.critical_multiplier);
+			if (this.equip_effect.damage_modifier != null) equipEffectJson.put("setNonWeaponDamageModifier", this.equip_effect.damage_modifier);
 			if (this.equip_effect.conditions != null) {
 				List conditionsJson = new ArrayList();
 				equipEffectJson.put("addedConditions", conditionsJson);

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

@@ -171,17 +171,10 @@ public class ItemCategory extends JSONElement {
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 
 		//Nothing to link to :D
 		this.state = State.linked;

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

@@ -26,8 +26,7 @@ public abstract class JSONElement extends GameDataElement {
 
 	@SuppressWarnings("rawtypes")
 	public void parse() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
 		JSONParser parser = new JSONParser();
@@ -38,10 +37,16 @@ public abstract class JSONElement extends GameDataElement {
 			for (Object obj : gameDataElements) {
 				Map jsonObj = (Map)obj;
 				String id  = (String) jsonObj.get("id");
-				if (id != null && id.equals(this.id )) {
-					this.parse(jsonObj);
-					this.state = State.parsed;
-					break;
+				try {
+					if (id != null && id.equals(this.id )) {
+						this.parse(jsonObj);
+						this.state = State.parsed;
+						break;
+					}
+				}
+				catch(Exception e){
+					System.out.println("Error in ID: " + id);
+					System.out.println(e.getMessage());
 				}
 			}
 		} catch (FileNotFoundException e) {
@@ -53,6 +58,10 @@ public abstract class JSONElement extends GameDataElement {
 		} catch (ParseException e) {
 			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
 			e.printStackTrace();
+		} catch (IllegalArgumentException e) {
+			System.out.println(id);
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
 		} finally {
 			if (reader != null)
 				try {

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

@@ -18,6 +18,8 @@ import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.Project;
 
+import static com.gpl.rpg.atcontentstudio.model.gamedata.Common.*;
+
 public class NPC extends JSONElement {
 
 	private static final long serialVersionUID = 1093728879485491933L;
@@ -73,40 +75,6 @@ public class NPC extends JSONElement {
         wholeMap
 	}
 
-	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;
-		public String condition_id = null;
-		public Integer duration = null;
-		public Double chance = null;
-		
-		//Available from linked state
-		public ActorCondition condition = null; 
-	
-	}
-	
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+name+" ("+id+")";
@@ -211,78 +179,14 @@ public class NPC extends JSONElement {
 				this.hit_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("min")));
 			}
 			List conditionsSourceJson = (List) hitEffect.get("conditionsSource");
-			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
-				this.hit_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_effect.conditions_source.add(condition);
-				}
-			}
+			this.hit_effect.conditions_source = parseTimedConditionEffects(conditionsSourceJson);
 			List conditionsTargetJson = (List) hitEffect.get("conditionsTarget");
-			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
-				this.hit_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_effect.conditions_target.add(condition);
-				}
-			}
+			this.hit_effect.conditions_target = parseTimedConditionEffects(conditionsTargetJson);
 		}
 
 		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);
-				}
-			}
+			this.hit_received_effect = parseHitReceivedEffect(hitReceivedEffect);
 		}
 
 		Map deathEffect = (Map) npcJson.get("deathEffect");
@@ -297,35 +201,17 @@ public class NPC extends JSONElement {
 				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);
-				}
-			}
+            this.death_effect.conditions_source = parseTimedConditionEffects(conditionsSourceJson);
 		}
 
 	}
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking item "+id+". No parent project found.");
@@ -342,35 +228,16 @@ public class NPC extends JSONElement {
 		if (this.droplist_id != null) this.droplist = proj.getDroplist(this.droplist_id);
 		if (this.droplist != null) this.droplist.addBacklink(this);
 
-		if (this.hit_effect != null && this.hit_effect.conditions_source != null) {
-			for (TimedConditionEffect ce : this.hit_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_effect != null) {
+			linkConditions(this.hit_effect.conditions_source, proj, this);
+			linkConditions(this.hit_effect.conditions_target, proj, this);
 		}
-		if (this.hit_effect != null && this.hit_effect.conditions_target != null) {
-			for (TimedConditionEffect ce : this.hit_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.hit_received_effect != null) {
+			linkConditions(this.hit_received_effect.conditions_source, proj, this);
+			linkConditions(this.hit_received_effect.conditions_target, proj, 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);
-			}
+		if (this.death_effect != null) {
+			linkConditions(this.death_effect.conditions_source, proj, this);
 		}
 		this.state = State.linked;
 	}
@@ -413,103 +280,15 @@ public class NPC extends JSONElement {
 		clone.faction_id = this.faction_id;
 		if (this.hit_effect != null) {
 			clone.hit_effect = new HitEffect();
-			clone.hit_effect.ap_boost_max = this.hit_effect.ap_boost_max;
-			clone.hit_effect.ap_boost_min = this.hit_effect.ap_boost_min;
-			clone.hit_effect.hp_boost_max = this.hit_effect.hp_boost_max;
-			clone.hit_effect.hp_boost_min = this.hit_effect.hp_boost_min;
-			if (this.hit_effect.conditions_source != null) {
-				clone.hit_effect.conditions_source = new ArrayList<TimedConditionEffect>();
-				for (TimedConditionEffect c : this.hit_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_effect.conditions_source.add(cclone);
-				}
-			}
-			if (this.hit_effect.conditions_target != null) {
-				clone.hit_effect.conditions_target = new ArrayList<TimedConditionEffect>();
-				for (TimedConditionEffect c : this.hit_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_effect.conditions_target.add(cclone);
-				}
-			}
+			copyHitEffectValues(clone.hit_effect, this.hit_effect, clone);
 		}
 		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);
-				}
-			}
+            clone.hit_received_effect = new HitReceivedEffect();
+			copyHitReceivedEffectValues(clone.hit_received_effect, this.hit_received_effect, clone);
 		}
 		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);
-				}
-			}
+			copyDeathEffectValues(clone.death_effect, this.death_effect, clone);
 		}
 		clone.max_ap = this.max_ap;
 		clone.max_hp = this.max_hp;
@@ -675,7 +454,7 @@ public class NPC extends JSONElement {
 			}
 			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);
+				 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);

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

@@ -113,17 +113,10 @@ public class Quest extends JSONElement {
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 
 		for (QuestStage stage : stages) {
 			stage.link();

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

@@ -59,17 +59,10 @@ public class QuestStage extends JSONElement {
 
 	@Override
 	public void link() {
-		if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-			//This type of state is unrelated to parsing/linking.
-			return;
-		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
+		ensureParseIfNeeded();
 
 		//Nothing to link to :D
 		this.state = State.linked;

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

@@ -26,10 +26,13 @@ public class Requirement extends JSONElement {
 		countedItemTypes.add(RequirementType.inventoryRemove);
 		countedItemTypes.add(RequirementType.inventoryKeep);
 		countedItemTypes.add(RequirementType.usedItem);
+		countedItemTypes.add(RequirementType.wear);
+		countedItemTypes.add(RequirementType.wearRemove);
 		COMPATIBLE_TYPES.put(RequirementType.inventoryRemove, countedItemTypes);
 		COMPATIBLE_TYPES.put(RequirementType.inventoryKeep, countedItemTypes);
 		COMPATIBLE_TYPES.put(RequirementType.usedItem, countedItemTypes);
-		
+		COMPATIBLE_TYPES.put(RequirementType.wear, countedItemTypes);
+		COMPATIBLE_TYPES.put(RequirementType.wearRemove, countedItemTypes);
 	}
 	
 	//Available from parsed state
@@ -54,7 +57,14 @@ public class Requirement extends JSONElement {
 		spentGold,
 		consumedBonemeals,
 		hasActorCondition,
-		factionScore
+		factionScore,
+		random,
+		factionScoreEquals,
+		wearRemove,
+		date,
+		dateEquals,
+		time,
+		timeEquals
 	}
 	
 	public enum SkillID {
@@ -79,6 +89,7 @@ public class Requirement extends JSONElement {
 		,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
+		,sporeImmunity
 		,crit1			// lowers atk ability
 		,crit2			// lowers def ability ,rejuvenation	// Reduces magnitudes of conditions
 		,rejuvenation	// Reduces magnitudes of conditions
@@ -90,6 +101,7 @@ public class Requirement extends JSONElement {
 		,weaponProficiencyAxe
 		,weaponProficiencyBlunt
 		,weaponProficiencyUnarmed
+		,weaponProficiencyPole
 		,armorProficiencyShield
 		,armorProficiencyUnarmored
 		,armorProficiencyLight
@@ -104,9 +116,21 @@ public class Requirement extends JSONElement {
 	
 	@Override
 	public String getDesc() {
+		String obj_id = "";
+		if (required_obj_id != null)
+		{
+			obj_id = required_obj_id;
+			if (type != null && type == RequirementType.random){
+				obj_id = " Chance " + obj_id + (required_obj_id.contains("/") ? "" : "%"); 
+			}
+			else {
+				obj_id += ":";
+			}
+		}
+		
 		return ((negated != null && negated) ? "NOT " : "")
 				+(type == null ? "" : type.toString()+":")
-				+(required_obj_id == null ? "" : required_obj_id+":")
+				+obj_id
 				+(required_value == null ? "" : required_value.toString());
 	}
 
@@ -153,6 +177,7 @@ public class Requirement extends JSONElement {
 		case inventoryRemove:
 		case usedItem:
 		case wear:
+		case wearRemove:
 			this.required_obj = proj.getItem(required_obj_id);
 			break;
 		case killedMonster:
@@ -172,6 +197,13 @@ public class Requirement extends JSONElement {
 		case skillLevel:
 		case spentGold:
 		case timerElapsed:
+		case factionScore:
+		case factionScoreEquals:
+		case random:
+		case date:
+		case dateEquals:
+		case time:
+		case timeEquals:
 			break;
 		}
 		if (this.required_obj != null) this.required_obj.addBacklink((GameDataElement) this.parent);
@@ -190,6 +222,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) {
@@ -223,6 +256,12 @@ public class Requirement extends JSONElement {
 			required_obj_id = null;
 			required_value = null;
 		}
+		
+		if(destType==RequirementType.random)
+		{
+			required_obj_id = "50/100";
+		}
+		
 		type = destType;
 	}
 

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

@@ -19,6 +19,7 @@ public class KeyArea extends MapObject {
 		String requireType = obj.getProperties().getProperty("requireType");
 		String requireId = obj.getProperties().getProperty("requireId");
 		String requireValue = obj.getProperties().getProperty("requireValue");
+		String requireNegation = obj.getProperties().getProperty("requireNegation");
 		oldSchoolRequirement = false;
 		if (requireType == null) {
 			String[] fields = obj.getName().split(":");
@@ -38,7 +39,9 @@ public class KeyArea extends MapObject {
 		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
@@ -98,7 +101,7 @@ public class KeyArea extends MapObject {
 
 	public void updateNameFromRequirementChange() {
 		if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
-			name = requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : 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

@@ -20,6 +20,7 @@ public class ReplaceArea extends MapObject {
 		String requireType = obj.getProperties().getProperty("requireType");
 		String requireId = obj.getProperties().getProperty("requireId");
 		String requireValue = obj.getProperties().getProperty("requireValue");
+		String requireNegation = obj.getProperties().getProperty("requireNegation");
 		if (requireType == null) {
 			String[] fields = obj.getName().split(":");
 			if (fields.length == 2) {
@@ -37,6 +38,7 @@ public class ReplaceArea extends MapObject {
 		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;
 		
 		
@@ -69,6 +71,9 @@ public class ReplaceArea extends MapObject {
 		addReplacement(repl);
 		return repl;
 	}
+	public ReplaceArea.Replacement createReplacement(String source, String target) {
+		return new Replacement(source, target);
+	}
 	
 	public void addReplacement(ReplaceArea.Replacement repl) {
 		if (replacements == null) replacements = new ArrayList<ReplaceArea.Replacement>();
@@ -93,7 +98,9 @@ public class ReplaceArea extends MapObject {
 			if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
 				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.type != null) {
+					tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
+				}
 				if (requirement.required_obj != null) {
 					tmxObject.getProperties().setProperty("requireId", requirement.required_obj.id);
 				} else if (requirement.required_obj_id != null) {
@@ -112,7 +119,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+":"+((requirement.required_value == null) ? "" : 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

@@ -11,8 +11,9 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 public class SpawnArea extends MapObject {
 
 	public int quantity = 1;
-	public int spawnchance = 10;
+	public int respawnSpeed = 10;
 	public boolean active = true;
+	public boolean ignoreAreas = false;
 	public String spawngroup_id;
 	public List<NPC> spawnGroup = new ArrayList<NPC>();
 	
@@ -20,12 +21,15 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("quantity") != null) {
 			this.quantity = Integer.parseInt(obj.getProperties().getProperty("quantity"));
 		}
-		if (obj.getProperties().getProperty("spawnchance") != null) {
-			this.spawnchance = Integer.parseInt(obj.getProperties().getProperty("spawnchance"));
+		if (obj.getProperties().getProperty("respawnspeed") != null) {
+			this.respawnSpeed = Integer.parseInt(obj.getProperties().getProperty("respawnspeed"));
 		}
 		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 ){
@@ -78,12 +82,14 @@ public class SpawnArea extends MapObject {
 		if (quantity != 1) {
 			tmxObject.getProperties().setProperty("quantity", Integer.toString(quantity));
 		}
-		if (spawnchance != 10) {
-			tmxObject.getProperties().setProperty("spawnchance", Integer.toString(spawnchance));
+		if (respawnSpeed != 10) {
+			tmxObject.getProperties().setProperty("respawnspeed", Integer.toString(respawnSpeed));
 		}
 		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 {
@@ -257,7 +258,7 @@ public class TMXMap extends GameDataElement {
 			if (getDataType() == GameSource.Type.source) {
 				writer.writeMap(tmxMap, baos, tmxFile.getAbsolutePath());
 			} else {
-				writer.writeMap(tmxMap, baos, getProject().baseContent.gameMaps.mapFolder.getAbsolutePath()+File.separator+"placeholder.tmx");
+				writer.writeMap(tmxMap, baos, ((TMXMapSet)this.parent).mapFolder.getAbsolutePath()+File.separator+"placeholder.tmx");
 			}
 		} catch (Exception e) {
 			Notification.addError("Error while converting map "+getDesc()+" to XML: "+e.getMessage());
@@ -398,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;
 
@@ -99,22 +100,24 @@ public class TMXMapSet implements ProjectTreeNode {
 					while(getProject().open) {
 						try {
 							watchService = FileSystems.getDefault().newWatchService();
-							WatchKey watchKey = folderPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY);
+							/*WatchKey watchKey = */folderPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_CREATE);
 							WatchKey wk;
 							validService: while(getProject().open) {
-								wk = watchService.take();
-								for (WatchEvent<?> event : wk.pollEvents()) {
-									Path changed = (Path) event.context();
-									String name = changed.getFileName().toString();
-									String id = name.substring(0, name.length() - 4);
-									TMXMap map = getMap(id);
-									if (map != null) {
-										map.mapChangedOnDisk();
+								wk = watchService.poll(10, TimeUnit.SECONDS);
+								if (wk != null) {
+									for (WatchEvent<?> event : wk.pollEvents()) {
+										Path changed = (Path) event.context();
+										String name = changed.getFileName().toString();
+										String id = name.substring(0, name.length() - 4);
+										TMXMap map = getMap(id);
+										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/tools/i18n/PoPotWriter.java

@@ -0,0 +1,89 @@
+package com.gpl.rpg.atcontentstudio.model.tools.i18n;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+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 {
+			Writer fw = new OutputStreamWriter(new FileOutputStream(destination), StandardCharsets.UTF_8);
+			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,101 @@
+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));
+			pushString(stringsResources, resourcesStrings, ac.description, getPotContextComment(ac)+":description");
+		}
+		
+		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/ui/AboutEditor.java

@@ -26,7 +26,9 @@ public class AboutEditor extends Editor {
 	private static final long serialVersionUID = 6230549148222457139L;
 
 	public static final String WELCOME_STRING = 
-			"<html><body>" +
+			"<html><head>" + 
+			"<meta http-equiv=\\\"Content-Type\\\" content=\\\"text/html; charset=UTF-8\\\" />" +
+			"</head><body>" +
 			"<table><tr valign=\"top\">" +
 			"<td><img src=\""+ATContentStudio.class.getResource("/com/gpl/rpg/atcontentstudio/img/atcs_border_banner.png")+"\"/></td>" +
 			"<td><font size=+1>Welcome to "+ATContentStudio.APP_NAME+" "+ATContentStudio.APP_VERSION+"</font><br/>" +
@@ -35,22 +37,24 @@ public class AboutEditor extends Editor {
 			"<b>Right click on the left area or use the \"File\" menu to create a project.</b><br/>" +
 			"<br/>" +
 			"Play <a href=\"https://play.google.com/store/apps/details?id=com.gpl.rpg.AndorsTrail\">Andor's Trail</a> for free on your Android device.<br/>" +
-			"Visit <a href=\"http://andorstrail.com/\">the official forum</a> to give or receive help.<br/>" +
+			"Visit <a href=\"https://andorstrail.com/\">the official forum</a> to give or receive help.<br/>" +
 			"Open the project's <a href=\"https://github.com/Zukero/andors-trail/\">GitHub project page</a> to check out the game's source code.<br/>" +
 			"<br/>" +
 			"For content creation help, make sure to use the following resources:<br/>" +
-			"<a href=\"http://andorstrail.com/viewtopic.php?f=6&t=4560\">The contribution guide on the forums</a><br/>" +
-			"<a href=\"http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section\">The developer section of the Andor's Trail wiki</a><br/>" +
+			"<a href=\"https://andorstrail.com/viewtopic.php?f=6&t=4560\">The contribution guide on the forums</a><br/>" +
+			"<a href=\"https://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section\">The developer section of the Andor's Trail wiki</a><br/>" +
 			"<a href=\"https://docs.google.com/document/d/1BwWD1tLgPcmA2bwudrVnOc6f2dkPLFCjWdn7tXlIp5g\">The design outline document on Google Drive/Docs</a><br/>" +
 			"<br/>" +
 			"<font size=+1>Credits:</font><br/>" +
 			"<br/>" +
-			"Author: <a href=\"http://andorstrail.com/memberlist.php?mode=viewprofile&u=2875\">Zukero</a><br/>" +
+			"Author: <a href=\"https://andorstrail.com/memberlist.php?mode=viewprofile&u=2875\">Zukero</a><br/>" +
 			"Licence: <a href=\"http://www.gnu.org/licenses/gpl-3.0.html\">GPL v3</a><br/>" +
 			"Sources are included in this package and on <a href=\"https://github.com/Zukero/ATCS\">GitHub</a>.<br/>" +
 			"<br/>" +
 			"Contributors: <br/>" +
 			"Quentin Delvallet<br/>" +
+			"Žižkin<br/>" +
+			"Gonk<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 +82,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 +139,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

@@ -76,6 +76,14 @@ public class DefaultIcons {
 	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); }
 	public static Image getTiledIconIcon() { return getIcon(TILED_ICON_RES); }
@@ -252,6 +260,14 @@ public class DefaultIcons {
 	public static Image getTimerImage() { return getImage(TIMER_RES); }
 	public static Image getTimerIcon() { return getIcon(TIMER_RES); }
 	
+	private static String DATE_RES = "/com/gpl/rpg/atcontentstudio/img/date.png";
+	public static Image getDateImage() { return getImage(DATE_RES); }
+	public static Image getDateIcon() { return getIcon(DATE_RES); }
+	
+	private static String TIME_RES = "/com/gpl/rpg/atcontentstudio/img/date.png";
+	public static Image getTimeImage() { return getImage(TIME_RES); }
+	public static Image getTimeIcon() { return getIcon(TIME_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); }
@@ -276,6 +292,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) {

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

@@ -348,6 +348,138 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 		return spinner;
 	}
 	
+	
+	private static final String percent = "%";
+	private static final String ratio = "x/y";
+	public static JComponent addChanceField(JPanel pane, String label, String initialValue, String defaultValue, boolean editable, final FieldUpdateListener listener) {
+		int defaultChance = 1;
+		int defaultMaxChance = 100;
+		if (defaultValue != null) {
+			if (defaultValue.contains("/")) {
+				int c = defaultValue.indexOf('/');
+				try { defaultChance = Integer.parseInt(defaultValue.substring(0, c)); } catch (NumberFormatException nfe) {};
+				try { defaultMaxChance = Integer.parseInt(defaultValue.substring(c+1)); } catch (NumberFormatException nfe) {};
+			} else {
+				try { defaultChance = Integer.parseInt(defaultValue); } catch (NumberFormatException nfe) {};
+			}
+		}
+		
+		boolean currentFormIsRatio = true; 
+		int chance = defaultChance;
+		int maxChance = defaultMaxChance;
+		if (initialValue != null) {
+			if (initialValue.contains("/")) {
+				int c = initialValue.indexOf('/');
+				try { chance = Integer.parseInt(initialValue.substring(0, c)); } catch (NumberFormatException nfe) {};
+				try { maxChance = Integer.parseInt(initialValue.substring(c+1)); } catch (NumberFormatException nfe) {};
+			} else {
+				try { 
+					chance = Integer.parseInt(initialValue); 
+					currentFormIsRatio = false;
+				} catch (NumberFormatException nfe) {};
+			}
+		}
+		
+		final JPanel tfPane = new JPanel();
+		tfPane.setLayout(new JideBoxLayout(tfPane, JideBoxLayout.LINE_AXIS, 6));
+		JLabel tfLabel = new JLabel(label);
+		tfPane.add(tfLabel, JideBoxLayout.FIX);
+		
+		final JComboBox<String> entryTypeBox = new JComboBox<String>(new String[] {percent, ratio});
+		if (currentFormIsRatio) {
+			entryTypeBox.setSelectedItem(ratio);
+		} else {
+			entryTypeBox.setSelectedItem(percent);
+		}
+		entryTypeBox.setEnabled(editable);
+		tfPane.add(entryTypeBox, JideBoxLayout.FIX);
+		/////////////////////////////////////////////////////////////////////////////////////////////////// make sure "chance" is between 1 and 100. If lower than 1 get 1. If higher than 100, get chance/maxChance * 100... Then do the same with defaultChance, in case no value exist.
+		final SpinnerNumberModel percentModel = new SpinnerNumberModel(initialValue != null ? ((chance > 1 ? chance : 1) < 100 ? chance : (chance * 100 / maxChance)) : ((defaultChance > 1 ? defaultChance : 1) < 100 ? defaultChance : (defaultChance * 100 / defaultMaxChance)) , 1, 100, 1);
+		final SpinnerNumberModel ratioChanceModel = new SpinnerNumberModel(initialValue != null ? chance : defaultChance, 1, Integer.MAX_VALUE, 1);
+		
+		final JSpinner chanceSpinner = new JSpinner(currentFormIsRatio ? ratioChanceModel : percentModel);
+		if (!currentFormIsRatio) ((JSpinner.DefaultEditor)chanceSpinner.getEditor()).getTextField().setHorizontalAlignment(JTextField.LEFT);
+		chanceSpinner.setEnabled(editable);
+		((DefaultFormatter)((NumberEditor)chanceSpinner.getEditor()).getTextField().getFormatter()).setCommitsOnValidEdit(true);
+		tfPane.add(chanceSpinner, JideBoxLayout.FLEXIBLE);
+		
+		final JLabel ratioLabel = new JLabel("/");
+		tfPane.add(ratioLabel, JideBoxLayout.FIX);
+		
+		final JSpinner maxChanceSpinner = new JSpinner(new SpinnerNumberModel(initialValue != null ? maxChance : defaultMaxChance, 1, Integer.MAX_VALUE, 1));
+		((JSpinner.DefaultEditor)maxChanceSpinner.getEditor()).getTextField().setHorizontalAlignment(JTextField.LEFT);
+		maxChanceSpinner.setEnabled(editable);
+		((DefaultFormatter)((NumberEditor)maxChanceSpinner.getEditor()).getTextField().getFormatter()).setCommitsOnValidEdit(true);
+		tfPane.add(maxChanceSpinner, JideBoxLayout.FLEXIBLE);
+		
+		if (!currentFormIsRatio) {
+			ratioLabel.setVisible(false);
+			maxChanceSpinner.setVisible(false);
+			tfPane.revalidate();
+			tfPane.repaint();
+		}
+		
+		final JButton nullify = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
+		tfPane.add(nullify, JideBoxLayout.FIX);
+		nullify.setEnabled(editable);
+		pane.add(tfPane, JideBoxLayout.FIX);
+		
+		entryTypeBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (entryTypeBox.getSelectedItem() == percent) {
+					int chance = ((Integer)chanceSpinner.getValue());
+					int maxChance = ((Integer)maxChanceSpinner.getValue());
+					chance *= 100;
+					chance /= maxChance;
+					chance = Math.max(0,  Math.min(100, chance));
+					chanceSpinner.setModel(percentModel);
+					chanceSpinner.setValue(chance);
+					((JSpinner.DefaultEditor)chanceSpinner.getEditor()).getTextField().setHorizontalAlignment(JTextField.LEFT);
+					ratioLabel.setVisible(false);
+					maxChanceSpinner.setVisible(false);
+					tfPane.revalidate();
+					tfPane.repaint();
+					listener.valueChanged(chanceSpinner, chanceSpinner.getValue().toString());
+				} else if (entryTypeBox.getSelectedItem() == ratio) {
+					int chance = ((Integer)chanceSpinner.getValue());
+					chanceSpinner.setModel(ratioChanceModel);
+					chanceSpinner.setValue(chance);
+					maxChanceSpinner.setValue(100);
+					ratioLabel.setVisible(true);
+					maxChanceSpinner.setVisible(true);
+					tfPane.revalidate();
+					tfPane.repaint();
+					listener.valueChanged(chanceSpinner, chanceSpinner.getValue().toString() + "/" + maxChanceSpinner.getValue().toString());
+				}
+			}
+		});
+		chanceSpinner.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				if (entryTypeBox.getSelectedItem() == percent) {
+					listener.valueChanged(chanceSpinner, chanceSpinner.getValue().toString());
+				} else if (entryTypeBox.getSelectedItem() == ratio) {
+					listener.valueChanged(chanceSpinner, chanceSpinner.getValue().toString() + "/" + maxChanceSpinner.getValue().toString());
+				}
+			}
+		});
+		maxChanceSpinner.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				listener.valueChanged(chanceSpinner, chanceSpinner.getValue().toString() + "/" + maxChanceSpinner.getValue().toString());
+			}
+		});
+		nullify.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				chanceSpinner.setValue(1);
+				listener.valueChanged(chanceSpinner, null);
+			}
+		});
+		return chanceSpinner;
+	}
+	
 //	public static JSpinner addDoubleField(JPanel pane, String label, Double initialValue, boolean editable) {
 //		return addDoubleField(pane, label, initialValue, editable, nullListener);
 //	}
@@ -652,7 +784,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);
@@ -702,7 +834,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");
 	}
@@ -812,7 +944,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());
 					}
@@ -866,7 +998,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

@@ -57,7 +57,7 @@ public class ExportProjectWizard extends JDialog {
 		radioGroup.add(asZip);
 		overSources = new JRadioButton("... into a game source folder");
 		radioGroup.add(overSources);
-		asZip.setSelected(true);
+		overSources.setSelected(true);
 
 		pane.add(asZip, JideBoxLayout.FIX);
 		pane.add(overSources, JideBoxLayout.FIX);

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;
@@ -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

@@ -213,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/WorkspaceActions.java

@@ -59,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);

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

@@ -182,12 +182,19 @@ public class WorkspaceSettingsEditor extends JDialog {
 		useInternetBox.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				translatorLanguagesBox.setEnabled(useInternetBox.isSelected());
+				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());
+			}
+		});
+		
 		
 		return pane;
 	}

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

@@ -30,12 +30,14 @@ public class ActorConditionEditor extends JSONElementEditor {
 	private JButton acIcon;
 	private JTextField idField;
 	private JTextField nameField;
+	private JTextField descriptionField;
 	@SuppressWarnings("rawtypes")
 	private JComboBox categoryBox;
 	private IntegerBasedCheckBox positiveBox;
 	private IntegerBasedCheckBox stackingBox;
 	
 	//private JTextField roundVisualField;
+	@SuppressWarnings("rawtypes")
 	private JComboBox roundVisualField;
 	private JSpinner roundHpMinField;
 	private JSpinner roundHpMaxField;
@@ -43,6 +45,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 	private JSpinner roundApMaxField;
 	
 	//private JTextField fullRoundVisualField;
+	@SuppressWarnings("rawtypes")
 	private JComboBox fullRoundVisualField;
 	private JSpinner fullRoundHpMinField;
 	private JSpinner fullRoundHpMaxField;
@@ -79,6 +82,7 @@ public class ActorConditionEditor extends JSONElementEditor {
 		
 		idField = addTextField(pane, "Internal ID: ", ac.id, ac.writable, listener);
 		nameField = addTranslatableTextField(pane, "Display name: ", ac.display_name, ac.writable, listener);
+		descriptionField = addTranslatableTextField(pane, "Description: ", ac.description, ac.writable, listener);
 		categoryBox = addEnumValueBox(pane, "Category: ", ActorCondition.ACCategory.values(), ac.category, ac.writable, listener);
 		positiveBox = addIntegerBasedCheckBox(pane, "Positive", ac.positive, ac.writable, listener);
 		stackingBox = addIntegerBasedCheckBox(pane, "Stacking", ac.stacking, ac.writable, listener);
@@ -170,6 +174,10 @@ public class ActorConditionEditor extends JSONElementEditor {
 				ActorConditionEditor.this.name = aCond.getDesc();
 				aCond.childrenChanged(new ArrayList<ProjectTreeNode>());
 				ATContentStudio.frame.editorChanged(ActorConditionEditor.this);
+			}else if (source == descriptionField) {
+				aCond.description = (String) value;
+				aCond.childrenChanged(new ArrayList<ProjectTreeNode>());
+				ATContentStudio.frame.editorChanged(ActorConditionEditor.this);
 			} else if (source == acIcon) {
 				aCond.icon_id = (String) value;
 				aCond.childrenChanged(new ArrayList<ProjectTreeNode>());

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

@@ -6,13 +6,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultListCellRenderer;
@@ -28,10 +23,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
@@ -54,6 +46,8 @@ 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.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
+import com.gpl.rpg.atcontentstudio.utils.lambda.CallWithSingleArg;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class DialogueEditor extends JSONElementEditor {
@@ -96,6 +90,7 @@ 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;
@@ -120,8 +115,9 @@ public class DialogueEditor extends JSONElementEditor {
 	private JComboBox requirementTypeCombo;
 	private JPanel requirementParamsPane;
 	private MyComboBox requirementObj;
+	@SuppressWarnings("rawtypes")
 	private JComboBox requirementSkill;
-	private JTextField requirementObjId;
+	private JComponent requirementObjId;
 	private JComponent requirementValue;
 	private BooleanBasedCheckBox requirementNegated;
 
@@ -176,163 +172,62 @@ public class DialogueEditor extends JSONElementEditor {
 		messageField = addTranslatableTextArea(pane, "Message: ", dialogue.message, dialogue.writable, listener);
 		switchToNpcBox = addNPCBox(pane, dialogue.getProject(), "Switch active NPC to: ", dialogue.switch_to_npc, dialogue.writable, listener);
 
-		CollapsiblePanel rewards = new CollapsiblePanel("Reaching this phrase gives the following rewards: ");
-		rewards.setLayout(new JideBoxLayout(rewards, JideBoxLayout.PAGE_AXIS));
+		String rewardsTitle = "Reaching this phrase gives the following rewards: ";
+		RewardsCellRenderer rewardsCellRenderer = new RewardsCellRenderer();
 		rewardsListModel = new RewardsListModel(dialogue);
-		rewardsList = new JList(rewardsListModel);
-		rewardsList.setCellRenderer(new RewardsCellRenderer());
-		rewardsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		rewards.add(new JScrollPane(rewardsList), JideBoxLayout.FIX);
-		final JPanel rewardsEditorPane = new JPanel();
-		final JButton createReward = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteReward = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		deleteReward.setEnabled(false);
-		rewardsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedReward = (Dialogue.Reward) rewardsList.getSelectedValue();
-				if (selectedReward == null) {
-					deleteReward.setEnabled(false);
-				} else {
-					deleteReward.setEnabled(true);
-				}
-				updateRewardsEditorPane(rewardsEditorPane, selectedReward, listener);
-			}
-		});
-		if (dialogue.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createReward.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Dialogue.Reward reward = new Dialogue.Reward();
-					rewardsListModel.addItem(reward);
-					rewardsList.setSelectedValue(reward, true);
-					listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteReward.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedReward != null) {
-						rewardsListModel.removeItem(selectedReward);
-						selectedReward = null;
-						rewardsList.clearSelection();
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean rewardsMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Dialogue.Reward> rewardsResult = CommonEditor.createListPanel(
+				rewardsTitle,
+				rewardsCellRenderer,
+				rewardsListModel,
+				dialogue.writable,
+				rewardsMoveUpDownEnabled,
+				(e) -> selectedReward = e,
+				() -> selectedReward,
+				this::updateRewardsEditorPane,
+				listener,
+				Dialogue.Reward::new);
+		CollapsiblePanel rewards = rewardsResult.panel;
+		rewardsList = rewardsResult.list;
 
-			listButtonsPane.add(createReward, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteReward, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			rewards.add(listButtonsPane, JideBoxLayout.FIX);
-		}
 		if (dialogue.rewards == null || dialogue.rewards.isEmpty()) {
 			rewards.collapse();
 		}
-		rewardsEditorPane.setLayout(new JideBoxLayout(rewardsEditorPane, JideBoxLayout.PAGE_AXIS));
-		rewards.add(rewardsEditorPane, JideBoxLayout.FIX);
 
 		pane.add(rewards, JideBoxLayout.FIX);
 
-		CollapsiblePanel replies = new CollapsiblePanel("Replies / Next Phrase: ");
-		replies.setLayout(new JideBoxLayout(replies, JideBoxLayout.PAGE_AXIS));
-		repliesListModel = new RepliesListModel(dialogue);
-		repliesList = new JList(repliesListModel);
-		repliesList.setCellRenderer(new RepliesCellRenderer());
-		repliesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		replies.add(new JScrollPane(repliesList), JideBoxLayout.FIX);
-		final JPanel repliesEditorPane = new JPanel();
-		final JButton createReply = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteReply = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		final JButton moveReplyUp = new JButton(new ImageIcon(DefaultIcons.getArrowUpIcon()));
-		final JButton moveReplyDown = new JButton(new ImageIcon(DefaultIcons.getArrowDownIcon()));
-		deleteReply.setEnabled(false);
-		moveReplyUp.setEnabled(false);
-		moveReplyDown.setEnabled(false);
-		repliesList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedReply = (Dialogue.Reply) repliesList.getSelectedValue();
-				if (selectedReply != null && !Dialogue.Reply.GO_NEXT_TEXT.equals(selectedReply.text)) {
-					replyTextCache = selectedReply.text;
-				} else {
-					replyTextCache = null;
-				}
-				if (selectedReply != null) {
-					deleteReply.setEnabled(true);
-					moveReplyUp.setEnabled(repliesList.getSelectedIndex() > 0);
-					moveReplyDown.setEnabled(repliesList.getSelectedIndex() < (repliesListModel.getSize() - 1));
-				} else {
-					deleteReply.setEnabled(false);
-					moveReplyUp.setEnabled(false);
-					moveReplyDown.setEnabled(false);
-				}
-				updateRepliesEditorPane(repliesEditorPane, selectedReply, listener);
+		String title = "Replies / Next Phrase: ";
+		RepliesCellRenderer cellRenderer = new RepliesCellRenderer();
+
+		repliesListModel = new DialogueEditor.RepliesListModel(dialogue);
+		boolean moveUpDownEnabled = true;
+		CallWithSingleArg<Dialogue.Reply> selectedReplyChanged = e -> {
+			selectedReply = e;
+			if (selectedReply != null && !Dialogue.Reply.GO_NEXT_TEXT.equals(selectedReply.text)) {
+				replyTextCache = selectedReply.text;
+			} else {
+				replyTextCache = null;
 			}
-		});
-		if (dialogue.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createReply.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Dialogue.Reply reply = new Dialogue.Reply();
-					repliesListModel.addItem(reply);
-					repliesList.setSelectedValue(reply, true);
-					listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteReply.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedReply != null) {
-						repliesListModel.removeItem(selectedReply);
-						selectedReply = null;
-						repliesList.clearSelection();
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
-			moveReplyUp.addActionListener(new ActionListener() {
+		};
+		CollapsiblePanel replies = CommonEditor.createListPanel(
+				title,
+				cellRenderer,
+				repliesListModel,
+				dialogue.writable,
+				moveUpDownEnabled,
+				selectedReplyChanged,
+				()->selectedReply,
+                this::updateRepliesEditorPane,
+				listener,
+                Dialogue.Reply::new).panel;
 
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedReply != null) {
-						repliesListModel.moveUp(selectedReply);
-						repliesList.setSelectedValue(selectedReply, true);
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
-			moveReplyDown.addActionListener(new ActionListener() {
-				
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedReply != null) {
-						repliesListModel.moveDown(selectedReply);
-						repliesList.setSelectedValue(selectedReply, true);
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
-			listButtonsPane.add(createReply, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteReply, JideBoxLayout.FIX);
-			listButtonsPane.add(moveReplyUp, JideBoxLayout.FIX);
-			listButtonsPane.add(moveReplyDown, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			replies.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		if (dialogue.replies == null || dialogue.replies.isEmpty()) {
+		boolean isEmpty = dialogue.replies == null || dialogue.replies.isEmpty();
+		if (isEmpty) {
 			replies.collapse();
 		}
-		repliesEditorPane.setLayout(new JideBoxLayout(repliesEditorPane, JideBoxLayout.PAGE_AXIS));
-		replies.add(repliesEditorPane, JideBoxLayout.FIX);
 
 		pane.add(replies, JideBoxLayout.FIX);
-		
-		
 	}
 
 	public void updateRewardsEditorPane(final JPanel pane, final Dialogue.Reward reward, final FieldUpdateListener listener) {
@@ -382,6 +277,13 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardObj = null;
 				rewardValue = null;
 				break;
+			case mapchange:
+				rewardMap = addMapBox(pane, ((Dialogue)target).getProject(), "Map Name: ", reward.map, writable, listener);
+				rewardObjId = addTextField(pane, "Place: ", reward.reward_obj_id, writable, listener);
+				rewardObjIdCombo = null;
+				rewardObj = null;
+				rewardValue = null;
+				break;
 			case deactivateSpawnArea:
 			case removeSpawnArea:
 			case spawnAll:
@@ -577,80 +479,24 @@ public class DialogueEditor extends JSONElementEditor {
 		updateRepliesParamsEditorPane(repliesParamsPane, reply, listener);
 		pane.add(repliesParamsPane, JideBoxLayout.FIX);
 
-		CollapsiblePanel requirementsPane = new CollapsiblePanel("Requirements the player must fulfill to select this reply: ");
-		requirementsPane.setLayout(new JideBoxLayout(requirementsPane, JideBoxLayout.PAGE_AXIS));
+		ReplyRequirementsCellRenderer cellRenderer = new ReplyRequirementsCellRenderer();
+		String title = "Requirements the player must fulfill to select this reply: ";
 		requirementsListModel = new ReplyRequirementsListModel(reply);
-		requirementsList = new JList(requirementsListModel);
-		requirementsList.setCellRenderer(new ReplyRequirementsCellRenderer());
-		requirementsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		requirementsPane.add(new JScrollPane(requirementsList), JideBoxLayout.FIX);
-		final JPanel requirementsEditorPane = new JPanel();
-		final JButton createReq = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteReq = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		deleteReq.setEnabled(false);
-		requirementsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedRequirement = (Requirement) requirementsList.getSelectedValue();
-				if (selectedRequirement != null) {
-					deleteReq.setEnabled(true);
-				} else {
-					deleteReq.setEnabled(false);
-				}
-				updateRequirementsEditorPane(requirementsEditorPane, selectedRequirement, listener);
-			}
-		});
-		requirementsList.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				if (e.getClickCount() == 2) {
-					if (requirementsList.getSelectedValue() != null && ((Requirement)requirementsList.getSelectedValue()).required_obj != null) {
-						ATContentStudio.frame.openEditor(((Requirement)requirementsList.getSelectedValue()).required_obj);
-						ATContentStudio.frame.selectInTree(((Requirement)requirementsList.getSelectedValue()).required_obj);
-					}
-				}
-			}
-		});
-		requirementsList.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-					ATContentStudio.frame.openEditor(((Requirement)requirementsList.getSelectedValue()).required_obj);
-					ATContentStudio.frame.selectInTree(((Requirement)requirementsList.getSelectedValue()).required_obj);
-				}
-			}
-		});
-		if (((Dialogue)target).writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createReq.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Requirement req = new Requirement();
-					requirementsListModel.addItem(req);
-					requirementsList.setSelectedValue(req, true);
-					listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteReq.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedRequirement != null) {
-						requirementsListModel.removeItem(selectedRequirement);
-						selectedRequirement = null;
-						requirementsList.clearSelection();
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
 
-			listButtonsPane.add(createReq, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteReq, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			requirementsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		requirementsEditorPane.setLayout(new JideBoxLayout(requirementsEditorPane, JideBoxLayout.PAGE_AXIS));
-		requirementsPane.add(requirementsEditorPane, JideBoxLayout.FIX);
+		final boolean moveUpDownEnabled = false;
+
+		CollapsiblePanel requirementsPane = CommonEditor.createListPanel(
+				title,
+				cellRenderer,
+				requirementsListModel,
+				target.writable,
+				moveUpDownEnabled,
+				(e)->selectedRequirement=e,
+				()->selectedRequirement,
+				this::updateRequirementsEditorPane,
+				listener,
+                Requirement::new).panel;
+
 		if (reply.requirements == null || reply.requirements.isEmpty()) {
 			requirementsPane.collapse();
 		}
@@ -695,7 +541,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);
@@ -712,7 +558,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:
@@ -720,6 +566,11 @@ public class DialogueEditor extends JSONElementEditor {
 				requirementObjId = null;
 				requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener);
 				break;
+			case random:
+				requirementObj = null;
+				requirementObjId = addChanceField(pane, "Chance: ", requirement.required_obj_id, "50/100", writable, listener);
+				requirementValue = null;
+				break;
 			case hasActorCondition:
 				requirementObj = addActorConditionBox(pane, project, "Actor Condition: ", (ActorCondition) requirement.required_obj, writable, listener);
 				requirementObjId = null;
@@ -728,6 +579,8 @@ public class DialogueEditor extends JSONElementEditor {
 			case inventoryKeep:
 			case inventoryRemove:
 			case usedItem:
+			case wear:
+			case wearRemove:
 				requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener);
 				requirementObjId = null;
 				requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener);
@@ -763,10 +616,30 @@ public class DialogueEditor extends JSONElementEditor {
 				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;
-				requirementValue = null;
+			case factionScoreEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact value: ", requirement.required_value, true, writable, listener);
+				break;
+			case date:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Date type YYYYMMTT:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum date value: ", requirement.required_value, true, writable, listener);
+				break;
+			case dateEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Date type YYYYMMTT:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact date value: ", requirement.required_value, true, writable, listener);
+				break;
+			case time:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum time value: ", requirement.required_value, true, writable, listener);
+				break;
+			case timeEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
 				break;
 			}
 			requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
@@ -776,67 +649,23 @@ public class DialogueEditor extends JSONElementEditor {
 	}
 
 
-	public static class RewardsListModel implements ListModel<Dialogue.Reward> {
-		
-		Dialogue source;
+ public static class RewardsListModel extends CommonEditor.AtListModel<Dialogue.Reward, Dialogue> {
 
 		public RewardsListModel(Dialogue dialogue) {
-			this.source = dialogue;
+			super(dialogue);
 		}
 
 		@Override
-		public int getSize() {
-			if (source.rewards == null) return 0;
-			return source.rewards.size();
+		protected List<Dialogue.Reward> getInner() {
+			return source.rewards;
 		}
 
 		@Override
-		public Dialogue.Reward getElementAt(int index) {
-			if (source.rewards == null) return null;
-			return source.rewards.get(index);
+		protected void setInner(List<Dialogue.Reward> value) {
+			source.rewards = value;
 		}
 
-		public void addItem(Dialogue.Reward item) {
-			if (source.rewards == null) {
-				source.rewards = new ArrayList<Dialogue.Reward>();
-			}
-			source.rewards.add(item);
-			int index = source.rewards.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(Dialogue.Reward item) {
-			int index = source.rewards.indexOf(item);
-			source.rewards.remove(item);
-			if (source.rewards.isEmpty()) {
-				source.rewards = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(Dialogue.Reward item) {
-			int index = source.rewards.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-		
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	}
+ }
 
 	public static class RewardsCellRenderer extends DefaultListCellRenderer {
 		private static final long serialVersionUID = 7987880146189575234L;
@@ -934,6 +763,10 @@ public class DialogueEditor extends JSONElementEditor {
 				label.setText("Change map filter to "+rewardObjDesc+" on map "+reward.map_name);
 				label.setIcon(new ImageIcon(DefaultIcons.getReplaceIcon()));
 				break;
+			case mapchange:
+				label.setText("Teleport to "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getMapchangeIcon()));
+				break;
 			}
 		} else {
 			label.setText("New, undefined reward");
@@ -941,88 +774,21 @@ public class DialogueEditor extends JSONElementEditor {
 	}
 
 
-	public static class RepliesListModel implements ListModel<Dialogue.Reply> {
-
-		Dialogue source;
-
+	public static class RepliesListModel extends CommonEditor.AtListModel<Dialogue.Reply, Dialogue> {
 		public RepliesListModel(Dialogue dialogue) {
-			this.source = dialogue;
-		}
-
-		
-		@Override
-		public int getSize() {
-			if (source.replies == null) return 0;
-			return source.replies.size();
+			super(dialogue);
 		}
 
 		@Override
-		public Dialogue.Reply getElementAt(int index) {
-			if (source.replies == null) return null;
-			return source.replies.get(index);
-		}
-		
-		public void addItem(Dialogue.Reply item) {
-			if (source.replies == null) {
-				source.replies = new ArrayList<Dialogue.Reply>();
-			}
-			source.replies.add(item);
-			int index = source.replies.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(Dialogue.Reply item) {
-			int index = source.replies.indexOf(item);
-			source.replies.remove(item);
-			if (source.replies.isEmpty()) {
-				source.replies = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(Dialogue.Reply item) {
-			int index = source.replies.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		public void moveUp(Dialogue.Reply item) {
-			int index = source.replies.indexOf(item);
-			Dialogue.Reply exchanged = source.replies.get(index - 1);
-			source.replies.set(index, exchanged);
-			source.replies.set(index - 1, item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index - 1, index));
-			}
-		}
-
-		public void moveDown(Dialogue.Reply item) {
-			int index = source.replies.indexOf(item);
-			Dialogue.Reply exchanged = source.replies.get(index + 1);
-			source.replies.set(index, exchanged);
-			source.replies.set(index + 1, item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index + 1));
-			}
-		}
-
-
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
+		protected List<Dialogue.Reply> getInner() {
+			return source.replies;
 		}
 
 		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
+		protected void setInner(List<Dialogue.Reply> value) {
+			source.replies = value;
 		}
+
 	}
 
 	public static class RepliesCellRenderer extends DefaultListCellRenderer {
@@ -1075,70 +841,27 @@ public class DialogueEditor extends JSONElementEditor {
 		}
 	}
 
-	public static class ReplyRequirementsListModel implements ListModel<Requirement> {
+	 public static class ReplyRequirementsListModel extends CommonEditor.AtListModel<Requirement, Dialogue.Reply> {
 
-		Dialogue.Reply reply;
+		 public ReplyRequirementsListModel(Dialogue.Reply reply) {
+			 super(reply);
+		 }
 
-		public ReplyRequirementsListModel(Dialogue.Reply reply) {
-			this.reply = reply;
-		}
+		 @Override
+		 protected List<Requirement> getInner() {
+			 return source.requirements;
+		 }
 
-		@Override
-		public int getSize() {
-			if (reply.requirements == null) return 0;
-			return reply.requirements.size();
-		}
+		 @Override
+		 protected void setInner(List<Requirement> value) {
+			 source.requirements = value;
+		 }
 
-		@Override
-		public Requirement getElementAt(int index) {
-			if (reply.requirements == null) return null;
-			return reply.requirements.get(index);
-		}
-		
-
-		
-		public void addItem(Requirement item) {
-			if (reply.requirements == null) {
-				reply.requirements = new ArrayList<Requirement>();
-			}
-			reply.requirements.add(item);
-			int index = reply.requirements.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(Requirement item) {
-			int index = reply.requirements.indexOf(item);
-			reply.requirements.remove(item);
-			if (reply.requirements.isEmpty()) {
-				reply.requirements = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(Requirement item) {
-			int index = reply.requirements.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-		
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-		
-	}
+		 @Override
+		 protected GameDataElement getNavigationElement(Requirement element) {
+             return element != null ? element.required_obj : null;
+		 }
+	 }
 
 	public static class ReplyRequirementsCellRenderer extends DefaultListCellRenderer {
 		private static final long serialVersionUID = 7987880146189575234L;
@@ -1167,8 +890,11 @@ public class DialogueEditor extends JSONElementEditor {
 			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) {
+		} else if (req.type == Requirement.RequirementType.factionScore || req.type == Requirement.RequirementType.factionScoreEquals) {
 			label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon()));
+		} else if (req.type == Requirement.RequirementType.date || req.type == Requirement.RequirementType.dateEquals || 
+				   req.type == Requirement.RequirementType.time || req.type == Requirement.RequirementType.timeEquals) {
+			label.setIcon(new ImageIcon(DefaultIcons.getDateIcon()));
 		}
 		if (req.type == null) {
 			label.setText("New, undefined requirement.");

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

@@ -1,28 +1,17 @@
 package com.gpl.rpg.atcontentstudio.ui.gamedataeditors;
 
 import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.JTextField;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
@@ -32,8 +21,8 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist.DroppedItem;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
 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.tools.CommonEditor;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class DroplistEditor extends JSONElementEditor {
@@ -50,7 +39,7 @@ public class DroplistEditor extends JSONElementEditor {
 	private DroppedItemsListModel droppedItemsListModel;
 	private JSpinner qtyMinField;
 	private JSpinner qtyMaxField;
-	private JSpinner chanceField;
+	private JComponent chanceField;
 
 	public DroplistEditor(Droplist droplist) {
 		super(droplist, droplist.getDesc(), droplist.getIcon());
@@ -58,7 +47,6 @@ public class DroplistEditor extends JSONElementEditor {
 		addEditorTab(json_view_id, getJSONView());
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void insertFormViewDataField(JPanel pane) {
 
@@ -69,60 +57,23 @@ public class DroplistEditor extends JSONElementEditor {
 
 		idField = addTextField(pane, "Droplist ID: ", droplist.id, droplist.writable, listener);
 
-		CollapsiblePanel itemsPane = new CollapsiblePanel("Items in this droplist: ");
-		itemsPane.setLayout(new JideBoxLayout(itemsPane, JideBoxLayout.PAGE_AXIS));
+		String title = "Items in this droplist: ";
+		DroppedItemsCellRenderer cellRenderer = new DroppedItemsCellRenderer();
 		droppedItemsListModel = new DroppedItemsListModel(droplist);
-		final JList itemsList = new JList(droppedItemsListModel);
-		itemsList.setCellRenderer(new DroppedItemsCellRenderer());
-		itemsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		itemsPane.add(new JScrollPane(itemsList), JideBoxLayout.FIX);
-		final JPanel droppedItemsEditorPane = new JPanel();
-		final JButton createDroppedItem = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteDroppedItem = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		deleteDroppedItem.setEnabled(false);
-		itemsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedItem = (Droplist.DroppedItem) itemsList.getSelectedValue();
-				if (selectedItem == null) {
-					deleteDroppedItem.setEnabled(false);
-				} else {
-					deleteDroppedItem.setEnabled(true);
-				}
-				updateDroppedItemsEditorPane(droppedItemsEditorPane, selectedItem, listener);
-			}
-		});
-		if (droplist.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createDroppedItem.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Droplist.DroppedItem tempItem = new Droplist.DroppedItem();
-					droppedItemsListModel.addItem(tempItem);
-					itemsList.setSelectedValue(tempItem, true);
-					listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteDroppedItem.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedItem != null) {
-						droppedItemsListModel.removeItem(selectedItem);
-						selectedItem = null;
-						itemsList.clearSelection();
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean moveUpDownEnabled = false;
+
+		CollapsiblePanel itemsPane = CommonEditor.createListPanel(
+				title,
+				cellRenderer,
+				droppedItemsListModel,
+				droplist.writable,
+				moveUpDownEnabled,
+				(e) -> selectedItem = e,
+				() -> selectedItem,
+				this::updateDroppedItemsEditorPane,
+				listener,
+				Droplist.DroppedItem::new).panel;
 
-			listButtonsPane.add(createDroppedItem, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteDroppedItem, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			itemsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		droppedItemsEditorPane.setLayout(new JideBoxLayout(droppedItemsEditorPane, JideBoxLayout.PAGE_AXIS));
-		itemsPane.add(droppedItemsEditorPane, JideBoxLayout.FIX);
 		if (droplist.dropped_items == null || droplist.dropped_items.isEmpty()) {
 			itemsPane.collapse();
 		}
@@ -132,8 +83,8 @@ public class DroplistEditor extends JSONElementEditor {
 	}
 
 	public void updateDroppedItemsEditorPane(JPanel pane, DroppedItem di, FieldUpdateListener listener) {
-		boolean writable = ((Droplist)target).writable;
-		Project proj = ((Droplist)target).getProject();
+		boolean writable = target.writable;
+		Project proj = target.getProject();
 		pane.removeAll();
 		if (itemCombo != null) {
 			removeElementListener(itemCombo);
@@ -142,71 +93,26 @@ public class DroplistEditor extends JSONElementEditor {
 			itemCombo = addItemBox(pane, proj, "Item: ", di.item, writable, listener);
 			qtyMinField = addIntegerField(pane, "Quantity min: ", di.quantity_min, false, writable, listener);
 			qtyMaxField = addIntegerField(pane, "Quantity max: ", di.quantity_max, false, writable, listener);
-			chanceField = addDoubleField(pane, "Chance: ", di.chance, writable, listener);
+			chanceField = addChanceField(pane, "Chance: ", di.chance, "100", writable, listener);//addDoubleField(pane, "Chance: ", di.chance, writable, listener);
 		}
 		pane.revalidate();
 		pane.repaint();
 	}
 
-	public class DroppedItemsListModel implements ListModel<Droplist.DroppedItem> {
-		
-		Droplist source;
+	public static class DroppedItemsListModel extends CommonEditor.AtListModel<Droplist.DroppedItem, Droplist> {
 
 		public DroppedItemsListModel(Droplist droplist) {
-			this.source = droplist;
+			super(droplist);
 		}
 
 		@Override
-		public int getSize() {
-			if (source.dropped_items == null) return 0;
-			return source.dropped_items.size();
+		protected List<Droplist.DroppedItem> getInner() {
+			return source.dropped_items;
 		}
 
 		@Override
-		public Droplist.DroppedItem getElementAt(int index) {
-			if (source.dropped_items == null) return null;
-			return source.dropped_items.get(index);
-		}
-		
-		public void addItem(Droplist.DroppedItem item) {
-			if (source.dropped_items == null) {
-				source.dropped_items = new ArrayList<Droplist.DroppedItem>();
-			}
-			source.dropped_items.add(item);
-			int index = source.dropped_items.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(Droplist.DroppedItem item) {
-			int index = source.dropped_items.indexOf(item);
-			source.dropped_items.remove(item);
-			if (source.dropped_items.isEmpty()) {
-				source.dropped_items = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(Droplist.DroppedItem item) {
-			int index = source.dropped_items.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-		
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
+		protected void setInner(List<Droplist.DroppedItem> value) {
+			source.dropped_items = value;
 		}
 	}
 
@@ -214,16 +120,16 @@ public class DroplistEditor extends JSONElementEditor {
 		private static final long serialVersionUID = 7987880146189575234L;
 
 		@Override
-		public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
 			Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if (c instanceof JLabel) {
 				JLabel label = ((JLabel)c);
 				Droplist.DroppedItem di = (Droplist.DroppedItem)value;
 				if (di.item != null) {
 					label.setIcon(new ImageIcon(di.item.getIcon()));
-					label.setText(di.chance+"% to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item.getDesc());
+					label.setText(di.chance+(di.chance != null && di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item.getDesc());
 				} else if (!isNull(di)) {
-					label.setText(di.chance+"% to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item_id);
+					label.setText(di.chance+(di.chance != null && di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item_id);
 				} else {
 					label.setText("New, undefined, dropped item.");
 				}
@@ -253,12 +159,12 @@ public class DroplistEditor extends JSONElementEditor {
 					skipNext = false;
 					return;
 				}
-				if (target.id.equals((String) value)) return;
+				if (target.id.equals(value)) return;
 
 				if (idChanging()) {
 					droplist.id = (String) value;
 					DroplistEditor.this.name = droplist.getDesc();
-					droplist.childrenChanged(new ArrayList<ProjectTreeNode>());
+					droplist.childrenChanged(new ArrayList<>());
 					ATContentStudio.frame.editorChanged(DroplistEditor.this);
 				} else {
 					cancelIdEdit(idField);
@@ -283,14 +189,14 @@ public class DroplistEditor extends JSONElementEditor {
 				selectedItem.quantity_max = (Integer) value;
 				droppedItemsListModel.itemChanged(selectedItem);
 			} else if (source == chanceField) {
-				selectedItem.chance = (Double) value;
+				selectedItem.chance = (String) value;
 				droppedItemsListModel.itemChanged(selectedItem);
 			}
 
 			if (droplist.state != GameDataElement.State.modified) {
 				droplist.state = GameDataElement.State.modified;
 				DroplistEditor.this.name = droplist.getDesc();
-				droplist.childrenChanged(new ArrayList<ProjectTreeNode>());
+				droplist.childrenChanged(new ArrayList<>());
 				ATContentStudio.frame.editorChanged(DroplistEditor.this);
 			}
 			updateJsonViewText(droplist.toJsonString());

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

@@ -5,7 +5,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultListCellRenderer;
@@ -17,21 +16,15 @@ 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.JTextField;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Common;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
 import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
@@ -40,6 +33,7 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.FieldUpdateListener;
 import com.gpl.rpg.atcontentstudio.ui.IntegerBasedCheckBox;
 import com.gpl.rpg.atcontentstudio.ui.OverlayIcon;
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class ItemEditor extends JSONElementEditor {
@@ -53,12 +47,12 @@ public class ItemEditor extends JSONElementEditor {
 	private static final String useLabel = "Effect on use: ";
 
 
-	private Item.ConditionEffect selectedEquipEffectCondition;
-	private Item.TimedConditionEffect selectedHitEffectSourceCondition;
-	private Item.TimedConditionEffect selectedHitEffectTargetCondition;
-	private Item.TimedConditionEffect selectedKillEffectCondition;
-	private Item.TimedConditionEffect selectedHitReceivedEffectSourceCondition;
-	private Item.TimedConditionEffect selectedHitReceivedEffectTargetCondition;
+	private Common.ConditionEffect selectedEquipEffectCondition;
+	private Common.TimedConditionEffect selectedHitEffectSourceCondition;
+	private Common.TimedConditionEffect selectedHitEffectTargetCondition;
+	private Common.TimedConditionEffect selectedKillEffectCondition;
+	private Common.TimedConditionEffect selectedHitReceivedEffectSourceCondition;
+	private Common.TimedConditionEffect selectedHitReceivedEffectTargetCondition;
 
 
 	private JButton itemIcon;
@@ -82,6 +76,7 @@ public class ItemEditor extends JSONElementEditor {
 	private JSpinner equipBoostBC;
 	private JSpinner equipBoostCS;
 	private JSpinner equipSetCM;
+	private JSpinner equipSetDM;
 	private JSpinner equipBoostDR;
 	private JSpinner equipIncMoveCost;
 	private JSpinner equipIncUseCost;
@@ -96,7 +91,7 @@ public class ItemEditor extends JSONElementEditor {
 	private JSpinner equipConditionMagnitude;
 
 	private CollapsiblePanel hitEffectPane;
-	private Item.HitEffect hitEffect;
+	private Common.HitEffect hitEffect;//TODO: Check if this was set anywhere before my changes
 	private JSpinner hitHPMin;
 	private JSpinner hitHPMax;
 	private JSpinner hitAPMin;
@@ -127,7 +122,7 @@ public class ItemEditor extends JSONElementEditor {
 	private JSpinner hitTargetConditionDuration;
 
 	private CollapsiblePanel killEffectPane;
-	private Item.KillEffect killEffect;
+	private Common.DeathEffect killEffect;
 	private JSpinner killHPMin;
 	private JSpinner killHPMax;
 	private JSpinner killAPMin;
@@ -146,7 +141,7 @@ public class ItemEditor extends JSONElementEditor {
 	private JSpinner killSourceConditionDuration;
 
 	private CollapsiblePanel hitReceivedEffectPane;
-	private Item.HitReceivedEffect hitReceivedEffect;
+	private Common.HitReceivedEffect hitReceivedEffect;
 	private JSpinner hitReceivedHPMin;
 	private JSpinner hitReceivedHPMax;
 	private JSpinner hitReceivedAPMin;
@@ -217,6 +212,7 @@ public class ItemEditor extends JSONElementEditor {
 		}
 		equipDmgMin = addIntegerField(equipEffectPane, "Attack Damage min: ", equipEffect.damage_boost_min, true, item.writable, listener);
 		equipDmgMax = addIntegerField(equipEffectPane, "Attack Damage max: ", equipEffect.damage_boost_max, true, item.writable, listener);
+		equipSetDM =  addIntegerField(equipEffectPane, "Damage modifier %: ", equipEffect.damage_modifier, 100, false, item.writable, listener);
 		equipBoostHP = addIntegerField(equipEffectPane, "Boost max HP: ", equipEffect.max_hp_boost, true, item.writable, listener);
 		equipBoostAP = addIntegerField(equipEffectPane, "Boost max AP: ", equipEffect.max_ap_boost, true, item.writable, listener);
 		equipBoostAC = addIntegerField(equipEffectPane, "Boost attack chance: ", equipEffect.increase_attack_chance, true, item.writable, listener);
@@ -228,59 +224,25 @@ public class ItemEditor extends JSONElementEditor {
 		equipIncUseCost = addIntegerField(equipEffectPane, "Increase item use cost: ", equipEffect.increase_use_item_cost, true, item.writable, listener);
 		equipIncReequipCost = addIntegerField(equipEffectPane, "Increase reequip cost: ", equipEffect.increase_reequip_cost, true, item.writable, listener);
 		equipIncAttackCost = addIntegerField(equipEffectPane, "Increase attack cost: ", equipEffect.increase_attack_cost, true, item.writable, listener);
-		CollapsiblePanel equipConditionsPane = new CollapsiblePanel("Actor Conditions applied when equipped: ");
-		equipConditionsPane.setLayout(new JideBoxLayout(equipConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String title = "Actor Conditions applied when equipped: ";
+		ConditionsCellRenderer cellRenderer = new ConditionsCellRenderer();
 		equipConditionsModel = new ConditionsListModel(equipEffect);
-		equipConditionsList = new JList(equipConditionsModel);
-		equipConditionsList.setCellRenderer(new ConditionsCellRenderer());
-		equipConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		equipConditionsPane.add(new JScrollPane(equipConditionsList), JideBoxLayout.FIX);
-		final JPanel equipConditionsEditorPane = new JPanel();
-		final JButton createEquipCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteEquipCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		equipConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedEquipEffectCondition = (Item.ConditionEffect) equipConditionsList.getSelectedValue();
-				if (selectedEquipEffectCondition == null) {
-					deleteEquipCondition.setEnabled(false);
-				} else {
-					deleteEquipCondition.setEnabled(true);
-				}
-				updateEquipConditionEditorPane(equipConditionsEditorPane, selectedEquipEffectCondition, listener);
-			}
-		});
-		if (item.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createEquipCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Item.ConditionEffect condition = new Item.ConditionEffect();
-					equipConditionsModel.addItem(condition);
-					equipConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(equipConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteEquipCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedEquipEffectCondition != null) {
-						equipConditionsModel.removeItem(selectedEquipEffectCondition);
-						selectedEquipEffectCondition = null;
-						equipConditionsList.clearSelection();
-						listener.valueChanged(equipConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean moveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.ConditionEffect> equipConditionsCreation = CommonEditor.createListPanel(
+				title,
+				cellRenderer,
+				equipConditionsModel,
+				item.writable,
+				moveUpDownEnabled,
+				(e) -> selectedEquipEffectCondition = e,
+				() -> selectedEquipEffectCondition,
+				this::updateEquipConditionEditorPane,
+				listener,
+				Common.ConditionEffect::new);
+		CollapsiblePanel equipConditionsPane =  equipConditionsCreation.panel;
+		equipConditionsList = equipConditionsCreation.list;
 
-			listButtonsPane.add(createEquipCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteEquipCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			equipConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		equipConditionsEditorPane.setLayout(new JideBoxLayout(equipConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		equipConditionsPane.add(equipConditionsEditorPane, JideBoxLayout.FIX);
 		if (item.equip_effect == null || item.equip_effect.conditions == null || item.equip_effect.conditions.isEmpty()) {
 			equipConditionsPane.collapse();
 		}
@@ -290,127 +252,55 @@ public class ItemEditor extends JSONElementEditor {
 			equipEffectPane.collapse();
 		}
 
-		hitEffectPane = new CollapsiblePanel("Effect on every hit: ");
-		hitEffectPane.setLayout(new JideBoxLayout(hitEffectPane, JideBoxLayout.PAGE_AXIS));
-		if (item.hit_effect == null) {
-			hitEffect = new Item.HitEffect();
-		} else {
-			hitEffect = item.hit_effect;
-		}
-		hitHPMin = addIntegerField(hitEffectPane, "HP bonus min: ", hitEffect.hp_boost_min, true, item.writable, listener);
-		hitHPMax = addIntegerField(hitEffectPane, "HP bonus max: ", hitEffect.hp_boost_max, true, item.writable, listener);
-		hitAPMin = addIntegerField(hitEffectPane, "AP bonus min: ", hitEffect.ap_boost_min, true, item.writable, listener);
-		hitAPMax = addIntegerField(hitEffectPane, "AP bonus max: ", hitEffect.ap_boost_max, true, item.writable, listener);
-		final CollapsiblePanel hitSourceConditionsPane = new CollapsiblePanel("Actor Conditions applied to the source: ");
-		hitSourceConditionsPane.setLayout(new JideBoxLayout(hitSourceConditionsPane, JideBoxLayout.PAGE_AXIS));
-		hitSourceConditionsModel = new SourceTimedConditionsListModel(hitEffect);
-		hitSourceConditionsList = new JList(hitSourceConditionsModel);
-		hitSourceConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitSourceConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitSourceConditionsPane.add(new JScrollPane(hitSourceConditionsList), JideBoxLayout.FIX);
-		final JPanel sourceTimedConditionsEditorPane = new JPanel();
-		final JButton createHitSourceCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitSourceCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitSourceConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitEffectSourceCondition = (Item.TimedConditionEffect) hitSourceConditionsList.getSelectedValue();
-				updateHitSourceTimedConditionEditorPane(sourceTimedConditionsEditorPane, selectedHitEffectSourceCondition, listener);
-				if (selectedHitEffectSourceCondition == null) {
-					deleteHitSourceCondition.setEnabled(false);
-				} else {
-					deleteHitSourceCondition.setEnabled(true);
-				}
-			}
-		});
-		if (item.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Item.TimedConditionEffect condition = new Item.TimedConditionEffect();
-					hitSourceConditionsModel.addItem(condition);
-					hitSourceConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitEffectSourceCondition != null) {
-						hitSourceConditionsModel.removeItem(selectedHitEffectSourceCondition);
-						selectedHitEffectSourceCondition = null;
-						hitSourceConditionsList.clearSelection();
-						listener.valueChanged(hitSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		CommonEditor.CreateDeathEffectPanelResult hitEffectPanelResult = CommonEditor.createDeathEffectPanel(item.hit_effect, item.writable, listener, "Effect on every hit: ");
+		hitEffectPane = hitEffectPanelResult.panel;
+		hitHPMin = hitEffectPanelResult.HPMin;
+		hitHPMax = hitEffectPanelResult.HPMax;
+		hitAPMax = hitEffectPanelResult.APMax;
+		hitAPMin = hitEffectPanelResult.APMin;
+
+		String hitSourceTitle = "Actor Conditions applied to the source: ";
+		TimedConditionsCellRenderer hitSourceCellRenderer = new TimedConditionsCellRenderer();
+		hitSourceConditionsModel = new SourceTimedConditionsListModel(hitEffect);
+		final boolean hitSourceMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> hitSourceConditionsCreation = CommonEditor.createListPanel(
+				hitSourceTitle,
+				hitSourceCellRenderer,
+				hitSourceConditionsModel,
+				item.writable,
+				hitSourceMoveUpDownEnabled,
+				(e) -> selectedHitEffectSourceCondition = e,
+				() -> selectedHitEffectSourceCondition,
+				this::updateHitSourceTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		final CollapsiblePanel hitSourceConditionsPane = hitSourceConditionsCreation.panel;
+		hitSourceConditionsList = hitSourceConditionsCreation.list;
 
-			listButtonsPane.add(createHitSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitSourceConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		sourceTimedConditionsEditorPane.setLayout(new JideBoxLayout(sourceTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitSourceConditionsPane.add(sourceTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (item.hit_effect == null || item.hit_effect.conditions_source == null || item.hit_effect.conditions_source.isEmpty()) {
 			hitSourceConditionsPane.collapse();
 		}
 		hitEffectPane.add(hitSourceConditionsPane, JideBoxLayout.FIX);
-		final CollapsiblePanel hitTargetConditionsPane = new CollapsiblePanel("Actor Conditions applied to the target: ");
-		hitTargetConditionsPane.setLayout(new JideBoxLayout(hitTargetConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitTargetTitle = "Actor Conditions applied to the target: ";
+		TimedConditionsCellRenderer hitTargetCellRenderer = new TimedConditionsCellRenderer();
 		hitTargetConditionsModel = new TargetTimedConditionsListModel(hitEffect);
-		hitTargetConditionsList = new JList(hitTargetConditionsModel);
-		hitTargetConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitTargetConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitTargetConditionsPane.add(new JScrollPane(hitTargetConditionsList), JideBoxLayout.FIX);
-		final JPanel targetTimedConditionsEditorPane = new JPanel();
-		final JButton createHitTargetCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitTargetCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitTargetConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitEffectTargetCondition = (Item.TimedConditionEffect) hitTargetConditionsList.getSelectedValue();
-				updateHitTargetTimedConditionEditorPane(targetTimedConditionsEditorPane, selectedHitEffectTargetCondition, listener);
-				if (selectedHitEffectTargetCondition == null) {
-					deleteHitTargetCondition.setEnabled(false);
-				} else {
-					deleteHitTargetCondition.setEnabled(true);
-				}
-			}
-		});
-		if (item.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Item.TimedConditionEffect condition = new Item.TimedConditionEffect();
-					hitTargetConditionsModel.addItem(condition);
-					hitTargetConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitEffectTargetCondition != null) {
-						hitTargetConditionsModel.removeItem(selectedHitEffectTargetCondition);
-						selectedHitEffectTargetCondition = null;
-						hitTargetConditionsList.clearSelection();
-						listener.valueChanged(hitTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitTargetMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> listPanel2 = CommonEditor.createListPanel(
+				hitTargetTitle,
+				hitTargetCellRenderer,
+				hitTargetConditionsModel,
+				item.writable,
+				hitTargetMoveUpDownEnabled,
+				(e) -> selectedHitEffectTargetCondition = e,
+				() -> selectedHitEffectTargetCondition,
+				this::updateHitTargetTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		final CollapsiblePanel hitTargetConditionsPane = (CollapsiblePanel) listPanel2.panel;
+		hitTargetConditionsList = listPanel2.list;
 
-			listButtonsPane.add(createHitTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitTargetConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		targetTimedConditionsEditorPane.setLayout(new JideBoxLayout(targetTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitTargetConditionsPane.add(targetTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (item.hit_effect == null || item.hit_effect.conditions_target == null || item.hit_effect.conditions_target.isEmpty()) {
 			hitTargetConditionsPane.collapse();
 		}
@@ -421,71 +311,38 @@ public class ItemEditor extends JSONElementEditor {
 		pane.add(hitEffectPane, JideBoxLayout.FIX);
 
 
-		
-		killEffectPane = new CollapsiblePanel(killLabel);
-		killEffectPane.setLayout(new JideBoxLayout(killEffectPane, JideBoxLayout.PAGE_AXIS));
 		if (item.kill_effect == null) {
-			killEffect = new Item.KillEffect();
+			killEffect = new Common.DeathEffect();
 		} else {
 			killEffect = item.kill_effect;
 		}
-		killHPMin = addIntegerField(killEffectPane, "HP bonus min: ", killEffect.hp_boost_min, true, item.writable, listener);
-		killHPMax = addIntegerField(killEffectPane, "HP bonus max: ", killEffect.hp_boost_max, true, item.writable, listener);
-		killAPMin = addIntegerField(killEffectPane, "AP bonus min: ", killEffect.ap_boost_min, true, item.writable, listener);
-		killAPMax = addIntegerField(killEffectPane, "AP bonus max: ", killEffect.ap_boost_max, true, item.writable, listener);
-		final CollapsiblePanel killSourceConditionsPane = new CollapsiblePanel("Actor Conditions applied to the source: ");
-		killSourceConditionsPane.setLayout(new JideBoxLayout(killSourceConditionsPane, JideBoxLayout.PAGE_AXIS));
-		killSourceConditionsModel = new SourceTimedConditionsListModel(killEffect);
-		killSourceConditionsList = new JList(killSourceConditionsModel);
-		killSourceConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		killSourceConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		killSourceConditionsPane.add(new JScrollPane(killSourceConditionsList), JideBoxLayout.FIX);
-		final JPanel killSourceTimedConditionsEditorPane = new JPanel();
-		final JButton createKillSourceCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteKillSourceCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		killSourceConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedKillEffectCondition = (Item.TimedConditionEffect) killSourceConditionsList.getSelectedValue();
-				updateKillSourceTimedConditionEditorPane(killSourceTimedConditionsEditorPane, selectedKillEffectCondition, listener);
-				if (selectedKillEffectCondition == null) {
-					deleteKillSourceCondition.setEnabled(false);
-				} else {
-					deleteKillSourceCondition.setEnabled(true);
-				}
-			}
-		});
-		if (item.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createKillSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Item.TimedConditionEffect condition = new Item.TimedConditionEffect();
-					killSourceConditionsModel.addItem(condition);
-					killSourceConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(killSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteKillSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedKillEffectCondition != null) {
-						killSourceConditionsModel.removeItem(selectedKillEffectCondition);
-						selectedKillEffectCondition = null;
-						killSourceConditionsList.clearSelection();
-						listener.valueChanged(killSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
 
-			listButtonsPane.add(createKillSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteKillSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			killSourceConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		killSourceTimedConditionsEditorPane.setLayout(new JideBoxLayout(killSourceTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		killSourceConditionsPane.add(killSourceTimedConditionsEditorPane, JideBoxLayout.FIX);
+		CommonEditor.CreateDeathEffectPanelResult x = CommonEditor.createDeathEffectPanel(killEffect, item.writable, listener, killLabel);
+		killEffectPane = x.panel;
+		killHPMin = x.HPMin;
+		killHPMax = x.HPMax;
+		killAPMin = x.APMin;
+		killAPMax = x.APMax;
+
+		String killSourceTitle = "Actor Conditions applied to the source: ";
+		TimedConditionsCellRenderer killSourceCellRenderer = new TimedConditionsCellRenderer();
+		killSourceConditionsModel = new SourceTimedConditionsListModel(killEffect);
+		final boolean killSourceMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> listPanel = CommonEditor.createListPanel(
+				killSourceTitle,
+				killSourceCellRenderer,
+				killSourceConditionsModel,
+				item.writable,
+				killSourceMoveUpDownEnabled,
+				(e) -> selectedKillEffectCondition = e,
+				() -> selectedKillEffectCondition,
+				this::updateKillSourceTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		final CollapsiblePanel killSourceConditionsPane = listPanel.panel;
+		killSourceConditionsList = listPanel.list;
+
 		if (item.kill_effect == null || item.kill_effect.conditions_source == null || item.kill_effect.conditions_source.isEmpty()) {
 			killSourceConditionsPane.collapse();
 		}
@@ -496,13 +353,14 @@ public class ItemEditor extends JSONElementEditor {
 		pane.add(killEffectPane, JideBoxLayout.FIX);
 
 
-		hitReceivedEffectPane = new CollapsiblePanel("Effect on every hit received: ");
-		hitReceivedEffectPane.setLayout(new JideBoxLayout(hitReceivedEffectPane, JideBoxLayout.PAGE_AXIS));
 		if (item.hit_received_effect == null) {
-			hitReceivedEffect = new Item.HitReceivedEffect();
+			hitReceivedEffect = new Common.HitReceivedEffect();
 		} else {
 			hitReceivedEffect = item.hit_received_effect;
 		}
+		String titleHitReceived = "Effect on every hit received: ";
+		hitReceivedEffectPane = new CollapsiblePanel(titleHitReceived);
+		hitReceivedEffectPane.setLayout(new JideBoxLayout(hitReceivedEffectPane, JideBoxLayout.PAGE_AXIS));
 		hitReceivedHPMin = addIntegerField(hitReceivedEffectPane, "Player HP bonus min: ", hitReceivedEffect.hp_boost_min, true, item.writable, listener);
 		hitReceivedHPMax = addIntegerField(hitReceivedEffectPane, "Player HP bonus max: ", hitReceivedEffect.hp_boost_max, true, item.writable, listener);
 		hitReceivedAPMin = addIntegerField(hitReceivedEffectPane, "Player AP bonus min: ", hitReceivedEffect.ap_boost_min, true, item.writable, listener);
@@ -511,116 +369,48 @@ public class ItemEditor extends JSONElementEditor {
 		hitReceivedHPMaxTarget = addIntegerField(hitReceivedEffectPane, "Attacker HP bonus max: ", hitReceivedEffect.hp_boost_max_target, true, item.writable, listener);
 		hitReceivedAPMinTarget = addIntegerField(hitReceivedEffectPane, "Attacker AP bonus min: ", hitReceivedEffect.ap_boost_min_target, true, item.writable, listener);
 		hitReceivedAPMaxTarget = addIntegerField(hitReceivedEffectPane, "Attacker AP bonus max: ", hitReceivedEffect.ap_boost_max_target, true, item.writable, listener);
-		final CollapsiblePanel hitReceivedSourceConditionsPane = new CollapsiblePanel("Actor Conditions applied to the player: ");
-		hitReceivedSourceConditionsPane.setLayout(new JideBoxLayout(hitReceivedSourceConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitReceivedSourceTitle = "Actor Conditions applied to the player: ";
+		TimedConditionsCellRenderer hitReceivedSourceCellRenderer = new TimedConditionsCellRenderer();
 		hitReceivedSourceConditionsModel = new SourceTimedConditionsListModel(hitReceivedEffect);
-		hitReceivedSourceConditionsList = new JList(hitReceivedSourceConditionsModel);
-		hitReceivedSourceConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitReceivedSourceConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitReceivedSourceConditionsPane.add(new JScrollPane(hitReceivedSourceConditionsList), JideBoxLayout.FIX);
-		final JPanel hitReceivedSourceTimedConditionsEditorPane = new JPanel();
-		final JButton createHitReceivedSourceCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitReceivedSourceCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitReceivedSourceConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitReceivedEffectSourceCondition = (Item.TimedConditionEffect) hitReceivedSourceConditionsList.getSelectedValue();
-				updateHitReceivedSourceTimedConditionEditorPane(hitReceivedSourceTimedConditionsEditorPane, selectedHitReceivedEffectSourceCondition, listener);
-				if (selectedHitReceivedEffectSourceCondition == null) {
-					deleteHitReceivedSourceCondition.setEnabled(false);
-				} else {
-					deleteHitReceivedSourceCondition.setEnabled(true);
-				}
-			}
-		});
-		if (item.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitReceivedSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Item.TimedConditionEffect condition = new Item.TimedConditionEffect();
-					hitReceivedSourceConditionsModel.addItem(condition);
-					hitReceivedSourceConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitReceivedSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitReceivedSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitReceivedEffectSourceCondition != null) {
-						hitReceivedSourceConditionsModel.removeItem(selectedHitReceivedEffectSourceCondition);
-						selectedHitReceivedEffectSourceCondition = null;
-						hitReceivedSourceConditionsList.clearSelection();
-						listener.valueChanged(hitReceivedSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitReceivedSourceMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> listPanel1 = CommonEditor.createListPanel(
+				hitReceivedSourceTitle,
+				hitReceivedSourceCellRenderer,
+				hitReceivedSourceConditionsModel,
+				item.writable,
+				hitReceivedSourceMoveUpDownEnabled,
+				(e) -> selectedHitReceivedEffectSourceCondition = e,
+				() -> selectedHitReceivedEffectSourceCondition,
+				this::updateHitReceivedSourceTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		final CollapsiblePanel hitReceivedSourceConditionsPane = listPanel1.panel;
+		hitReceivedSourceConditionsList = listPanel1.list;
 
-			listButtonsPane.add(createHitReceivedSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitReceivedSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitReceivedSourceConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		hitReceivedSourceTimedConditionsEditorPane.setLayout(new JideBoxLayout(hitReceivedSourceTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitReceivedSourceConditionsPane.add(hitReceivedSourceTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (item.hit_received_effect == null || item.hit_received_effect.conditions_source == null || item.hit_received_effect.conditions_source.isEmpty()) {
 			hitReceivedSourceConditionsPane.collapse();
 		}
 		hitReceivedEffectPane.add(hitReceivedSourceConditionsPane, JideBoxLayout.FIX);
-		final CollapsiblePanel hitReceivedTargetConditionsPane = new CollapsiblePanel("Actor Conditions applied to the attacker: ");
-		hitReceivedTargetConditionsPane.setLayout(new JideBoxLayout(hitReceivedTargetConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitReceivedTargetTitle = "Actor Conditions applied to the attacker: ";
+		TimedConditionsCellRenderer hitReceivedTargetCellRenderer = new TimedConditionsCellRenderer();
 		hitReceivedTargetConditionsModel = new TargetTimedConditionsListModel(hitReceivedEffect);
-		hitReceivedTargetConditionsList = new JList(hitReceivedTargetConditionsModel);
-		hitReceivedTargetConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitReceivedTargetConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitReceivedTargetConditionsPane.add(new JScrollPane(hitReceivedTargetConditionsList), JideBoxLayout.FIX);
-		final JPanel hitReceivedTargetTimedConditionsEditorPane = new JPanel();
-		final JButton createHitReceivedTargetCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitReceivedTargetCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitReceivedTargetConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitReceivedEffectTargetCondition = (Item.TimedConditionEffect) hitReceivedTargetConditionsList.getSelectedValue();
-				updateHitReceivedTargetTimedConditionEditorPane(hitReceivedTargetTimedConditionsEditorPane, selectedHitReceivedEffectTargetCondition, listener);
-				if (selectedHitReceivedEffectTargetCondition == null) {
-					deleteHitReceivedTargetCondition.setEnabled(false);
-				} else {
-					deleteHitReceivedTargetCondition.setEnabled(true);
-				}
-			}
-		});
-		if (item.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitReceivedTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					Item.TimedConditionEffect condition = new Item.TimedConditionEffect();
-					hitReceivedTargetConditionsModel.addItem(condition);
-					hitReceivedTargetConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitReceivedTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitReceivedTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitReceivedEffectTargetCondition != null) {
-						hitReceivedTargetConditionsModel.removeItem(selectedHitReceivedEffectTargetCondition);
-						selectedHitReceivedEffectTargetCondition = null;
-						hitReceivedTargetConditionsList.clearSelection();
-						listener.valueChanged(hitReceivedTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitReceivedTargetMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> hitReceivedTargetResult = CommonEditor.createListPanel(
+				hitReceivedTargetTitle,
+				hitReceivedTargetCellRenderer,
+				hitReceivedTargetConditionsModel,
+				item.writable,
+				hitReceivedTargetMoveUpDownEnabled,
+				(e) -> selectedHitReceivedEffectTargetCondition = e,
+				() -> selectedHitReceivedEffectTargetCondition,
+				this::updateHitReceivedTargetTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		final CollapsiblePanel hitReceivedTargetConditionsPane = hitReceivedTargetResult.panel;
+		hitReceivedTargetConditionsList = hitReceivedTargetResult.list;
 
-			listButtonsPane.add(createHitReceivedTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitReceivedTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitReceivedTargetConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		hitReceivedTargetTimedConditionsEditorPane.setLayout(new JideBoxLayout(hitReceivedTargetTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitReceivedTargetConditionsPane.add(hitReceivedTargetTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (item.hit_received_effect == null || item.hit_received_effect.conditions_target == null || item.hit_received_effect.conditions_target.isEmpty()) {
 			hitReceivedTargetConditionsPane.collapse();
 		}
@@ -653,7 +443,7 @@ public class ItemEditor extends JSONElementEditor {
 
 	}
 
-	public void updateHitSourceTimedConditionEditorPane(JPanel pane, Item.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitSourceTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitSourceConditionBox != null) {
 			removeElementListener(hitSourceConditionBox);
@@ -664,8 +454,8 @@ public class ItemEditor extends JSONElementEditor {
 			return;
 		}
 
-		boolean writable = ((Item)target).writable;
-		Project proj = ((Item)target).getProject();
+		boolean writable = target.writable;
+		Project proj = target.getProject();
 
 		hitSourceConditionBox = addActorConditionBox(pane, proj, "Actor Condition: ", condition.condition, writable, listener);
 		hitSourceConditionChance = addDoubleField(pane, "Chance: ", condition.chance, writable, listener);
@@ -731,7 +521,7 @@ public class ItemEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitSourceTimedConditionWidgets(Item.TimedConditionEffect condition) {
+	public void updateHitSourceTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -749,7 +539,7 @@ public class ItemEditor extends JSONElementEditor {
 		hitSourceConditionForever.setEnabled(!clear);
 	}
 
-	public void updateHitTargetTimedConditionEditorPane(JPanel pane, Item.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitTargetTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitTargetConditionBox != null) {
 			removeElementListener(hitTargetConditionBox);
@@ -760,8 +550,8 @@ public class ItemEditor extends JSONElementEditor {
 			return;
 		}
 
-		boolean writable = ((Item)target).writable;
-		Project proj = ((Item)target).getProject();
+		boolean writable = target.writable;
+		Project proj = target.getProject();
 
 		hitTargetConditionBox = addActorConditionBox(pane, proj, "Actor Condition: ", condition.condition, writable, listener);
 		hitTargetConditionChance = addDoubleField(pane, "Chance: ", condition.chance, writable, listener);
@@ -827,7 +617,7 @@ public class ItemEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitTargetTimedConditionWidgets(Item.TimedConditionEffect condition) {
+	public void updateHitTargetTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -845,7 +635,7 @@ public class ItemEditor extends JSONElementEditor {
 		hitTargetConditionForever.setEnabled(!clear);
 	}
 
-	public void updateKillSourceTimedConditionEditorPane(JPanel pane, Item.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateKillSourceTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (killSourceConditionBox != null) {
 			removeElementListener(killSourceConditionBox);
@@ -923,7 +713,7 @@ public class ItemEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateKillSourceTimedConditionWidgets(Item.TimedConditionEffect condition) {
+	public void updateKillSourceTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -941,7 +731,7 @@ public class ItemEditor extends JSONElementEditor {
 		killSourceConditionForever.setEnabled(!clear);
 	}
 
-	public void updateEquipConditionEditorPane(JPanel pane, Item.ConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateEquipConditionEditorPane(JPanel pane, Common.ConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (equipConditionBox != null) {
 			removeElementListener(equipConditionBox);
@@ -989,7 +779,7 @@ public class ItemEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitReceivedSourceTimedConditionEditorPane(JPanel pane, Item.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitReceivedSourceTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitReceivedSourceConditionBox != null) {
 			removeElementListener(hitReceivedSourceConditionBox);
@@ -1067,7 +857,7 @@ public class ItemEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitReceivedSourceTimedConditionWidgets(Item.TimedConditionEffect condition) {
+	public void updateHitReceivedSourceTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -1085,7 +875,7 @@ public class ItemEditor extends JSONElementEditor {
 		hitReceivedSourceConditionForever.setEnabled(!clear);
 	}
 
-	public void updateHitReceivedTargetTimedConditionEditorPane(JPanel pane, Item.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitReceivedTargetTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitReceivedTargetConditionBox != null) {
 			removeElementListener(hitReceivedTargetConditionBox);
@@ -1163,7 +953,7 @@ public class ItemEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitReceivedTargetTimedConditionWidgets(Item.TimedConditionEffect condition) {
+	public void updateHitReceivedTargetTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -1182,129 +972,41 @@ public class ItemEditor extends JSONElementEditor {
 	}
 
 
-	public static class SourceTimedConditionsListModel implements ListModel<Item.TimedConditionEffect> {
+ public static class SourceTimedConditionsListModel extends CommonEditor.AtListModel<Common.TimedConditionEffect, Common.DeathEffect> {
 
-		Item.KillEffect source;
-		
-		public SourceTimedConditionsListModel(Item.KillEffect effect) {
-			this.source = effect;;
+		public SourceTimedConditionsListModel(Common.DeathEffect effect) {
+			super(effect);
 		}
 
 		@Override
-		public int getSize() {
-			if (source.conditions_source == null) return 0;
-			return source.conditions_source.size();
+		protected List<Common.TimedConditionEffect> getInner() {
+			return source.conditions_source;
 		}
 
 		@Override
-		public Item.TimedConditionEffect getElementAt(int index) {
-			if (source.conditions_source == null) return null;
-			return source.conditions_source.get(index);
+		protected void setInner(List<Common.TimedConditionEffect> value) {
+			source.conditions_source = value;
 		}
 
-		public void addItem(Item.TimedConditionEffect item) {
-			if (source.conditions_source == null) {
-				source.conditions_source = new ArrayList<Item.TimedConditionEffect>();
-			}
-			source.conditions_source.add(item);
-			int index = source.conditions_source.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
+ }
 
-		public void removeItem(Item.TimedConditionEffect item) {
-			int index = source.conditions_source.indexOf(item);
-			source.conditions_source.remove(item);
-			if (source.conditions_source.isEmpty()) {
-				source.conditions_source = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
+ public static class TargetTimedConditionsListModel extends CommonEditor.AtListModel<Common.TimedConditionEffect, Common.HitEffect> {
 
-		public void itemChanged(Item.TimedConditionEffect item) {
-			int index = source.conditions_source.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
+		public TargetTimedConditionsListModel(Common.HitEffect effect) {
+			super(effect);
 		}
 
 		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	}
-	
-	public static class TargetTimedConditionsListModel implements ListModel<Item.TimedConditionEffect> {
-		
-		Item.HitEffect source;
-		
-		public TargetTimedConditionsListModel(Item.HitEffect effect) {
-			this.source = effect;;
+		protected List<Common.TimedConditionEffect> getInner() {
+			return source.conditions_target;
 		}
 
 		@Override
-		public int getSize() {
-			if (source.conditions_target == null) return 0;
-			return source.conditions_target.size();
+		protected void setInner(List<Common.TimedConditionEffect> value) {
+			source.conditions_target = value;
 		}
 
-		@Override
-		public Item.TimedConditionEffect getElementAt(int index) {
-			if (source.conditions_target == null) return null;
-			return source.conditions_target.get(index);
-		}
-		
-		public void addItem(Item.TimedConditionEffect item) {
-			if (source.conditions_target == null) {
-				source.conditions_target = new ArrayList<Item.TimedConditionEffect>();
-			}
-			source.conditions_target.add(item);
-			int index = source.conditions_target.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(Item.TimedConditionEffect item) {
-			int index = source.conditions_target.indexOf(item);
-			source.conditions_target.remove(item);
-			if (source.conditions_target.isEmpty()) {
-				source.conditions_target = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(Item.TimedConditionEffect item) {
-			int index = source.conditions_target.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-		
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	}
+ }
 
 	public static class TimedConditionsCellRenderer extends DefaultListCellRenderer {
 		private static final long serialVersionUID = 7987880146189575234L;
@@ -1314,7 +1016,7 @@ public class ItemEditor extends JSONElementEditor {
 			Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if (c instanceof JLabel) {
 				JLabel label = ((JLabel)c);
-				Item.TimedConditionEffect effect = (Item.TimedConditionEffect) value;
+				Common.TimedConditionEffect effect = (Common.TimedConditionEffect) value;
 
 				if (effect.condition != null) {
 
@@ -1340,67 +1042,22 @@ public class ItemEditor extends JSONElementEditor {
 		}
 	}
 
-	public static class ConditionsListModel implements ListModel<Item.ConditionEffect> {
-		
-		Item.EquipEffect source;
+ public static class ConditionsListModel extends CommonEditor.AtListModel<Common.ConditionEffect, Item.EquipEffect> {
 
 		public ConditionsListModel(Item.EquipEffect equipEffect) {
-			this.source = equipEffect;
+			super(equipEffect);
 		}
 
 		@Override
-		public int getSize() {
-			if (source.conditions == null) return 0;
-			return source.conditions.size();
+		protected List<Common.ConditionEffect> getInner() {
+			return source.conditions;
 		}
 
 		@Override
-		public Item.ConditionEffect getElementAt(int index) {
-			if (source.conditions == null) return null;
-			return source.conditions.get(index);
+		protected void setInner(List<Common.ConditionEffect> value) {
+			source.conditions = value;
 		}
-		
-		public void addItem(Item.ConditionEffect item) {
-			if (source.conditions == null) {
-				source.conditions = new ArrayList<Item.ConditionEffect>();
-			}
-			source.conditions.add(item);
-			int index = source.conditions.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(Item.ConditionEffect item) {
-			int index = source.conditions.indexOf(item);
-			source.conditions.remove(item);
-			if (source.conditions.isEmpty()) {
-				source.conditions = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(Item.ConditionEffect item) {
-			int index = source.conditions.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-		
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	}
+ }
 
 	public static class ConditionsCellRenderer extends DefaultListCellRenderer {
 		private static final long serialVersionUID = 7987880146189575234L;
@@ -1410,7 +1067,7 @@ public class ItemEditor extends JSONElementEditor {
 			Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if (c instanceof JLabel) {
 				JLabel label = ((JLabel)c);
-				Item.ConditionEffect effect = (Item.ConditionEffect) value;
+				Common.ConditionEffect effect = (Common.ConditionEffect) value;
 
 				if (effect.condition != null) {
 					if (effect.magnitude == ActorCondition.MAGNITUDE_CLEAR) {
@@ -1431,6 +1088,7 @@ public class ItemEditor extends JSONElementEditor {
 	public static boolean isNull(Item.EquipEffect effect) {
 		if (effect.conditions != null) return false;
 		if (effect.critical_multiplier != null) return false;
+		if (effect.damage_modifier != null) return false;
 		if (effect.damage_boost_max != null) return false;
 		if (effect.damage_boost_min != null) return false;
 		if (effect.increase_attack_chance != null) return false;
@@ -1447,7 +1105,7 @@ public class ItemEditor extends JSONElementEditor {
 	}
 
 
-	public static boolean isNull(Item.HitEffect effect) {
+	public static boolean isNull(Common.HitEffect effect) {
 		if (effect.ap_boost_min != null) return false;
 		if (effect.ap_boost_max != null) return false;
 		if (effect.hp_boost_min != null) return false;
@@ -1458,7 +1116,7 @@ public class ItemEditor extends JSONElementEditor {
 	}
 
 
-	public static boolean isNull(Item.KillEffect effect) {
+	public static boolean isNull(Common.DeathEffect effect) {
 		if (effect.ap_boost_min != null) return false;
 		if (effect.ap_boost_max != null) return false;
 		if (effect.hp_boost_min != null) return false;
@@ -1467,7 +1125,7 @@ public class ItemEditor extends JSONElementEditor {
 		return true;
 	}
 
-	public static boolean isNull(Item.HitReceivedEffect effect) {
+	public static boolean isNull(Common.HitReceivedEffect effect) {
 		if (effect.ap_boost_min != null) return false;
 		if (effect.ap_boost_max != null) return false;
 		if (effect.hp_boost_min != null) return false;
@@ -1619,6 +1277,10 @@ public class ItemEditor extends JSONElementEditor {
 				equipEffect.critical_multiplier = (Double) value;
 				updatePrice = true;
 				updateEquip = true;
+			} else if (source == equipSetDM) {
+				equipEffect.damage_modifier = (Integer) value;
+				updatePrice = true;
+				updateEquip = true;		
 			} else if (source == equipBoostDR) {
 				equipEffect.increase_damage_resistance = (Integer) value;
 				updatePrice = true;

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 {
@@ -205,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);
@@ -243,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);
 		}
@@ -269,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);
@@ -303,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/NPCEditor.java

@@ -6,7 +6,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultListCellRenderer;
@@ -18,24 +17,14 @@ 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.JTextField;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
-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.NPC;
+import com.gpl.rpg.atcontentstudio.model.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.ui.CollapsiblePanel;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
@@ -43,6 +32,7 @@ import com.gpl.rpg.atcontentstudio.ui.FieldUpdateListener;
 import com.gpl.rpg.atcontentstudio.ui.IntegerBasedCheckBox;
 import com.gpl.rpg.atcontentstudio.ui.OverlayIcon;
 import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.dialoguetree.DialogueGraphView;
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class NPCEditor extends JSONElementEditor {
@@ -53,16 +43,17 @@ public class NPCEditor extends JSONElementEditor {
 	private static final String json_view_id = "JSON";
 	private static final String dialogue_tree_id = "Dialogue Tree";
 
-	private NPC.TimedConditionEffect selectedHitEffectSourceCondition;
-	private NPC.TimedConditionEffect selectedHitEffectTargetCondition;
-	private NPC.TimedConditionEffect selectedHitReceivedEffectSourceCondition;
-	private NPC.TimedConditionEffect selectedHitReceivedEffectTargetCondition;
-	private NPC.TimedConditionEffect selectedDeathEffectSourceCondition;
+	private Common.TimedConditionEffect selectedHitEffectSourceCondition;
+	private Common.TimedConditionEffect selectedHitEffectTargetCondition;
+	private Common.TimedConditionEffect selectedHitReceivedEffectSourceCondition;
+	private Common.TimedConditionEffect selectedHitReceivedEffectTargetCondition;
+	private Common.TimedConditionEffect selectedDeathEffectSourceCondition;
 
 	private JButton npcIcon;
 	private JTextField idField;
 	private JTextField nameField;
 	private JTextField spawnGroupField;
+	private JTextField factionField;
 	private JSpinner experienceField;
 	private MyComboBox dialogueBox;
 	private MyComboBox droplistBox;
@@ -85,7 +76,7 @@ public class NPCEditor extends JSONElementEditor {
 	private JSpinner blockChance;
 	private JSpinner dmgRes;
 
-	private NPC.HitEffect hitEffect;
+	private Common.HitEffect hitEffect;
 	private CollapsiblePanel hitEffectPane;
 	private JSpinner hitEffectHPMin;
 	private JSpinner hitEffectHPMax;
@@ -118,7 +109,7 @@ public class NPCEditor extends JSONElementEditor {
 	private JRadioButton hitTargetConditionForever;
 	private JSpinner hitTargetConditionDuration;
 
-	private NPC.HitReceivedEffect hitReceivedEffect;
+	private Common.HitReceivedEffect hitReceivedEffect;
 	private CollapsiblePanel hitReceivedEffectPane;
 	private JSpinner hitReceivedEffectHPMin;
 	private JSpinner hitReceivedEffectHPMax;
@@ -155,7 +146,7 @@ public class NPCEditor extends JSONElementEditor {
 	private JRadioButton hitReceivedTargetConditionForever;
 	private JSpinner hitReceivedTargetConditionDuration;
 
-	private NPC.DeathEffect deathEffect;
+	private Common.DeathEffect deathEffect;
 	private CollapsiblePanel deathEffectPane;
 	private JSpinner deathEffectHPMin;
 	private JSpinner deathEffectHPMax;
@@ -246,6 +237,7 @@ public class NPCEditor extends JSONElementEditor {
 		idField = addTextField(pane, "Internal ID: ", npc.id, npc.writable, listener);
 		nameField = addTranslatableTextField(pane, "Display name: ", npc.name, npc.writable, listener);
 		spawnGroupField = addTextField(pane, "Spawn group ID: ", npc.spawngroup_id, npc.writable, listener);
+		factionField = addTextField(pane, "Faction ID: ", npc.faction_id, npc.writable, listener);
 		experienceField = addIntegerField(pane, "Experience reward: ", npc.getMonsterExperience(), false, false, listener);
 		dialogueBox = addDialogueBox(pane, npc.getProject(), "Initial phrase: ", npc.dialogue, npc.writable, listener);
 		droplistBox = addDroplistBox(pane, npc.getProject(), "Droplist / Shop inventory: ", npc.droplist, npc.writable, listener);
@@ -268,7 +260,7 @@ public class NPCEditor extends JSONElementEditor {
 		hitEffectPane = new CollapsiblePanel("Effect on every hit: ");
 		hitEffectPane.setLayout(new JideBoxLayout(hitEffectPane, JideBoxLayout.PAGE_AXIS));
 		if (npc.hit_effect == null) {
-			hitEffect = new NPC.HitEffect();
+			hitEffect = new Common.HitEffect();
 		} else {
 			hitEffect = npc.hit_effect;
 		}
@@ -277,106 +269,48 @@ public class NPCEditor extends JSONElementEditor {
 		hitEffectAPMin = addIntegerField(hitEffectPane, "AP bonus min: ", hitEffect.ap_boost_min, true, npc.writable, listener);
 		hitEffectAPMax = addIntegerField(hitEffectPane, "AP bonus max: ", hitEffect.ap_boost_max, true, npc.writable, listener);
 
-		CollapsiblePanel hitSourceConditionsPane = new CollapsiblePanel("Actor Conditions applied to the source: ");
-		hitSourceConditionsPane.setLayout(new JideBoxLayout(hitSourceConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitSourceTitle = "Actor Conditions applied to the source: ";
+		TimedConditionsCellRenderer hitSourceCellRenderer = new TimedConditionsCellRenderer();
 		hitSourceConditionsListModel = new SourceTimedConditionsListModel(hitEffect);
-		hitSourceConditionsList = new JList(hitSourceConditionsListModel);
-		hitSourceConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitSourceConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitSourceConditionsPane.add(new JScrollPane(hitSourceConditionsList), JideBoxLayout.FIX);
-		final JPanel hitSourceTimedConditionsEditorPane = new JPanel();
-		final JButton createHitSourceCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitSourceCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitSourceConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitEffectSourceCondition = (NPC.TimedConditionEffect) hitSourceConditionsList.getSelectedValue();
-				updateHitSourceTimedConditionEditorPane(hitSourceTimedConditionsEditorPane, selectedHitEffectSourceCondition, listener);
-			}
-		});
-		if (npc.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					NPC.TimedConditionEffect condition = new NPC.TimedConditionEffect();
-					hitSourceConditionsListModel.addItem(condition);
-					hitSourceConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitEffectSourceCondition != null) {
-						hitSourceConditionsListModel.removeItem(selectedHitEffectSourceCondition);
-						selectedHitEffectSourceCondition = null;
-						hitSourceConditionsList.clearSelection();
-						listener.valueChanged(hitSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitSourceMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> hitSourceResult = CommonEditor.createListPanel(
+				hitSourceTitle,
+				hitSourceCellRenderer,
+				hitSourceConditionsListModel,
+				npc.writable,
+				hitSourceMoveUpDownEnabled,
+				(e) -> selectedHitEffectSourceCondition = e,
+				() -> selectedHitEffectSourceCondition,
+				this::updateHitSourceTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		CollapsiblePanel hitSourceConditionsPane = hitSourceResult.panel;
+		hitSourceConditionsList = hitSourceResult.list;
 
-			listButtonsPane.add(createHitSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitSourceConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		hitSourceTimedConditionsEditorPane.setLayout(new JideBoxLayout(hitSourceTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitSourceConditionsPane.add(hitSourceTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (npc.hit_effect == null || npc.hit_effect.conditions_source == null || npc.hit_effect.conditions_source.isEmpty()) {
 			hitSourceConditionsPane.collapse();
 		}
 		hitEffectPane.add(hitSourceConditionsPane, JideBoxLayout.FIX);
-		final CollapsiblePanel hitTargetConditionsPane = new CollapsiblePanel("Actor Conditions applied to the target: ");
-		hitTargetConditionsPane.setLayout(new JideBoxLayout(hitTargetConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitTargetTitle = "Actor Conditions applied to the target: ";
+		TimedConditionsCellRenderer hitTargetCellRenderer = new TimedConditionsCellRenderer();
 		hitTargetConditionsListModel = new TargetTimedConditionsListModel(hitEffect);
-		hitTargetConditionsList = new JList(hitTargetConditionsListModel);
-		hitTargetConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitTargetConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitTargetConditionsPane.add(new JScrollPane(hitTargetConditionsList), JideBoxLayout.FIX);
-		final JPanel hitTargetTimedConditionsEditorPane = new JPanel();
-		final JButton createHitTargetCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitTargetCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitTargetConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitEffectTargetCondition = (NPC.TimedConditionEffect) hitTargetConditionsList.getSelectedValue();
-				updateHitTargetTimedConditionEditorPane(hitTargetTimedConditionsEditorPane, selectedHitEffectTargetCondition, listener);
-			}
-		});
-		if (npc.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					NPC.TimedConditionEffect condition = new NPC.TimedConditionEffect();
-					hitTargetConditionsListModel.addItem(condition);
-					hitTargetConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitEffectTargetCondition != null) {
-						hitTargetConditionsListModel.removeItem(selectedHitEffectTargetCondition);
-						selectedHitEffectTargetCondition = null;
-						hitTargetConditionsList.clearSelection();
-						listener.valueChanged(hitTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitTargetMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> hitTargetResult = CommonEditor.createListPanel(
+				hitTargetTitle,
+				hitTargetCellRenderer,
+				hitTargetConditionsListModel,
+				npc.writable,
+				hitTargetMoveUpDownEnabled,
+				(e) -> selectedHitEffectTargetCondition = e,
+				() -> selectedHitEffectTargetCondition,
+				this::updateHitTargetTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		CollapsiblePanel hitTargetConditionsPane = hitTargetResult.panel;
+		hitTargetConditionsList = hitTargetResult.list;
 
-			listButtonsPane.add(createHitTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitTargetConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		hitTargetTimedConditionsEditorPane.setLayout(new JideBoxLayout(hitTargetTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitTargetConditionsPane.add(hitTargetTimedConditionsEditorPane, JideBoxLayout.FIX);
 		hitEffectPane.add(hitTargetConditionsPane, JideBoxLayout.FIX);
 		if (npc.hit_effect == null || npc.hit_effect.conditions_target == null || npc.hit_effect.conditions_target.isEmpty()) {
 			hitTargetConditionsPane.collapse();
@@ -386,7 +320,7 @@ public class NPCEditor extends JSONElementEditor {
 		hitReceivedEffectPane = new CollapsiblePanel("Effect on every hit received: ");
 		hitReceivedEffectPane.setLayout(new JideBoxLayout(hitReceivedEffectPane, JideBoxLayout.PAGE_AXIS));
 		if (npc.hit_received_effect == null) {
-			hitReceivedEffect = new NPC.HitReceivedEffect();
+			hitReceivedEffect = new Common.HitReceivedEffect();
 		} else {
 			hitReceivedEffect = npc.hit_received_effect;
 		}
@@ -399,106 +333,48 @@ public class NPCEditor extends JSONElementEditor {
 		hitReceivedEffectAPMinTarget = addIntegerField(hitReceivedEffectPane, "Attacker AP bonus min: ", hitReceivedEffect.ap_boost_min_target, true, npc.writable, listener);
 		hitReceivedEffectAPMaxTarget = addIntegerField(hitReceivedEffectPane, "Attacker AP bonus max: ", hitReceivedEffect.ap_boost_max_target, true, npc.writable, listener);
 
-		CollapsiblePanel hitReceivedSourceConditionsPane = new CollapsiblePanel("Actor Conditions applied to this NPC: ");
-		hitReceivedSourceConditionsPane.setLayout(new JideBoxLayout(hitReceivedSourceConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitReceivedSourceTitle = "Actor Conditions applied to this NPC: ";
+		TimedConditionsCellRenderer hitReceivedSourceCellRenderer = new TimedConditionsCellRenderer();
 		hitReceivedSourceConditionsListModel = new SourceTimedConditionsListModel(hitReceivedEffect);
-		hitReceivedSourceConditionsList = new JList(hitReceivedSourceConditionsListModel);
-		hitReceivedSourceConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitReceivedSourceConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitReceivedSourceConditionsPane.add(new JScrollPane(hitReceivedSourceConditionsList), JideBoxLayout.FIX);
-		final JPanel hitReceivedSourceTimedConditionsEditorPane = new JPanel();
-		final JButton createHitReceivedSourceCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitReceivedSourceCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitReceivedSourceConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitReceivedEffectSourceCondition = (NPC.TimedConditionEffect) hitReceivedSourceConditionsList.getSelectedValue();
-				updateHitReceivedSourceTimedConditionEditorPane(hitReceivedSourceTimedConditionsEditorPane, selectedHitReceivedEffectSourceCondition, listener);
-			}
-		});
-		if (npc.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitReceivedSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					NPC.TimedConditionEffect condition = new NPC.TimedConditionEffect();
-					hitReceivedSourceConditionsListModel.addItem(condition);
-					hitReceivedSourceConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitReceivedSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitReceivedSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitReceivedEffectSourceCondition != null) {
-						hitReceivedSourceConditionsListModel.removeItem(selectedHitReceivedEffectSourceCondition);
-						selectedHitReceivedEffectSourceCondition = null;
-						hitReceivedSourceConditionsList.clearSelection();
-						listener.valueChanged(hitReceivedSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitReceivedSourceMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> hitReceivedSourceResult = CommonEditor.createListPanel(
+				hitReceivedSourceTitle,
+				hitReceivedSourceCellRenderer,
+				hitReceivedSourceConditionsListModel,
+				npc.writable,
+				hitReceivedSourceMoveUpDownEnabled,
+				(e) -> selectedHitReceivedEffectSourceCondition = e,
+				() -> selectedHitReceivedEffectSourceCondition,
+				this::updateHitReceivedSourceTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		CollapsiblePanel hitReceivedSourceConditionsPane = hitReceivedSourceResult.panel;
+		hitReceivedSourceConditionsList = hitReceivedSourceResult.list;
 
-			listButtonsPane.add(createHitReceivedSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitReceivedSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitReceivedSourceConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		hitReceivedSourceTimedConditionsEditorPane.setLayout(new JideBoxLayout(hitReceivedSourceTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitReceivedSourceConditionsPane.add(hitReceivedSourceTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (npc.hit_received_effect == null || npc.hit_received_effect.conditions_source == null || npc.hit_received_effect.conditions_source.isEmpty()) {
 			hitReceivedSourceConditionsPane.collapse();
 		}
 		hitReceivedEffectPane.add(hitReceivedSourceConditionsPane, JideBoxLayout.FIX);
-		final CollapsiblePanel hitReceivedTargetConditionsPane = new CollapsiblePanel("Actor Conditions applied to the attacker: ");
-		hitReceivedTargetConditionsPane.setLayout(new JideBoxLayout(hitReceivedTargetConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String hitReceivedTargetTitle = "Actor Conditions applied to the attacker: ";
+		TimedConditionsCellRenderer hitReceivedTargetCellRenderer = new TimedConditionsCellRenderer();
 		hitReceivedTargetConditionsListModel = new TargetTimedConditionsListModel(hitReceivedEffect);
-		hitReceivedTargetConditionsList = new JList(hitReceivedTargetConditionsListModel);
-		hitReceivedTargetConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		hitReceivedTargetConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		hitReceivedTargetConditionsPane.add(new JScrollPane(hitReceivedTargetConditionsList), JideBoxLayout.FIX);
-		final JPanel hitReceivedTargetTimedConditionsEditorPane = new JPanel();
-		final JButton createHitReceivedTargetCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteHitReceivedTargetCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		hitReceivedTargetConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedHitReceivedEffectTargetCondition = (NPC.TimedConditionEffect) hitReceivedTargetConditionsList.getSelectedValue();
-				updateHitReceivedTargetTimedConditionEditorPane(hitReceivedTargetTimedConditionsEditorPane, selectedHitReceivedEffectTargetCondition, listener);
-			}
-		});
-		if (npc.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createHitReceivedTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					NPC.TimedConditionEffect condition = new NPC.TimedConditionEffect();
-					hitReceivedTargetConditionsListModel.addItem(condition);
-					hitReceivedTargetConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(hitReceivedTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteHitReceivedTargetCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedHitReceivedEffectTargetCondition != null) {
-						hitReceivedTargetConditionsListModel.removeItem(selectedHitReceivedEffectTargetCondition);
-						selectedHitReceivedEffectTargetCondition = null;
-						hitReceivedTargetConditionsList.clearSelection();
-						listener.valueChanged(hitReceivedTargetConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean hitReceivedTargetMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> hitReceivedTargetResult = CommonEditor.createListPanel(
+				hitReceivedTargetTitle,
+				hitReceivedTargetCellRenderer,
+				hitReceivedTargetConditionsListModel,
+				npc.writable,
+				hitReceivedTargetMoveUpDownEnabled,
+				(e) -> selectedHitReceivedEffectTargetCondition = e,
+				() -> selectedHitReceivedEffectTargetCondition,
+				this::updateHitReceivedTargetTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		final CollapsiblePanel hitReceivedTargetConditionsPane = hitReceivedTargetResult.panel;
+		hitReceivedTargetConditionsList = hitReceivedTargetResult.list;
 
-			listButtonsPane.add(createHitReceivedTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteHitReceivedTargetCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			hitReceivedTargetConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		hitReceivedTargetTimedConditionsEditorPane.setLayout(new JideBoxLayout(hitReceivedTargetTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		hitReceivedTargetConditionsPane.add(hitReceivedTargetTimedConditionsEditorPane, JideBoxLayout.FIX);
 		hitReceivedEffectPane.add(hitReceivedTargetConditionsPane, JideBoxLayout.FIX);
 		if (npc.hit_received_effect == null || npc.hit_received_effect.conditions_target == null || npc.hit_received_effect.conditions_target.isEmpty()) {
 			hitReceivedTargetConditionsPane.collapse();
@@ -508,7 +384,7 @@ public class NPCEditor extends JSONElementEditor {
 		deathEffectPane = new CollapsiblePanel("Effect when killed: ");
 		deathEffectPane.setLayout(new JideBoxLayout(deathEffectPane, JideBoxLayout.PAGE_AXIS));
 		if (npc.death_effect == null) {
-			deathEffect = new NPC.DeathEffect();
+			deathEffect = new Common.DeathEffect();
 		} else {
 			deathEffect = npc.death_effect;
 		}
@@ -517,54 +393,25 @@ public class NPCEditor extends JSONElementEditor {
 		deathEffectAPMin = addIntegerField(deathEffectPane, "Killer AP bonus min: ", deathEffect.ap_boost_min, true, npc.writable, listener);
 		deathEffectAPMax = addIntegerField(deathEffectPane, "Killer AP bonus max: ", deathEffect.ap_boost_max, true, npc.writable, listener);
 
-		CollapsiblePanel deathSourceConditionsPane = new CollapsiblePanel("Actor Conditions applied to the killer: ");
-		deathSourceConditionsPane.setLayout(new JideBoxLayout(deathSourceConditionsPane, JideBoxLayout.PAGE_AXIS));
+		String deathSourceTitle = "Actor Conditions applied to the killer: ";
+		TimedConditionsCellRenderer deathSourceCellRenderer = new TimedConditionsCellRenderer();
 		deathSourceConditionsListModel = new SourceTimedConditionsListModel(deathEffect);
-		deathSourceConditionsList = new JList(deathSourceConditionsListModel);
-		deathSourceConditionsList.setCellRenderer(new TimedConditionsCellRenderer());
-		deathSourceConditionsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		deathSourceConditionsPane.add(new JScrollPane(deathSourceConditionsList), JideBoxLayout.FIX);
-		final JPanel deathSourceTimedConditionsEditorPane = new JPanel();
-		final JButton createDeathSourceCondition = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteDeathSourceCondition = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		deathSourceConditionsList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedDeathEffectSourceCondition = (NPC.TimedConditionEffect) deathSourceConditionsList.getSelectedValue();
-				updateDeathSourceTimedConditionEditorPane(deathSourceTimedConditionsEditorPane, selectedDeathEffectSourceCondition, listener);
-			}
-		});
-		if (npc.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createDeathSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					NPC.TimedConditionEffect condition = new NPC.TimedConditionEffect();
-					deathSourceConditionsListModel.addItem(condition);
-					deathSourceConditionsList.setSelectedValue(condition, true);
-					listener.valueChanged(deathSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteDeathSourceCondition.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedDeathEffectSourceCondition != null) {
-						deathSourceConditionsListModel.removeItem(selectedDeathEffectSourceCondition);
-						selectedDeathEffectSourceCondition = null;
-						deathSourceConditionsList.clearSelection();
-						listener.valueChanged(deathSourceConditionsList, null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
+		final boolean deathSourceMoveUpDownEnabled = false;
+
+		CommonEditor.PanelCreateResult<Common.TimedConditionEffect> deathSourceResult = CommonEditor.createListPanel(
+				deathSourceTitle,
+				deathSourceCellRenderer,
+				deathSourceConditionsListModel,
+				npc.writable,
+				deathSourceMoveUpDownEnabled,
+				(e) -> selectedDeathEffectSourceCondition = e,
+				() -> selectedDeathEffectSourceCondition,
+				this::updateDeathSourceTimedConditionEditorPane,
+				listener,
+				Common.TimedConditionEffect::new);
+		CollapsiblePanel deathSourceConditionsPane = deathSourceResult.panel;
+		deathSourceConditionsList = deathSourceResult.list;
 
-			listButtonsPane.add(createDeathSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteDeathSourceCondition, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			deathSourceConditionsPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
-		deathSourceTimedConditionsEditorPane.setLayout(new JideBoxLayout(deathSourceTimedConditionsEditorPane, JideBoxLayout.PAGE_AXIS));
-		deathSourceConditionsPane.add(deathSourceTimedConditionsEditorPane, JideBoxLayout.FIX);
 		if (npc.death_effect == null || npc.death_effect.conditions_source == null || npc.death_effect.conditions_source.isEmpty()) {
 			deathSourceConditionsPane.collapse();
 		}
@@ -575,7 +422,7 @@ public class NPCEditor extends JSONElementEditor {
 		pane.add(combatTraitPane, JideBoxLayout.FIX);
 	}
 
-	public void updateHitSourceTimedConditionEditorPane(JPanel pane, NPC.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitSourceTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitSourceConditionBox != null) {
 			removeElementListener(hitSourceConditionBox);
@@ -647,7 +494,7 @@ public class NPCEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitSourceTimedConditionWidgets(NPC.TimedConditionEffect condition) {
+	public void updateHitSourceTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -666,7 +513,7 @@ public class NPCEditor extends JSONElementEditor {
 	}
 
 
-	public void updateHitTargetTimedConditionEditorPane(JPanel pane, NPC.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitTargetTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitTargetConditionBox != null) {
 			removeElementListener(hitTargetConditionBox);
@@ -737,7 +584,7 @@ public class NPCEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitTargetTimedConditionWidgets(NPC.TimedConditionEffect condition) {
+	public void updateHitTargetTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -756,7 +603,7 @@ public class NPCEditor extends JSONElementEditor {
 	}
 
 
-	public void updateHitReceivedSourceTimedConditionEditorPane(JPanel pane, NPC.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitReceivedSourceTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitReceivedSourceConditionBox != null) {
 			removeElementListener(hitReceivedSourceConditionBox);
@@ -828,7 +675,7 @@ public class NPCEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitReceivedSourceTimedConditionWidgets(NPC.TimedConditionEffect condition) {
+	public void updateHitReceivedSourceTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -847,7 +694,7 @@ public class NPCEditor extends JSONElementEditor {
 	}
 
 
-	public void updateHitReceivedTargetTimedConditionEditorPane(JPanel pane, NPC.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateHitReceivedTargetTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (hitReceivedTargetConditionBox != null) {
 			removeElementListener(hitReceivedTargetConditionBox);
@@ -918,7 +765,7 @@ public class NPCEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateHitReceivedTargetTimedConditionWidgets(NPC.TimedConditionEffect condition) {
+	public void updateHitReceivedTargetTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -936,7 +783,7 @@ public class NPCEditor extends JSONElementEditor {
 		hitReceivedTargetConditionForever.setEnabled(!clear);
 	}
 
-	public void updateDeathSourceTimedConditionEditorPane(JPanel pane, NPC.TimedConditionEffect condition, final FieldUpdateListener listener) {
+	public void updateDeathSourceTimedConditionEditorPane(JPanel pane, Common.TimedConditionEffect condition, final FieldUpdateListener listener) {
 		pane.removeAll();
 		if (deathSourceConditionBox != null) {
 			removeElementListener(deathSourceConditionBox);
@@ -1008,7 +855,7 @@ public class NPCEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 
-	public void updateDeathSourceTimedConditionWidgets(NPC.TimedConditionEffect condition) {
+	public void updateDeathSourceTimedConditionWidgets(Common.TimedConditionEffect condition) {
 
 		boolean immunity = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration != null && condition.duration > ActorCondition.DURATION_NONE);
 		boolean clear = (condition.magnitude == null || condition.magnitude == ActorCondition.MAGNITUDE_CLEAR) && (condition.duration == null || condition.duration == ActorCondition.DURATION_NONE);
@@ -1026,129 +873,41 @@ public class NPCEditor extends JSONElementEditor {
 		deathSourceConditionForever.setEnabled(!clear);
 	}
 
-	public static class TargetTimedConditionsListModel implements ListModel<NPC.TimedConditionEffect> {
+ public static class TargetTimedConditionsListModel extends CommonEditor.AtListModel<Common.TimedConditionEffect, Common.HitEffect> {
 
-		NPC.HitEffect source;
-		
-		public TargetTimedConditionsListModel(NPC.HitEffect effect) {
-			this.source = effect;
+		public TargetTimedConditionsListModel(Common.HitEffect effect) {
+			super(effect);
 		}
 
 		@Override
-		public int getSize() {
-			if (source.conditions_target == null) return 0;
-			return source.conditions_target.size();
+		protected List<Common.TimedConditionEffect> getInner() {
+			return source.conditions_target;
 		}
 
 		@Override
-		public NPC.TimedConditionEffect getElementAt(int index) {
-			if (source.conditions_target == null) return null;
-			return source.conditions_target.get(index);
+		protected void setInner(List<Common.TimedConditionEffect> value) {
+			source.conditions_target = value;
 		}
 
-		public void addItem(NPC.TimedConditionEffect item) {
-			if (source.conditions_target == null) {
-				source.conditions_target = new ArrayList<NPC.TimedConditionEffect>();
-			}
-			source.conditions_target.add(item);
-			int index = source.conditions_target.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
+ }
 
-		public void removeItem(NPC.TimedConditionEffect item) {
-			int index = source.conditions_target.indexOf(item);
-			source.conditions_target.remove(item);
-			if (source.conditions_target.isEmpty()) {
-				source.conditions_target = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
+ public static class SourceTimedConditionsListModel extends CommonEditor.AtListModel<Common.TimedConditionEffect, Common.DeathEffect> {
 
-		public void itemChanged(NPC.TimedConditionEffect item) {
-			int index = source.conditions_target.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
+		public SourceTimedConditionsListModel(Common.DeathEffect effect) {
+			super(effect);
 		}
 
 		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	}
-	
-	public static class SourceTimedConditionsListModel implements ListModel<NPC.TimedConditionEffect> {
-		
-		NPC.DeathEffect source;
-		
-		public SourceTimedConditionsListModel(NPC.DeathEffect effect) {
-			this.source = effect;
+		protected List<Common.TimedConditionEffect> getInner() {
+			return source.conditions_source;
 		}
 
 		@Override
-		public int getSize() {
-			if (source.conditions_source == null) return 0;
-			return source.conditions_source.size();
+		protected void setInner(List<Common.TimedConditionEffect> value) {
+			source.conditions_source = value;
 		}
 
-		@Override
-		public NPC.TimedConditionEffect getElementAt(int index) {
-			if (source.conditions_source == null) return null;
-			return source.conditions_source.get(index);
-		}
-		
-		public void addItem(NPC.TimedConditionEffect item) {
-			if (source.conditions_source == null) {
-				source.conditions_source = new ArrayList<NPC.TimedConditionEffect>();
-			}
-			source.conditions_source.add(item);
-			int index = source.conditions_source.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(NPC.TimedConditionEffect item) {
-			int index = source.conditions_source.indexOf(item);
-			source.conditions_source.remove(item);
-			if (source.conditions_source.isEmpty()) {
-				source.conditions_source = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(NPC.TimedConditionEffect item) {
-			int index = source.conditions_source.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-		
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	}
+ }
 
 	public static class TimedConditionsCellRenderer extends DefaultListCellRenderer {
 		private static final long serialVersionUID = 7987880146189575234L;
@@ -1158,7 +917,7 @@ public class NPCEditor extends JSONElementEditor {
 			Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 			if (c instanceof JLabel) {
 				JLabel label = ((JLabel)c);
-				NPC.TimedConditionEffect effect = (NPC.TimedConditionEffect) value;
+				Common.TimedConditionEffect effect = (Common.TimedConditionEffect) value;
 
 				if (effect.condition != null) {
 
@@ -1184,7 +943,7 @@ public class NPCEditor extends JSONElementEditor {
 		}
 	}
 
-	public static boolean isNull(NPC.HitEffect effect) {
+	public static boolean isNull(Common.HitEffect effect) {
 		if (effect.ap_boost_min != null) return false;
 		if (effect.ap_boost_max != null) return false;
 		if (effect.hp_boost_min != null) return false;
@@ -1194,7 +953,7 @@ public class NPCEditor extends JSONElementEditor {
 		return true;
 	}
 
-	public static boolean isNull(NPC.HitReceivedEffect effect) {
+	public static boolean isNull(Common.HitReceivedEffect effect) {
 		if (effect.ap_boost_min != null) return false;
 		if (effect.ap_boost_max != null) return false;
 		if (effect.hp_boost_min != null) return false;
@@ -1208,7 +967,7 @@ public class NPCEditor extends JSONElementEditor {
 		return true;
 	}
 
-	public static boolean isNull(NPC.DeathEffect effect) {
+	public static boolean isNull(Common.DeathEffect effect) {
 		if (effect.ap_boost_min != null) return false;
 		if (effect.ap_boost_max != null) return false;
 		if (effect.hp_boost_min != null) return false;
@@ -1256,6 +1015,8 @@ public class NPCEditor extends JSONElementEditor {
 				npcIcon.repaint();
 			} else if (source == spawnGroupField) {
 				npc.spawngroup_id = (String) value;
+			}  else if (source == factionField) {
+				npc.faction_id = (String) value;
 			} else if (source == dialogueBox) {
 				if (npc.dialogue != null) {
 					npc.dialogue.removeBacklink(npc);

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

@@ -1,29 +1,18 @@
 package com.gpl.rpg.atcontentstudio.ui.gamedataeditors;
 
 import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.swing.ListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
@@ -31,17 +20,15 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
 import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
 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.IntegerBasedCheckBox;
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
 import com.jidesoft.swing.JideBoxLayout;
 
 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";
 	
@@ -79,94 +66,26 @@ public class QuestEditor extends JSONElementEditor {
 		nameField = addTranslatableTextField(pane, "Quest Name: ", quest.name, quest.writable, listener);
 		visibleBox = addIntegerBasedCheckBox(pane, "Visible in quest log", quest.visible_in_log, quest.writable, listener);
 
-		CollapsiblePanel stagesPane = new CollapsiblePanel("Quest stages: ");
-		stagesPane.setLayout(new JideBoxLayout(stagesPane, JideBoxLayout.PAGE_AXIS));
+		String title = "Quest stages: ";
+		StagesCellRenderer cellRenderer = new StagesCellRenderer();
 		stagesListModel = new StagesListModel(quest);
-		stagesList = new JList<QuestStage>(stagesListModel);
-		stagesList.setCellRenderer(new StagesCellRenderer());
-		stagesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		stagesPane.add(new JScrollPane(stagesList), JideBoxLayout.FIX);
-		final JPanel stagesEditorPane = new JPanel();
-		final JButton createStage = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
-		final JButton deleteStage = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
-		final JButton moveStageUp = new JButton(new ImageIcon(DefaultIcons.getArrowUpIcon()));
-		final JButton moveStageDown = new JButton(new ImageIcon(DefaultIcons.getArrowDownIcon()));
-		deleteStage.setEnabled(false);
-		moveStageUp.setEnabled(false);
-		moveStageDown.setEnabled(false);
-		stagesList.addListSelectionListener(new ListSelectionListener() {
-			@Override
-			public void valueChanged(ListSelectionEvent e) {
-				selectedStage = (QuestStage) stagesList.getSelectedValue();
-				if (selectedStage != null) {
-					deleteStage.setEnabled(true);
-					moveStageUp.setEnabled(stagesList.getSelectedIndex() > 0);
-					moveStageDown.setEnabled(stagesList.getSelectedIndex() < (stagesListModel.getSize() - 1));
-				} else {
-					deleteStage.setEnabled(false);
-					moveStageUp.setEnabled(false);
-					moveStageDown.setEnabled(false);
-				}
-				updateStageEditorPane(stagesEditorPane, selectedStage, listener);
-			}
-		});
-		if (quest.writable) {
-			JPanel listButtonsPane = new JPanel();
-			listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
-			createStage.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					QuestStage stage = new QuestStage(quest);
-					stagesListModel.addItem(stage);
-					stagesList.setSelectedValue(stage, true);
-					listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-				}
-			});
-			deleteStage.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedStage != null) {
-						stagesListModel.removeItem(selectedStage);
-						selectedStage = null;
-						stagesList.clearSelection();
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
-			moveStageUp.addActionListener(new ActionListener() {
+		final boolean moveUpDownEnabled = true;
 
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedStage != null) {
-						stagesListModel.moveUp(selectedStage);
-						stagesList.setSelectedValue(selectedStage, true);
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
-			moveStageDown.addActionListener(new ActionListener() {
+		CollapsiblePanel stagesPane = CommonEditor.createListPanel(
+				title,
+				cellRenderer,
+				stagesListModel,
+				quest.writable,
+				moveUpDownEnabled,
+				(e)->selectedStage=e,
+				()->selectedStage,
+				this::updateStageEditorPane,
+				listener,
+				()->new QuestStage(quest)).panel;
 
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					if (selectedStage != null) {
-						stagesListModel.moveDown(selectedStage);
-						stagesList.setSelectedValue(selectedStage, true);
-						listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
-					}
-				}
-			});
-			listButtonsPane.add(createStage, JideBoxLayout.FIX);
-			listButtonsPane.add(deleteStage, JideBoxLayout.FIX);
-			listButtonsPane.add(moveStageUp, JideBoxLayout.FIX);
-			listButtonsPane.add(moveStageDown, JideBoxLayout.FIX);
-			listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
-			stagesPane.add(listButtonsPane, JideBoxLayout.FIX);
-		}
 		if (quest.stages == null || quest.stages.isEmpty()) {
 			stagesPane.collapse();
 		}
-		stagesEditorPane.setLayout(new JideBoxLayout(stagesEditorPane, JideBoxLayout.PAGE_AXIS));
-		stagesPane.add(stagesEditorPane, JideBoxLayout.FIX);
 		pane.add(stagesPane, JideBoxLayout.FIX);
 
 	}
@@ -186,88 +105,21 @@ public class QuestEditor extends JSONElementEditor {
 		pane.repaint();
 	}
 	
-	public static class StagesListModel implements ListModel<QuestStage> {
-
-		Quest source;
-
+	public static class StagesListModel extends CommonEditor.AtListModel<QuestStage,Quest> {
 		public StagesListModel(Quest quest) {
-			this.source = quest;
-		}
-
-		
-		@Override
-		public int getSize() {
-			if (source.stages == null) return 0;
-			return source.stages.size();
+			super(quest);
 		}
 
 		@Override
-		public QuestStage getElementAt(int index) {
-			if (source.stages == null) return null;
-			return source.stages.get(index);
-		}
-		
-		public void addItem(QuestStage item) {
-			if (source.stages == null) {
-				source.stages = new ArrayList<QuestStage>();
-			}
-			source.stages.add(item);
-			int index = source.stages.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeItem(QuestStage item) {
-			int index = source.stages.indexOf(item);
-			source.stages.remove(item);
-			if (source.stages.isEmpty()) {
-				source.stages = null;
-			}
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		public void itemChanged(QuestStage item) {
-			int index = source.stages.indexOf(item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		public void moveUp(QuestStage item) {
-			int index = source.stages.indexOf(item);
-			QuestStage exchanged = source.stages.get(index - 1);
-			source.stages.set(index, exchanged);
-			source.stages.set(index - 1, item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index - 1, index));
-			}
-		}
-
-		public void moveDown(QuestStage item) {
-			int index = source.stages.indexOf(item);
-			QuestStage exchanged = source.stages.get(index + 1);
-			source.stages.set(index, exchanged);
-			source.stages.set(index + 1, item);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index + 1));
-			}
-		}
-
-
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
+		protected List<QuestStage> getInner() {
+			return source.stages;
 		}
 
 		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
+		protected void setInner(List<QuestStage> value) {
+			source.stages = value;
 		}
+
 	}
 	
 	

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

@@ -18,6 +18,7 @@ import javax.swing.JToolTip;
 import javax.swing.SwingConstants;
 import javax.swing.ToolTipManager;
 
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
 import prefuse.Display;
 import prefuse.Visualization;
 import prefuse.action.ActionList;
@@ -49,11 +50,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 +76,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 +97,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 +161,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 +199,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 +236,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);
@@ -276,23 +322,7 @@ public class DialogueGraphView extends Display {
 		
 		@Override
 		protected String getText(VisualItem item) {
-			return wordWrap(super.getText(item), 40);
-		}
-				
-		public String wordWrap(String in, int length) {
-			final String newline = "\n";
-			//:: Trim
-			while(in.length() > 0 && (in.charAt(0) == '\t' || in.charAt(0) == ' ')) in = in.substring(1);
-			//:: If Small Enough Already, Return Original
-			if(in.length() < length) return in;
-			//:: If Next length Contains Newline, Split There
-			if(in.substring(0, length).contains(newline)) return in.substring(0, in.indexOf(newline)).trim() + newline + wordWrap(in.substring(in.indexOf("\n") + 1), length);
-			//:: Otherwise, Split Along Nearest Previous Space/Tab/Dash
-			int spaceIndex = Math.max(Math.max( in.lastIndexOf(" ", length), in.lastIndexOf("\t", length)), in.lastIndexOf("-", length));
-			//:: If No Nearest Space, Split At length
-			if(spaceIndex == -1) spaceIndex = length;
-			//:: Split
-			return in.substring(0, spaceIndex).trim() + newline + wordWrap(in.substring(spaceIndex), length);
+			return CommonEditor.wordWrap(super.getText(item), 40);
 		}
 	}
 	

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

@@ -62,6 +62,7 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 
@@ -161,7 +162,9 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	@SuppressWarnings("rawtypes")
 	private JComboBox evaluateTriggerBox;
 	private JSpinner quantityField;
+	private JSpinner respawnSpeedField;
 	private JCheckBox spawnActiveForNewGame;
+	private JCheckBox spawnIgnoreAreas;
 	private JTextField spawngroupField;
 	@SuppressWarnings("rawtypes")
 	private JList npcList;
@@ -172,7 +175,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	private JPanel requirementParamsPane;
 	@SuppressWarnings("rawtypes")
 	private JComboBox requirementObj;
-	private JTextField requirementObjId;
+	private JComponent requirementObjId;
 	private JComponent requirementValue;
 	private BooleanBasedCheckBox requirementNegated;
 	
@@ -211,7 +214,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		editorTabsHolder.add("TMX", tmxScroller);
 		editorTabsHolder.add("XML", xmlScroller);
 		//editorTabsHolder.add("Replacements", replScroller);
-		editorTabsHolder.add("Replacements", getReplacementSimulatorPane());
+		editorTabsHolder.add("Testing", getReplacementSimulatorPane());
 		
 	}
 	
@@ -376,7 +379,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addMapchange.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newMapchange(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -389,7 +392,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addSpawn.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newSpawnArea(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -402,7 +405,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addRest.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newRest(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -415,7 +418,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addKey.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newKey(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -428,7 +431,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addReplace.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newReplace(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -441,7 +444,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addScript.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newScript(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -454,7 +457,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addContainer.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newContainer(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -467,7 +470,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addSign.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.addObject(MapObject.newSign(new tiled.core.MapObject(0, 0, 32, 32), map));
+					groupObjectsListModel.addItem(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);
@@ -480,7 +483,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			deleteObject.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					groupObjectsListModel.removeObject(selectedMapObject);
+					groupObjectsListModel.removeItem(selectedMapObject);
 					map.state = GameDataElement.State.modified;
 					map.childrenChanged(new ArrayList<ProjectTreeNode>());
 					ATContentStudio.frame.editorChanged(TMXMapEditor.this);
@@ -585,7 +588,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			addReplacement.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					replacementsListModel.addObject(null, null);
+					replacementsListModel.addReplacement(null, null);
 				}
 			});
 			deleteReplacement = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
@@ -594,7 +597,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			deleteReplacement.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
-					replacementsListModel.removeObject(selectedReplacement);
+					replacementsListModel.removeItem(selectedReplacement);
 				}
 			});
 			replacementListButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
@@ -628,7 +631,9 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			areaField = addTextField(pane, "Spawn area ID: ", ((SpawnArea)selected).name, ((TMXMap)target).writable, listener);
 			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);
+			respawnSpeedField = addIntegerField(pane, "Respawn-Speed of NPCs: ", ((SpawnArea)selected).respawnSpeed, 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));
@@ -673,6 +678,11 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				requirementObjId = null;
 				requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener);
 				break;
+			case random:
+				requirementObj = null;
+				requirementObjId = addChanceField(pane, "Chance: ", requirement.required_obj_id, "50/100", writable, listener);
+				requirementValue = null;
+				break;
 			case hasActorCondition:
 				requirementObj = addActorConditionBox(pane, project, "Actor Condition: ", (ActorCondition) requirement.required_obj, writable, listener);
 				requirementObjId = null;
@@ -681,6 +691,8 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 			case inventoryKeep:
 			case inventoryRemove:
 			case usedItem:
+			case wear:
+			case wearRemove:
 				requirementObj = addItemBox(pane, project, "Item: ", (Item) requirement.required_obj, writable, listener);
 				requirementObjId = null;
 				requirementValue = addIntegerField(pane, "Quantity: ", requirement.required_value, false, writable, listener);
@@ -715,10 +727,30 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				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;
-				requirementValue = null;
+			case factionScoreEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact value: ", requirement.required_value, true, writable, listener);
+				break;				
+			case date:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Date type YYYYMMTT:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum date value: ", requirement.required_value, true, writable, listener);
+				break;
+			case dateEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Date type YYYYMMTT:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact date value: ", requirement.required_value, true, writable, listener);
+				break;
+			case time:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum time value: ", requirement.required_value, true, writable, listener);
+				break;
+			case timeEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
 				break;
 			}
 		}
@@ -780,7 +812,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();
@@ -798,10 +834,15 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		activateAndViewPane.add(areasActivationPane, JideBoxLayout.FIX);
 		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) {
@@ -810,6 +851,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) {
@@ -1098,61 +1154,22 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		}
 	}
 	
-	public class ReplacementsListModel implements ListModel<ReplaceArea.Replacement> {
-		
-		public ReplaceArea area;
-		
+	public class ReplacementsListModel extends CommonEditor.AtListModel<ReplaceArea.Replacement, ReplaceArea> {
 		public ReplacementsListModel(ReplaceArea area) {
-			this.area = area;
+			super(area);
+		}
+		@Override
+		protected List<ReplaceArea.Replacement> getInner() {
+			return source.replacements;
 		}
 
 		@Override
-		public int getSize() {
-			if (area.replacements == null) return 0;
-			return area.replacements.size();
+		protected void setInner(List<ReplaceArea.Replacement> value) {
+			source.replacements = value;
 		}
 
-		@Override
-		public ReplaceArea.Replacement getElementAt(int index) {
-			if (index < 0 || index > getSize()) return null;
-			if (area.replacements == null) return null;
-			return area.replacements.get(index);
-		}
-
-
-		public void objectChanged(ReplaceArea.Replacement repl) {
-			int index = area.replacements.indexOf(repl);
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
-			}
-		}
-		
-		public void addObject(String source, String target) {
-			ReplaceArea.Replacement repl = area.addReplacement(source, target);
-			int index = area.replacements.indexOf(repl);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeObject(ReplaceArea.Replacement repl) {
-			int index = area.replacements.indexOf(repl);
-			area.removeReplacement(repl);
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-		
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
+		public void addReplacement(String source, String target) {
+			addItem(this.source.createReplacement(source, target));
 		}
 	}
 	
@@ -1231,58 +1248,20 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		}
 	}
 	
-	public class MapObjectsListModel implements ListModel<MapObject> {
-
-		public MapObjectGroup group;
-		
+	public class MapObjectsListModel extends CommonEditor.AtListModel<MapObject, MapObjectGroup> {
 		public MapObjectsListModel(MapObjectGroup group) {
-			this.group = group;
+			super(group);
 		}
 
 		@Override
-		public int getSize() {
-			return group.mapObjects.size();
+		protected List<MapObject> getInner() {
+			return source.mapObjects;
 		}
 
 		@Override
-		public MapObject getElementAt(int index) {
-			return group.mapObjects.get(index);
+		protected void setInner(List<MapObject> value) {
+			source.mapObjects = value;
 		}
-		
-		public void objectChanged(MapObject area) {
-			for (ListDataListener l : listeners) {
-				l.contentsChanged(new ListDataEvent(groupObjectsList, ListDataEvent.CONTENTS_CHANGED, group.mapObjects.indexOf(area), group.mapObjects.indexOf(area)));
-			}
-		}
-		
-		public void addObject(MapObject area) {
-			group.mapObjects.add(area);
-			int index = group.mapObjects.indexOf(area);
-			for (ListDataListener l : listeners) {
-				l.intervalAdded(new ListDataEvent(groupObjectsList, ListDataEvent.INTERVAL_ADDED, index, index));
-			}
-		}
-		
-		public void removeObject(MapObject area) {
-			int index = group.mapObjects.indexOf(area);
-			group.mapObjects.remove(area);
-			for (ListDataListener l : listeners) {
-				l.intervalRemoved(new ListDataEvent(groupObjectsList, ListDataEvent.INTERVAL_REMOVED, index, index));
-			}
-		}
-
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	
 	}
 
 	public class GroupObjectsRenderer extends DefaultListCellRenderer {
@@ -1298,36 +1277,20 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 		}
 	}
 	
-	public class SpawnGroupNpcListModel implements ListModel<NPC> {
-		
-		public SpawnArea area;
-		
+	public class SpawnGroupNpcListModel extends CommonEditor.AtListModel<NPC, SpawnArea> {
 		public SpawnGroupNpcListModel(SpawnArea area) {
-			this.area = area;
+			super(area);
 		}
 
 		@Override
-		public int getSize() {
-			return area.spawnGroup.size();
+		protected List<NPC> getInner() {
+			return source.spawnGroup;
 		}
 
 		@Override
-		public NPC getElementAt(int index) {
-			return area.spawnGroup.get(index);
+		protected void setInner(List<NPC> value) {
+			source.spawnGroup = value;
 		}
-
-		List<ListDataListener> listeners = new CopyOnWriteArrayList<ListDataListener>();
-		
-		@Override
-		public void addListDataListener(ListDataListener l) {
-			listeners.add(l);
-		}
-
-		@Override
-		public void removeListDataListener(ListDataListener l) {
-			listeners.remove(l);
-		}
-	
 	}
 	
 	
@@ -1753,6 +1716,20 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				}
 			});
 			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);
@@ -1816,6 +1793,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);
@@ -1873,7 +1864,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 							area.oldSchoolRequirement = false;
 						}
 					}
-					groupObjectsListModel.objectChanged(selectedMapObject);
+					groupObjectsListModel.itemChanged(selectedMapObject);
 				}
 			} else if (source == spawngroupField) {
 				if (selectedMapObject instanceof SpawnArea) {
@@ -1886,7 +1877,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					area.spawngroup_id = (String) value;
 					selectedMapObject.link();
 					npcList.setModel(new SpawnGroupNpcListModel(area));
-					groupObjectsListModel.objectChanged(area);
+					groupObjectsListModel.itemChanged(area);
 					npcList.revalidate();
 					npcList.repaint();
 					tmxViewer.revalidate();
@@ -1915,7 +1906,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					} else {
 						area.name = null;
 					}
-					groupObjectsListModel.objectChanged(area);
+					groupObjectsListModel.itemChanged(area);
 					tmxViewer.revalidate();
 					tmxViewer.repaint();
 				}
@@ -1944,7 +1935,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					} else {
 						area.name = null;
 					}
-					groupObjectsListModel.objectChanged(area);
+					groupObjectsListModel.itemChanged(area);
 					tmxViewer.revalidate();
 					tmxViewer.repaint();
 				} else if (selectedMapObject instanceof SignArea) {
@@ -1958,7 +1949,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					} else {
 						area.name = null;
 					}
-					groupObjectsListModel.objectChanged(area);
+					groupObjectsListModel.itemChanged(area);
 					tmxViewer.revalidate();
 					tmxViewer.repaint();
 				}
@@ -1988,11 +1979,21 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					SpawnArea area = (SpawnArea) selectedMapObject;
 					area.quantity = (Integer) value;
 				}
+			} else if (source == respawnSpeedField) {
+				if (selectedMapObject instanceof SpawnArea) {
+					SpawnArea area = (SpawnArea) selectedMapObject;					
+					area.respawnSpeed = (Integer) value;
+				}
 			} else if (source == spawnActiveForNewGame) {
 				if (selectedMapObject instanceof SpawnArea) {
 					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;
@@ -2133,12 +2134,12 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 				}
 			}  else if (source == sourceLayer) {
 				selectedReplacement.sourceLayer = (String)value;
-				replacementsListModel.objectChanged(selectedReplacement);
-				groupObjectsListModel.objectChanged(selectedMapObject);
+				replacementsListModel.itemChanged(selectedReplacement);
+				groupObjectsListModel.itemChanged(selectedMapObject);
 			} else if (source == targetLayer) {
 				selectedReplacement.targetLayer = (String)value;
-				replacementsListModel.objectChanged(selectedReplacement);
-				groupObjectsListModel.objectChanged(selectedMapObject);
+				replacementsListModel.itemChanged(selectedReplacement);
+				groupObjectsListModel.itemChanged(selectedMapObject);
 			}
 			if (modified) {
 				if (map.state != GameDataElement.State.modified) {
@@ -2176,11 +2177,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>();
@@ -2199,8 +2202,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);
@@ -2208,12 +2212,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();
+	        		}
 	        	}
 			});
 	        
@@ -2223,9 +2231,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()) {
@@ -2237,6 +2245,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();
 	        		}
@@ -2250,11 +2260,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	        			if (!activeReplacements.containsKey(area)) {
 	        				activeReplacements.put(area, true);
 	        			}
-	        			for (ReplaceArea.Replacement repl : area.replacements) {
-	        				if (replacementsForLayer.get(repl.sourceLayer) == null) {
-	        					replacementsForLayer.put(repl.sourceLayer, new ArrayList<ReplaceArea>());
-	        				}
-	        				replacementsForLayer.get(repl.sourceLayer).add(area);
+	        			
+	        			if(area.replacements != null) {
+		        			for (ReplaceArea.Replacement repl : area.replacements) {
+		        				if (replacementsForLayer.get(repl.sourceLayer) == null) {
+		        					replacementsForLayer.put(repl.sourceLayer, new ArrayList<ReplaceArea>());
+		        				}
+		        				replacementsForLayer.get(repl.sourceLayer).add(area);
+		        			}
 	        			}
 	        		}
 	        	}
@@ -2266,6 +2279,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    	ground = mergeReplacements(groundName);
 	    	objects = mergeReplacements(objectsName);
 	    	above = mergeReplacements(aboveName);
+	    	top = mergeReplacements(topName);
 	    	walkable = mergeReplacements(walkableName);
 	    }
 	    
@@ -2321,10 +2335,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);
 	        }
@@ -2378,13 +2400,15 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	        return false;
 	    }
 	    
-	    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 noTileGround = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
+	    JLabel noTileObjects = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
+	    JLabel noTileAbove = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
+	    JLabel noTileTop = new JLabel("None", new ImageIcon(DefaultIcons.getNullifyImage().getScaledInstance(32, 32, Image.SCALE_DEFAULT)), SwingConstants.LEFT);
 	    {
 	    	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;
@@ -2404,16 +2428,35 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    	JPanel content = new JPanel();
 	    	content.setLayout(new JideBoxLayout(content, JideBoxLayout.PAGE_AXIS));
 	    	if (tooltippedTile != null) {
-	    		Image tile;
+	    		tiled.core.Tile tile;
+	    		Image tileImage;
 	    		JLabel label;
 
-	    		if (above != null && above.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
-	    			tile = above.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
+	    		if (top != null && top.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
+	    			tile = top.getTileAt(tooltippedTile.x, tooltippedTile.y);
+	    			tileImage = tile.getImage();
 	    		} else {
 	    			tile = null;
+	    			tileImage = null;
 	    		}
-	    		if (tile != null) {
-	    			label = new JLabel(new ImageIcon(tile));
+	    		if (tileImage != null) {
+	    			label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
+	    			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);
+	    			tileImage = tile.getImage();
+	    		} else {
+	    			tile = null;
+	    			tileImage = null;
+	    		}
+	    		if (tileImage != null) {
+	    			label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
 	    			label.setPreferredSize(new Dimension(32,32));
 	    			content.add(label, JideBoxLayout.FIX);
 	    		} else {
@@ -2421,12 +2464,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    		}
 	    		
 	    		if (objects != null && objects.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
-	    			tile = objects.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
+	    			tile = objects.getTileAt(tooltippedTile.x, tooltippedTile.y);
+	    			tileImage = tile.getImage();
 	    		} else {
 	    			tile = null;
+	    			tileImage = null;
 	    		}
-	    		if (tile != null) {
-	    			label = new JLabel(new ImageIcon(tile));
+	    		if (tileImage != null) {
+	    			label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
 	    			label.setPreferredSize(new Dimension(32,32));
 	    			content.add(label, JideBoxLayout.FIX);
 	    		} else {
@@ -2434,12 +2479,14 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 	    		}
 	    		
 	    		if (ground != null && ground.getTileAt(tooltippedTile.x, tooltippedTile.y) != null) {
-	    			tile = ground.getTileAt(tooltippedTile.x, tooltippedTile.y).getImage();
+	    			tile = ground.getTileAt(tooltippedTile.x, tooltippedTile.y);
+	    			tileImage = tile.getImage();
 	    		} else {
 	    			tile = null;
+	    			tileImage = null;
 	    		}
-	    		if (tile != null) {
-	    			label = new JLabel(new ImageIcon(tile));
+	    		if (tileImage != null) {
+	    			label = new JLabel(tile.getTileSet().getName(), new ImageIcon(tileImage), SwingConstants.LEFT);
 	    			label.setPreferredSize(new Dimension(32,32));
 	    			content.add(label, JideBoxLayout.FIX);
 	    		} else {

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

@@ -316,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()) {
@@ -333,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) {
@@ -354,7 +354,7 @@ public class WorldMapEditor extends Editor implements FieldUpdateListener {
 						pushToModel();
 					}
 					mapView.updateFromModel();
-					update = true;
+//					update = true;
 					mapBeingAddedID = null;
 				}
 //				if (update) {
@@ -986,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;

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

@@ -85,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()) {
@@ -521,16 +521,6 @@ public class WorldMapView extends JComponent implements Scrollable {
 			}
 			worldmap.getProject().getMap(id).addBacklink(worldmap);
 		}
-		
-		List<String> toRemove = new ArrayList<String>();
-		for (String s : worldmap.labels.keySet()) {
-			if (!mapLocations.containsKey(s)) {
-				toRemove.add(s);
-			}
-		}
-		for (String s : toRemove) {
-			worldmap.labels.remove(s);
-		}
 	}
 	
 }

src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java

@@ -1,29 +1,20 @@
 package com.gpl.rpg.atcontentstudio.ui.sprites;
 
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
-import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JToggleButton;
-import javax.swing.ScrollPaneConstants;
+import javax.swing.*;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet.Category;
+import com.gpl.rpg.atcontentstudio.utils.SpriteUtils;
 
 
 public class SpriteChooser extends JDialog {
@@ -34,8 +25,8 @@ public class SpriteChooser extends JDialog {
 	private static final int STD_HEIGHT = 32;
 	private static final int MAX_PER_ROW = 10;
 
-	public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category,SpriteChooser>>();
-	public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category,List<Spritesheet>>>();
+	public static Map<Project, Map<Spritesheet.Category, SpriteChooser>> cache = new LinkedHashMap<Project, Map<Spritesheet.Category, SpriteChooser>>();
+	public static Map<Project, Map<Spritesheet.Category, List<Spritesheet>>> cacheValidator = new LinkedHashMap<Project, Map<Category, List<Spritesheet>>>();
 
 
 	public static SpriteChooser getChooser(Project proj, Spritesheet.Category category) {
@@ -46,13 +37,13 @@ public class SpriteChooser extends JDialog {
 			cache.get(proj).put(category, new SpriteChooser(proj, category));
 		} else {
 			List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
-			for (int i=0; i<proj.getSpritesheetCount(); i++) {
+			for (int i = 0; i < proj.getSpritesheetCount(); i++) {
 				Spritesheet sheet = proj.getSpritesheet(i);
 				if (sheet.category == category) {
 					spritesheets.add(sheet);
 				}
 			}
-			if ( !spritesheets.equals(cacheValidator.get(proj).get(category)) ) {
+			if (!spritesheets.equals(cacheValidator.get(proj).get(category))) {
 				cache.get(proj).put(category, new SpriteChooser(proj, category));
 			}
 		}
@@ -78,7 +69,7 @@ public class SpriteChooser extends JDialog {
 		setTitle("Select a sprite");
 		setModalityType(ModalityType.APPLICATION_MODAL);
 		List<Spritesheet> spritesheets = new ArrayList<Spritesheet>();
-		for (int i=0; i<proj.getSpritesheetCount(); i++) {
+		for (int i = 0; i < proj.getSpritesheetCount(); i++) {
 			Spritesheet sheet = proj.getSpritesheet(i);
 			if (sheet.category == category) {
 				spritesheets.add(sheet);
@@ -106,11 +97,15 @@ public class SpriteChooser extends JDialog {
 		Point nextFreeSlot = new Point(0, 0);
 
 		int i;
-		Image img;
+		BufferedImage img;
 		group = new ButtonGroup();
+		//For every sprite find a free space in panel:
 		for (Spritesheet sheet : spritesheets) {
-			i = 0;
-			while ((img = sheet.getImage(i)) != null) {
+            i = -1;
+            while ((img = sheet.getImage(++i)) != null) {
+                if (SpriteUtils.checkIsImageEmpty(img)) {
+                    continue;
+                }
 				IconButton button = new IconButton(img, sheet.id, i);
 				group.add(button);
 				if (sheet.spriteWidth == STD_WIDTH && sheet.spriteHeight == STD_HEIGHT) {
@@ -120,7 +115,7 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx,  c.gridy);
+					nextFreeSlot.setLocation(c.gridx, c.gridy);
 				} else {
 					c.gridwidth = (sheet.spriteWidth / STD_WIDTH) + (sheet.spriteWidth % STD_WIDTH == 0 ? 0 : 1);
 					c.gridheight = (sheet.spriteHeight / STD_HEIGHT) + (sheet.spriteHeight % STD_HEIGHT == 0 ? 0 : 1);
@@ -131,13 +126,19 @@ public class SpriteChooser extends JDialog {
 							for (int y = c.gridy; y < c.gridy + c.gridwidth; y++) {
 								if (reservedSlots.contains(new Point(x, y))) {
 									slotOk = false;
+									break;
 								}
 							}
+							if (!slotOk) {
+								break;
+							}
 						}
-						if (slotOk && c.gridx + c.gridwidth > MAX_PER_ROW) {
+						if (c.gridx + c.gridwidth > MAX_PER_ROW) {
 							c.gridx = 0;
 							c.gridy++;
 							slotOk = false;
+						} else if (!slotOk) {
+							c.gridx++;
 						}						
 					}
 					pane.add(button, c);
@@ -157,9 +158,8 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx,  c.gridy);
+					nextFreeSlot.setLocation(c.gridx, c.gridy);
 				}
-				i++;
 			}
 		}
 
@@ -232,12 +232,12 @@ public class SpriteChooser extends JDialog {
 			super(new ImageIcon(img));
 			this.sheetId = sheetId;
 			this.spriteIndex = spriteIndex;
-			setToolTipText(sheetId+":"+spriteIndex);
+			setToolTipText(sheetId + ":" + spriteIndex);
 			addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					if (IconButton.this.isSelected()) {
-						selectedIconId = IconButton.this.sheetId+":"+IconButton.this.spriteIndex;
+						selectedIconId = IconButton.this.sheetId + ":" + IconButton.this.spriteIndex;
 						SpriteChooser.this.setVisible(false);
 						SpriteChooser.this.dispose();
 						if (listener != null) listener.iconSelected(selectedIconId);

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();
-				PrintStream printOut = new PrintStream(new AreaOutputStream(outArea));
+				final Interpreter shInt = new Interpreter();
+				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 {
-					shInt.eval(shArea.getText());
-				} catch (EvalError e1) {
-					e1.printStackTrace(printErr);
-				}
+				WorkerDialog.showTaskMessage("Running your script...", null, new Runnable() {
+					@Override
+					public void run() {
+						
+						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/CommonEditor.java

@@ -0,0 +1,282 @@
+package com.gpl.rpg.atcontentstudio.ui.tools;
+
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Common;
+import com.gpl.rpg.atcontentstudio.ui.CollapsiblePanel;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.ui.Editor;
+import com.gpl.rpg.atcontentstudio.ui.FieldUpdateListener;
+import com.gpl.rpg.atcontentstudio.utils.lambda.CallWithReturn;
+import com.gpl.rpg.atcontentstudio.utils.lambda.CallWithSingleArg;
+import com.gpl.rpg.atcontentstudio.utils.lambda.CallWithThreeArgs;
+import com.jidesoft.swing.JideBoxLayout;
+
+import javax.swing.*;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public final class CommonEditor {
+
+    public static class PanelCreateResult<E>{
+        public CollapsiblePanel panel;
+        public JList<E> list;
+    }
+    public static  <E, S> PanelCreateResult<E> createListPanel(String title,
+                                                          ListCellRenderer<? super E> cellRenderer,
+                                                          AtListModel<E, S> listModel,
+                                                          boolean writable,
+                                                          boolean moveUpDownEnabled,
+                                                          CallWithSingleArg<E> selectedValueSetter,
+                                                          CallWithReturn<E> selectedValueGetter,
+                                                          CallWithThreeArgs<JPanel, E, FieldUpdateListener> updateRepliesEditorPane,
+                                                          FieldUpdateListener listener,
+                                                          CallWithReturn<E> createNew) {
+        CollapsiblePanel replies = new CollapsiblePanel(title);
+        replies.setLayout(new JideBoxLayout(replies, JideBoxLayout.PAGE_AXIS));
+        JList<E> repliesList = new JList<>(listModel);
+        repliesList.setCellRenderer(cellRenderer);
+        repliesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        replies.add(new JScrollPane(repliesList), JideBoxLayout.FIX);
+        final JPanel repliesEditorPane = new JPanel();
+        final JButton createReply = new JButton(new ImageIcon(DefaultIcons.getCreateIcon()));
+        final JButton deleteReply = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
+        final JButton moveReplyUp = new JButton(new ImageIcon(DefaultIcons.getArrowUpIcon()));
+        final JButton moveReplyDown = new JButton(new ImageIcon(DefaultIcons.getArrowDownIcon()));
+        deleteReply.setEnabled(false);
+        moveReplyUp.setEnabled(false);
+        moveReplyDown.setEnabled(false);
+        repliesList.addListSelectionListener(e -> {
+            E selectedReply = repliesList.getSelectedValue();
+            selectedValueSetter.call(selectedReply);
+            if (selectedReply != null) {
+                deleteReply.setEnabled(true);
+                if (moveUpDownEnabled) {
+                    moveReplyUp.setEnabled(repliesList.getSelectedIndex() > 0);
+                    moveReplyDown.setEnabled(repliesList.getSelectedIndex() < (listModel.getSize() - 1));
+                }
+            } else {
+                deleteReply.setEnabled(false);
+                if (moveUpDownEnabled) {
+                    moveReplyUp.setEnabled(false);
+                    moveReplyDown.setEnabled(false);
+                }
+            }
+            updateRepliesEditorPane.call(repliesEditorPane, selectedReply, listener);
+        });
+
+        repliesList.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2) {
+                    GameDataElement navObj = listModel.getNavigationElement( repliesList.getSelectedValue());
+                    if (navObj != null) {
+                        ATContentStudio.frame.openEditor(navObj);
+                        ATContentStudio.frame.selectInTree(navObj);
+                    }
+                }
+            }
+        });
+        repliesList.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyReleased(KeyEvent e) {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    GameDataElement navObj = listModel.getNavigationElement( repliesList.getSelectedValue());
+                    ATContentStudio.frame.openEditor(navObj);
+                    ATContentStudio.frame.selectInTree(navObj);
+                }
+            }
+        });
+        if (writable) {
+            JPanel listButtonsPane = new JPanel();
+            listButtonsPane.setLayout(new JideBoxLayout(listButtonsPane, JideBoxLayout.LINE_AXIS, 6));
+            createReply.addActionListener(e -> {
+                E created = createNew.call();
+                listModel.addItem(created);
+                repliesList.setSelectedValue(created, true);
+                listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
+            });
+            deleteReply.addActionListener(e -> {
+                E selected = selectedValueGetter.call();
+                if (selected != null) {
+                    listModel.removeItem(selected);
+                    selected = null;
+                    selectedValueSetter.call(selected);
+                    repliesList.clearSelection();
+                    listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
+                }
+            });
+            if (moveUpDownEnabled) {
+                moveReplyUp.addActionListener(e -> {
+                    E selected = selectedValueGetter.call();
+                    if (selected != null) {
+                        listModel.moveUp(selected);
+                        repliesList.setSelectedValue(selected, true);
+                        listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
+                    }
+                });
+                moveReplyDown.addActionListener(e -> {
+                    E selected = selectedValueGetter.call();
+                    if (selected != null) {
+                        listModel.moveDown(selected);
+                        repliesList.setSelectedValue(selected, true);
+                        listener.valueChanged(new JLabel(), null); //Item changed, but we took care of it, just do the usual notification and JSON update stuff.
+                    }
+                });
+            }
+            listButtonsPane.add(createReply, JideBoxLayout.FIX);
+            listButtonsPane.add(deleteReply, JideBoxLayout.FIX);
+            if (moveUpDownEnabled) {
+                listButtonsPane.add(moveReplyUp, JideBoxLayout.FIX);
+                listButtonsPane.add(moveReplyDown, JideBoxLayout.FIX);
+            }
+            listButtonsPane.add(new JPanel(), JideBoxLayout.VARY);
+            replies.add(listButtonsPane, JideBoxLayout.FIX);
+        }
+        repliesEditorPane.setLayout(new JideBoxLayout(repliesEditorPane, JideBoxLayout.PAGE_AXIS));
+        replies.add(repliesEditorPane, JideBoxLayout.FIX);
+        PanelCreateResult<E> ePanelCreateResult = new PanelCreateResult<>();
+        ePanelCreateResult.panel  =replies;
+        ePanelCreateResult.list = repliesList;
+        return ePanelCreateResult;
+    }
+
+
+
+    public static class CreateDeathEffectPanelResult {
+        public CollapsiblePanel panel;
+        public JSpinner HPMin;
+        public JSpinner HPMax;
+        public JSpinner APMin;
+        public JSpinner APMax;
+    }
+    public static CreateDeathEffectPanelResult createDeathEffectPanel(Common.DeathEffect hitEffect, boolean writable, FieldUpdateListener listener, String title){
+        CreateDeathEffectPanelResult result = new CreateDeathEffectPanelResult();
+        result.panel = new CollapsiblePanel(title);
+        result.panel.setLayout(new JideBoxLayout(result.panel, JideBoxLayout.PAGE_AXIS));
+        result.HPMin = Editor.addIntegerField(result.panel, "HP bonus min: ", hitEffect.hp_boost_min, true, writable, listener);
+        result.HPMax = Editor.addIntegerField(result.panel, "HP bonus max: ", hitEffect.hp_boost_max, true, writable, listener);
+        result.APMin = Editor.addIntegerField(result.panel, "AP bonus min: ", hitEffect.ap_boost_min, true, writable, listener);
+        result.APMax = Editor.addIntegerField(result.panel, "AP bonus max: ", hitEffect.ap_boost_max, true, writable, listener);
+
+        return result;
+    }
+    public static String wordWrap(String in, int length) {
+        if (in == null) return null;
+        final String newline = "\n";
+        //:: Trim
+        while (!in.isEmpty() && (in.charAt(0) == '\t' || in.charAt(0) == ' ')) in = in.substring(1);
+        //:: If Small Enough Already, Return Original
+        if (in.length() < length) return in;
+        //:: If Next length Contains Newline, Split There
+        if (in.substring(0, length).contains(newline))
+            return in.substring(0, in.indexOf(newline)).trim() + newline + wordWrap(in.substring(in.indexOf("\n") + 1), length);
+        //:: Otherwise, Split Along Nearest Previous Space/Tab/Dash
+        int spaceIndex = Math.max(Math.max(in.lastIndexOf(" ", length), in.lastIndexOf("\t", length)), in.lastIndexOf("-", length));
+        //:: If No Nearest Space, Split At length
+        if (spaceIndex == -1) spaceIndex = length;
+        //:: Split
+        return in.substring(0, spaceIndex).trim() + newline + wordWrap(in.substring(spaceIndex), length);
+    }
+
+
+    public abstract static class AtListModel<E, S> implements ListModel<E> {
+
+        protected S source;
+
+        protected abstract List<E> getInner();
+
+        protected abstract void setInner(List<E> value);
+        protected GameDataElement getNavigationElement(E element){
+            return null;
+        }
+
+        public AtListModel(S source) {
+            this.source = source;
+        }
+
+
+
+
+        @Override
+        public int getSize() {
+            if (getInner() == null) return 0;
+            return getInner().size();
+        }
+
+        @Override
+        public E getElementAt(int index) {
+            if (index < 0 || index >= getSize()) return null;
+            return getInner().get(index);
+        }
+
+        public void addItem(E item) {
+            if (getInner() == null) {
+                setInner(new ArrayList<>());
+            }
+            getInner().add(item);
+            int index = getInner().indexOf(item);
+            for (ListDataListener l : listeners) {
+                l.intervalAdded(new ListDataEvent(this, ListDataEvent.INTERVAL_ADDED, index, index));
+            }
+        }
+
+        public void removeItem(E item) {
+            int index = getInner().indexOf(item);
+            getInner().remove(item);
+            if (getInner().isEmpty()) {
+                setInner(null);
+            }
+            for (ListDataListener l : listeners) {
+                l.intervalRemoved(new ListDataEvent(this, ListDataEvent.INTERVAL_REMOVED, index, index));
+            }
+        }
+
+        public void itemChanged(E item) {
+            int index = getInner().indexOf(item);
+            for (ListDataListener l : listeners) {
+                l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index));
+            }
+        }
+
+        public void moveUp(E item) {
+            int index = getInner().indexOf(item);
+            E exchanged = getInner().get(index - 1);
+            getInner().set(index, exchanged);
+            getInner().set(index - 1, item);
+            for (ListDataListener l : listeners) {
+                l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index - 1, index));
+            }
+        }
+
+        public void moveDown(E item) {
+            int index = getInner().indexOf(item);
+            E exchanged = getInner().get(index + 1);
+            getInner().set(index, exchanged);
+            getInner().set(index + 1, item);
+            for (ListDataListener l : listeners) {
+                l.contentsChanged(new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, index, index + 1));
+            }
+        }
+
+
+        List<ListDataListener> listeners = new CopyOnWriteArrayList<>();
+
+        @Override
+        public void addListDataListener(ListDataListener l) {
+            listeners.add(l);
+        }
+
+        @Override
+        public void removeListDataListener(ListDataListener l) {
+            listeners.remove(l);
+        }
+    }
+}

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

@@ -5,14 +5,7 @@ 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.gamedata.*;
 import com.gpl.rpg.atcontentstudio.model.maps.ContainerArea;
 import com.gpl.rpg.atcontentstudio.model.maps.KeyArea;
 import com.gpl.rpg.atcontentstudio.model.maps.MapChange;
@@ -111,18 +104,18 @@ public class GDEVisitor {
 		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) {
+			for (Common.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) {
+				for (Common.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) {
+				for (Common.ConditionEffect condEffect : element.hit_effect.conditions_target) {
 					visit(condEffect.condition, visited, includeSource);
 				}
 			}
@@ -144,12 +137,12 @@ public class GDEVisitor {
 		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) {
+				for (Common.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) {
+				for (Common.TimedConditionEffect condEffect : element.hit_effect.conditions_target) {
 					visit(condEffect.condition, visited, includeSource);
 				}
 			}

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

@@ -37,7 +37,7 @@ public class ItemsTableView extends ElementTableView {
 
 		@Override
 		public int getColumnCount() {
-			return 33;
+			return 43;
 		}
 
 		@Override
@@ -62,20 +62,30 @@ public class ItemsTableView extends ElementTableView {
 			case 16: return "On kill - AP min";
 			case 17: return "On kill - AP max";
 			case 18: return "On kill - # conditions";
-			case 19: return "AD min";
-			case 20: return "AD max";
-			case 21: return "Max HP";
-			case 22: return "Max AP";
-			case 23: return "Attack cost";
-			case 24: return "AC";
-			case 25: return "BC";
-			case 26: return "DR";
-			case 27: return "CS";
-			case 28: return "CM";
-			case 29: return "Move cost";
-			case 30: return "Use cost";
-			case 31: return "Reequip cost";
-			case 32: return "# conditions";
+			case 19: return "On hit recv - HP min";
+			case 20: return "On hit recv - HP max";
+			case 21: return "On hit recv - AP min";
+			case 22: return "On hit recv - AP max";
+			case 23: return "On hit recv - # conditions";
+			case 24: return "On hit recv - Tgt HP min";
+			case 25: return "On hit recv - Tgt HP max";
+			case 26: return "On hit recv - Tgt AP min";
+			case 27: return "On hit recv - Tgt AP max";			
+			case 28: return "AD min";
+			case 29: return "AD max";
+			case 30: return "Damage modifier %";					
+			case 31: return "Max HP";
+			case 32: return "Max AP";	
+			case 33: return "Attack cost";
+			case 34: return "AC";
+			case 35: return "BC";
+			case 36: return "DR";
+			case 37: return "CS";
+			case 38: return "CM";
+			case 39: return "Move cost";
+			case 40: return "Use cost";
+			case 41: return "Reequip cost";
+			case 42: return "# conditions";
 			}
 			return null;
 		}
@@ -103,20 +113,30 @@ public class ItemsTableView extends ElementTableView {
 			case 16: return Integer.class;//"On kill - AP min";
 			case 17: return Integer.class;//"On kill - AP max";
 			case 18: return Integer.class;//"On kill - # conditions";
-			case 19: return Integer.class;//"AD min";
-			case 20: return Integer.class;//"AD max";
-			case 21: return Integer.class;//"Max HP";
-			case 22: return Integer.class;//"Max AP";
-			case 23: return Integer.class;//"Attack cost";
-			case 24: return Integer.class;//"AC";
-			case 25: return Integer.class;//"BC";
-			case 26: return Integer.class;//"DR";
-			case 27: return Integer.class;//"CS";
-			case 28: return Double.class;//"CM";
-			case 29: return Integer.class;//"Move cost";
-			case 30: return Integer.class;//"Use cost";
-			case 31: return Integer.class;//"Reequip cost";
-			case 32: return Integer.class;//"# conditions";
+			case 19: return Integer.class;//"On hit recv - HP min";
+			case 20: return Integer.class;//"On hit recv - HP max";
+			case 21: return Integer.class;//"On hit recv - AP min";
+			case 22: return Integer.class;//"On hit recv - AP max";
+			case 23: return Integer.class;//"On hit recv - # conditions";
+			case 24: return Integer.class;//"On hit recv - Tgt HP min";
+			case 25: return Integer.class;//"On hit recv - Tgt HP max";
+			case 26: return Integer.class;//"On hit recv - Tgt AP min";
+			case 27: return Integer.class;//"On hit recv - Tgt AP max";			
+			case 28: return Integer.class;//"AD min";
+			case 29: return Integer.class;//"AD max";
+			case 30: return Integer.class;//"Damage modifier";				
+			case 31: return Integer.class;//"Max HP";
+			case 32: return Integer.class;//"Max AP";		
+			case 33: return Integer.class;//"Attack cost";
+			case 34: return Integer.class;//"AC";
+			case 35: return Integer.class;//"BC";
+			case 36: return Integer.class;//"DR";
+			case 37: return Integer.class;//"CS";
+			case 38: return Double.class;//"CM";
+			case 39: return Integer.class;//"Move cost";
+			case 40: return Integer.class;//"Use cost";
+			case 41: return Integer.class;//"Reequip cost";
+			case 42: return Integer.class;//"# conditions";
 			}
 			return null;
 		}
@@ -177,20 +197,30 @@ public class ItemsTableView extends ElementTableView {
 			case 16: return (!canUse && item.kill_effect != null) ? item.kill_effect.ap_boost_min : null;//"On kill - AP min";
 			case 17: return (!canUse && item.kill_effect != null) ? item.kill_effect.ap_boost_max : null;//"On kill - AP max";
 			case 18: return (!canUse && item.kill_effect != null && item.kill_effect.conditions_source != null) ? item.kill_effect.conditions_source.size() : null;//"On kill - # conditions";
-			case 19: return (canEquip && item.equip_effect != null) ? item.equip_effect.damage_boost_min : null;//"AD min";
-			case 20: return (canEquip && item.equip_effect != null) ? item.equip_effect.damage_boost_max : null;//"AD max";
-			case 21: return (canEquip && item.equip_effect != null) ? item.equip_effect.max_hp_boost : null;//"Max HP";
-			case 22: return (canEquip && item.equip_effect != null) ? item.equip_effect.max_ap_boost : null;//"Max AP";
-			case 23: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_attack_cost : null;//"Attack cost";
-			case 24: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_attack_chance : null;//"AC";
-			case 25: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_block_chance : null;//"BC";
-			case 26: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_damage_resistance : null;//"DR";
-			case 27: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_critical_skill : null;//"CS";
-			case 28: return (canEquip && item.equip_effect != null) ? item.equip_effect.critical_multiplier : null;//"CM";
-			case 29: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_move_cost : null;//"Move cost";
-			case 30: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_use_item_cost : null;//"Use cost";
-			case 31: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_reequip_cost : null;//"Reequip cost";
-			case 32: return (canEquip && item.equip_effect != null && item.equip_effect.conditions != null) ? item.equip_effect.conditions.size() : null;//"# conditions";
+			case 19: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.hp_boost_min : null;//"On hit recv - HP min";
+			case 20: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.hp_boost_max : null;//"On hit recv - HP max";
+			case 21: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.ap_boost_min : null;//"On hit recv - AP min";
+			case 22: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.ap_boost_max : null;//"On hit recv - AP max";
+			case 23: return (!canUse && item.hit_received_effect != null && item.hit_received_effect.conditions_source != null) ? item.hit_received_effect.conditions_source.size() : null;//"On hit recv - # conditions";
+			case 24: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.hp_boost_min : null;//"On hit recv - Tgt HP min";
+			case 25: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.hp_boost_max : null;//"On hit recv - Tgt HP max";
+			case 26: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.ap_boost_min : null;//"On hit recv - Tgt AP min";
+			case 27: return (!canUse && item.hit_received_effect != null) ? item.hit_received_effect.ap_boost_max : null;//"On hit recv - Tgt AP max";			
+			case 28: return (canEquip && item.equip_effect != null) ? item.equip_effect.damage_boost_min : null;//"AD min";
+			case 29: return (canEquip && item.equip_effect != null) ? item.equip_effect.damage_boost_max : null;//"AD max";
+			case 30: return (canEquip && item.equip_effect != null) ? item.equip_effect.damage_modifier : null;//"Damage modifier";			
+			case 31: return (canEquip && item.equip_effect != null) ? item.equip_effect.max_hp_boost : null;//"Max HP";
+			case 32: return (canEquip && item.equip_effect != null) ? item.equip_effect.max_ap_boost : null;//"Max AP";
+			case 33: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_attack_cost : null;//"Attack cost";
+			case 34: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_attack_chance : null;//"AC";
+			case 35: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_block_chance : null;//"BC";
+			case 36: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_damage_resistance : null;//"DR";
+			case 37: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_critical_skill : null;//"CS";
+			case 38: return (canEquip && item.equip_effect != null) ? item.equip_effect.critical_multiplier : null;//"CM";
+			case 39: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_move_cost : null;//"Move cost";
+			case 40: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_use_item_cost : null;//"Use cost";
+			case 41: return (canEquip && item.equip_effect != null) ? item.equip_effect.increase_reequip_cost : null;//"Reequip cost";
+			case 42: return (canEquip && item.equip_effect != null && item.equip_effect.conditions != null) ? item.equip_effect.conditions.size() : null;//"# conditions";
 			}
 			return null;
 		}

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

@@ -27,6 +27,7 @@ import javax.swing.JTextArea;
 import javax.swing.KeyStroke;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
 
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
 import prefuse.Display;
 import prefuse.Visualization;
 import prefuse.action.Action;
@@ -341,12 +342,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);
@@ -355,7 +356,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);
@@ -380,7 +381,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);
@@ -415,25 +416,9 @@ public class WriterModeEditor extends Editor {
     		@Override
     		protected String getText(VisualItem item) {
     			if (!item.getBoolean(IS_REPLY) && super.getText(item) == null) return "[Selector]";
-    			return wordWrap(super.getText(item), 40);
+    			return CommonEditor.wordWrap(super.getText(item), 40);
     		}
 
-    		public String wordWrap(String in, int length) {
-    			if (in == null) return null;
-    			final String newline = "\n";
-    			//:: Trim
-    			while(in.length() > 0 && (in.charAt(0) == '\t' || in.charAt(0) == ' ')) in = in.substring(1);
-    			//:: If Small Enough Already, Return Original
-    			if(in.length() < length) return in;
-    			//:: If Next length Contains Newline, Split There
-    			if(in.substring(0, length).contains(newline)) return in.substring(0, in.indexOf(newline)).trim() + newline + wordWrap(in.substring(in.indexOf("\n") + 1), length);
-    			//:: Otherwise, Split Along Nearest Previous Space/Tab/Dash
-    			int spaceIndex = Math.max(Math.max( in.lastIndexOf(" ", length), in.lastIndexOf("\t", length)), in.lastIndexOf("-", length));
-    			//:: If No Nearest Space, Split At length
-    			if(spaceIndex == -1) spaceIndex = length;
-    			//:: Split
-    			return in.substring(0, spaceIndex).trim() + newline + wordWrap(in.substring(spaceIndex), length);
-    		}
     	}
     	
     	class NodeStrokeColorAction extends ColorAction {
@@ -665,7 +650,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;
 
@@ -689,7 +674,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");
@@ -732,7 +717,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");
@@ -758,7 +743,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");
@@ -903,18 +888,18 @@ public class WriterModeEditor extends Editor {
 				}
 		}
         
-        public void selectScrollAndEdit(WriterNode node) {
-			if (node != null) {
-					setSelected(node);
-
-					m_vis.run("colors");
-					m_vis.run("layout");
-					m_vis.run("scrollToSelectedAndEdit");
-
-					revalidate();
-					repaint();
-				}
-		}
+//        public void selectScrollAndEdit(WriterNode node) {
+//			if (node != null) {
+//					setSelected(node);
+//
+//					m_vis.run("colors");
+//					m_vis.run("layout");
+//					m_vis.run("scrollToSelectedAndEdit");
+//
+//					revalidate();
+//					repaint();
+//				}
+//		}
         
         
         

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

@@ -0,0 +1,34 @@
+package com.gpl.rpg.atcontentstudio.utils;
+
+import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
+
+public final class SpriteUtils {
+
+	/**
+	 * Check if the image is empty (transparent )
+	 *
+	 * @param img The image to check
+	 * @return true if the image is empty
+	 */
+	public static boolean checkIsImageEmpty(BufferedImage img) {
+		int width = img.getWidth(null);
+		int height = img.getHeight(null);
+		WritableRaster raster = img.getAlphaRaster();
+		if (raster == null) {
+			return false;
+		}
+		for (int x = 0; x < width; x++) {
+			for (int y = 0; y < height; y++) {
+				//get pixel alpha value
+				int alpha = raster.getSample(x, y, 0);
+				//if alpha is not 0 then the pixel is not transparent
+				if (alpha != 0) {
+					return false;
+				}
+			}
+		}
+		//no non-transparent pixel found
+		return true;
+	}
+}

src/com/gpl/rpg/atcontentstudio/utils/lambda/CallWithReturn.java

@@ -0,0 +1,5 @@
+package com.gpl.rpg.atcontentstudio.utils.lambda;
+
+public interface CallWithReturn<T> {
+    T call();
+}

src/com/gpl/rpg/atcontentstudio/utils/lambda/CallWithSingleArg.java

@@ -0,0 +1,7 @@
+package com.gpl.rpg.atcontentstudio.utils.lambda;
+
+public interface CallWithSingleArg<T> {
+    void call(T arg);
+}
+
+

src/com/gpl/rpg/atcontentstudio/utils/lambda/CallWithThreeArgs.java

@@ -0,0 +1,5 @@
+package com.gpl.rpg.atcontentstudio.utils.lambda;
+
+public interface CallWithThreeArgs<T1, T2, T3> {
+    void call(T1 arg1, T2 arg2, T3 arg3);
+}

src/com/gpl/rpg/atcontentstudio/utils/lambda/CallWithTwoArgs.java

@@ -0,0 +1,6 @@
+package com.gpl.rpg.atcontentstudio.utils.lambda;
+
+public interface CallWithTwoArgs<T1, T2> {
+    void call(T1 arg1, T2 arg2);
+}
+

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();
+    }
+}