refactor: improve bounds checking in getElementAt method in CommonEditor

and use that for moving elements up and down

.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="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.15.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/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);

packaging/ATCS_latest

@@ -1 +1 @@
-v0.6.15
+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.15"
+!define VERSION "0.6.21"
 !define TRAINER_VERSION "0.1.5"
-!define JAVA_BIN "javaw"
+!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,31 +47,33 @@ 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'
   FileWrite $9 'set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"$\r$\n'
   FileWrite $9 'set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"$\r$\n'
   FileWrite $9 '$\r$\n'
-  FileWrite $9 'if exist "%ENV_FILE%" ($\r$\n' 
+  FileWrite $9 'if exist "%ENV_FILE%" ($\r$\n'
   FileWrite $9 '  call "%ENV_FILE%"$\r$\n'
   FileWrite $9 ') else ($\r$\n'
   FileWrite $9 '  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"$\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 ""
  
@@ -172,4 +163,4 @@ Function GetJRE
  JreFound:
   Pop $R1
   Exch $R0
-FunctionEnd
+FunctionEnd

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

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

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

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

@@ -1,193 +1,219 @@
-package com.gpl.rpg.atcontentstudio.model;
-
-import java.awt.Image;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-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;
-	
-	public static enum State {
-		init, // We know the object exists, and have its key/ID.
-		parsed, // We know the object's properties, but related objects are referenced by ID only.
-		linked, // We know the object fully, and all links to related objects point to objects in the parsed state at least.
-		created, // This is an object we are creating
-		modified, // Whether altered or created, this item has been modified since creation from scratch or from JSON.
-		saved // Whether altered or created, this item has been saved since last modification.
-	}
-	
-	public State state = State.init;
-	
-	//Available from state init.
-	public ProjectTreeNode parent;
-	
-	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>();
-
-	public String id = null;
-	
-	@Override
-	public Enumeration<ProjectTreeNode> children() {
-		return null;
-	}
-	@Override
-	public boolean getAllowsChildren() {
-		return false;
-	}
-	@Override
-	public TreeNode getChildAt(int arg0) {
-		return null;
-	}
-	@Override
-	public int getChildCount() {
-		return 0;
-	}
-	@Override
-	public int getIndex(TreeNode arg0) {
-		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 abstract String getDesc();
-	
-	public static String getStaticDesc() {
-		return "GameDataElements";
-	}
-	
-	public abstract void parse();
-	public abstract void link();
-	
-	
-	
-	@Override
-	public Project getProject() {
-		return parent == null ? null : parent.getProject();
-	}
-	
-	
-	public Image getIcon() {
-		return null;
-	}
-	@Override
-	public Image getClosedIcon() {return null;}
-	@Override
-	public Image getOpenIcon() {return null;}
-	@Override
-	public Image getLeafIcon() {
-		return getIcon();
-	}
-	
-	
-	public abstract GameDataElement clone();
-	
-	public abstract void elementChanged(GameDataElement oldOne, GameDataElement newOne);
-
-	
-	@Override
-	public GameSource.Type getDataType() {
-		if (parent == null) {
-			System.out.println("blerf.");
-		}
-		return parent.getDataType();
-	}
-	
-	
-	public List<BacklinksListener> backlinkListeners = new ArrayList<GameDataElement.BacklinksListener>();
-	
-	public void addBacklinkListener(BacklinksListener l) {
-		backlinkListeners.add(l);
-	}
-
-	public void removeBacklinkListener(BacklinksListener l) {
-		backlinkListeners.remove(l);
-	}
-	
-	public void addBacklink(GameDataElement gde) {
-		if (!backlinks.containsKey(gde)) {
-			backlinks.put(gde, 1);
-			for (BacklinksListener l : backlinkListeners) {
-				l.backlinkAdded(gde);
-			}
-		} else {
-			backlinks.put(gde, backlinks.get(gde) + 1);
-		}
-	}
-
-	public void removeBacklink(GameDataElement gde) {
-		if (backlinks.get(gde) == null) return;
-		backlinks.put(gde, backlinks.get(gde) - 1);
-		if (backlinks.get(gde) == 0) {
-			backlinks.remove(gde);
-			for (BacklinksListener l : backlinkListeners) {
-				l.backlinkRemoved(gde);
-			}
-		}
-	}
-
-	public Set<GameDataElement> getBacklinks() {
-		return backlinks.keySet();
-	}
-	
-	public static interface BacklinksListener {
-		public void backlinkAdded(GameDataElement gde);
-		public void backlinkRemoved(GameDataElement gde);
-	}
-	
-	@Override
-	public boolean isEmpty() {
-		return false;
-	}
-	
-	public boolean needsSaving() {
-		return this.state == State.modified || this.state == State.created;
-	}
-	
-	public abstract String getProjectFilename();
-	
-	public abstract void save();
-	
-	public abstract List<SaveEvent> attemptSave();
-	
-}
+package com.gpl.rpg.atcontentstudio.model;
+
+import java.awt.Image;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+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;
+
+	public static enum State {
+		init, // We know the object exists, and have its key/ID.
+		parsed, // We know the object's properties, but related objects are referenced by ID only.
+		linked, // We know the object fully, and all links to related objects point to objects in the parsed state at least.
+		created, // This is an object we are creating
+		modified, // Whether altered or created, this item has been modified since creation from scratch or from JSON.
+		saved // Whether altered or created, this item has been saved since last modification.
+	}
+
+	public State state = State.init;
+
+	//Available from state init.
+	public ProjectTreeNode parent;
+
+	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>();
+
+	public String id = null;
+
+	@Override
+	public Enumeration<ProjectTreeNode> children() {
+		return null;
+	}
+	@Override
+	public boolean getAllowsChildren() {
+		return false;
+	}
+	@Override
+	public TreeNode getChildAt(int arg0) {
+		return null;
+	}
+	@Override
+	public int getChildCount() {
+		return 0;
+	}
+	@Override
+	public int getIndex(TreeNode arg0) {
+		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 abstract String getDesc();
+
+	public static String getStaticDesc() {
+		return "GameDataElements";
+	}
+
+	public abstract void parse();
+	public abstract void link();
+
+
+
+	@Override
+	public Project getProject() {
+		return parent == null ? null : parent.getProject();
+	}
+
+
+	public Image getIcon() {
+		return null;
+	}
+	@Override
+	public Image getClosedIcon() {return null;}
+	@Override
+	public Image getOpenIcon() {return null;}
+	@Override
+	public Image getLeafIcon() {
+		return getIcon();
+	}
+
+
+	public abstract GameDataElement clone();
+
+	public abstract void elementChanged(GameDataElement oldOne, GameDataElement newOne);
+
+
+	@Override
+	public GameSource.Type getDataType() {
+		if (parent == null) {
+			System.out.println("blerf.");
+		}
+		return parent.getDataType();
+	}
+
+
+	public List<BacklinksListener> backlinkListeners = new ArrayList<GameDataElement.BacklinksListener>();
+
+	public void addBacklinkListener(BacklinksListener l) {
+		backlinkListeners.add(l);
+	}
+
+	public void removeBacklinkListener(BacklinksListener l) {
+		backlinkListeners.remove(l);
+	}
+
+	public void addBacklink(GameDataElement gde) {
+		if (!backlinks.containsKey(gde)) {
+			backlinks.put(gde, 1);
+			for (BacklinksListener l : backlinkListeners) {
+				l.backlinkAdded(gde);
+			}
+		} else {
+			backlinks.put(gde, backlinks.get(gde) + 1);
+		}
+	}
+
+	public void removeBacklink(GameDataElement gde) {
+		if (backlinks.get(gde) == null) return;
+		backlinks.put(gde, backlinks.get(gde) - 1);
+		if (backlinks.get(gde) == 0) {
+			backlinks.remove(gde);
+			for (BacklinksListener l : backlinkListeners) {
+				l.backlinkRemoved(gde);
+			}
+		}
+	}
+
+	public Set<GameDataElement> getBacklinks() {
+		return backlinks.keySet();
+	}
+
+	public static interface BacklinksListener {
+		public void backlinkAdded(GameDataElement gde);
+		public void backlinkRemoved(GameDataElement gde);
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return false;
+	}
+
+	public boolean needsSaving() {
+		return this.state == State.modified || this.state == State.created;
+	}
+
+	public abstract String getProjectFilename();
+
+	public abstract void save();
+
+	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

@@ -11,6 +11,10 @@ import java.io.IOException;
 import java.io.Serializable;
 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;
@@ -74,7 +78,9 @@ 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";
 	
@@ -1079,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());
 			}
 
@@ -1096,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());
 			}
 
@@ -1107,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();
@@ -1139,12 +1157,12 @@ public class Project implements ProjectTreeNode, Serializable {
 		writtenFiles = new LinkedList<String>();
 		for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
 			if (createdMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
-			FileUtils.copyFile(createdMapFile, new File(tmpMapDir, createdMapFile.getName()));
+			copyTmxConverted(createdMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), createdMapFile.getName()));
 			writtenFiles.add(createdMapFile.getName());
 		}
 		for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
 			if (alteredMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
-			FileUtils.copyFile(alteredMapFile, new File(tmpMapDir, alteredMapFile.getName()));
+			copyTmxConverted(alteredMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), alteredMapFile.getName()));
 			writtenFiles.add(alteredMapFile.getName());
 		}
 		writtenFilesPerDataType.put(TMXMap.class, writtenFiles);
@@ -1177,6 +1195,16 @@ 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>();

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

@@ -1,372 +1,374 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import java.awt.Image;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-
-
-public class ActorCondition extends JSONElement {
-	
-	private static final long serialVersionUID = -3969824899972048507L;
-
-	public static final Integer MAGNITUDE_CLEAR = -99;
-	public static final Integer DURATION_FOREVER = 999;;
-	public static final Integer DURATION_NONE = 0;
-	
-	// Available from init state
-	//public String id; inherited.
-	public String icon_id;
-	public String display_name;
-	
-	// Available from parsed state
-	public ACCategory category = null;
-	public Integer positive = null;
-	public Integer stacking = null;
-	public RoundEffect round_effect = null;
-	public RoundEffect full_round_effect = null;
-	public AbilityEffect constant_ability_effect = null;
-	
-	public enum ACCategory {
-		spiritual,
-		mental,
-		physical,
-		blood
-	}
-	
-	public static enum VisualEffectID {
-		redSplash
-		,blueSwirl
-		,greenSplash
-		,miss
-	}
-	
-	public static class RoundEffect implements Cloneable {
-		// Available from parsed state
-		public VisualEffectID visual_effect = null;
-		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 Object clone() {
-			try {
-				return super.clone();
-			} catch (CloneNotSupportedException e) {
-				e.printStackTrace();
-			}
-			return null;
-		}
-	}
-	
-	public static class AbilityEffect implements Cloneable {
-		// Available from parsed state
-		public Integer max_hp_boost = null;
-		public Integer max_ap_boost = null;
-		public Integer increase_move_cost = null;
-		public Integer increase_use_cost = null;
-		public Integer increase_reequip_cost = null;
-		public Integer increase_attack_cost = null;
-		public Integer increase_attack_chance = null;
-		public Integer increase_damage_min = null;
-		public Integer increase_damage_max = null;
-		public Integer increase_critical_skill = null;
-		public Integer increase_block_chance = null;
-		public Integer increase_damage_resistance = null;
-		
-		public Object clone() {
-			try {
-				return super.clone();
-			} catch (CloneNotSupportedException e) {
-				e.printStackTrace();
-			}
-			return null;
-		}
-	}
-	
-	@Override
-	public String getDesc() {
-		return (needsSaving() ? "*" : "")+display_name+" ("+id+")";
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static void fromJson(File jsonFile, GameDataCategory<ActorCondition> category) {
-		JSONParser parser = new JSONParser();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(jsonFile);
-			List actorConditions = (List) parser.parse(reader);
-			for (Object obj : actorConditions) {
-				Map aCondJson = (Map)obj;
-				ActorCondition aCond = fromJson(aCondJson);
-				aCond.jsonFile = jsonFile;
-				aCond.parent = category;
-				if (aCond.getDataType() == GameSource.Type.created || aCond.getDataType() == GameSource.Type.altered) {
-					aCond.writable = true;
-				}
-				category.add(aCond);
-			}
-		} catch (FileNotFoundException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (ParseException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} finally {
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static ActorCondition fromJson(String jsonString) throws ParseException {
-		Map aCondJson = (Map) new JSONParser().parse(jsonString);
-		ActorCondition aCond = fromJson(aCondJson);
-		aCond.parse(aCondJson);
-		return aCond;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static ActorCondition fromJson(Map aCondJson) {
-		ActorCondition aCond = new ActorCondition();
-		aCond.icon_id = (String) aCondJson.get("iconID");
-		aCond.id = (String) aCondJson.get("id");
-		aCond.display_name = (String) aCondJson.get("name");
-		return aCond;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	@Override
-	public void parse(Map aCondJson) {
-
-		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");
-		if (abilityEffect != null) {
-			this.constant_ability_effect = new AbilityEffect();
-			this.constant_ability_effect.increase_attack_chance = JSONElement.getInteger((Number) abilityEffect.get("increaseAttackChance"));
-			if (abilityEffect.get("increaseAttackDamage") != null) {
-				this.constant_ability_effect.increase_damage_min = JSONElement.getInteger((Number) (((Map)abilityEffect.get("increaseAttackDamage")).get("min")));
-				this.constant_ability_effect.increase_damage_max = JSONElement.getInteger((Number) (((Map)abilityEffect.get("increaseAttackDamage")).get("max")));
-			}
-			this.constant_ability_effect.max_hp_boost = JSONElement.getInteger((Number) abilityEffect.get("increaseMaxHP"));
-			this.constant_ability_effect.max_ap_boost = JSONElement.getInteger((Number) abilityEffect.get("increaseMaxAP"));
-			this.constant_ability_effect.increase_move_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseMoveCost"));
-			this.constant_ability_effect.increase_use_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseUseItemCost"));
-			this.constant_ability_effect.increase_reequip_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseReequipCost"));
-			this.constant_ability_effect.increase_attack_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseAttackCost"));
-			this.constant_ability_effect.increase_critical_skill = JSONElement.getInteger((Number) abilityEffect.get("increaseCriticalSkill"));
-			this.constant_ability_effect.increase_block_chance = JSONElement.getInteger((Number) abilityEffect.get("increaseBlockChance"));
-			this.constant_ability_effect.increase_damage_resistance = JSONElement.getInteger((Number) abilityEffect.get("increaseDamageResistance"));
-		}
-		this.stacking = JSONElement.getInteger((Number) aCondJson.get("isStacking"));
-		Map roundEffect = (Map) aCondJson.get("roundEffect");
-		if (roundEffect != null) {
-			this.round_effect = new RoundEffect();
-			if (roundEffect.get("increaseCurrentHP") != null) {
-				this.round_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentHP")).get("max")));
-				this.round_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentHP")).get("min")));
-			}
-			if (roundEffect.get("increaseCurrentAP") != null) {
-				this.round_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentAP")).get("max")));
-				this.round_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentAP")).get("min")));
-			}
-			String vfx = (String) roundEffect.get("visualEffectID");
-			this.round_effect.visual_effect = null;
-			if (vfx != null) {
-				try {
-					this.round_effect.visual_effect = VisualEffectID.valueOf(vfx);
-				} catch(IllegalArgumentException e) {}
-			}
-		}
-		Map fullRoundEffect = (Map) aCondJson.get("fullRoundEffect");
-		if (fullRoundEffect != null) {
-			this.full_round_effect = new RoundEffect();
-			if (fullRoundEffect.get("increaseCurrentHP") != null) {
-				this.full_round_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentHP")).get("max")));
-				this.full_round_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentHP")).get("min")));
-			}
-			if (fullRoundEffect.get("increaseCurrentAP") != null) {
-				this.full_round_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentAP")).get("max")));
-				this.full_round_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentAP")).get("min")));
-			}
-			String vfx = (String) fullRoundEffect.get("visualEffectID");
-			this.full_round_effect.visual_effect = null;
-			if (vfx != null) {
-				try {
-					this.full_round_effect.visual_effect = VisualEffectID.valueOf(vfx);
-				} catch(IllegalArgumentException e) {}
-			}
-		}
-		this.state = State.parsed;
-
-	}
-	
-	@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.
-			return;
-		}
-		if (this.icon_id != null) {
-			String spritesheetId = this.icon_id.split(":")[0];
-			if (getProject().getSpritesheet(spritesheetId) == null) {
-				System.out.println(this.id);
-			}
-			getProject().getSpritesheet(spritesheetId).addBacklink(this);
-		}
-		
-		this.state = State.linked;
-	}
-	
-
-	public static String getStaticDesc() {
-		return "Actor Conditions";
-	}
-	
-
-	@Override
-	public Image getIcon() {
-		return getProject().getIcon(icon_id);
-	}
-	
-	public Image getImage() {
-		return getProject().getImage(icon_id);
-	}
-	
-	@Override
-	public JSONElement clone() {
-		ActorCondition clone = new ActorCondition();
-		clone.jsonFile = this.jsonFile;
-		clone.state = this.state;
-		clone.id = this.id;
-		clone.display_name = this.display_name;
-		clone.icon_id = this.icon_id;
-		clone.category = this.category;
-		clone.positive = this.positive;
-		clone.stacking = this.stacking;
-		if (this.round_effect != null) {
-			clone.round_effect = (RoundEffect) this.round_effect.clone();
-		}
-		if (this.constant_ability_effect != null) {
-			clone.constant_ability_effect = (AbilityEffect) constant_ability_effect.clone();
-		}
-		if (this.full_round_effect != null) {
-			clone.full_round_effect = (RoundEffect) this.full_round_effect.clone();
-		}
-		return clone;
-	}
-	
-	@Override
-	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-		//Nothing to link to.
-	}
-	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public Map toJson() {
-		Map jsonAC = new LinkedHashMap();
-		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.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);
-		if (this.round_effect != null) {
-			Map jsonRound = new LinkedHashMap();
-			if (this.round_effect.visual_effect != null) jsonRound.put("visualEffectID", this.round_effect.visual_effect.toString());
-			if (this.round_effect.hp_boost_min != null || this.round_effect.hp_boost_max != null) {
-				Map jsonHP = new LinkedHashMap();
-				if (this.round_effect.hp_boost_min != null) jsonHP.put("min", this.round_effect.hp_boost_min);
-				else jsonHP.put("min", 0);
-				if (this.round_effect.hp_boost_max != null) jsonHP.put("max", this.round_effect.hp_boost_max);
-				else jsonHP.put("max", 0);
-				jsonRound.put("increaseCurrentHP", jsonHP);
-			}
-			if (this.round_effect.ap_boost_min != null || this.round_effect.ap_boost_max != null) {
-				Map jsonAP = new LinkedHashMap();
-				if (this.round_effect.ap_boost_min != null) jsonAP.put("min", this.round_effect.ap_boost_min);
-				else jsonAP.put("min", 0);
-				if (this.round_effect.ap_boost_max != null) jsonAP.put("max", this.round_effect.ap_boost_max);
-				else jsonAP.put("max", 0);
-				jsonRound.put("increaseCurrentAP", jsonAP);
-			}
-			jsonAC.put("roundEffect", jsonRound);
-		}
-		if (this.full_round_effect != null) {
-			Map jsonFullRound = new LinkedHashMap();
-			if (this.full_round_effect.visual_effect != null) jsonFullRound.put("visualEffectID", this.full_round_effect.visual_effect.toString());
-			if (this.full_round_effect.hp_boost_min != null || this.full_round_effect.hp_boost_max != null) {
-				Map jsonHP = new LinkedHashMap();
-				if (this.full_round_effect.hp_boost_min != null) jsonHP.put("min", this.full_round_effect.hp_boost_min);
-				else jsonHP.put("min", 0);
-				if (this.full_round_effect.hp_boost_max != null) jsonHP.put("max", this.full_round_effect.hp_boost_max);
-				else jsonHP.put("max", 0);
-				jsonFullRound.put("increaseCurrentHP", jsonHP);
-			}
-			if (this.full_round_effect.ap_boost_min != null || this.full_round_effect.ap_boost_max != null) {
-				Map jsonAP = new LinkedHashMap();
-				if (this.full_round_effect.ap_boost_min != null) jsonAP.put("min", this.full_round_effect.ap_boost_min);
-				else jsonAP.put("min", 0);
-				if (this.full_round_effect.ap_boost_max != null) jsonAP.put("max", this.full_round_effect.ap_boost_max);
-				else jsonAP.put("max", 0);
-				jsonFullRound.put("increaseCurrentAP", jsonAP);
-			}
-			jsonAC.put("fullRoundEffect", jsonFullRound);
-		}
-		if (this.constant_ability_effect != null) {
-			Map jsonAbility = new LinkedHashMap();
-			if (this.constant_ability_effect.increase_attack_chance != null) jsonAbility.put("increaseAttackChance", this.constant_ability_effect.increase_attack_chance);
-			if (this.constant_ability_effect.increase_damage_min != null || this.constant_ability_effect.increase_damage_max != null) {
-				Map jsonAD = new LinkedHashMap();
-				if (this.constant_ability_effect.increase_damage_min != null) jsonAD.put("min", this.constant_ability_effect.increase_damage_min);
-				else jsonAD.put("min", 0);
-				if (this.constant_ability_effect.increase_damage_max != null) jsonAD.put("max", this.constant_ability_effect.increase_damage_max);
-				else jsonAD.put("max", 0);
-				jsonAbility.put("increaseAttackDamage", jsonAD);
-			}
-			if (this.constant_ability_effect.max_hp_boost != null) jsonAbility.put("increaseMaxHP", this.constant_ability_effect.max_hp_boost);
-			if (this.constant_ability_effect.max_ap_boost != null) jsonAbility.put("increaseMaxAP", this.constant_ability_effect.max_ap_boost);
-			if (this.constant_ability_effect.increase_move_cost != null) jsonAbility.put("increaseMoveCost", this.constant_ability_effect.increase_move_cost);
-			if (this.constant_ability_effect.increase_use_cost != null) jsonAbility.put("increaseUseItemCost", this.constant_ability_effect.increase_use_cost);
-			if (this.constant_ability_effect.increase_reequip_cost != null) jsonAbility.put("increaseReequipCost", this.constant_ability_effect.increase_reequip_cost);
-			if (this.constant_ability_effect.increase_attack_cost != null) jsonAbility.put("increaseAttackCost", this.constant_ability_effect.increase_attack_cost);
-			if (this.constant_ability_effect.increase_critical_skill != null) jsonAbility.put("increaseCriticalSkill", this.constant_ability_effect.increase_critical_skill);
-			if (this.constant_ability_effect.increase_block_chance != null) jsonAbility.put("increaseBlockChance", this.constant_ability_effect.increase_block_chance);
-			if (this.constant_ability_effect.increase_damage_resistance != null) jsonAbility.put("increaseDamageResistance", this.constant_ability_effect.increase_damage_resistance);
-			jsonAC.put("abilityEffect", jsonAbility);
-		}
-		return jsonAC;
-	}
-
-	@Override
-	public String getProjectFilename() {
-		return "actorconditions_"+getProject().name+".json";
-	}
-	
-}
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+
+
+public class ActorCondition extends JSONElement {
+
+	private static final long serialVersionUID = -3969824899972048507L;
+
+	public static final Integer MAGNITUDE_CLEAR = -99;
+	public static final Integer DURATION_FOREVER = 999;;
+	public static final Integer DURATION_NONE = 0;
+
+	// Available from init state
+	//public String id; inherited.
+	public String icon_id;
+	public String display_name;
+	public String description;
+
+	// Available from parsed state
+	public ACCategory category = null;
+	public Integer positive = null;
+	public Integer stacking = null;
+	public RoundEffect round_effect = null;
+	public RoundEffect full_round_effect = null;
+	public AbilityEffect constant_ability_effect = null;
+
+	public enum ACCategory {
+		spiritual,
+		mental,
+		physical,
+		blood
+	}
+
+	public static enum VisualEffectID {
+		redSplash
+		,blueSwirl
+		,greenSplash
+		,miss
+	}
+
+	public static class RoundEffect implements Cloneable {
+		// Available from parsed state
+		public VisualEffectID visual_effect = null;
+		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 Object clone() {
+			try {
+				return super.clone();
+			} catch (CloneNotSupportedException e) {
+				e.printStackTrace();
+			}
+			return null;
+		}
+	}
+
+	public static class AbilityEffect implements Cloneable {
+		// Available from parsed state
+		public Integer max_hp_boost = null;
+		public Integer max_ap_boost = null;
+		public Integer increase_move_cost = null;
+		public Integer increase_use_cost = null;
+		public Integer increase_reequip_cost = null;
+		public Integer increase_attack_cost = null;
+		public Integer increase_attack_chance = null;
+		public Integer increase_damage_min = null;
+		public Integer increase_damage_max = null;
+		public Integer increase_critical_skill = null;
+		public Integer increase_block_chance = null;
+		public Integer increase_damage_resistance = null;
+
+		public Object clone() {
+			try {
+				return super.clone();
+			} catch (CloneNotSupportedException e) {
+				e.printStackTrace();
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+display_name+" ("+id+")";
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static void fromJson(File jsonFile, GameDataCategory<ActorCondition> category) {
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(jsonFile);
+			List actorConditions = (List) parser.parse(reader);
+			for (Object obj : actorConditions) {
+				Map aCondJson = (Map)obj;
+				ActorCondition aCond = fromJson(aCondJson);
+				aCond.jsonFile = jsonFile;
+				aCond.parent = category;
+				if (aCond.getDataType() == GameSource.Type.created || aCond.getDataType() == GameSource.Type.altered) {
+					aCond.writable = true;
+				}
+				category.add(aCond);
+			}
+		} catch (FileNotFoundException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (IOException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (ParseException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} finally {
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static ActorCondition fromJson(String jsonString) throws ParseException {
+		Map aCondJson = (Map) new JSONParser().parse(jsonString);
+		ActorCondition aCond = fromJson(aCondJson);
+		aCond.parse(aCondJson);
+		return aCond;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static ActorCondition fromJson(Map aCondJson) {
+		ActorCondition aCond = new ActorCondition();
+		aCond.icon_id = (String) aCondJson.get("iconID");
+		aCond.id = (String) aCondJson.get("id");
+		aCond.display_name = (String) aCondJson.get("name");
+		return aCond;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@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");
+		if (abilityEffect != null) {
+			this.constant_ability_effect = new AbilityEffect();
+			this.constant_ability_effect.increase_attack_chance = JSONElement.getInteger((Number) abilityEffect.get("increaseAttackChance"));
+			if (abilityEffect.get("increaseAttackDamage") != null) {
+				this.constant_ability_effect.increase_damage_min = JSONElement.getInteger((Number) (((Map)abilityEffect.get("increaseAttackDamage")).get("min")));
+				this.constant_ability_effect.increase_damage_max = JSONElement.getInteger((Number) (((Map)abilityEffect.get("increaseAttackDamage")).get("max")));
+			}
+			this.constant_ability_effect.max_hp_boost = JSONElement.getInteger((Number) abilityEffect.get("increaseMaxHP"));
+			this.constant_ability_effect.max_ap_boost = JSONElement.getInteger((Number) abilityEffect.get("increaseMaxAP"));
+			this.constant_ability_effect.increase_move_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseMoveCost"));
+			this.constant_ability_effect.increase_use_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseUseItemCost"));
+			this.constant_ability_effect.increase_reequip_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseReequipCost"));
+			this.constant_ability_effect.increase_attack_cost = JSONElement.getInteger((Number) abilityEffect.get("increaseAttackCost"));
+			this.constant_ability_effect.increase_critical_skill = JSONElement.getInteger((Number) abilityEffect.get("increaseCriticalSkill"));
+			this.constant_ability_effect.increase_block_chance = JSONElement.getInteger((Number) abilityEffect.get("increaseBlockChance"));
+			this.constant_ability_effect.increase_damage_resistance = JSONElement.getInteger((Number) abilityEffect.get("increaseDamageResistance"));
+		}
+		this.stacking = JSONElement.getInteger((Number) aCondJson.get("isStacking"));
+		Map roundEffect = (Map) aCondJson.get("roundEffect");
+		if (roundEffect != null) {
+			this.round_effect = new RoundEffect();
+			if (roundEffect.get("increaseCurrentHP") != null) {
+				this.round_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentHP")).get("max")));
+				this.round_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentHP")).get("min")));
+			}
+			if (roundEffect.get("increaseCurrentAP") != null) {
+				this.round_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentAP")).get("max")));
+				this.round_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)roundEffect.get("increaseCurrentAP")).get("min")));
+			}
+			String vfx = (String) roundEffect.get("visualEffectID");
+			this.round_effect.visual_effect = null;
+			if (vfx != null) {
+				try {
+					this.round_effect.visual_effect = VisualEffectID.valueOf(vfx);
+				} catch(IllegalArgumentException e) {}
+			}
+		}
+		Map fullRoundEffect = (Map) aCondJson.get("fullRoundEffect");
+		if (fullRoundEffect != null) {
+			this.full_round_effect = new RoundEffect();
+			if (fullRoundEffect.get("increaseCurrentHP") != null) {
+				this.full_round_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentHP")).get("max")));
+				this.full_round_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentHP")).get("min")));
+			}
+			if (fullRoundEffect.get("increaseCurrentAP") != null) {
+				this.full_round_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentAP")).get("max")));
+				this.full_round_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)fullRoundEffect.get("increaseCurrentAP")).get("min")));
+			}
+			String vfx = (String) fullRoundEffect.get("visualEffectID");
+			this.full_round_effect.visual_effect = null;
+			if (vfx != null) {
+				try {
+					this.full_round_effect.visual_effect = VisualEffectID.valueOf(vfx);
+				} catch(IllegalArgumentException e) {}
+			}
+		}
+		this.state = State.parsed;
+
+	}
+
+	@Override
+	public void link() {
+		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);
+		}
+
+		this.state = State.linked;
+	}
+
+
+	public static String getStaticDesc() {
+		return "Actor Conditions";
+	}
+
+
+	@Override
+	public Image getIcon() {
+		return getProject().getIcon(icon_id);
+	}
+
+	public Image getImage() {
+		return getProject().getImage(icon_id);
+	}
+
+	@Override
+	public JSONElement clone() {
+		ActorCondition clone = new ActorCondition();
+		clone.jsonFile = this.jsonFile;
+		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;
+		clone.stacking = this.stacking;
+		if (this.round_effect != null) {
+			clone.round_effect = (RoundEffect) this.round_effect.clone();
+		}
+		if (this.constant_ability_effect != null) {
+			clone.constant_ability_effect = (AbilityEffect) constant_ability_effect.clone();
+		}
+		if (this.full_round_effect != null) {
+			clone.full_round_effect = (RoundEffect) this.full_round_effect.clone();
+		}
+		return clone;
+	}
+
+	@Override
+	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		//Nothing to link to.
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public Map toJson() {
+		Map jsonAC = new LinkedHashMap();
+		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);
+		if (this.round_effect != null) {
+			Map jsonRound = new LinkedHashMap();
+			if (this.round_effect.visual_effect != null) jsonRound.put("visualEffectID", this.round_effect.visual_effect.toString());
+			if (this.round_effect.hp_boost_min != null || this.round_effect.hp_boost_max != null) {
+				Map jsonHP = new LinkedHashMap();
+				if (this.round_effect.hp_boost_min != null) jsonHP.put("min", this.round_effect.hp_boost_min);
+				else jsonHP.put("min", 0);
+				if (this.round_effect.hp_boost_max != null) jsonHP.put("max", this.round_effect.hp_boost_max);
+				else jsonHP.put("max", 0);
+				jsonRound.put("increaseCurrentHP", jsonHP);
+			}
+			if (this.round_effect.ap_boost_min != null || this.round_effect.ap_boost_max != null) {
+				Map jsonAP = new LinkedHashMap();
+				if (this.round_effect.ap_boost_min != null) jsonAP.put("min", this.round_effect.ap_boost_min);
+				else jsonAP.put("min", 0);
+				if (this.round_effect.ap_boost_max != null) jsonAP.put("max", this.round_effect.ap_boost_max);
+				else jsonAP.put("max", 0);
+				jsonRound.put("increaseCurrentAP", jsonAP);
+			}
+			jsonAC.put("roundEffect", jsonRound);
+		}
+		if (this.full_round_effect != null) {
+			Map jsonFullRound = new LinkedHashMap();
+			if (this.full_round_effect.visual_effect != null) jsonFullRound.put("visualEffectID", this.full_round_effect.visual_effect.toString());
+			if (this.full_round_effect.hp_boost_min != null || this.full_round_effect.hp_boost_max != null) {
+				Map jsonHP = new LinkedHashMap();
+				if (this.full_round_effect.hp_boost_min != null) jsonHP.put("min", this.full_round_effect.hp_boost_min);
+				else jsonHP.put("min", 0);
+				if (this.full_round_effect.hp_boost_max != null) jsonHP.put("max", this.full_round_effect.hp_boost_max);
+				else jsonHP.put("max", 0);
+				jsonFullRound.put("increaseCurrentHP", jsonHP);
+			}
+			if (this.full_round_effect.ap_boost_min != null || this.full_round_effect.ap_boost_max != null) {
+				Map jsonAP = new LinkedHashMap();
+				if (this.full_round_effect.ap_boost_min != null) jsonAP.put("min", this.full_round_effect.ap_boost_min);
+				else jsonAP.put("min", 0);
+				if (this.full_round_effect.ap_boost_max != null) jsonAP.put("max", this.full_round_effect.ap_boost_max);
+				else jsonAP.put("max", 0);
+				jsonFullRound.put("increaseCurrentAP", jsonAP);
+			}
+			jsonAC.put("fullRoundEffect", jsonFullRound);
+		}
+		if (this.constant_ability_effect != null) {
+			Map jsonAbility = new LinkedHashMap();
+			if (this.constant_ability_effect.increase_attack_chance != null) jsonAbility.put("increaseAttackChance", this.constant_ability_effect.increase_attack_chance);
+			if (this.constant_ability_effect.increase_damage_min != null || this.constant_ability_effect.increase_damage_max != null) {
+				Map jsonAD = new LinkedHashMap();
+				if (this.constant_ability_effect.increase_damage_min != null) jsonAD.put("min", this.constant_ability_effect.increase_damage_min);
+				else jsonAD.put("min", 0);
+				if (this.constant_ability_effect.increase_damage_max != null) jsonAD.put("max", this.constant_ability_effect.increase_damage_max);
+				else jsonAD.put("max", 0);
+				jsonAbility.put("increaseAttackDamage", jsonAD);
+			}
+			if (this.constant_ability_effect.max_hp_boost != null) jsonAbility.put("increaseMaxHP", this.constant_ability_effect.max_hp_boost);
+			if (this.constant_ability_effect.max_ap_boost != null) jsonAbility.put("increaseMaxAP", this.constant_ability_effect.max_ap_boost);
+			if (this.constant_ability_effect.increase_move_cost != null) jsonAbility.put("increaseMoveCost", this.constant_ability_effect.increase_move_cost);
+			if (this.constant_ability_effect.increase_use_cost != null) jsonAbility.put("increaseUseItemCost", this.constant_ability_effect.increase_use_cost);
+			if (this.constant_ability_effect.increase_reequip_cost != null) jsonAbility.put("increaseReequipCost", this.constant_ability_effect.increase_reequip_cost);
+			if (this.constant_ability_effect.increase_attack_cost != null) jsonAbility.put("increaseAttackCost", this.constant_ability_effect.increase_attack_cost);
+			if (this.constant_ability_effect.increase_critical_skill != null) jsonAbility.put("increaseCriticalSkill", this.constant_ability_effect.increase_critical_skill);
+			if (this.constant_ability_effect.increase_block_chance != null) jsonAbility.put("increaseBlockChance", this.constant_ability_effect.increase_block_chance);
+			if (this.constant_ability_effect.increase_damage_resistance != null) jsonAbility.put("increaseDamageResistance", this.constant_ability_effect.increase_damage_resistance);
+			jsonAC.put("abilityEffect", jsonAbility);
+		}
+		return jsonAC;
+	}
+
+	@Override
+	public String getProjectFilename() {
+		return "actorconditions_"+getProject().name+".json";
+	}
+
+}

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

@@ -1,468 +1,463 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import java.awt.Image;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement.RequirementType;
-import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-
-public class Dialogue extends JSONElement {
-
-	private static final long serialVersionUID = -6872164604703134683L;
-	
-
-	//Available from init state
-	//public String id = null; inherited.
-	public String message = null;
-	
-	//Available from parsed state;
-	public List<Reward> rewards = null;
-	public List<Reply> replies = null;
-	public String switch_to_npc_id = null;
-	
-	//Available from linked state;
-	public NPC switch_to_npc = null;
-
-	public static class Reward {
-		
-		//Available from parsed state
-		public RewardType type = null;
-		public String reward_obj_id = null;
-		public Integer reward_value = null;
-		public String map_name = null;
-		
-		//Available from linked state
-		public GameDataElement reward_obj = null;
-		public TMXMap map = null;
-		
-		public enum RewardType {
-			questProgress,
-			removeQuestProgress,
-			dropList,
-			skillIncrease,
-			actorCondition,
-			actorConditionImmunity,
-			alignmentChange,
-			alignmentSet,
-			giveItem,
-			createTimer,
-			spawnAll,
-			removeSpawnArea,
-			deactivateSpawnArea,
-			activateMapObjectGroup,
-			deactivateMapObjectGroup,
-			changeMapFilter
-		}
-	}
-	
-	public static class Reply {
-		
-		public static final String GO_NEXT_TEXT = "N";
-		public static final String SHOP_PHRASE_ID = "S";
-		public static final String FIGHT_PHRASE_ID = "F";
-		public static final String EXIT_PHRASE_ID = "X";
-		public static final String REMOVE_PHRASE_ID = "R";
-		
-		public static final List<String> KEY_PHRASE_ID = Arrays.asList(new String[]{SHOP_PHRASE_ID, FIGHT_PHRASE_ID, EXIT_PHRASE_ID, REMOVE_PHRASE_ID});
-		
-		//Available from parsed state
-		public String text = null;
-		public String next_phrase_id = null;
-		public List<Requirement> requirements = null;
-		
-		//Available from linked state
-		public Dialogue next_phrase = null;
-		
-	}
-	
-	@Override
-	public String getDesc() {
-		return (needsSaving() ? "*" : "")+id;
-	}
-
-	public static String getStaticDesc() {
-		return "Dialogues";
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static void fromJson(File jsonFile, GameDataCategory<Dialogue> category) {
-		JSONParser parser = new JSONParser();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(jsonFile);
-			List dialogues = (List) parser.parse(reader);
-			for (Object obj : dialogues) {
-				Map dialogueJson = (Map)obj;
-				Dialogue dialogue = fromJson(dialogueJson);
-				dialogue.jsonFile = jsonFile;
-				dialogue.parent = category;
-				if (dialogue.getDataType() == GameSource.Type.created || dialogue.getDataType() == GameSource.Type.altered) {
-					dialogue.writable = true;
-				}
-				category.add(dialogue);
-			}
-		} catch (FileNotFoundException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (ParseException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} finally {
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static Dialogue fromJson(String jsonString) throws ParseException {
-		Map dialogueJson = (Map) new JSONParser().parse(jsonString);
-		Dialogue dialogue = fromJson(dialogueJson);
-		dialogue.parse(dialogueJson);
-		return dialogue;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static Dialogue fromJson(Map dialogueJson) {
-		Dialogue dialogue = new Dialogue();
-		dialogue.id = (String) dialogueJson.get("id");
-		dialogue.message = (String) dialogueJson.get("message");
-		return dialogue;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	@Override
-	public void parse(Map dialogueJson) {
-		this.switch_to_npc_id = (String) dialogueJson.get("switchToNPC");
-		List repliesJson = (List) dialogueJson.get("replies");
-		if (repliesJson != null && !repliesJson.isEmpty()) {
-			this.replies = new ArrayList<Dialogue.Reply>();
-			for (Object replyJsonObj : repliesJson) {
-				Map replyJson = (Map)replyJsonObj;
-				Reply reply = new Reply();
-				reply.text = (String) replyJson.get("text");
-				reply.next_phrase_id = (String) replyJson.get("nextPhraseID");
-				List requirementsJson = (List) replyJson.get("requires");
-				if (requirementsJson != null && !requirementsJson.isEmpty()) {
-					reply.requirements = new ArrayList<Requirement>();
-					for (Object requirementJsonObj : requirementsJson) {
-						Map requirementJson = (Map) requirementJsonObj;
-						Requirement requirement = new Requirement();
-						requirement.jsonFile = this.jsonFile;
-						requirement.parent = this;
-						if (requirementJson.get("requireType") != null) requirement.type = RequirementType.valueOf((String) requirementJson.get("requireType"));
-						requirement.required_obj_id = (String) requirementJson.get("requireID");
-						if (requirementJson.get("value") != null) requirement.required_value = JSONElement.getInteger(Integer.parseInt(requirementJson.get("value").toString()));
-						if (requirementJson.get("negate") != null) requirement.negated = (Boolean) requirementJson.get("negate");
-						requirement.state = State.parsed;
-						reply.requirements.add(requirement);
-					}
-				}
-				this.replies.add(reply);
-			}
-		}
-		List rewardsJson = (List) dialogueJson.get("rewards");
-		if (rewardsJson != null && !rewardsJson.isEmpty()) {
-			this.rewards = new ArrayList<Dialogue.Reward>();
-			for (Object rewardJsonObj : rewardsJson) {
-				Map rewardJson = (Map)rewardJsonObj;
-				Reward reward = new Reward();
-				if (rewardJson.get("rewardType") != null) reward.type = Reward.RewardType.valueOf((String) rewardJson.get("rewardType"));
-				if (rewardJson.get("rewardID") != null) reward.reward_obj_id = (String) rewardJson.get("rewardID");
-				if (rewardJson.get("value") != null) reward.reward_value = JSONElement.getInteger((Number) rewardJson.get("value"));
-				if (rewardJson.get("mapName") != null) reward.map_name = (String) rewardJson.get("mapName");
-				this.rewards.add(reward);
-			}
-		}
-		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.
-			return;
-		}
-		Project proj = getProject();
-		if (proj == null) {
-			Notification.addError("Error linking dialogue "+id+". No parent project found.");
-			return;
-		}
-		if (this.switch_to_npc_id != null) this.switch_to_npc = proj.getNPC(this.switch_to_npc_id);
-		if (this.switch_to_npc != null) this.switch_to_npc.addBacklink(this);
-		
-		if (replies != null) {
-			for (Reply reply : replies) {
-				if (reply.next_phrase_id != null) {
-					if (!Reply.KEY_PHRASE_ID.contains(reply.next_phrase_id)) {
-						reply.next_phrase = proj.getDialogue(reply.next_phrase_id);
-					}
-				}
-				if (reply.next_phrase != null) reply.next_phrase.addBacklink(this);
-				if (reply.requirements != null) {
-					for (Requirement requirement : reply.requirements) {
-						requirement.link();
-					}
-				}
-			}
-		}
-		if (rewards != null) {
-			for (Reward reward : rewards) {
-				if (reward.reward_obj_id != null) {
-					switch (reward.type) {
-					case activateMapObjectGroup:
-					case deactivateMapObjectGroup:
-					case spawnAll:
-					case removeSpawnArea:
-					case deactivateSpawnArea:
-					case changeMapFilter:
-						reward.map = reward.map_name != null ? proj.getMap(reward.map_name) : null;
-						break;
-					case actorCondition:
-					case actorConditionImmunity:
-						reward.reward_obj = proj.getActorCondition(reward.reward_obj_id);
-						break;
-					case alignmentChange:
-					case alignmentSet:
-							//Nothing to do (yet ?).
-						break;
-					case createTimer:
-						//Nothing to do.
-						break;
-					case dropList:
-						reward.reward_obj = proj.getDroplist(reward.reward_obj_id);
-						break;
-					case giveItem:
-						reward.reward_obj = proj.getItem(reward.reward_obj_id);
-						break;
-					case questProgress:
-					case removeQuestProgress:
-						reward.reward_obj = proj.getQuest(reward.reward_obj_id);
-						if (reward.reward_obj != null && reward.reward_value != null) {
-							QuestStage stage = ((Quest)reward.reward_obj).getStage(reward.reward_value);
-							if (stage != null) {
-								stage.addBacklink(this);
-							}
-						}
-						break;
-					case skillIncrease:
-						//Nothing to do (yet ?).
-						break;
-					}
-					if (reward.reward_obj != null) reward.reward_obj.addBacklink(this);
-					if (reward.map != null) reward.map.addBacklink(this);
-				}
-			}
-		}
-		
-		this.state = State.linked;
-	}
-	
-
-
-	@Override
-	public Image getIcon() {
-		return DefaultIcons.getDialogueIcon();
-	}
-	
-
-	public Image getImage() {
-		return DefaultIcons.getDialogueImage();
-	}
-	
-	@Override
-	public GameDataElement clone() {
-		Dialogue clone = new Dialogue();
-		clone.jsonFile = this.jsonFile;
-		clone.state = this.state;
-		clone.id = this.id;
-		clone.message = this.message;
-		clone.switch_to_npc_id = this.switch_to_npc_id;
-		clone.switch_to_npc = this.switch_to_npc;
-		if (clone.switch_to_npc != null) {
-			clone.switch_to_npc.addBacklink(clone);
-		}
-		if (this.rewards != null) {
-			clone.rewards = new ArrayList<Dialogue.Reward>();
-			for (Reward r : this.rewards) {
-				Reward rclone = new Reward();
-				rclone.type = r.type;
-				rclone.reward_obj_id = r.reward_obj_id;
-				rclone.reward_value = r.reward_value;
-				rclone.reward_obj = r.reward_obj;
-				if (rclone.reward_obj != null) {
-					rclone.reward_obj.addBacklink(clone);
-				}
-				rclone.map = r.map;
-				rclone.map_name = r.map_name;
-				if (rclone.map != null) {
-					rclone.map.addBacklink(clone);
-				}
-				clone.rewards.add(rclone);
-			}
-		}
-		if (this.replies != null) {
-			clone.replies = new ArrayList<Dialogue.Reply>();
-			for (Reply r : this.replies) {
-				Reply rclone = new Reply();
-				rclone.text = r.text;
-				rclone.next_phrase_id = r.next_phrase_id;
-				rclone.next_phrase = r.next_phrase;
-				if (rclone.next_phrase != null) {
-					rclone.next_phrase.addBacklink(clone);
-				}
-				if (r.requirements != null) {
-					rclone.requirements = new ArrayList<Requirement>();
-					for (Requirement req : r.requirements) {
-						//Special clone method, as Requirement is a special GDE, hidden from the project tree.
-						rclone.requirements.add((Requirement) req.clone(clone));
-					}
-				}
-				clone.replies.add(rclone);
-			}
-		}
-		return clone;
-	}
-	
-	@Override
-	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-		if (switch_to_npc == oldOne) {
-			oldOne.removeBacklink(this);
-			switch_to_npc = (NPC) newOne;
-			if (newOne != null) newOne.addBacklink(this);
-		} else {
-			if (replies != null) {
-				for (Reply r : replies) {
-					if (r.next_phrase == oldOne) {
-						oldOne.removeBacklink(this);
-						r.next_phrase = (Dialogue) newOne;
-						if (newOne != null) newOne.addBacklink(this);
-					}
-					if (r.requirements != null) {
-						for (Requirement req : r.requirements) {
-							req.elementChanged(oldOne, newOne);
-						}
-					}
-				}
-			}
-			if (rewards != null) {
-				for (Reward r : rewards) {
-					if (r.reward_obj == oldOne) {
-						oldOne.removeBacklink(this);
-						r.reward_obj = newOne;
-						if (newOne != null) newOne.addBacklink(this);
-					}
-					if (oldOne instanceof QuestStage) {
-						if (r.reward_obj != null && r.reward_obj.equals(oldOne.parent) && r.reward_value != null && r.reward_value.equals(((QuestStage) oldOne).progress)) {
-							oldOne.removeBacklink((GameDataElement) this);
-							if (newOne != null) newOne.addBacklink((GameDataElement) this);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public Map toJson() {
-		Map dialogueJson = new LinkedHashMap();
-		dialogueJson.put("id", this.id);
-		if (this.message != null) dialogueJson.put("message", this.message);
-		if (this.switch_to_npc != null) {
-			dialogueJson.put("switchToNPC", this.switch_to_npc.id);
-		} else if (this.switch_to_npc_id != null) {
-			dialogueJson.put("switchToNPC", this.switch_to_npc_id);
-		}
-		if (this.replies != null) {
-			List repliesJson = new ArrayList();
-			dialogueJson.put("replies", repliesJson);
-			for (Reply reply : this.replies){
-				Map replyJson = new LinkedHashMap();
-				repliesJson.add(replyJson);
-				if (reply.text != null) replyJson.put("text", reply.text);
-				if (reply.next_phrase != null) {
-					replyJson.put("nextPhraseID", reply.next_phrase.id);
-				} else if (reply.next_phrase_id != null) {
-					replyJson.put("nextPhraseID", reply.next_phrase_id);
-				}
-				if (reply.requirements != null) {
-					List requirementsJson = new ArrayList();
-					replyJson.put("requires", requirementsJson);
-					for (Requirement requirement : reply.requirements) {
-						Map requirementJson = new LinkedHashMap();
-						requirementsJson.add(requirementJson);
-						if (requirement.type != null) requirementJson.put("requireType", requirement.type.toString());
-						if (requirement.required_obj != null) {
-							requirementJson.put("requireID", requirement.required_obj.id);
-						} else if (requirement.required_obj_id != null) {
-							requirementJson.put("requireID", requirement.required_obj_id);
-						}
-						if (requirement.required_value != null) {
-							requirementJson.put("value", requirement.required_value);
-						}
-						if (requirement.negated != null) requirementJson.put("negate", requirement.negated);
-					}
-				}
-			}
-		}
-		if (this.rewards != null) {
-			List rewardsJson = new ArrayList();
-			dialogueJson.put("rewards", rewardsJson);
-			for (Reward reward : this.rewards) {
-				Map rewardJson = new LinkedHashMap();
-				rewardsJson.add(rewardJson);
-				if (reward.type != null) rewardJson.put("rewardType", reward.type.toString());
-				if (reward.reward_obj != null) {
-					rewardJson.put("rewardID", reward.reward_obj.id);
-				} else if (reward.reward_obj_id != null) {
-					rewardJson.put("rewardID", reward.reward_obj_id);
-				}
-				if (reward.reward_value != null) rewardJson.put("value", reward.reward_value);
-				if (reward.map != null) {
-					rewardJson.put("mapName", reward.map.id);
-				} else if (reward.map_name != null) rewardJson.put("mapName", reward.map_name);
-			}
-		}
-		return dialogueJson;
-	}
-
-	@Override
-	public String getProjectFilename() {
-		return "conversationlist_"+getProject().name+".json";
-	}
-	
-}
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement.RequirementType;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+
+public class Dialogue extends JSONElement {
+
+	private static final long serialVersionUID = -6872164604703134683L;
+
+
+	//Available from init state
+	//public String id = null; inherited.
+	public String message = null;
+
+	//Available from parsed state;
+	public List<Reward> rewards = null;
+	public List<Reply> replies = null;
+	public String switch_to_npc_id = null;
+
+	//Available from linked state;
+	public NPC switch_to_npc = null;
+
+	public static class Reward {
+
+		//Available from parsed state
+		public RewardType type = null;
+		public String reward_obj_id = null;
+		public Integer reward_value = null;
+		public String map_name = null;
+
+		//Available from linked state
+		public GameDataElement reward_obj = null;
+		public TMXMap map = null;
+
+		public enum RewardType {
+			questProgress,
+			removeQuestProgress,
+			dropList,
+			skillIncrease,
+			actorCondition,
+			actorConditionImmunity,
+			alignmentChange,
+			alignmentSet,
+			giveItem,
+			createTimer,
+			spawnAll,
+			removeSpawnArea,
+			deactivateSpawnArea,
+			activateMapObjectGroup,
+			deactivateMapObjectGroup,
+			changeMapFilter,
+			mapchange
+		}
+	}
+
+	public static class Reply {
+
+		public static final String GO_NEXT_TEXT = "N";
+		public static final String SHOP_PHRASE_ID = "S";
+		public static final String FIGHT_PHRASE_ID = "F";
+		public static final String EXIT_PHRASE_ID = "X";
+		public static final String REMOVE_PHRASE_ID = "R";
+
+		public static final List<String> KEY_PHRASE_ID = Arrays.asList(new String[]{SHOP_PHRASE_ID, FIGHT_PHRASE_ID, EXIT_PHRASE_ID, REMOVE_PHRASE_ID});
+
+		//Available from parsed state
+		public String text = null;
+		public String next_phrase_id = null;
+		public List<Requirement> requirements = null;
+
+		//Available from linked state
+		public Dialogue next_phrase = null;
+
+	}
+
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+id;
+	}
+
+	public static String getStaticDesc() {
+		return "Dialogues";
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static void fromJson(File jsonFile, GameDataCategory<Dialogue> category) {
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(jsonFile);
+			List dialogues = (List) parser.parse(reader);
+			for (Object obj : dialogues) {
+				Map dialogueJson = (Map)obj;
+				Dialogue dialogue = fromJson(dialogueJson);
+				dialogue.jsonFile = jsonFile;
+				dialogue.parent = category;
+				if (dialogue.getDataType() == GameSource.Type.created || dialogue.getDataType() == GameSource.Type.altered) {
+					dialogue.writable = true;
+				}
+				category.add(dialogue);
+			}
+		} catch (FileNotFoundException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (IOException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (ParseException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} finally {
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Dialogue fromJson(String jsonString) throws ParseException {
+		Map dialogueJson = (Map) new JSONParser().parse(jsonString);
+		Dialogue dialogue = fromJson(dialogueJson);
+		dialogue.parse(dialogueJson);
+		return dialogue;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Dialogue fromJson(Map dialogueJson) {
+		Dialogue dialogue = new Dialogue();
+		dialogue.id = (String) dialogueJson.get("id");
+		dialogue.message = (String) dialogueJson.get("message");
+		return dialogue;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public void parse(Map dialogueJson) {
+		this.switch_to_npc_id = (String) dialogueJson.get("switchToNPC");
+		List repliesJson = (List) dialogueJson.get("replies");
+		if (repliesJson != null && !repliesJson.isEmpty()) {
+			this.replies = new ArrayList<Dialogue.Reply>();
+			for (Object replyJsonObj : repliesJson) {
+				Map replyJson = (Map)replyJsonObj;
+				Reply reply = new Reply();
+				reply.text = (String) replyJson.get("text");
+				reply.next_phrase_id = (String) replyJson.get("nextPhraseID");
+				List requirementsJson = (List) replyJson.get("requires");
+				if (requirementsJson != null && !requirementsJson.isEmpty()) {
+					reply.requirements = new ArrayList<Requirement>();
+					for (Object requirementJsonObj : requirementsJson) {
+						Map requirementJson = (Map) requirementJsonObj;
+						Requirement requirement = new Requirement();
+						requirement.jsonFile = this.jsonFile;
+						requirement.parent = this;
+						if (requirementJson.get("requireType") != null) requirement.type = RequirementType.valueOf((String) requirementJson.get("requireType"));
+						requirement.required_obj_id = (String) requirementJson.get("requireID");
+						if (requirementJson.get("value") != null) requirement.required_value = JSONElement.getInteger(Integer.parseInt(requirementJson.get("value").toString()));
+						if (requirementJson.get("negate") != null) requirement.negated = (Boolean) requirementJson.get("negate");
+						requirement.state = State.parsed;
+						reply.requirements.add(requirement);
+					}
+				}
+				this.replies.add(reply);
+			}
+		}
+		List rewardsJson = (List) dialogueJson.get("rewards");
+		if (rewardsJson != null && !rewardsJson.isEmpty()) {
+			this.rewards = new ArrayList<Dialogue.Reward>();
+			for (Object rewardJsonObj : rewardsJson) {
+				Map rewardJson = (Map)rewardJsonObj;
+				Reward reward = new Reward();
+				if (rewardJson.get("rewardType") != null) reward.type = Reward.RewardType.valueOf((String) rewardJson.get("rewardType"));
+				if (rewardJson.get("rewardID") != null) reward.reward_obj_id = (String) rewardJson.get("rewardID");
+				if (rewardJson.get("value") != null) reward.reward_value = JSONElement.getInteger((Number) rewardJson.get("value"));
+				if (rewardJson.get("mapName") != null) reward.map_name = (String) rewardJson.get("mapName");
+				this.rewards.add(reward);
+			}
+		}
+		this.state = State.parsed;
+	}
+
+
+
+
+	@Override
+	public void link() {
+		if (shouldSkipParseOrLink()) {
+			return;
+		}
+		ensureParseIfNeeded();
+		Project proj = getProject();
+		if (proj == null) {
+			Notification.addError("Error linking dialogue "+id+". No parent project found.");
+			return;
+		}
+		if (this.switch_to_npc_id != null) this.switch_to_npc = proj.getNPC(this.switch_to_npc_id);
+		if (this.switch_to_npc != null) this.switch_to_npc.addBacklink(this);
+
+		if (replies != null) {
+			for (Reply reply : replies) {
+				if (reply.next_phrase_id != null) {
+					if (!Reply.KEY_PHRASE_ID.contains(reply.next_phrase_id)) {
+						reply.next_phrase = proj.getDialogue(reply.next_phrase_id);
+					}
+				}
+				if (reply.next_phrase != null) reply.next_phrase.addBacklink(this);
+				if (reply.requirements != null) {
+					for (Requirement requirement : reply.requirements) {
+						requirement.link();
+					}
+				}
+			}
+		}
+		if (rewards != null) {
+			for (Reward reward : rewards) {
+				if (reward.reward_obj_id != null) {
+					switch (reward.type) {
+					case activateMapObjectGroup:
+					case deactivateMapObjectGroup:
+					case spawnAll:
+					case removeSpawnArea:
+					case deactivateSpawnArea:
+					case changeMapFilter:
+					case mapchange:
+						reward.map = reward.map_name != null ? proj.getMap(reward.map_name) : null;
+						break;
+					case actorCondition:
+					case actorConditionImmunity:
+						reward.reward_obj = proj.getActorCondition(reward.reward_obj_id);
+						break;
+					case alignmentChange:
+					case alignmentSet:
+							//Nothing to do (yet ?).
+						break;
+					case createTimer:
+						//Nothing to do.
+						break;
+					case dropList:
+						reward.reward_obj = proj.getDroplist(reward.reward_obj_id);
+						break;
+					case giveItem:
+						reward.reward_obj = proj.getItem(reward.reward_obj_id);
+						break;
+					case questProgress:
+					case removeQuestProgress:
+						reward.reward_obj = proj.getQuest(reward.reward_obj_id);
+						if (reward.reward_obj != null && reward.reward_value != null) {
+							QuestStage stage = ((Quest)reward.reward_obj).getStage(reward.reward_value);
+							if (stage != null) {
+								stage.addBacklink(this);
+							}
+						}
+						break;
+					case skillIncrease:
+						//Nothing to do (yet ?).
+						break;
+					}
+					if (reward.reward_obj != null) reward.reward_obj.addBacklink(this);
+					if (reward.map != null) reward.map.addBacklink(this);
+				}
+			}
+		}
+
+		this.state = State.linked;
+	}
+
+
+
+	@Override
+	public Image getIcon() {
+		return DefaultIcons.getDialogueIcon();
+	}
+
+
+	public Image getImage() {
+		return DefaultIcons.getDialogueImage();
+	}
+
+	@Override
+	public GameDataElement clone() {
+		Dialogue clone = new Dialogue();
+		clone.jsonFile = this.jsonFile;
+		clone.state = this.state;
+		clone.id = this.id;
+		clone.message = this.message;
+		clone.switch_to_npc_id = this.switch_to_npc_id;
+		clone.switch_to_npc = this.switch_to_npc;
+		if (clone.switch_to_npc != null) {
+			clone.switch_to_npc.addBacklink(clone);
+		}
+		if (this.rewards != null) {
+			clone.rewards = new ArrayList<Dialogue.Reward>();
+			for (Reward r : this.rewards) {
+				Reward rclone = new Reward();
+				rclone.type = r.type;
+				rclone.reward_obj_id = r.reward_obj_id;
+				rclone.reward_value = r.reward_value;
+				rclone.reward_obj = r.reward_obj;
+				if (rclone.reward_obj != null) {
+					rclone.reward_obj.addBacklink(clone);
+				}
+				rclone.map = r.map;
+				rclone.map_name = r.map_name;
+				if (rclone.map != null) {
+					rclone.map.addBacklink(clone);
+				}
+				clone.rewards.add(rclone);
+			}
+		}
+		if (this.replies != null) {
+			clone.replies = new ArrayList<Dialogue.Reply>();
+			for (Reply r : this.replies) {
+				Reply rclone = new Reply();
+				rclone.text = r.text;
+				rclone.next_phrase_id = r.next_phrase_id;
+				rclone.next_phrase = r.next_phrase;
+				if (rclone.next_phrase != null) {
+					rclone.next_phrase.addBacklink(clone);
+				}
+				if (r.requirements != null) {
+					rclone.requirements = new ArrayList<Requirement>();
+					for (Requirement req : r.requirements) {
+						//Special clone method, as Requirement is a special GDE, hidden from the project tree.
+						rclone.requirements.add((Requirement) req.clone(clone));
+					}
+				}
+				clone.replies.add(rclone);
+			}
+		}
+		return clone;
+	}
+
+	@Override
+	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		if (switch_to_npc == oldOne) {
+			oldOne.removeBacklink(this);
+			switch_to_npc = (NPC) newOne;
+			if (newOne != null) newOne.addBacklink(this);
+		} else {
+			if (replies != null) {
+				for (Reply r : replies) {
+					if (r.next_phrase == oldOne) {
+						oldOne.removeBacklink(this);
+						r.next_phrase = (Dialogue) newOne;
+						if (newOne != null) newOne.addBacklink(this);
+					}
+					if (r.requirements != null) {
+						for (Requirement req : r.requirements) {
+							req.elementChanged(oldOne, newOne);
+						}
+					}
+				}
+			}
+			if (rewards != null) {
+				for (Reward r : rewards) {
+					if (r.reward_obj == oldOne) {
+						oldOne.removeBacklink(this);
+						r.reward_obj = newOne;
+						if (newOne != null) newOne.addBacklink(this);
+					}
+					if (oldOne instanceof QuestStage) {
+						if (r.reward_obj != null && r.reward_obj.equals(oldOne.parent) && r.reward_value != null && r.reward_value.equals(((QuestStage) oldOne).progress)) {
+							oldOne.removeBacklink((GameDataElement) this);
+							if (newOne != null) newOne.addBacklink((GameDataElement) this);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public Map toJson() {
+		Map dialogueJson = new LinkedHashMap();
+		dialogueJson.put("id", this.id);
+		if (this.message != null) dialogueJson.put("message", this.message);
+		if (this.switch_to_npc != null) {
+			dialogueJson.put("switchToNPC", this.switch_to_npc.id);
+		} else if (this.switch_to_npc_id != null) {
+			dialogueJson.put("switchToNPC", this.switch_to_npc_id);
+		}
+		if (this.replies != null) {
+			List repliesJson = new ArrayList();
+			dialogueJson.put("replies", repliesJson);
+			for (Reply reply : this.replies){
+				Map replyJson = new LinkedHashMap();
+				repliesJson.add(replyJson);
+				if (reply.text != null) replyJson.put("text", reply.text);
+				if (reply.next_phrase != null) {
+					replyJson.put("nextPhraseID", reply.next_phrase.id);
+				} else if (reply.next_phrase_id != null) {
+					replyJson.put("nextPhraseID", reply.next_phrase_id);
+				}
+				if (reply.requirements != null) {
+					List requirementsJson = new ArrayList();
+					replyJson.put("requires", requirementsJson);
+					for (Requirement requirement : reply.requirements) {
+						Map requirementJson = new LinkedHashMap();
+						requirementsJson.add(requirementJson);
+						if (requirement.type != null) requirementJson.put("requireType", requirement.type.toString());
+						if (requirement.required_obj != null) {
+							requirementJson.put("requireID", requirement.required_obj.id);
+						} else if (requirement.required_obj_id != null) {
+							requirementJson.put("requireID", requirement.required_obj_id);
+						}
+						if (requirement.required_value != null) {
+							requirementJson.put("value", requirement.required_value);
+						}
+						if (requirement.negated != null) requirementJson.put("negate", requirement.negated);
+					}
+				}
+			}
+		}
+		if (this.rewards != null) {
+			List rewardsJson = new ArrayList();
+			dialogueJson.put("rewards", rewardsJson);
+			for (Reward reward : this.rewards) {
+				Map rewardJson = new LinkedHashMap();
+				rewardsJson.add(rewardJson);
+				if (reward.type != null) rewardJson.put("rewardType", reward.type.toString());
+				if (reward.reward_obj != null) {
+					rewardJson.put("rewardID", reward.reward_obj.id);
+				} else if (reward.reward_obj_id != null) {
+					rewardJson.put("rewardID", reward.reward_obj_id);
+				}
+				if (reward.reward_value != null) rewardJson.put("value", reward.reward_value);
+				if (reward.map != null) {
+					rewardJson.put("mapName", reward.map.id);
+				} else if (reward.map_name != null) rewardJson.put("mapName", reward.map_name);
+			}
+		}
+		return dialogueJson;
+	}
+
+	@Override
+	public String getProjectFilename() {
+		return "conversationlist_"+getProject().name+".json";
+	}
+
+}

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

@@ -1,242 +1,235 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import java.awt.Image;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-
-public class Droplist extends JSONElement {
-
-	private static final long serialVersionUID = -2903944916807382571L;
-	
-	//Available from init state
-	//public String id = null; inherited.
-
-	//Available from parsed state;
-	public List<DroppedItem> dropped_items = null;
-	
-	//Available from linked state;
-	//None
-	
-	public static class DroppedItem {
-		//Available from parsed state;
-		public String item_id = null;
-		public String chance = null;
-		public Integer quantity_min = null;
-		public Integer quantity_max = null;
-		
-		//Available from linked state;
-		public Item item = null;
-	}
-	
-	@Override
-	public String getDesc() {
-		return (needsSaving() ? "*" : "")+id;
-	}
-
-	public static String getStaticDesc() {
-		return "Droplists";
-	}
-
-	@SuppressWarnings("rawtypes")
-	public static void fromJson(File jsonFile, GameDataCategory<Droplist> category) {
-		JSONParser parser = new JSONParser();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(jsonFile);
-			List droplists = (List) parser.parse(reader);
-			for (Object obj : droplists) {
-				Map droplistJson = (Map)obj;
-				Droplist droplist = fromJson(droplistJson);
-				droplist.jsonFile = jsonFile;
-				droplist.parent = category;
-				if (droplist.getDataType() == GameSource.Type.created || droplist.getDataType() == GameSource.Type.altered) {
-					droplist.writable = true;
-				}
-				category.add(droplist);
-			}
-		} catch (FileNotFoundException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (ParseException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} finally {
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static Droplist fromJson(String jsonString) throws ParseException {
-		Map droplistJson = (Map) new JSONParser().parse(jsonString);
-		Droplist droplist = fromJson(droplistJson);
-		droplist.parse(droplistJson);
-		return droplist;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static Droplist fromJson(Map droplistJson) {
-		Droplist droplist = new Droplist();
-		droplist.id = (String) droplistJson.get("id");
-		return droplist;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	@Override
-	public void parse(Map droplistJson) {
-		List droppedItemsJson = (List) droplistJson.get("items");
-		if (droppedItemsJson != null && !droppedItemsJson.isEmpty()) {
-			this.dropped_items = new ArrayList<DroppedItem>();
-			for (Object droppedItemJsonObj : droppedItemsJson) {
-				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());
-				droppedItem.chance = (String) droppedItemJson.get("chance");
-				Map droppedItemQtyJson = (Map) droppedItemJson.get("quantity");
-				if (droppedItemQtyJson != null) {
-					droppedItem.quantity_min = JSONElement.getInteger((Number) droppedItemQtyJson.get("min"));
-					droppedItem.quantity_max = JSONElement.getInteger((Number) droppedItemQtyJson.get("max"));
-				}
-				this.dropped_items.add(droppedItem);
-			}
-		}
-		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.
-			return;
-		}
-		Project proj = getProject();
-		if (proj == null) {
-			Notification.addError("Error linking droplist "+id+". No parent project found.");
-			return;
-		}
-		if (dropped_items != null) {
-			for (DroppedItem droppedItem : dropped_items) {
-				if (droppedItem.item_id != null) droppedItem.item = proj.getItem(droppedItem.item_id);
-				if (droppedItem.item != null) droppedItem.item.addBacklink(this);
-			}
-		}
-		this.state = State.linked;
-	}
-	
-
-
-	public static Image getImage() {
-		return DefaultIcons.getDroplistImage();
-	}
-	
-	@Override
-	public Image getIcon() {
-		return DefaultIcons.getDroplistIcon();
-	}
-	
-	@Override
-	public GameDataElement clone() {
-		Droplist clone = new Droplist();
-		clone.jsonFile = this.jsonFile;
-		clone.state = this.state;
-		clone.id = this.id;
-		if (this.dropped_items != null) {
-			clone.dropped_items = new ArrayList<Droplist.DroppedItem>();
-			for (DroppedItem di : this.dropped_items) {
-				DroppedItem diclone = new DroppedItem();
-				diclone.chance = di.chance;
-				diclone.item_id = di.item_id;
-				diclone.quantity_min = di.quantity_min;
-				diclone.quantity_max = di.quantity_max;
-				diclone.item = di.item;
-				if (diclone.item != null) {
-					diclone.item.addBacklink(clone);
-				}
-				clone.dropped_items.add(diclone);
-			}
-		}
-		return clone;
-	}
-	
-	@Override
-	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-		if (dropped_items != null) {
-			for (DroppedItem di : dropped_items) {
-				if (di.item == oldOne) {
-					oldOne.removeBacklink(this);
-					di.item = (Item) newOne;
-					if (newOne != null) newOne.addBacklink(this);
-				}
-			}
-		}
-	}
-	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public Map toJson() {
-		Map droplistJson = new LinkedHashMap();
-		droplistJson.put("id", this.id);
-		if (this.dropped_items != null) {
-			List droppedItemsJson = new ArrayList();
-			droplistJson.put("items", droppedItemsJson);
-			for (DroppedItem droppedItem : this.dropped_items) {
-				Map droppedItemJson = new LinkedHashMap();
-				droppedItemsJson.add(droppedItemJson);
-				if (droppedItem.item != null) {
-					droppedItemJson.put("itemID", droppedItem.item.id);
-				} 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", droppedItem.chance);
-				if (droppedItem.quantity_min != null || droppedItem.quantity_max != null) {
-					Map quantityJson = new LinkedHashMap();
-					droppedItemJson.put("quantity", quantityJson);
-					if (droppedItem.quantity_min != null) quantityJson.put("min", droppedItem.quantity_min);
-					else quantityJson.put("min", 0);
-					if (droppedItem.quantity_max != null) quantityJson.put("max", droppedItem.quantity_max);
-					else quantityJson.put("max", 0);
-				}
-			}
-		}
-		return droplistJson;
-	}
-	
-
-	@Override
-	public String getProjectFilename() {
-		return "droplists_"+getProject().name+".json";
-	}
-	
-}
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+
+public class Droplist extends JSONElement {
+
+	private static final long serialVersionUID = -2903944916807382571L;
+
+	//Available from init state
+	//public String id = null; inherited.
+
+	//Available from parsed state;
+	public List<DroppedItem> dropped_items = null;
+
+	//Available from linked state;
+	//None
+
+	public static class DroppedItem {
+		//Available from parsed state;
+		public String item_id = null;
+		public String chance = null;
+		public Integer quantity_min = null;
+		public Integer quantity_max = null;
+
+		//Available from linked state;
+		public Item item = null;
+	}
+
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+id;
+	}
+
+	public static String getStaticDesc() {
+		return "Droplists";
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static void fromJson(File jsonFile, GameDataCategory<Droplist> category) {
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(jsonFile);
+			List droplists = (List) parser.parse(reader);
+			for (Object obj : droplists) {
+				Map droplistJson = (Map)obj;
+				Droplist droplist = fromJson(droplistJson);
+				droplist.jsonFile = jsonFile;
+				droplist.parent = category;
+				if (droplist.getDataType() == GameSource.Type.created || droplist.getDataType() == GameSource.Type.altered) {
+					droplist.writable = true;
+				}
+				category.add(droplist);
+			}
+		} catch (FileNotFoundException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (IOException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (ParseException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} finally {
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Droplist fromJson(String jsonString) throws ParseException {
+		Map droplistJson = (Map) new JSONParser().parse(jsonString);
+		Droplist droplist = fromJson(droplistJson);
+		droplist.parse(droplistJson);
+		return droplist;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Droplist fromJson(Map droplistJson) {
+		Droplist droplist = new Droplist();
+		droplist.id = (String) droplistJson.get("id");
+		return droplist;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public void parse(Map droplistJson) {
+		List droppedItemsJson = (List) droplistJson.get("items");
+		if (droppedItemsJson != null && !droppedItemsJson.isEmpty()) {
+			this.dropped_items = new ArrayList<DroppedItem>();
+			for (Object droppedItemJsonObj : droppedItemsJson) {
+				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());
+				droppedItem.chance = (String) droppedItemJson.get("chance");
+				Map droppedItemQtyJson = (Map) droppedItemJson.get("quantity");
+				if (droppedItemQtyJson != null) {
+					droppedItem.quantity_min = JSONElement.getInteger((Number) droppedItemQtyJson.get("min"));
+					droppedItem.quantity_max = JSONElement.getInteger((Number) droppedItemQtyJson.get("max"));
+				}
+				this.dropped_items.add(droppedItem);
+			}
+		}
+		this.state = State.parsed;
+	}
+
+	@Override
+	public void link() {
+		if (shouldSkipParseOrLink()) {
+			return;
+		}
+		ensureParseIfNeeded();
+		Project proj = getProject();
+		if (proj == null) {
+			Notification.addError("Error linking droplist "+id+". No parent project found.");
+			return;
+		}
+		if (dropped_items != null) {
+			for (DroppedItem droppedItem : dropped_items) {
+				if (droppedItem.item_id != null) droppedItem.item = proj.getItem(droppedItem.item_id);
+				if (droppedItem.item != null) droppedItem.item.addBacklink(this);
+			}
+		}
+		this.state = State.linked;
+	}
+
+
+
+	public static Image getImage() {
+		return DefaultIcons.getDroplistImage();
+	}
+
+	@Override
+	public Image getIcon() {
+		return DefaultIcons.getDroplistIcon();
+	}
+
+	@Override
+	public GameDataElement clone() {
+		Droplist clone = new Droplist();
+		clone.jsonFile = this.jsonFile;
+		clone.state = this.state;
+		clone.id = this.id;
+		if (this.dropped_items != null) {
+			clone.dropped_items = new ArrayList<Droplist.DroppedItem>();
+			for (DroppedItem di : this.dropped_items) {
+				DroppedItem diclone = new DroppedItem();
+				diclone.chance = di.chance;
+				diclone.item_id = di.item_id;
+				diclone.quantity_min = di.quantity_min;
+				diclone.quantity_max = di.quantity_max;
+				diclone.item = di.item;
+				if (diclone.item != null) {
+					diclone.item.addBacklink(clone);
+				}
+				clone.dropped_items.add(diclone);
+			}
+		}
+		return clone;
+	}
+
+	@Override
+	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		if (dropped_items != null) {
+			for (DroppedItem di : dropped_items) {
+				if (di.item == oldOne) {
+					oldOne.removeBacklink(this);
+					di.item = (Item) newOne;
+					if (newOne != null) newOne.addBacklink(this);
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public Map toJson() {
+		Map droplistJson = new LinkedHashMap();
+		droplistJson.put("id", this.id);
+		if (this.dropped_items != null) {
+			List droppedItemsJson = new ArrayList();
+			droplistJson.put("items", droppedItemsJson);
+			for (DroppedItem droppedItem : this.dropped_items) {
+				Map droppedItemJson = new LinkedHashMap();
+				droppedItemsJson.add(droppedItemJson);
+				if (droppedItem.item != null) {
+					droppedItemJson.put("itemID", droppedItem.item.id);
+				} 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", droppedItem.chance);
+				if (droppedItem.quantity_min != null || droppedItem.quantity_max != null) {
+					Map quantityJson = new LinkedHashMap();
+					droppedItemJson.put("quantity", quantityJson);
+					if (droppedItem.quantity_min != null) quantityJson.put("min", droppedItem.quantity_min);
+					else quantityJson.put("min", 0);
+					if (droppedItem.quantity_max != null) quantityJson.put("max", droppedItem.quantity_max);
+					else quantityJson.put("max", 0);
+				}
+			}
+		}
+		return droplistJson;
+	}
+
+
+	@Override
+	public String getProjectFilename() {
+		return "droplists_"+getProject().name+".json";
+	}
+
+}

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

@@ -1,329 +1,322 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import java.awt.Image;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.imageio.ImageIO;
-
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-
-public class ItemCategory extends JSONElement {
-
-	private static final long serialVersionUID = -348864002519568300L;
-	
-	public static final String ICON_NO_SLOT_RES = "/com/gpl/rpg/atcontentstudio/img/equip_square.png";
-	public static final String ICON_BODY_RES = "/com/gpl/rpg/atcontentstudio/img/equip_body.png";
-	public static final String ICON_FEET_RES = "/com/gpl/rpg/atcontentstudio/img/equip_feet.png";
-	public static final String ICON_HAND_RES = "/com/gpl/rpg/atcontentstudio/img/equip_hand.png";
-	public static final String ICON_HEAD_RES = "/com/gpl/rpg/atcontentstudio/img/equip_head.png";
-	public static final String ICON_NECK_RES = "/com/gpl/rpg/atcontentstudio/img/equip_neck.png";
-	public static final String ICON_RING_RES = "/com/gpl/rpg/atcontentstudio/img/equip_ring.png";
-	public static final String ICON_SHIELD_RES = "/com/gpl/rpg/atcontentstudio/img/equip_shield.png";
-	public static final String ICON_WEAPON_RES = "/com/gpl/rpg/atcontentstudio/img/equip_weapon.png";
-
-	public static Image no_slot_image = null;
-	public static Image no_slot_icon = null;
-
-	public static Image body_image = null;
-	public static Image body_icon = null;
-
-	public static Image feet_image = null;
-	public static Image feet_icon = null;
-
-	public static Image hand_image = null;
-	public static Image hand_icon = null;
-
-	public static Image head_image = null;
-	public static Image head_icon = null;
-
-	public static Image neck_image = null;
-	public static Image neck_icon = null;
-
-	public static Image ring_image = null;
-	public static Image ring_icon = null;
-
-	public static Image shield_image = null;
-	public static Image shield_icon = null;
-
-	public static Image weapon_image = null;
-	public static Image weapon_icon = null;
-	
-	
-	//Available from init state
-	//public String id = null; inherited.
-	public String name = null;
-	public InventorySlot slot = null;
-	
-	//Available from parsed state
-	public ActionType action_type = null;
-	public Size size = null;
-	
-	//Available from linked state
-	//None
-	
-	public static enum ActionType {
-		none,
-		use,
-		equip
-	}
-	
-	public static enum Size {
-		none,
-		light,
-		std,
-		large
-	}
-	
-	public static enum InventorySlot {
-		weapon,
-		shield,
-	    head,
-	    body,
-	    hand,
-	    feet,
-	    neck, 
-	    leftring,
-	    rightring
-	}
-
-	@Override
-	public String getDesc() {
-		return (needsSaving() ? "*" : "")+name+" ("+id+")";
-	}
-
-	public static String getStaticDesc() {
-		return "Item categories";
-	}
-	
-	
-	@SuppressWarnings("rawtypes")
-	public static void fromJson(File jsonFile, GameDataCategory<ItemCategory> category) {
-		JSONParser parser = new JSONParser();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(jsonFile);
-			List itemCategories = (List) parser.parse(reader);
-			for (Object obj : itemCategories) {
-				Map itemCatJson = (Map)obj;
-				ItemCategory itemCat = fromJson(itemCatJson);
-				itemCat.jsonFile = jsonFile;
-				itemCat.parent = category;
-				if (itemCat.getDataType() == GameSource.Type.created || itemCat.getDataType() == GameSource.Type.altered) {
-					itemCat.writable = true;
-				}
-				category.add(itemCat);
-			}
-		} catch (FileNotFoundException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (ParseException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} finally {
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static ItemCategory fromJson(String jsonString) throws ParseException {
-		Map itemCatJson = (Map) new JSONParser().parse(jsonString);
-		ItemCategory item = fromJson(itemCatJson);
-		item.parse(itemCatJson);
-		return item;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static ItemCategory fromJson(Map itemCatJson) {
-		ItemCategory itemCat = new ItemCategory();
-		itemCat.id = (String) itemCatJson.get("id");
-		itemCat.name = (String) itemCatJson.get("name");
-		if (itemCatJson.get("inventorySlot") != null) itemCat.slot = InventorySlot.valueOf((String) itemCatJson.get("inventorySlot"));
-		return itemCat;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	@Override
-	public void parse(Map itemCatJson) {
-		if (itemCatJson.get("actionType") != null) action_type = ActionType.valueOf((String) itemCatJson.get("actionType"));
-		if (itemCatJson.get("size") != null) size = Size.valueOf((String) itemCatJson.get("size"));
-		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.
-			return;
-		}
-		
-		//Nothing to link to :D
-		this.state = State.linked;
-	}
-	
-	@Override
-	public Image getIcon() {
-		return getIcon(this.slot);
-	}
-	
-	public Image getImage() {
-		return getImage(this.slot);
-	}
-	
-	public static Image getImage(InventorySlot slot) {
-		if (slot == null) {
-			return getImage(ICON_NO_SLOT_RES, no_slot_image, "no_slot_image");
-		}
-		switch (slot) {
-		case body:
-			return getImage(ICON_BODY_RES, body_image, "body_image");
-		case feet:
-			return getImage(ICON_FEET_RES, feet_image, "feet_image");
-		case hand:
-			return getImage(ICON_HAND_RES, hand_image, "hand_image");
-		case head:
-			return getImage(ICON_HEAD_RES, head_image, "head_image");
-		case leftring:
-		case rightring:
-			return getImage(ICON_RING_RES, ring_image, "ring_image");
-		case neck:
-			return getImage(ICON_NECK_RES, neck_image, "neck_image");
-		case shield:
-			return getImage(ICON_SHIELD_RES, shield_image, "shield_image");
-		case weapon:
-			return getImage(ICON_WEAPON_RES, weapon_image, "weapon_image");
-		default:
-			return getImage(ICON_NO_SLOT_RES, no_slot_image, "no_slot_image");
-		}
-	}
-	
-	public static Image getIcon(InventorySlot slot) {
-		if (slot == null) {
-			return getIcon(ICON_NO_SLOT_RES, no_slot_image, no_slot_icon, "no_slot_image", "no_slot_icon");
-		}
-		switch (slot) {
-		case body:
-			return getIcon(ICON_BODY_RES, body_image, body_icon, "body_image", "body_icon");
-		case feet:
-			return getIcon(ICON_FEET_RES, feet_image, feet_icon, "feet_image", "feet_icon");
-		case hand:
-			return getIcon(ICON_HAND_RES, hand_image, hand_icon, "hand_image", "hand_icon");
-		case head:
-			return getIcon(ICON_HEAD_RES, head_image, head_icon, "head_image", "head_icon");
-		case leftring:
-		case rightring:
-			return getIcon(ICON_RING_RES, ring_image, ring_icon, "ring_image", "ring_icon");
-		case neck:
-			return getIcon(ICON_NECK_RES, neck_image, neck_icon, "neck_image", "neck_icon");
-		case shield:
-			return getIcon(ICON_SHIELD_RES, shield_image, shield_icon, "shield_image", "shield_icon");
-		case weapon:
-			return getIcon(ICON_WEAPON_RES, weapon_image, weapon_icon, "weapon_image", "weapon_icon");
-		default:
-			return getIcon(ICON_NO_SLOT_RES, no_slot_image, no_slot_icon, "no_slot_image", "no_slot_icon");
-		}
-	}
-
-	public static Image getImage(String res, Image img, String fieldName) {
-		if (img == null) {
-			try {
-				img = ImageIO.read(ItemCategory.class.getResourceAsStream(res));
-				ItemCategory.class.getField(fieldName).set(null, img);
-			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
-			} catch (SecurityException e) {
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
-			} catch (NoSuchFieldException e) {
-				e.printStackTrace();
-			} catch (IOException e) {
-				Notification.addError("Failed to load item category icon "+res);
-				e.printStackTrace();
-			}
-		}
-		return img;
-	}
-	
-	public static Image getIcon(String res, Image img, Image icon, String imgFieldName, String iconFieldName) {
-		if (icon == null) {
-			icon = getImage(res, img, imgFieldName).getScaledInstance(16, 16, Image.SCALE_SMOOTH);
-			try {
-				ItemCategory.class.getField(iconFieldName).set(null, icon);
-			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
-			} catch (SecurityException e) {
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
-			} catch (NoSuchFieldException e) {
-				e.printStackTrace();
-			}
-		}
-		return icon;
-	}
-	
-	@Override
-	public GameDataElement clone() {
-		ItemCategory clone = new ItemCategory();
-		clone.jsonFile = this.jsonFile;
-		clone.state = this.state;
-		clone.id = this.id;
-		clone.name = this.name;
-		clone.size = this.size;
-		clone.slot = this.slot;
-		clone.action_type = this.action_type;
-		return clone;
-	}
-	
-	@Override
-	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-		// Nothing to link to.
-	}
-	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public Map toJson() {
-		Map itemCatJson = new LinkedHashMap();
-		itemCatJson.put("id", this.id);
-		if (this.name != null) itemCatJson.put("name", this.name);
-		if (this.action_type != null) itemCatJson.put("actionType", this.action_type.toString());
-		if (this.size != null) itemCatJson.put("size", this.size.toString());
-		if (this.slot != null) itemCatJson.put("inventorySlot", this.slot.toString());
-		return itemCatJson;
-	}
-	
-
-	@Override
-	public String getProjectFilename() {
-		return "itemcategories_"+getProject().name+".json";
-	}
-	
-	
-}
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+
+public class ItemCategory extends JSONElement {
+
+	private static final long serialVersionUID = -348864002519568300L;
+
+	public static final String ICON_NO_SLOT_RES = "/com/gpl/rpg/atcontentstudio/img/equip_square.png";
+	public static final String ICON_BODY_RES = "/com/gpl/rpg/atcontentstudio/img/equip_body.png";
+	public static final String ICON_FEET_RES = "/com/gpl/rpg/atcontentstudio/img/equip_feet.png";
+	public static final String ICON_HAND_RES = "/com/gpl/rpg/atcontentstudio/img/equip_hand.png";
+	public static final String ICON_HEAD_RES = "/com/gpl/rpg/atcontentstudio/img/equip_head.png";
+	public static final String ICON_NECK_RES = "/com/gpl/rpg/atcontentstudio/img/equip_neck.png";
+	public static final String ICON_RING_RES = "/com/gpl/rpg/atcontentstudio/img/equip_ring.png";
+	public static final String ICON_SHIELD_RES = "/com/gpl/rpg/atcontentstudio/img/equip_shield.png";
+	public static final String ICON_WEAPON_RES = "/com/gpl/rpg/atcontentstudio/img/equip_weapon.png";
+
+	public static Image no_slot_image = null;
+	public static Image no_slot_icon = null;
+
+	public static Image body_image = null;
+	public static Image body_icon = null;
+
+	public static Image feet_image = null;
+	public static Image feet_icon = null;
+
+	public static Image hand_image = null;
+	public static Image hand_icon = null;
+
+	public static Image head_image = null;
+	public static Image head_icon = null;
+
+	public static Image neck_image = null;
+	public static Image neck_icon = null;
+
+	public static Image ring_image = null;
+	public static Image ring_icon = null;
+
+	public static Image shield_image = null;
+	public static Image shield_icon = null;
+
+	public static Image weapon_image = null;
+	public static Image weapon_icon = null;
+
+
+	//Available from init state
+	//public String id = null; inherited.
+	public String name = null;
+	public InventorySlot slot = null;
+
+	//Available from parsed state
+	public ActionType action_type = null;
+	public Size size = null;
+
+	//Available from linked state
+	//None
+
+	public static enum ActionType {
+		none,
+		use,
+		equip
+	}
+
+	public static enum Size {
+		none,
+		light,
+		std,
+		large
+	}
+
+	public static enum InventorySlot {
+		weapon,
+		shield,
+	    head,
+	    body,
+	    hand,
+	    feet,
+	    neck, 
+	    leftring,
+	    rightring
+	}
+
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+name+" ("+id+")";
+	}
+
+	public static String getStaticDesc() {
+		return "Item categories";
+	}
+
+
+	@SuppressWarnings("rawtypes")
+	public static void fromJson(File jsonFile, GameDataCategory<ItemCategory> category) {
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(jsonFile);
+			List itemCategories = (List) parser.parse(reader);
+			for (Object obj : itemCategories) {
+				Map itemCatJson = (Map)obj;
+				ItemCategory itemCat = fromJson(itemCatJson);
+				itemCat.jsonFile = jsonFile;
+				itemCat.parent = category;
+				if (itemCat.getDataType() == GameSource.Type.created || itemCat.getDataType() == GameSource.Type.altered) {
+					itemCat.writable = true;
+				}
+				category.add(itemCat);
+			}
+		} catch (FileNotFoundException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (IOException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (ParseException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} finally {
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static ItemCategory fromJson(String jsonString) throws ParseException {
+		Map itemCatJson = (Map) new JSONParser().parse(jsonString);
+		ItemCategory item = fromJson(itemCatJson);
+		item.parse(itemCatJson);
+		return item;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static ItemCategory fromJson(Map itemCatJson) {
+		ItemCategory itemCat = new ItemCategory();
+		itemCat.id = (String) itemCatJson.get("id");
+		itemCat.name = (String) itemCatJson.get("name");
+		if (itemCatJson.get("inventorySlot") != null) itemCat.slot = InventorySlot.valueOf((String) itemCatJson.get("inventorySlot"));
+		return itemCat;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public void parse(Map itemCatJson) {
+		if (itemCatJson.get("actionType") != null) action_type = ActionType.valueOf((String) itemCatJson.get("actionType"));
+		if (itemCatJson.get("size") != null) size = Size.valueOf((String) itemCatJson.get("size"));
+		this.state = State.parsed;
+
+	}
+
+	@Override
+	public void link() {
+		if (shouldSkipParseOrLink()) {
+			return;
+		}
+		ensureParseIfNeeded();
+
+		//Nothing to link to :D
+		this.state = State.linked;
+	}
+
+	@Override
+	public Image getIcon() {
+		return getIcon(this.slot);
+	}
+
+	public Image getImage() {
+		return getImage(this.slot);
+	}
+
+	public static Image getImage(InventorySlot slot) {
+		if (slot == null) {
+			return getImage(ICON_NO_SLOT_RES, no_slot_image, "no_slot_image");
+		}
+		switch (slot) {
+		case body:
+			return getImage(ICON_BODY_RES, body_image, "body_image");
+		case feet:
+			return getImage(ICON_FEET_RES, feet_image, "feet_image");
+		case hand:
+			return getImage(ICON_HAND_RES, hand_image, "hand_image");
+		case head:
+			return getImage(ICON_HEAD_RES, head_image, "head_image");
+		case leftring:
+		case rightring:
+			return getImage(ICON_RING_RES, ring_image, "ring_image");
+		case neck:
+			return getImage(ICON_NECK_RES, neck_image, "neck_image");
+		case shield:
+			return getImage(ICON_SHIELD_RES, shield_image, "shield_image");
+		case weapon:
+			return getImage(ICON_WEAPON_RES, weapon_image, "weapon_image");
+		default:
+			return getImage(ICON_NO_SLOT_RES, no_slot_image, "no_slot_image");
+		}
+	}
+
+	public static Image getIcon(InventorySlot slot) {
+		if (slot == null) {
+			return getIcon(ICON_NO_SLOT_RES, no_slot_image, no_slot_icon, "no_slot_image", "no_slot_icon");
+		}
+		switch (slot) {
+		case body:
+			return getIcon(ICON_BODY_RES, body_image, body_icon, "body_image", "body_icon");
+		case feet:
+			return getIcon(ICON_FEET_RES, feet_image, feet_icon, "feet_image", "feet_icon");
+		case hand:
+			return getIcon(ICON_HAND_RES, hand_image, hand_icon, "hand_image", "hand_icon");
+		case head:
+			return getIcon(ICON_HEAD_RES, head_image, head_icon, "head_image", "head_icon");
+		case leftring:
+		case rightring:
+			return getIcon(ICON_RING_RES, ring_image, ring_icon, "ring_image", "ring_icon");
+		case neck:
+			return getIcon(ICON_NECK_RES, neck_image, neck_icon, "neck_image", "neck_icon");
+		case shield:
+			return getIcon(ICON_SHIELD_RES, shield_image, shield_icon, "shield_image", "shield_icon");
+		case weapon:
+			return getIcon(ICON_WEAPON_RES, weapon_image, weapon_icon, "weapon_image", "weapon_icon");
+		default:
+			return getIcon(ICON_NO_SLOT_RES, no_slot_image, no_slot_icon, "no_slot_image", "no_slot_icon");
+		}
+	}
+
+	public static Image getImage(String res, Image img, String fieldName) {
+		if (img == null) {
+			try {
+				img = ImageIO.read(ItemCategory.class.getResourceAsStream(res));
+				ItemCategory.class.getField(fieldName).set(null, img);
+			} catch (IllegalArgumentException e) {
+				e.printStackTrace();
+			} catch (SecurityException e) {
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			} catch (NoSuchFieldException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				Notification.addError("Failed to load item category icon "+res);
+				e.printStackTrace();
+			}
+		}
+		return img;
+	}
+
+	public static Image getIcon(String res, Image img, Image icon, String imgFieldName, String iconFieldName) {
+		if (icon == null) {
+			icon = getImage(res, img, imgFieldName).getScaledInstance(16, 16, Image.SCALE_SMOOTH);
+			try {
+				ItemCategory.class.getField(iconFieldName).set(null, icon);
+			} catch (IllegalArgumentException e) {
+				e.printStackTrace();
+			} catch (SecurityException e) {
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			} catch (NoSuchFieldException e) {
+				e.printStackTrace();
+			}
+		}
+		return icon;
+	}
+
+	@Override
+	public GameDataElement clone() {
+		ItemCategory clone = new ItemCategory();
+		clone.jsonFile = this.jsonFile;
+		clone.state = this.state;
+		clone.id = this.id;
+		clone.name = this.name;
+		clone.size = this.size;
+		clone.slot = this.slot;
+		clone.action_type = this.action_type;
+		return clone;
+	}
+
+	@Override
+	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		// Nothing to link to.
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public Map toJson() {
+		Map itemCatJson = new LinkedHashMap();
+		itemCatJson.put("id", this.id);
+		if (this.name != null) itemCatJson.put("name", this.name);
+		if (this.action_type != null) itemCatJson.put("actionType", this.action_type.toString());
+		if (this.size != null) itemCatJson.put("size", this.size.toString());
+		if (this.slot != null) itemCatJson.put("inventorySlot", this.slot.toString());
+		return itemCatJson;
+	}
+
+
+	@Override
+	public String getProjectFilename() {
+		return "itemcategories_"+getProject().name+".json";
+	}
+
+
+}

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

@@ -1,170 +1,179 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.SaveEvent;
-
-public abstract class JSONElement extends GameDataElement {
-
-	private static final long serialVersionUID = -8015398814080503982L;
-
-	//Available from state init.
-	public File jsonFile;
-	
-	@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.
-			return;
-		}
-		JSONParser parser = new JSONParser();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(jsonFile);
-			List gameDataElements = (List) parser.parse(reader);
-			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;
-				}
-			}
-		} catch (FileNotFoundException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (ParseException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} finally {
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-	
-	}
-	
-	public abstract void parse(@SuppressWarnings("rawtypes") Map jsonObj);
-	
-	@SuppressWarnings("rawtypes")
-	public abstract Map toJson();
-	public String toJsonString() {
-		StringWriter writer = new JsonPrettyWriter();
-		try {
-			JSONObject.writeJSONString(this.toJson(), writer);
-		} catch (IOException e) {
-			//Impossible with a StringWriter
-		}
-		return writer.toString();
-	}
-	
-	
-	@Override
-	public GameDataSet getDataSet() {
-		if (parent == null) {
-			System.out.println("blerf.");
-		}
-		return parent.getDataSet();
-	}
-	
-	public void save() {
-		if (this.getParent() instanceof GameDataCategory<?> && writable) {
-			((GameDataCategory<?>)this.getParent()).save(this.jsonFile);
-		}
-	}
-	
-	/**
-	 * Returns null if save occurred (no notable events).
-	 */
-	public List<SaveEvent> attemptSave() {
-		List<SaveEvent> events = ((GameDataCategory<?>)this.getParent()).attemptSave(true, this.jsonFile.getName());
-		if (events == null || events.isEmpty()) {
-			return null;
-		}
-		if (events.size() == 1 && events.get(0).type == SaveEvent.Type.alsoSave && events.get(0).target == this) {
-			save();
-			return null;
-		}
-		return events;
-	}
-
-	public static Integer getInteger(Number n) {
-		return n == null ? null : n.intValue();
-	}
-
-	public static Double getDouble(Number n) {
-		return n == null ? null : n.doubleValue();
-	}
-	
-	public static Double parseChance(String s) {
-		if (s.equals("100")) return 100d;
-        else if (s.equals("70")) return 70d;
-        else if (s.equals("30")) return 30d;
-        else if (s.equals("25")) return 25d;
-        else if (s.equals("20")) return 20d;
-        else if (s.equals("10")) return 10d;
-        else if (s.equals("5")) return 5d;
-        else if (s.equals("1")) return 1d;
-        else if (s.equals("1/1000")) return 0.1;
-        else if (s.equals("1/10000")) return 0.01;
-        else if (s.indexOf('/') >= 0) {
-                int c = s.indexOf('/');
-                double a = 1;
-                try {
-                	a = Integer.parseInt(s.substring(0, c));
-                } catch (NumberFormatException nfe) {}
-                double b = 100;
-                try {
-                	b = Integer.parseInt(s.substring(c+1));
-                } catch (NumberFormatException nfe) {}
-                return a/b;
-        }
-        else {
-        	double a = 10;
-        	try {
-             	a = Double.parseDouble(s);
-            } catch (NumberFormatException nfe) {}
-        	return a;
-        }
-	}
-	
-	public static String printJsonChance(Double chance) {
-		if (chance.equals(100d)) return "100";
-        else if (chance.equals(70d)) return "70";
-        else if (chance.equals(30d)) return "30";
-        else if (chance.equals(25d)) return "25";
-        else if (chance.equals(20d)) return "20";
-        else if (chance.equals(10d)) return "10";
-        else if (chance.equals(5d)) return "5";
-        else if (chance.equals(1d)) return "1";
-        else if (chance.equals(0.1d)) return "1/1000";
-        else if (chance.equals(0.01d)) return "1/10000";
-        else {
-        	if (chance.intValue() == chance) return Integer.toString(chance.intValue());
-        	//TODO Better handling of fractions. Chance description need a complete overhaul in AT.
-        	//This part does not output the input content of parseDouble(String s) in the case of fractions.
-        	return chance.toString();
-        }
-	}
-
-}
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.SaveEvent;
+
+public abstract class JSONElement extends GameDataElement {
+
+	private static final long serialVersionUID = -8015398814080503982L;
+
+	//Available from state init.
+	public File jsonFile;
+
+	@SuppressWarnings("rawtypes")
+	public void parse() {
+		if (shouldSkipParseOrLink()) {
+			return;
+		}
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(jsonFile);
+			List gameDataElements = (List) parser.parse(reader);
+			for (Object obj : gameDataElements) {
+				Map jsonObj = (Map)obj;
+				String id  = (String) jsonObj.get("id");
+				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) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (IOException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} 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 {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+
+	}
+
+	public abstract void parse(@SuppressWarnings("rawtypes") Map jsonObj);
+
+	@SuppressWarnings("rawtypes")
+	public abstract Map toJson();
+	public String toJsonString() {
+		StringWriter writer = new JsonPrettyWriter();
+		try {
+			JSONObject.writeJSONString(this.toJson(), writer);
+		} catch (IOException e) {
+			//Impossible with a StringWriter
+		}
+		return writer.toString();
+	}
+
+
+	@Override
+	public GameDataSet getDataSet() {
+		if (parent == null) {
+			System.out.println("blerf.");
+		}
+		return parent.getDataSet();
+	}
+
+	public void save() {
+		if (this.getParent() instanceof GameDataCategory<?> && writable) {
+			((GameDataCategory<?>)this.getParent()).save(this.jsonFile);
+		}
+	}
+
+	/**
+	 * Returns null if save occurred (no notable events).
+	 */
+	public List<SaveEvent> attemptSave() {
+		List<SaveEvent> events = ((GameDataCategory<?>)this.getParent()).attemptSave(true, this.jsonFile.getName());
+		if (events == null || events.isEmpty()) {
+			return null;
+		}
+		if (events.size() == 1 && events.get(0).type == SaveEvent.Type.alsoSave && events.get(0).target == this) {
+			save();
+			return null;
+		}
+		return events;
+	}
+
+	public static Integer getInteger(Number n) {
+		return n == null ? null : n.intValue();
+	}
+
+	public static Double getDouble(Number n) {
+		return n == null ? null : n.doubleValue();
+	}
+
+	public static Double parseChance(String s) {
+		if (s.equals("100")) return 100d;
+        else if (s.equals("70")) return 70d;
+        else if (s.equals("30")) return 30d;
+        else if (s.equals("25")) return 25d;
+        else if (s.equals("20")) return 20d;
+        else if (s.equals("10")) return 10d;
+        else if (s.equals("5")) return 5d;
+        else if (s.equals("1")) return 1d;
+        else if (s.equals("1/1000")) return 0.1;
+        else if (s.equals("1/10000")) return 0.01;
+        else if (s.indexOf('/') >= 0) {
+                int c = s.indexOf('/');
+                double a = 1;
+                try {
+                	a = Integer.parseInt(s.substring(0, c));
+                } catch (NumberFormatException nfe) {}
+                double b = 100;
+                try {
+                	b = Integer.parseInt(s.substring(c+1));
+                } catch (NumberFormatException nfe) {}
+                return a/b;
+        }
+        else {
+        	double a = 10;
+        	try {
+             	a = Double.parseDouble(s);
+            } catch (NumberFormatException nfe) {}
+        	return a;
+        }
+	}
+
+	public static String printJsonChance(Double chance) {
+		if (chance.equals(100d)) return "100";
+        else if (chance.equals(70d)) return "70";
+        else if (chance.equals(30d)) return "30";
+        else if (chance.equals(25d)) return "25";
+        else if (chance.equals(20d)) return "20";
+        else if (chance.equals(10d)) return "10";
+        else if (chance.equals(5d)) return "5";
+        else if (chance.equals(1d)) return "1";
+        else if (chance.equals(0.1d)) return "1/1000";
+        else if (chance.equals(0.01d)) return "1/10000";
+        else {
+        	if (chance.intValue() == chance) return Integer.toString(chance.intValue());
+        	//TODO Better handling of fractions. Chance description need a complete overhaul in AT.
+        	//This part does not output the input content of parseDouble(String s) in the case of fractions.
+        	return chance.toString();
+        }
+	}
+
+}

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

@@ -1,198 +1,191 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import java.awt.Image;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-
-public class Quest extends JSONElement {
-
-	private static final long serialVersionUID = 2004839647483250099L;
-	
-	//Available from init state
-	//public String id = null; inherited.
-	public String name = null;
-	
-	//Available in parsed state
-	public Integer visible_in_log = null;
-	public List<QuestStage> stages = null;
-	
-	@Override
-	public String getDesc() {
-		return (needsSaving() ? "*" : "")+name+" ("+id+")";
-	}
-
-	public static String getStaticDesc() {
-		return "Quests";
-	}
-	
-
-	@SuppressWarnings("rawtypes")
-	public static void fromJson(File jsonFile, GameDataCategory<Quest> category) {
-		JSONParser parser = new JSONParser();
-		FileReader reader = null;
-		try {
-			reader = new FileReader(jsonFile);
-			List quests = (List) parser.parse(reader);
-			for (Object obj : quests) {
-				Map questJson = (Map)obj;
-				Quest quest = fromJson(questJson);
-				quest.jsonFile = jsonFile;
-				quest.parent = category;
-				if (quest.getDataType() == GameSource.Type.created || quest.getDataType() == GameSource.Type.altered) {
-					quest.writable = true;
-				}
-				category.add(quest);
-			}
-		} catch (FileNotFoundException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (IOException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} catch (ParseException e) {
-			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
-			e.printStackTrace();
-		} finally {
-			if (reader != null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-		}
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static Quest fromJson(String jsonString) throws ParseException {
-		Map questJson = (Map) new JSONParser().parse(jsonString);
-		Quest quest = fromJson(questJson);
-		quest.parse(questJson);
-		return quest;
-	}
-	
-	@SuppressWarnings("rawtypes")
-	public static Quest fromJson(Map questJson) {
-		Quest quest = new Quest();
-		quest.id = (String) questJson.get("id");
-		quest.name = (String) questJson.get("name");
-		//Quests have to be parsed to have their stages initialized.
-		quest.parse(questJson);
-		return quest;
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Override
-	public void parse(Map questJson) {
-		this.visible_in_log = JSONElement.getInteger((Number) questJson.get("showInLog"));
-		List questStagesJson = (List) questJson.get("stages");
-		this.stages = new ArrayList<QuestStage>();
-		if (questStagesJson != null && !questStagesJson.isEmpty()) {
-			for (Object questStageJsonObj : questStagesJson) {
-				Map questStageJson = (Map)questStageJsonObj;
-				QuestStage questStage = new QuestStage(this);
-				questStage.parse(questStageJson);
-				this.stages.add(questStage);
-			}
-		}
-		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.
-			return;
-		}
-		
-		for (QuestStage stage : stages) {
-			stage.link();
-		}
-		//Nothing to link to :D
-		this.state = State.linked;
-	}
-
-	@Override
-	public Image getIcon() {
-		return DefaultIcons.getQuestIcon();
-	}
-	
-	public Image getImage() {
-		return DefaultIcons.getQuestImage();
-	}
-	
-	@Override
-	public GameDataElement clone() {
-		Quest clone = new Quest();
-		clone.jsonFile = this.jsonFile;
-		clone.state = this.state;
-		clone.id = this.id;
-		clone.name = this.name;
-		clone.visible_in_log = this.visible_in_log;
-		if (this.stages != null) {
-			clone.stages = new ArrayList<QuestStage>();
-			for (QuestStage stage : this.stages){
-				clone.stages.add((QuestStage) stage.clone(clone));
-			}
-		}
-		return clone;
-	}
-	
-	@Override
-	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
-		//Nothing to link to.
-	}
-	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public Map toJson() {
-		Map questJson = new LinkedHashMap();
-		questJson.put("id", this.id);
-		if (this.name != null) questJson.put("name", this.name);
-		if (this.visible_in_log != null) questJson.put("showInLog", this.visible_in_log);
-		if (this.stages != null) {
-			List stagesJson = new ArrayList();
-			questJson.put("stages", stagesJson);
-			for (QuestStage stage : this.stages) {
-				stagesJson.add(stage.toJson());
-			}
-		}
-		return questJson;
-	}
-	
-
-	@Override
-	public String getProjectFilename() {
-		return "questlist_"+getProject().name+".json";
-	}
-
-	public QuestStage getStage(Integer stageId) {
-		for (QuestStage stage : stages) {
-			if (stage.progress.equals(stageId)) {
-				return stage;
-			}
-		}
-		return null;
-	}
-	
-}
+package com.gpl.rpg.atcontentstudio.model.gamedata;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+public class Quest extends JSONElement {
+
+	private static final long serialVersionUID = 2004839647483250099L;
+
+	//Available from init state
+	//public String id = null; inherited.
+	public String name = null;
+
+	//Available in parsed state
+	public Integer visible_in_log = null;
+	public List<QuestStage> stages = null;
+
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+name+" ("+id+")";
+	}
+
+	public static String getStaticDesc() {
+		return "Quests";
+	}
+
+
+	@SuppressWarnings("rawtypes")
+	public static void fromJson(File jsonFile, GameDataCategory<Quest> category) {
+		JSONParser parser = new JSONParser();
+		FileReader reader = null;
+		try {
+			reader = new FileReader(jsonFile);
+			List quests = (List) parser.parse(reader);
+			for (Object obj : quests) {
+				Map questJson = (Map)obj;
+				Quest quest = fromJson(questJson);
+				quest.jsonFile = jsonFile;
+				quest.parent = category;
+				if (quest.getDataType() == GameSource.Type.created || quest.getDataType() == GameSource.Type.altered) {
+					quest.writable = true;
+				}
+				category.add(quest);
+			}
+		} catch (FileNotFoundException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (IOException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} catch (ParseException e) {
+			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
+			e.printStackTrace();
+		} finally {
+			if (reader != null)
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Quest fromJson(String jsonString) throws ParseException {
+		Map questJson = (Map) new JSONParser().parse(jsonString);
+		Quest quest = fromJson(questJson);
+		quest.parse(questJson);
+		return quest;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static Quest fromJson(Map questJson) {
+		Quest quest = new Quest();
+		quest.id = (String) questJson.get("id");
+		quest.name = (String) questJson.get("name");
+		//Quests have to be parsed to have their stages initialized.
+		quest.parse(questJson);
+		return quest;
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public void parse(Map questJson) {
+		this.visible_in_log = JSONElement.getInteger((Number) questJson.get("showInLog"));
+		List questStagesJson = (List) questJson.get("stages");
+		this.stages = new ArrayList<QuestStage>();
+		if (questStagesJson != null && !questStagesJson.isEmpty()) {
+			for (Object questStageJsonObj : questStagesJson) {
+				Map questStageJson = (Map)questStageJsonObj;
+				QuestStage questStage = new QuestStage(this);
+				questStage.parse(questStageJson);
+				this.stages.add(questStage);
+			}
+		}
+		this.state = State.parsed;
+	}
+
+	@Override
+	public void link() {
+		if (shouldSkipParseOrLink()) {
+			return;
+		}
+		ensureParseIfNeeded();
+
+		for (QuestStage stage : stages) {
+			stage.link();
+		}
+		//Nothing to link to :D
+		this.state = State.linked;
+	}
+
+	@Override
+	public Image getIcon() {
+		return DefaultIcons.getQuestIcon();
+	}
+
+	public Image getImage() {
+		return DefaultIcons.getQuestImage();
+	}
+
+	@Override
+	public GameDataElement clone() {
+		Quest clone = new Quest();
+		clone.jsonFile = this.jsonFile;
+		clone.state = this.state;
+		clone.id = this.id;
+		clone.name = this.name;
+		clone.visible_in_log = this.visible_in_log;
+		if (this.stages != null) {
+			clone.stages = new ArrayList<QuestStage>();
+			for (QuestStage stage : this.stages){
+				clone.stages.add((QuestStage) stage.clone(clone));
+			}
+		}
+		return clone;
+	}
+
+	@Override
+	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		//Nothing to link to.
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public Map toJson() {
+		Map questJson = new LinkedHashMap();
+		questJson.put("id", this.id);
+		if (this.name != null) questJson.put("name", this.name);
+		if (this.visible_in_log != null) questJson.put("showInLog", this.visible_in_log);
+		if (this.stages != null) {
+			List stagesJson = new ArrayList();
+			questJson.put("stages", stagesJson);
+			for (QuestStage stage : this.stages) {
+				stagesJson.add(stage.toJson());
+			}
+		}
+		return questJson;
+	}
+
+
+	@Override
+	public String getProjectFilename() {
+		return "questlist_"+getProject().name+".json";
+	}
+
+	public QuestStage getStage(Integer stageId) {
+		for (QuestStage stage : stages) {
+			if (stage.progress.equals(stageId)) {
+				return stage;
+			}
+		}
+		return null;
+	}
+
+}

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

@@ -8,18 +8,18 @@ import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
 public class QuestStage extends JSONElement {
-	
+
 	private static final long serialVersionUID = 8313645819951513431L;
-	
+
 	public Integer progress = null;
 	public String log_text = null;
 	public Integer exp_reward = null;
 	public Integer finishes_quest = null;
-	
+
 	public QuestStage(Quest parent){
 		this.parent = parent;
 	}
-	
+
 	public QuestStage clone(Quest cloneParent) {
 		QuestStage clone = new QuestStage(cloneParent);
 		clone.progress = progress != null ? new Integer(progress) : null;
@@ -59,18 +59,11 @@ 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.
+		if (shouldSkipParseOrLink()) {
 			return;
 		}
-		if (this.state == State.init) {
-			//Not parsed yet.
-			this.parse();
-		} else if (this.state == State.linked) {
-			//Already linked.
-			return;
-		}
-		
+		ensureParseIfNeeded();
+
 		//Nothing to link to :D
 		this.state = State.linked;
 	}
@@ -89,15 +82,15 @@ public class QuestStage extends JSONElement {
 	public GameDataElement clone() {
 		return null;
 	}
-	
+
 	@Override
 	public Image getIcon() {
 		return DefaultIcons.getQuestIcon();
 	}
-	
+
 	public Image getImage() {
 		return DefaultIcons.getQuestImage();
 	}
 
-	
-}
+
+}

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
@@ -55,7 +58,13 @@ public class Requirement extends JSONElement {
 		consumedBonemeals,
 		hasActorCondition,
 		factionScore,
-		random
+		random,
+		factionScoreEquals,
+		wearRemove,
+		date,
+		dateEquals,
+		time,
+		timeEquals
 	}
 	
 	public enum SkillID {
@@ -80,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
@@ -91,6 +101,7 @@ public class Requirement extends JSONElement {
 		,weaponProficiencyAxe
 		,weaponProficiencyBlunt
 		,weaponProficiencyUnarmed
+		,weaponProficiencyPole
 		,armorProficiencyShield
 		,armorProficiencyUnarmored
 		,armorProficiencyLight
@@ -166,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:
@@ -186,7 +198,12 @@ public class Requirement extends JSONElement {
 		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);

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

@@ -71,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>();
@@ -95,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) {

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

@@ -11,7 +11,7 @@ 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;
@@ -21,8 +21,8 @@ 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"));
@@ -82,8 +82,8 @@ 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));
@@ -92,5 +92,4 @@ public class SpawnArea extends MapObject {
 			tmxObject.getProperties().setProperty("ignoreAreas", Boolean.toString(ignoreAreas));
 		}
 	}
-	
 }

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

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

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

@@ -1,9 +1,12 @@
 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;
@@ -17,7 +20,7 @@ public class PoPotWriter {
 	
 	public static void writePoFile(Map<String, List<String>> stringsResources, Map<String, String> translations, File destination) {
 		try {
-			FileWriter fw = new FileWriter(destination);
+			Writer fw = new OutputStreamWriter(new FileOutputStream(destination), StandardCharsets.UTF_8);
 			if (translations.get("") != null) {
 				fw.write(translations.get(""));
 				writeEndOfEntry(fw);

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

@@ -28,6 +28,7 @@ public class PotGenerator {
 		
 		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 ) {

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

@@ -37,17 +37,17 @@ 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/>" +

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

@@ -260,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); }
@@ -273,7 +281,7 @@ public class DefaultIcons {
 	public static Image getStatusOrangeIcon() { return getIcon(STATUS_ORANGE_RES); }
 	
 	private static String STATUS_GREEN_RES = "/com/gpl/rpg/atcontentstudio/img/status_green.png";
-	public static Image getStatusGreenImage() { return getImage(STATUS_GREEN_RES); }
+	public static Image getStatusGreenImage() { return getImage(STATUS_GREEN_RES); } 
 	public static Image getStatusGreenIcon() { return getIcon(STATUS_GREEN_RES); }
 	
 	private static String STATUS_BLUE_RES = "/com/gpl/rpg/atcontentstudio/img/status_blue.png";

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/gamedataeditors/ActorConditionEditor.java

@@ -30,6 +30,7 @@ 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;
@@ -81,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);
@@ -172,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/DroplistEditor.java

@@ -1,299 +1,205 @@
-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;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
-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.jidesoft.swing.JideBoxLayout;
-
-public class DroplistEditor extends JSONElementEditor {
-
-	private static final long serialVersionUID = 1139455254096811058L;
-	
-	private static final String form_view_id = "Form";
-	private static final String json_view_id = "JSON";
-	
-	private Droplist.DroppedItem selectedItem;
-	
-	private JTextField idField;
-	private MyComboBox itemCombo;
-	private DroppedItemsListModel droppedItemsListModel;
-	private JSpinner qtyMinField;
-	private JSpinner qtyMaxField;
-	private JComponent chanceField;
-	
-	public DroplistEditor(Droplist droplist) {
-		super(droplist, droplist.getDesc(), droplist.getIcon());
-		addEditorTab(form_view_id, getFormView());
-		addEditorTab(json_view_id, getJSONView());
-	}
-	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public void insertFormViewDataField(JPanel pane) {
-		
-		final Droplist droplist = (Droplist)target;
-		final FieldUpdateListener listener = new DroplistFieldUpdater();
-		
-		createButtonPane(pane, droplist.getProject(), droplist, Droplist.class, Droplist.getImage(), null, listener);
-		
-		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));
-		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.
-					}
-				}
-			});
-			
-			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();
-		}
-
-		pane.add(itemsPane, JideBoxLayout.FIX);
-		
-	}
-	
-	public void updateDroppedItemsEditorPane(JPanel pane, DroppedItem di, FieldUpdateListener listener) {
-		boolean writable = ((Droplist)target).writable;
-		Project proj = ((Droplist)target).getProject();
-		pane.removeAll();
-		if (itemCombo != null) {
-			removeElementListener(itemCombo);
-		}
-		if (di != null) {
-			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 = 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 DroppedItemsListModel(Droplist droplist) {
-			this.source = droplist;
-		}
-
-		@Override
-		public int getSize() {
-			if (source.dropped_items == null) return 0;
-			return source.dropped_items.size();
-		}
-		
-		@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);
-		}
-	}
-	
-	public static class DroppedItemsCellRenderer extends DefaultListCellRenderer {
-		private static final long serialVersionUID = 7987880146189575234L;
-
-		@Override
-		public Component getListCellRendererComponent(@SuppressWarnings("rawtypes") 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+(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+(di.chance != null && di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item_id);
-				} else {
-					label.setText("New, undefined, dropped item.");
-				}
-			}
-			return c;
-		}
-		
-		public boolean isNull(Droplist.DroppedItem item) {
-			return ((item == null) || (
-					item.item == null &&
-					item.item_id == null &&
-					item.quantity_min == null &&
-					item.quantity_max == null &&
-					item.chance == null
-					)); 
-		}
-	}
-	
-	
-	public class DroplistFieldUpdater implements FieldUpdateListener {
-		@Override
-		public void valueChanged(JComponent source, Object value) {
-			Droplist droplist = ((Droplist)target);
-			if (source == idField) {
-				//Events caused by cancel an ID edition. Dismiss.
-				if (skipNext) {
-					skipNext = false;
-					return;
-				}
-				if (target.id.equals((String) value)) return;
-				
-				if (idChanging()) {
-					droplist.id = (String) value;
-					DroplistEditor.this.name = droplist.getDesc();
-					droplist.childrenChanged(new ArrayList<ProjectTreeNode>());
-					ATContentStudio.frame.editorChanged(DroplistEditor.this);
-				} else {
-					cancelIdEdit(idField);
-					return;
-				}
-			} else if (source == itemCombo) {
-				if (selectedItem.item != null) {
-					selectedItem.item.removeBacklink(droplist);
-				}
-				selectedItem.item = (Item) value;
-				if (selectedItem.item != null) {
-					selectedItem.item_id = selectedItem.item.id;
-					selectedItem.item.addBacklink(droplist);
-				} else {
-					selectedItem.item_id = null;
-				}
-				droppedItemsListModel.itemChanged(selectedItem);
-			} else if (source == qtyMinField) {
-				selectedItem.quantity_min = (Integer) value;
-				droppedItemsListModel.itemChanged(selectedItem);
-			} else if (source == qtyMaxField) {
-				selectedItem.quantity_max = (Integer) value;
-				droppedItemsListModel.itemChanged(selectedItem);
-			} else if (source == chanceField) {
-				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>());
-				ATContentStudio.frame.editorChanged(DroplistEditor.this);
-			}
-			updateJsonViewText(droplist.toJsonString());
-		}
-	}
-}
+package com.gpl.rpg.atcontentstudio.ui.gamedataeditors;
+
+import java.awt.Component;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+
+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.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.FieldUpdateListener;
+import com.gpl.rpg.atcontentstudio.ui.tools.CommonEditor;
+import com.jidesoft.swing.JideBoxLayout;
+
+public class DroplistEditor extends JSONElementEditor {
+
+	private static final long serialVersionUID = 1139455254096811058L;
+
+	private static final String form_view_id = "Form";
+	private static final String json_view_id = "JSON";
+
+	private Droplist.DroppedItem selectedItem;
+
+	private JTextField idField;
+	private MyComboBox itemCombo;
+	private DroppedItemsListModel droppedItemsListModel;
+	private JSpinner qtyMinField;
+	private JSpinner qtyMaxField;
+	private JComponent chanceField;
+
+	public DroplistEditor(Droplist droplist) {
+		super(droplist, droplist.getDesc(), droplist.getIcon());
+		addEditorTab(form_view_id, getFormView());
+		addEditorTab(json_view_id, getJSONView());
+	}
+
+	@Override
+	public void insertFormViewDataField(JPanel pane) {
+
+		final Droplist droplist = (Droplist)target;
+		final FieldUpdateListener listener = new DroplistFieldUpdater();
+
+		createButtonPane(pane, droplist.getProject(), droplist, Droplist.class, Droplist.getImage(), null, listener);
+
+		idField = addTextField(pane, "Droplist ID: ", droplist.id, droplist.writable, listener);
+
+		String title = "Items in this droplist: ";
+		DroppedItemsCellRenderer cellRenderer = new DroppedItemsCellRenderer();
+		droppedItemsListModel = new DroppedItemsListModel(droplist);
+		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;
+
+		if (droplist.dropped_items == null || droplist.dropped_items.isEmpty()) {
+			itemsPane.collapse();
+		}
+
+		pane.add(itemsPane, JideBoxLayout.FIX);
+
+	}
+
+	public void updateDroppedItemsEditorPane(JPanel pane, DroppedItem di, FieldUpdateListener listener) {
+		boolean writable = target.writable;
+		Project proj = target.getProject();
+		pane.removeAll();
+		if (itemCombo != null) {
+			removeElementListener(itemCombo);
+		}
+		if (di != null) {
+			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 = addChanceField(pane, "Chance: ", di.chance, "100", writable, listener);//addDoubleField(pane, "Chance: ", di.chance, writable, listener);
+		}
+		pane.revalidate();
+		pane.repaint();
+	}
+
+	public static class DroppedItemsListModel extends CommonEditor.AtListModel<Droplist.DroppedItem, Droplist> {
+
+		public DroppedItemsListModel(Droplist droplist) {
+			super(droplist);
+		}
+
+		@Override
+		protected List<Droplist.DroppedItem> getInner() {
+			return source.dropped_items;
+		}
+
+		@Override
+		protected void setInner(List<Droplist.DroppedItem> value) {
+			source.dropped_items = value;
+		}
+	}
+
+	public static class DroppedItemsCellRenderer extends DefaultListCellRenderer {
+		private static final long serialVersionUID = 7987880146189575234L;
+
+		@Override
+		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+(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+(di.chance != null && di.chance.contains("/") ? "" : "%")+" to get "+di.quantity_min+"-"+di.quantity_max+" "+di.item_id);
+				} else {
+					label.setText("New, undefined, dropped item.");
+				}
+			}
+			return c;
+		}
+
+		public boolean isNull(Droplist.DroppedItem item) {
+			return ((item == null) || (
+					item.item == null &&
+					item.item_id == null &&
+					item.quantity_min == null &&
+					item.quantity_max == null &&
+					item.chance == null
+					)); 
+		}
+	}
+
+
+	public class DroplistFieldUpdater implements FieldUpdateListener {
+		@Override
+		public void valueChanged(JComponent source, Object value) {
+			Droplist droplist = ((Droplist)target);
+			if (source == idField) {
+				//Events caused by cancel an ID edition. Dismiss.
+				if (skipNext) {
+					skipNext = false;
+					return;
+				}
+				if (target.id.equals(value)) return;
+
+				if (idChanging()) {
+					droplist.id = (String) value;
+					DroplistEditor.this.name = droplist.getDesc();
+					droplist.childrenChanged(new ArrayList<>());
+					ATContentStudio.frame.editorChanged(DroplistEditor.this);
+				} else {
+					cancelIdEdit(idField);
+					return;
+				}
+			} else if (source == itemCombo) {
+				if (selectedItem.item != null) {
+					selectedItem.item.removeBacklink(droplist);
+				}
+				selectedItem.item = (Item) value;
+				if (selectedItem.item != null) {
+					selectedItem.item_id = selectedItem.item.id;
+					selectedItem.item.addBacklink(droplist);
+				} else {
+					selectedItem.item_id = null;
+				}
+				droppedItemsListModel.itemChanged(selectedItem);
+			} else if (source == qtyMinField) {
+				selectedItem.quantity_min = (Integer) value;
+				droppedItemsListModel.itemChanged(selectedItem);
+			} else if (source == qtyMaxField) {
+				selectedItem.quantity_max = (Integer) value;
+				droppedItemsListModel.itemChanged(selectedItem);
+			} else if (source == chanceField) {
+				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<>());
+				ATContentStudio.frame.editorChanged(DroplistEditor.this);
+			}
+			updateJsonViewText(droplist.toJsonString());
+		}
+	}
+}

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,9 +20,9 @@ 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 {
@@ -77,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() {
-				
-				@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() {
-				
-				@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);
-		}
+		final boolean moveUpDownEnabled = true;
+
+		CollapsiblePanel stagesPane = CommonEditor.createListPanel(
+				title,
+				cellRenderer,
+				stagesListModel,
+				quest.writable,
+				moveUpDownEnabled,
+				(e)->selectedStage=e,
+				()->selectedStage,
+				this::updateStageEditorPane,
+				listener,
+				()->new QuestStage(quest)).panel;
+
 		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);
 
 	}
@@ -184,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;
@@ -321,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/WorldMapView.java

@@ -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,43 +1,34 @@
 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 {
 
 	private static final long serialVersionUID = -6018113265015159521L;
-	
+
 	private static final int STD_WIDTH = 32;
 	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) {
 		if (cache.get(proj) == null) {
 			cache.put(proj, new LinkedHashMap<Spritesheet.Category, SpriteChooser>());
@@ -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));
 			}
 		}
@@ -65,20 +56,20 @@ public class SpriteChooser extends JDialog {
 		wanted.pack();
 		return wanted;
 	}
-	
+
 	private ButtonGroup group;
 //	private IconButton selectedOne = null;
 //	private JButton ok;
 //	private JButton cancel;
-	
+
 	public String selectedIconId = null;
-	
+
 	public SpriteChooser(Project proj, Category category) {
 		super(ATContentStudio.frame);
 		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);
@@ -88,8 +79,8 @@ public class SpriteChooser extends JDialog {
 			cacheValidator.put(proj, new LinkedHashMap<Spritesheet.Category, List<Spritesheet>>());
 		}
 		cacheValidator.get(proj).put(category, spritesheets);
-		
-		
+
+
 		JPanel pane = new JPanel();
 		pane.setLayout(new GridBagLayout());
 		GridBagConstraints c = new GridBagConstraints();
@@ -101,16 +92,20 @@ public class SpriteChooser extends JDialog {
 		c.gridheight = 1;
 		c.anchor = GridBagConstraints.NORTHWEST;
 		c.fill = GridBagConstraints.BOTH;
-		
+
 		List<Point> reservedSlots = new ArrayList<Point>();
 		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,14 +126,20 @@ 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);
 					for (int x = c.gridx; x < c.gridx + c.gridwidth; x++) {
@@ -157,15 +158,14 @@ public class SpriteChooser extends JDialog {
 						c.gridx = 0;
 						c.gridy++;
 					}
-					nextFreeSlot.setLocation(c.gridx,  c.gridy);
+					nextFreeSlot.setLocation(c.gridx, c.gridy);
 				}
-				i++;
 			}
 		}
-		
+
 //		ok = new JButton("Ok");
 //		cancel = new JButton("Cancel");
-		
+
 		c.gridx = 0;
 		boolean emptyLine = false;
 		while (!emptyLine) {
@@ -178,7 +178,7 @@ public class SpriteChooser extends JDialog {
 				}
 			}
 		}
-		
+
 //		JPanel buttonPane = new JPanel();
 //		buttonPane.add(cancel, BorderLayout.WEST);
 //		buttonPane.add(ok, BorderLayout.EAST);
@@ -190,7 +190,7 @@ public class SpriteChooser extends JDialog {
 		scroller.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		wrapper.add(scroller, BorderLayout.CENTER);
 //		wrapper.add(buttonPane, BorderLayout.SOUTH);
-		
+
 //		ok.addActionListener(new ActionListener() {
 //			@Override
 //			public void actionPerformed(ActionEvent e) {
@@ -200,7 +200,7 @@ public class SpriteChooser extends JDialog {
 //				if (listener != null) listener.iconSelected(selectedIconId);
 //			}
 //		});
-		
+
 //		cancel.addActionListener(new ActionListener() {
 //			@Override
 //			public void actionPerformed(ActionEvent e) {
@@ -210,21 +210,21 @@ public class SpriteChooser extends JDialog {
 //				if (listener != null) listener.iconSelected(null);
 //			}
 //		});
-		
+
 		setContentPane(wrapper);
 	}
-	
+
 	private SpriteChooser.SelectionListener listener = null;
-	
+
 	public void setSelectionListener(SpriteChooser.SelectionListener l) {
 		listener = l;
 	}
-	
-	
+
+
 	public class IconButton extends JToggleButton {
-		
+
 		private static final long serialVersionUID = 7559407153561178455L;
-		
+
 		public String sheetId;
 		public int spriteIndex;
 
@@ -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);
@@ -246,9 +246,9 @@ public class SpriteChooser extends JDialog {
 			});
 		}
 	}
-	
+
 	public static interface SelectionListener {
 		public void iconSelected(String selected);
 	}
-	
+
 }

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;
@@ -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);
-    		}
-    				
-    		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);
+    			return CommonEditor.wordWrap(super.getText(item), 40);
     		}
+
     	}
     	
     	class NodeStrokeColorAction extends ColorAction {

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/POParser.java

@@ -12,6 +12,8 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Vector;
 
 public class POParser
@@ -60,11 +62,9 @@ public class POParser
     	POFile result = null;
         try
         {
-            FileReader fr = new FileReader(file);
-            BufferedReader br = new BufferedReader(fr);
+            BufferedReader br = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8);
             result = parse(br);
             br.close();
-            fr.close();
         }
         catch (java.io.FileNotFoundException e)
         {