Merge branch 'master' into git_integration

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

.classpath

@@ -5,7 +5,7 @@
 	<classpathentry kind="src" path="hacked-libtiled"/>
 	<classpathentry kind="src" path="siphash-zackehh/src/main/java"/>
 	<classpathentry kind="src" path="minify"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_152"/>
 	<classpathentry kind="lib" path="lib/jide-oss.jar"/>
 	<classpathentry kind="lib" path="lib/json_simple-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
@@ -14,6 +14,19 @@
 	<classpathentry kind="lib" path="lib/ui.jar"/>
 	<classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.10.2.jar" sourcepath="lib/jsoup-1.10.2-sources.jar"/>
-	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.5.jar"/>
+	<classpathentry kind="lib" path="lib/AndorsTrainer_v0.1.4.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/commons-codec-1.6.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/httpclient-4.3.6.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/httpcore-4.3.3.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/JavaEWAH-1.1.6.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/jsch-0.1.54.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/jzlib-1.0.7.jar"/>
+	<classpathentry kind="lib" path="lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/ATContentStudio/lib/JGit/org.eclipse.jgit-4.9.0.201710071750-r-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/JGit/slf4j-api-1.7.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitattributes

@@ -1,6 +0,0 @@
-# Set default behavior to automatically normalize line endings.
-* text=auto
-
-# Force bash scripts to always use LF line endings so that if a repo is accessed
-# in Unix via a file share from Windows, the scripts will work.
-*.sh text eol=lf

.github/workflows/release.yml

@@ -1,56 +0,0 @@
-name: Release Build
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Get Version
-      id: get_version
-      shell: bash
-      run: |
-        echo "Reading version from file:"
-        cat res/ATCS_latest
-        echo ""
-        VERSION=$(tr -d '[:space:]' < "res/ATCS_latest")
-        echo "Processed version: $VERSION"
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
-        echo "Environment variable set to: $VERSION"
-
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-
-    - name: Build JAR
-      shell: bash
-      run: |
-        cd packaging
-        chmod +x package.sh
-        echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
-        ./package.sh -windows
-        echo "Created artifacts:"
-        ls -la common/ATCS.jar
-        ls -la ATCS_${{ env.VERSION }}.zip
-
-    - name: Install NSIS
-      uses: joncloud/makensis-action@v4
-      with:
-        script-file: packaging/Windows/ATCS_Installer.nsi
-        arguments: /DVERSION="${{ env.VERSION }}"
-
-    - name: Upload Release Assets
-      uses: softprops/action-gh-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        files: |
-          ./packaging/ATCS_${{ env.VERSION }}.zip
-          ./packaging/ATCS_${{ env.VERSION }}_Setup.exe

.gitignore

@@ -1,13 +1,3 @@
 /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

.idea/.gitignore

@@ -1,8 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-<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/jide-oss.jar" path-in-jar="/" />
-      </element>
-    </root>
-  </artifact>
-</component>

.idea/codeStyles/Project.xml

@@ -1,19 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="JD_P_AT_EMPTY_LINES" value="false" />
-    </JavaCodeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="RIGHT_MARGIN" value="200" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="BINARY_OPERATION_WRAP" value="5" />
-      <option name="SOFT_MARGINS" value="120" />
-    </codeStyleSettings>
-    <codeStyleSettings language="JSON">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/misc.xml

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

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?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

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

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

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

ATCS_JAR.jardesc

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

ATContentStudio.iml

@@ -1,117 +0,0 @@
-<?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

@@ -1,129 +0,0 @@
-@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 .workspace.json >> .gitignore
-    echo .project.json >> .gitignore
-    echo altered/drawable >> .gitignore
-    echo altered/drawable/* >> .gitignore
-    echo created/drawable >> .gitignore
-    echo created/drawable/* >> .gitignore
-    echo tmp/res/values/loadresources.xml >> .gitignore
-) else (
-    echo gitignore already existed
-)
-
-:git
-if not exist %2\%1\.git (
-    echo Initializing git
-    git init -b main || (
-        echo "failed to init git. Please make sure it is installed"
-        pause
-        goto :git
-    )
-    :git_commit
-    git add readme.md
-    git add .gitignore
-    git commit -m "Init project" || (
-        echo "failed to create the initial commit."
-        pause
-        goto :git_commit
-    )
-    echo Done initializing git
-) else (
-    echo git was already initialized
-)
-
-echo.
-echo Now create your repo %1 on https://github.com/%3  (if not already done)
-echo.
-pause
-echo pushing to git repo https://github.com/%3/%1.git
-git remote add origin https://github.com/%3/%1.git
-git push -u origin main
-
-echo.
-echo At last you have to find the repo in your git client:
-echo - In Smartgit: Menu option: Repository / Search for repository
-echo.
-goto :end
-
-:noParamError
-echo.
-echo You have given no parameter. 
-echo Maybe you have just double clicked it? That won't work.
-echo I have opened a CMD shell for you. Enter the command in that shell.
-start cmd
-echo Please switch to the CMD shell
-
-:help
-echo.
-echo Enter the command with 3 parameters:
-echo %0  project  path  git-user
-echo.
-echo Example:  %0  feygard_1  c:\AT\ATCS  NutAndor
-echo.
-
-:end
-echo.
-echo *** End ***
-pause

hacked-libtiled/tiled/core/MapObject.java

@@ -43,7 +43,7 @@ public class MapObject implements Cloneable
 {
     private Properties properties = new Properties();
     private ObjectGroup objectGroup;
-    private Rectangle bounds;
+    private Rectangle bounds = new Rectangle();
     private String name = "Object";
     private String type = "";
     private String imageSource = "";

hacked-libtiled/tiled/core/Sprite.java

@@ -57,7 +57,7 @@ public class Sprite
 
         private String name = null;
         private int id = -1;
-        private int flags;
+        private int flags = KEY_LOOP;
         private float frameRate = 1.0f;   //one fps
         private Tile[] frames;
 

hacked-libtiled/tiled/core/TileSet.java

@@ -98,11 +98,7 @@ public class TileSet implements Iterable<Tile>
         
         File f = new File(imgFilename);
 
-        BufferedImage image;
+        BufferedImage image = ImageIO.read(f.getCanonicalFile());
-        try {
-            image = ImageIO.read(f.getCanonicalFile());
-        } catch (IOException e) { throw new IOException("Failed to load " + imgFilename);
-        }
         if (image == null) {
             throw new IOException("Failed to load " + imgFilename);
         }

hacked-libtiled/tiled/io/TMXMapReader.java

@@ -913,8 +913,7 @@ 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,9 +47,6 @@ 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;
@@ -153,7 +150,7 @@ public class TMXMapWriter
     }
 
     private void writeMap(Map map, XMLWriter w, String wp) throws IOException {
-        w.writeDocType("map", null, "https://mapeditor.org/dtd/1.0/map.dtd");
+        w.writeDocType("map", null, "http://mapeditor.org/dtd/1.0/map.dtd");
         w.startElement("map");
 
         w.writeAttribute("version", "1.0");
@@ -241,15 +238,7 @@ public class TMXMapWriter
         } else {
             w.startElement("tileset");
             w.writeAttribute("firstgid", getFirstGidForTileset(set));
-			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());
             }
@@ -290,15 +279,7 @@ public class TMXMapWriter
 
         if (tileBitmapFile != null) {
             w.startElement("image");
-			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);
@@ -588,7 +569,7 @@ public class TMXMapWriter
         }
 
         // Iterate while parents are the same
-        int shared;
+        int shared = 0;
         int maxShared = Math.min(fromParents.size(), toParents.size());
         for (shared = 0; shared < maxShared; shared++) {
             String fromParent = fromParents.get(shared);

packaging/ATCS_latest

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

packaging/Linux/.gitignore

@@ -0,0 +1,2 @@
+/ATCS_v*.zip
+/ATCS_v*.zip.rename

packaging/Linux/ATCS/ATCS.cmd

@@ -1,20 +1,20 @@
 @echo off
 
 set "ATCS_DIR=%~dp0"
-set "MAX_MEM=1024M"
+set "MAX_MEM=512M"
-REM required minimum java version is 11
+set "CP=%ATCS_DIR%lib\*"
-set "JAVA=java.exe"
+set "JAVA=javaw.exe"
 set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
 set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
+set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"
 
 if exist "%ENV_FILE%" (
   call "%ENV_FILE%"
 ) else (
   echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
-  echo REM required minimum java version is 11
   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"
+start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%

packaging/Linux/ATCS/ATCS.sh

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

packaging/Linux/ATCS/lib/.gitignore

@@ -0,0 +1 @@
+/*.jar

packaging/Manifest.txt

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

packaging/Windows/ATCS_Installer.nsi

@@ -1,12 +1,11 @@
 !include MUI2.nsh
 
-; Version will be passed as /DVERSION=vx.x.x
+!define VERSION "0.6.14"
-!define TRAINER_VERSION "0.1.5"
+!define TRAINER_VERSION "0.1.4"
-!define JAVA_BIN "java"
+!define JAVA_BIN "javaw"
-!define ATCS_SOURCE_DIR "..\..\"
 
-Name "Andor's Trail Content Studio ${VERSION}"
+Name "Andor's Trail Content Studio v${VERSION}"
-OutFile "..\ATCS_${VERSION}_Setup.exe"
+OutFile "ATCS_v${VERSION}_Setup.exe"
 InstallDir "$PROGRAMFILES\ATCS\"
 
 ;SetCompressor /SOLID /FINAL lzma
@@ -14,10 +13,10 @@ 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 ${VERSION}"
+!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION} installer"
-!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio ${VERSION} - Install completed !"
+!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 ${VERSION}"
+!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio v${VERSION}"
 
 
 ;Start Menu Folder Page Configuration
@@ -47,50 +46,62 @@ 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"
-  file "${ATCS_SOURCE_DIR}\packaging\common\ATCS.jar"
+  
+  Delete "$INSTDIR\lib\*"
   
   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=1024M"$\r$\n'
+  FileWrite $9 'set "MAX_MEM=512M"$\r$\n'
-  FileWrite $9 'REM required minimum java version is 11$\r$\n'
+  FileWrite $9 'set "CP=%ATCS_DIR%lib\*"$\r$\n'
   FileWrite $9 'set "JAVA=$R0"$\r$\n'
-  FileWrite $9 'set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"$\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 '  call "%ENV_FILE%"$\r$\n'
   FileWrite $9 ') else ($\r$\n'
   FileWrite $9 '  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"$\r$\n'
-  FileWrite $9 '  echo REM required minimum java version is 11$\r$\n'
   FileWrite $9 '  echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"$\r$\n'
   FileWrite $9 '  echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"$\r$\n'
   FileWrite $9 '  echo.>>"%ENV_FILE%"$\r$\n'
   FileWrite $9 ')$\r$\n'
   FileWrite $9 '$\r$\n'
-  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -jar "%ATCS_DIR%\ATCS.jar"$\r$\n'
+  FileWrite $9 'start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%$\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"
@@ -99,8 +110,6 @@ Section install
   
 SectionEnd
 
-
-;------------------------------------------------------------------------------------
 Section uninstall
   
   Delete "$INSTDIR\lib\jide-oss.jar"
@@ -108,17 +117,18 @@ 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
@@ -130,20 +140,19 @@ Section uninstall
 SectionEnd
 
 
-;------------------------------------------------------------------------------------
 Function GetJRE
 ;
-;  Find JRE (java.exe)
+;  Find JRE (javaw.exe)
 ;  DISABLED 1 - in .\jre directory (JRE Installed with application)
 ;  2 - in JAVA_HOME environment variable
 ;  3 - in the registry
-;  4 - assume java.exe in current dir or PATH
+;  4 - assume javaw.exe in current dir or PATH
  
   Push $R0
   Push $R1
  
   ;ClearErrors
-  ;StrCpy $R0 "$EXEDIR\jre\bin\java.exe"
+  ;StrCpy $R0 "$EXEDIR\jre\bin\javaw.exe"
   ;IfFileExists $R0 JreFound
   ;StrCpy $R0 ""
  

packaging/common/ATCS.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# get the directory of this script
-ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")"
-echo "ATCS_DIR: '${ATCS_DIR}'"
-
-MAX_MEM="512M"
-JAVA="java" # minimum required version is Java 11
-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}\""
-    echo "#JAVA=\"${JAVA}\" # minimum required version is Java 11"
-    echo "#JAVA_OPTS=\"${JAVA_OPTS}\""
-    echo ""
-  }>"${ENV_FILE}"
-fi
-
-export ENV_FILE
-
-# shellcheck disable=SC2086
-# (spellchecker is disabled for this line, because we want it to be split into multiple arguments)
-$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar "${ATCS_DIR}/ATCS.jar"

packaging/package-windows.sh

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

packaging/package.sh

@@ -1,125 +0,0 @@
-#!/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")") # Directory of this script
-ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}") # Parent directory of this script, assumed to be ATCS source root
-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="${ATCS_SOURCE_DIR}/res/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
-
-# --- **ADDITIONAL SOURCE CODE FOLDERS** ---
-EXTRA_SOURCE_DIRS=(
-  "hacked-libtiled"
-  "minify"
-  "siphash-zackehh/src/main/java"
-)
-
-# --- Libraries to include ---
-LIBRARIES=(
-  "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=$(tr -d '[:space:]' < "${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
-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'
-
-# shellcheck disable=SC2086
-# (we need word splitting here to pass multiple files)
-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
-cp "${VERSION_FILE}" "${TEMP_DIR}/" # Copy version file
-
-# --- 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}" "${PACKAGING_DIR}/common/ATCS.jar" # Copy JAR to versioned name
-
-# --- Create archive ---
-cd "${PACKAGING_DIR}" || exit
-echo "Creating archive"
-if [ "$PLATFORM" = "WINDOWS" ]; then
-    # Use PowerShell's Compress-Archive which is available by default on Windows
-    powershell.exe -Command "Compress-Archive -Path './common/*' -DestinationPath './ATCS_${VERSION}.zip' -Force"
-else
-    # Use zip command on Linux
-    zip -r "ATCS_${VERSION}.zip" common/* # archive the 'common' folder which now contains the JAR and libs
-fi
-if [ $? -ne 0 ]; then
-    echo "Archive creation failed."
-    exit 1
-fi
-echo "Created archive at ${PACKAGING_DIR}/ATCS_${VERSION}.zip"
-
-echo "Script finished."

res/ATCS_latest

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

res/spritesheets.properties

@@ -1,94 +1,64 @@
 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_books.category=item
+atcs.spritesheet.items_weapons.category=item
-atcs.spritesheet.items_consumables.category=item
+atcs.spritesheet.items_weapons_2.category=item
-atcs.spritesheet.items_consumables_omi1.category=item
+atcs.spritesheet.items_weapons_3.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_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_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_gisons.category=monster
+atcs.spritesheet.monsters_hydra1.sizex=64
-atcs.spritesheet.monsters_guynmart.category=monster
+atcs.spritesheet.monsters_hydra1.sizey=64
-
 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_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_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_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_tometik1.category=monster
 atcs.spritesheet.monsters_tometik2.category=monster
 atcs.spritesheet.monsters_tometik3.category=monster
@@ -99,36 +69,20 @@ 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_giantbasilisk.category=monster
+atcs.spritesheet.monsters_cyclops.category=monster
-atcs.spritesheet.monsters_giantbasilisk.sizex=64
+atcs.spritesheet.monsters_cyclops.sizex=64
-atcs.spritesheet.monsters_giantbasilisk.sizey=64
+atcs.spritesheet.monsters_cyclops.sizey=96
-atcs.spritesheet.monsters_hydra1.category=monster
+atcs.spritesheet.effect_blood3.animate=true
-atcs.spritesheet.monsters_hydra1.sizex=64
+atcs.spritesheet.effect_blood4.animate=true
-atcs.spritesheet.monsters_hydra1.sizey=64
+atcs.spritesheet.effect_bluetentacle.animate=true
-atcs.spritesheet.monsters_newb_2.category=monster
+atcs.spritesheet.effect_heal2.animate=true
-atcs.spritesheet.monsters_newb_2.sizex=64
+atcs.spritesheet.effect_poison1.animate=true
-atcs.spritesheet.monsters_newb_2.sizey=32
+atcs.spritesheet.effect_tometik1.animate=true
-atcs.spritesheet.monsters_newb_3.category=monster
+atcs.spritesheet.effect_tometik2.animate=true
-atcs.spritesheet.monsters_newb_3.sizex=64
+atcs.spritesheet.monsters_guynmart.category=monster
-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

@@ -1,6 +0,0 @@
-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,16 +1,10 @@
 package com.gpl.rpg.atcontentstudio;
 
-import com.gpl.rpg.atcontentstudio.model.Workspace;
+import java.awt.Color;
-import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
+import java.awt.Desktop;
-import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import java.awt.Dimension;
-import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
+import java.awt.Font;
-import prefuse.data.expression.parser.ExpressionParser;
+import java.awt.Toolkit;
-
-import javax.swing.*;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
-import javax.swing.plaf.FontUIResource;
-import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.BufferedReader;
@@ -20,19 +14,47 @@ import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.http.HttpTimeoutException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.plaf.FontUIResource;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.attributes.AttributesNodeProvider;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.lib.ObjectDatabase;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.RefDatabase;
+import org.eclipse.jgit.lib.ReflogReader;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+
+import prefuse.data.expression.parser.ExpressionParser;
+
+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 = readVersionFromFile();
+	public static final String APP_VERSION = "v0.6.14";
 	
 	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
 	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
@@ -43,8 +65,7 @@ public class ATContentStudio {
 	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
+	//Need to keep a strong reference to it, to avoid garbage collection that'll reset these loggers.
-    // reset these loggers.
 	public static final List<Logger> configuredLoggers = new LinkedList<Logger>();
 	
 	/**
@@ -52,7 +73,7 @@ public class ATContentStudio {
 	 */
 	public static void main(String[] args) {
 		String fontScaling = System.getProperty(FONT_SCALE_ENV_VAR_NAME);
-        Float fontScale;
+		Float fontScale = null;
 		if (fontScaling != null) {
 			try {
 				fontScale = Float.parseFloat(fontScaling);
@@ -63,13 +84,39 @@ public class ATContentStudio {
 			}
 		}
 		
+//		try {
+//			Git git = new Git(new FileRepository("/home/xxx/git_repos/andors-trail/.git/"));
+//			List<Ref> branches = git.branchList().call();
+//			for (Ref branch : branches) {
+//				System.out.println(branch.getName());
+//			}
+//		} catch (IOException e1) {
+//			e1.printStackTrace();
+//		} catch (GitAPIException e1) {
+//			e1.printStackTrace();
+//		}
+		
+		
 		ConfigCache.init();
 		
+		try {
 			String laf = ConfigCache.getFavoriteLaFClassName();
-        setLookAndFeel(laf);
+			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();
+		}
 		
-        // Need to keep a strong reference to it, to avoid garbage collection that'll
+		
-        // reset this setting.
+		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); 
@@ -90,18 +137,15 @@ public class ATContentStudio {
 					WorkerDialog.showTaskMessage("Loading your workspace...", null, new Runnable(){
 						public void run() {
 							Workspace.setActive(workspaceRoot);
-                            if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue()
+							if (Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
-                                    && Workspace.activeWorkspace.settings.checkUpdates.getCurrentValue()) {
 								new Thread() {
-                                    public void run() {
+									public void run() {checkUpdate();}
-                                        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)) {
@@ -119,34 +163,6 @@ public class ATContentStudio {
 		});
 	}
 	
-    public static void setLookAndFeel(String laf) {
-        if (laf == null)
-        {
-            System.out.println("No look and feel specified, using system default.");
-            laf = UIManager.getSystemLookAndFeelClassName();
-        }
-        System.out.println("Info: Setting look and feel to: " + laf);
-
-        try {
-            UIManager.setLookAndFeel(laf);
-        } catch (ClassNotFoundException e) {
-            System.err.println("Failed to load system look and feel. ");
-            System.err.println("Installed look and feel classes: ");
-            for (UIManager.LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
-                System.err.println("  " + info.getName() + " (" + info.getClassName() + ")");
-            }
-            System.err.println("Tried to load: " + laf + " but got this error:");
-
-            e.printStackTrace();
-        } catch (InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        var newLaF = UIManager.getLookAndFeel();
-        System.out.println("Using look and feel: " + newLaF.getName() + " (" + newLaF.getClass().getName() + ")");
-
-        scaleUIFont();
-    }
-
 	private static void checkUpdate() {
 		BufferedReader in = null;
 		try {
@@ -154,9 +170,7 @@ public class ATContentStudio {
 			in = new BufferedReader(new InputStreamReader(url.openStream()));
 
 			String inputLine, lastLine = null;
-            while ((inputLine = in.readLine()) != null) {
+			while ((inputLine = in.readLine()) != null) {lastLine = inputLine;}
-                lastLine = inputLine;
-            }
 			if (lastLine != null && !lastLine.equals(APP_VERSION)) {
 				
 				// for copying style
@@ -168,13 +182,13 @@ public class ATContentStudio {
 			    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()
+			    style.append("background-color: rgb("+color.getRed()+","+color.getGreen()+","+color.getBlue()+");");
-                        + ");");
 				
-                JEditorPane ep = new JEditorPane("text/html",
+				JEditorPane ep = new JEditorPane("text/html", "<html><body style=\"" + style + "\">"
-                        "<html><body style=\"" + style + "\">" + "You are not running the latest ATCS version.<br/>"
+						+ "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/>"
+						+ "<a href=\""+DOWNLOAD_URL+"\">"+DOWNLOAD_URL+"</a><br/>"
+						+ "<br/>"
 						+ "</body></html>");
 				
 				ep.setEditable(false);
@@ -200,18 +214,11 @@ public class ATContentStudio {
 			}
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
-        } catch (HttpTimeoutException e) {
-            System.out.println("Could not connect to url to check for updates (timeout): " + CHECK_UPDATE_URL);
 		} catch (IOException e) {
-            if (e.getMessage() != null && e.getMessage().startsWith("Server returned HTTP response code:")) {
+			e.printStackTrace();
-                System.out.println("Could not fetch current version from server to check for updates (non-success-status): " + e.getMessage());
-            } else {
-                System.out.println("Could not check for updates: '" + CHECK_UPDATE_URL + "' - " + e.getMessage());
-            }
 		} finally {
 			try {
-                if (in != null)
+				if (in != null) in.close();
-                    in.close();
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -241,14 +248,4 @@ public class ATContentStudio {
 			}
 		}
 	}
-
-    private static String readVersionFromFile() {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
-                Objects.requireNonNull(ATContentStudio.class.getResourceAsStream("/ATCS_latest"))))) {
-            return reader.readLine();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return "unknown";
-        }
-    }
 }

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

@@ -1,12 +1,12 @@
 package com.gpl.rpg.atcontentstudio;
 
-import com.gpl.rpg.atcontentstudio.io.SettingsSave;
-
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gpl.rpg.atcontentstudio.io.SettingsSave;
+
 public class ConfigCache implements Serializable {
 
 	private static final long serialVersionUID = 4584324644282843961L;
@@ -91,8 +91,7 @@ public class ConfigCache implements Serializable {
 		return instance.notifConfig;
 	}
 
-    public static void init() {
+	public static void init() {}
-    }
 
 	public static void clear() {
 		instance.knownWorkspaces.clear();

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

@@ -8,7 +8,7 @@ public class Notification {
 
 	public static List<Notification> notifs = new ArrayList<Notification>();
 	private static List<NotificationListener> listeners = new CopyOnWriteArrayList<NotificationListener>();
-    public static boolean showS, showI, showW, showE;
+	public static boolean showS = true, showI = true, showW = true, showE = true;
 	
 	static {
 		boolean[] config = ConfigCache.getNotifViewConfig();

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

@@ -3,7 +3,6 @@ package com.gpl.rpg.atcontentstudio;
 public interface NotificationListener {
 
 	public void onNewNotification(Notification n);
-
 	public void onListCleared(int i);
 	
 }

src/com/gpl/rpg/atcontentstudio/io/JsonSerializable.java

@@ -1,8 +0,0 @@
-package com.gpl.rpg.atcontentstudio.io;
-
-import java.util.Map;
-
-public interface JsonSerializable {
-    Map toMap();
-    void fromMap(Map map);
-}

src/com/gpl/rpg/atcontentstudio/io/SettingsSave.java

@@ -1,8 +1,14 @@
 package com.gpl.rpg.atcontentstudio.io;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
-import java.io.*;
+import com.gpl.rpg.atcontentstudio.Notification;
 
 public class SettingsSave {
 

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

@@ -1,15 +1,16 @@
 package com.gpl.rpg.atcontentstudio.model;
 
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
 public class ClosedProject implements ProjectTreeNode {
 
 	String name;
@@ -24,32 +25,26 @@ public class ClosedProject implements ProjectTreeNode {
 	public TreeNode getChildAt(int childIndex) {
 		return null;
 	}
-
 	@Override
 	public int getChildCount() {
 		return 0;
 	}
-
 	@Override
 	public TreeNode getParent() {
 		return parent;
 	}
-
 	@Override
 	public int getIndex(TreeNode node) {
 		return 0;
 	}
-
 	@Override
 	public boolean getAllowsChildren() {
 		return false;
 	}
-
 	@Override
 	public boolean isLeaf() {
 		return true;
 	}
-
 	@Override
 	public Enumeration<ProjectTreeNode> children() {
 		return null;
@@ -60,19 +55,16 @@ public class ClosedProject implements ProjectTreeNode {
 		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>());
@@ -93,19 +85,16 @@ public class ClosedProject implements ProjectTreeNode {
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		//TODO Create a cool Project icon.
 		return DefaultIcons.getStdClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		//TODO Create a cool Project icon.
 		return DefaultIcons.getStdClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		//TODO Create a cool Project icon.

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

@@ -1,13 +1,17 @@
 package com.gpl.rpg.atcontentstudio.model;
 
-import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
+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 java.awt.*;
+
-import java.io.Serializable;
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarkEntry;
-import java.util.List;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 
@@ -40,37 +44,30 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	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);
@@ -88,12 +85,10 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 		path.add(0,this);
 		parent.childrenRemoved(path);
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
 	}
-
 	@Override
 	public abstract String getDesc();
 	
@@ -102,10 +97,10 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	}
 	
 	public abstract void parse();
-
 	public abstract void link();
 	
 	
+	
 	@Override
 	public Project getProject() {
 		return parent == null ? null : parent.getProject();
@@ -115,17 +110,10 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	public Image getIcon() {
 		return null;
 	}
-
 	@Override
-    public Image getClosedIcon() {
+	public Image getClosedIcon() {return null;}
-        return null;
-    }
-
 	@Override
-    public Image getOpenIcon() {
+	public Image getOpenIcon() {return null;}
-        return null;
-    }
-
 	@Override
 	public Image getLeafIcon() {
 		return getIcon();
@@ -184,7 +172,6 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	
 	public static interface BacklinksListener {
 		public void backlinkAdded(GameDataElement gde);
-
 		public void backlinkRemoved(GameDataElement gde);
 	}
 	
@@ -203,35 +190,4 @@ public abstract class GameDataElement implements ProjectTreeNode, Serializable {
 	
 	public abstract List<SaveEvent> attemptSave();
 	
-    /**
-     * Checks if the current state indicates that parsing/linking should be skipped.
-     *
-     * @return true if the operation should be skipped, false otherwise
-     */
-    protected boolean shouldSkipParseOrLink() {
-        if (shouldSkipParse()) return true;
-        if (this.state == State.linked) {
-            //Already linked.
-            return true;
-        }
-        return false;
-    }
-
-    protected boolean shouldSkipParse() {
-        if (this.state == State.created || this.state == State.modified || this.state == State.saved) {
-            //This type of state is unrelated to parsing/linking.
-            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/GameSource.java

@@ -1,6 +1,28 @@
 package com.gpl.rpg.atcontentstudio.model;
 
-import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+import java.awt.Image;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.tree.TreeNode;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 import com.gpl.rpg.atcontentstudio.model.Project.ResourceSet;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
@@ -10,22 +32,8 @@ import com.gpl.rpg.atcontentstudio.model.sprites.SpriteSheetSet;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
-import javax.swing.tree.TreeNode;
+public class GameSource implements ProjectTreeNode, Serializable {
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.awt.*;
-import java.io.*;
-import java.util.List;
-import java.util.*;
-
-public class GameSource implements ProjectTreeNode, Serializable, JsonSerializable {
 
 	private static final long serialVersionUID = -1512979360971918158L;
 	
@@ -39,22 +47,6 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 	public transient WriterModeDataSet writerModeDataSet;
 	private transient SavedSlotCollection v;
 	
-
-    @Override
-    public Map toMap() {
-        Map map = new HashMap();
-        map.put("type", type.toString());
-        map.put("baseFolder", baseFolder.getPath());
-        return map;
-    }
-
-    @Override
-    public void fromMap(Map map) {
-        if(map==null)return;
-        type = Enum.valueOf(Type.class, (String)map.get("type"));
-        baseFolder = new File((String) map.get("baseFolder"));
-    }
-
 	public static enum Type {
 		source,
 		referenced,
@@ -65,14 +57,10 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 	public File baseFolder;
 	public Type type;
 	
-    public transient Project parent;
+	public transient Project parent = null;
 	
 	public transient Map<String, List<String>> referencedSourceFiles = null;
 	
-    public GameSource(Map json, Project parent) {
-        fromMap(json);
-        refreshTransients(parent);
-    }
 	public GameSource(File folder, Project parent) {
 		this.parent = parent;
 		this.baseFolder = folder;
@@ -117,7 +105,7 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 	}
 	
 	public void readResourceList() {
-        File xmlFile;
+		File xmlFile = null;
 		if (parent.sourceSetToUse == ResourceSet.gameData) {
 			xmlFile = new File(baseFolder, DEFAULT_REL_PATH_FOR_GAME_RESOURCE);
 		} else if (parent.sourceSetToUse == ResourceSet.debugData) {
@@ -172,49 +160,40 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 	public Enumeration<ProjectTreeNode> children() {
 		return v.getNonEmptyElements();
 	}
-
 	@Override
 	public boolean getAllowsChildren() {
 		return true;
 	}
-
 	@Override
 	public TreeNode getChildAt(int arg0) {
 		return v.getNonEmptyElementAt(arg0);
 	}
-
 	@Override
 	public int getChildCount() {
 		return v.getNonEmptySize();
 	}
-
 	@Override
 	public int getIndex(TreeNode arg0) {
 		return v.getNonEmptyIndexOf((ProjectTreeNode) arg0);
 	}
-
 	@Override
 	public TreeNode getParent() {
 		return parent;
 	}
-
 	@Override
 	public boolean isLeaf() {
 		return false;
 	}
-
 	@Override
 	public void childrenAdded(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenAdded(path);
 	}
-
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenChanged(path);
 	}
-
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		if (path.size() == 1 && this.v.getNonEmptySize() == 1) {
@@ -224,7 +203,6 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -232,20 +210,14 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 			node.notifyCreated();
 		}
 	}
-
 	@Override
 	public String getDesc() {
 		switch(type) {
-            case altered:
+		case altered: return (needsSaving() ? "*" : "")+"Altered data";
-                return (needsSaving() ? "*" : "") + "Altered data";
+		case created: return (needsSaving() ? "*" : "")+"Created data";
-            case created:
+		case referenced: return (needsSaving() ? "*" : "")+"Referenced data";
-                return (needsSaving() ? "*" : "") + "Created data";
+		case source: return (needsSaving() ? "*" : "")+"AT Source"; //The fact that it is from "source" is already mentionned by its parent.
-            case referenced:
+		default: return (needsSaving() ? "*" : "")+"Game data";
-                return (needsSaving() ? "*" : "") + "Referenced data";
-            case source:
-                return (needsSaving() ? "*" : "") + "AT Source"; //The fact that it is from "source" is already mentionned by its parent.
-            default:
-                return (needsSaving() ? "*" : "") + "Game data";
 		}
 	}
 	
@@ -280,22 +252,18 @@ public class GameSource implements ProjectTreeNode, Serializable, JsonSerializab
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		return DefaultIcons.getATClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getATClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		return DefaultIcons.getATOpenIcon();
 	}
-
 	@Override
 	public GameDataSet getDataSet() {
 		return null;

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

@@ -1,53 +1,19 @@
 package com.gpl.rpg.atcontentstudio.model;
 
-import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+import java.awt.Dimension;
-
-import java.awt.*;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Preferences implements Serializable, JsonSerializable {
+public class Preferences implements Serializable {
 
 	private static final long serialVersionUID = 2455802658424031276L;
 	
 	public Dimension windowSize = null;
-    public Map<String, Integer> splittersPositions = new HashMap<>();
+	public Map<String, Integer> splittersPositions = new HashMap<String, Integer>();
 	
 	public Preferences() {
 
 	}
 	
-    @Override
-    public Map toMap() {
-        Map map = new HashMap();
-
-        if(windowSize!= null){
-            Map windowSizeMap = new HashMap<>();
-            windowSizeMap.put("width", windowSize.width);
-            windowSizeMap.put("height", windowSize.height);
-            map.put("windowSize", windowSizeMap);
-        }
-
-        map.put("splittersPositions", splittersPositions);
-        return map;
-    }
-
-    @Override
-    public void fromMap(Map map) {
-        if(map == null) return;
-
-        Map windowSize1 = (Map) map.get("windowSize");
-        if(windowSize1 != null){
-            windowSize = new Dimension(((Number) windowSize1.get("width")).intValue(), ((Number) windowSize1.get("height")).intValue());
-        }
-
-        Map<String, Number> splitters = (Map<String, Number>) map.get("splittersPositions");
-        Map<String, Integer> splittersInt = new HashMap<>(splitters.size());
-        for (Map.Entry<String, Number> entry : splitters. entrySet()){
-            splittersInt.put(entry.getKey(), entry.getValue().intValue());
-        }
-        splittersPositions = splittersInt;
-
-    }
 }

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

@@ -1,21 +1,41 @@
 package com.gpl.rpg.atcontentstudio.model;
 
-import com.gpl.rpg.atcontentstudio.ATContentStudio;
+import java.awt.Image;
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.io.ByteArrayInputStream;
-import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
+import java.io.File;
-import com.gpl.rpg.atcontentstudio.io.SettingsSave;
+import java.io.FileInputStream;
-import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import java.io.FileNotFoundException;
-import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarksRoot;
+import java.io.FileOutputStream;
-import com.gpl.rpg.atcontentstudio.model.gamedata.*;
+import java.io.FileWriter;
-import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import java.io.IOException;
-import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+import java.io.Serializable;
-import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
+import java.io.StringReader;
-import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
+import java.io.StringWriter;
-import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
+import java.util.ArrayList;
-import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
+import java.util.Collections;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import java.util.Enumeration;
-import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import java.util.HashMap;
-import com.gpl.rpg.atcontentstudio.utils.FileUtils;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.swing.tree.TreeNode;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.json.simple.JSONArray;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -23,32 +43,40 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import javax.swing.tree.TreeNode;
+import com.gpl.rpg.atcontentstudio.ATContentStudio;
-import javax.xml.parsers.DocumentBuilder;
+import com.gpl.rpg.atcontentstudio.Notification;
-import javax.xml.parsers.DocumentBuilderFactory;
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
-import javax.xml.parsers.ParserConfigurationException;
+import com.gpl.rpg.atcontentstudio.io.SettingsSave;
-import javax.xml.transform.*;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
-import javax.xml.transform.dom.DOMSource;
+import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarksRoot;
-import javax.xml.transform.stream.StreamResult;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
-import javax.xml.transform.stream.StreamSource;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
-import java.awt.*;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
-import java.io.*;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataCategory;
-import java.nio.charset.StandardCharsets;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
-import java.nio.file.Files;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
-import java.nio.file.Path;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
-import java.nio.file.Paths;
+import com.gpl.rpg.atcontentstudio.model.gamedata.JSONElement;
-import java.util.List;
+import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
-import java.util.*;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
+import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
+import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
+import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
+import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
+import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet;
+import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
+import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
+import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 
-public class Project implements ProjectTreeNode, Serializable, JsonSerializable {
+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";
-    public static final String SETTINGS_FILE_JSON = ".project.json";
 	
 	public String name;
 
@@ -57,39 +85,19 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	
 	public GameSource baseContent; //A.k.a library
 	
+	public GameSource referencedContent; //Pointers to base content
 	public transient GameSource alteredContent; //Copied from base content (does not overwrite yet)
 	public transient GameSource createdContent; //Stand-alone.
 	public transient BookmarksRoot bookmarks;
 	
 	
+	public SavedGamesSet saves; //For simulations.
+	
 	public transient SavedSlotCollection v;
 
 	public transient Workspace parent;
 	
-    public Properties knownSpritesheetsProperties;
+	public Properties knownSpritesheetsProperties = null;
-
-    @Override
-    public Map toMap() {
-        Map map = new HashMap();
-        map.put("name", name.toString());
-        map.put("baseFolder", baseFolder.getPath());
-        map.put("open", open);
-        map.put("baseContent", baseContent.toMap());
-        map.put("sourceSetToUse", sourceSetToUse.toString());
-        return map;
-    }
-
-    @Override
-    public void fromMap(Map map) {
-        if(map==null)return;
-        name = (String) map.get("name");
-        baseFolder = new File((String) map.get("baseFolder"));
-        open = (boolean) map.get("open");
-
-        baseContent = new GameSource((Map) map.get("baseContent"), this);
-
-        sourceSetToUse = Enum.valueOf(ResourceSet.class, (String)map.get("sourceSetToUse"));
-    }
 	
 	public static enum ResourceSet {
 		gameData,
@@ -97,17 +105,8 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		allFiles
 	} 
 	
-    public ResourceSet sourceSetToUse;
+	public ResourceSet sourceSetToUse = ResourceSet.allFiles;
 
-    public Project(Workspace w, File projectFile) {
-        this.parent = w;
-        loadSpritesheetProperties();
-        Map json = FileUtils.mapFromJsonFile(projectFile);
-        this.fromMap(json);
-
-        initializeData();
-        save();
-    }
 	public Project(Workspace w, String name, File source, ResourceSet sourceSet) {
 		this.parent = w;
 		this.name = name;
@@ -121,28 +120,38 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 			Notification.addError("Eror creating project root folder: "+e.getMessage());
 			e.printStackTrace();
 		}
-
-        loadSpritesheetProperties();
-        baseContent = new GameSource(source, this);
 		open = true;
-        initializeData();
-        linkAll();
-        save();
-    }
-
-    private void initializeData() {
 		v = new SavedSlotCollection();
 		
-        alteredContent = new GameSource(this, Type.altered);
+		knownSpritesheetsProperties = new Properties();
-        createdContent = new GameSource(this, Type.created);
+		try {
+			knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
+		} catch (IOException e) {
+			Notification.addWarn("Unable to load default spritesheets properties.");
+			e.printStackTrace();
+		}
+		
+		
+		baseContent = new GameSource(source, this);
+		
+//		referencedContent = new GameSource(this, GameSource.Type.referenced);
+
+		alteredContent = new GameSource(this, GameSource.Type.altered);
+		createdContent = new GameSource(this, GameSource.Type.created);
 		bookmarks = new BookmarksRoot(this);
 		
+		saves = new SavedGamesSet(this);
 
 		v.add(createdContent);
 		v.add(alteredContent);
 //		v.add(referencedContent);
 		v.add(baseContent);
+		v.add(saves);
 		v.add(bookmarks);
+
+		linkAll();
+		
+		save();
 	}
 	
 	
@@ -198,7 +207,6 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		path.add(0,this);
 		parent.childrenRemoved(path);
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -206,7 +214,6 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 			node.notifyCreated();
 		}
 	}
-
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+name;
@@ -224,21 +231,13 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 
 
 	public static Project fromFolder(Workspace w, File projRoot) {
-        Project p;
+		Project p = null;
-
-        File fJson = new File(projRoot, Project.SETTINGS_FILE_JSON);
-        if (fJson.exists()) {
-            p = new Project(w, fJson);
-        } else {
 		File f = new File(projRoot, Project.SETTINGS_FILE);
 		if (!f.exists()) {
 			Notification.addError("Unable to find "+SETTINGS_FILE+" for project "+projRoot.getName());
 			return null;
 		} else {
 			p = (Project) SettingsSave.loadInstance(f, "Project");
-                p.baseFolder = projRoot;
-            }
-            p.save();
 		}
 		p.refreshTransients(w);
 		return p;
@@ -249,7 +248,13 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 
 		projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
 
-        loadSpritesheetProperties();
+		try {
+			knownSpritesheetsProperties = new Properties();
+			knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
+		} catch (IOException e) {
+			Notification.addWarn("Unable to load default spritesheets properties.");
+			e.printStackTrace();
+		}
 		
 		if (sourceSetToUse == null) {
 			sourceSetToUse = ResourceSet.allFiles;
@@ -264,11 +269,14 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		createdContent = new GameSource(this, GameSource.Type.created);
 		bookmarks = new BookmarksRoot(this);
 		
+		saves.refreshTransients();
+
 		v = new SavedSlotCollection();
 		v.add(createdContent);
 		v.add(alteredContent);
 //		v.add(referencedContent);
 		v.add(baseContent);
+		v.add(saves);
 		v.add(bookmarks);
 		
 
@@ -276,40 +284,51 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		
 	}
 	
-    private void loadSpritesheetProperties() {
-        knownSpritesheetsProperties = new Properties();
-        try {
-            knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
-        } catch (IOException e) {
-            Notification.addWarn("Unable to load default spritesheets properties.");
-            e.printStackTrace();
-        }
-    }
-
 	public void linkAll() {
-        linkGameData(baseContent);
+		for (ProjectTreeNode node : baseContent.gameData.v.getNonEmptyIterable()) {
-        linkGameData(alteredContent);
-        linkGameData(createdContent);
-    }
-
-    private void linkGameData(GameSource source) {
-        for (ProjectTreeNode node : source.gameData.v.getNonEmptyIterable()) {
 			if (node instanceof GameDataCategory<?>) {
-                for (GameDataElement e : ((GameDataCategory<?>) node).toList()) {
+				for (GameDataElement e : ((GameDataCategory<?>) node)) {
 					e.link();
 				}
 			}
 		}
-        for (TMXMap node : source.gameMaps.tmxMaps) {
+		for (ProjectTreeNode node : baseContent.gameMaps.tmxMaps) {
+			((TMXMap)node).link();
+		}
+		for (ProjectTreeNode node : alteredContent.gameData.v.getNonEmptyIterable()) {
+			if (node instanceof GameDataCategory<?>) {
+				for (GameDataElement e : ((GameDataCategory<?>) node)) {
+					e.link();
+				}
+			}
+		}
+		for (ProjectTreeNode node : alteredContent.gameMaps.tmxMaps) {
+			((TMXMap)node).link();
+		}
+		for (ProjectTreeNode node : createdContent.gameData.v.getNonEmptyIterable()) {
+			if (node instanceof GameDataCategory<?>) {
+				for (GameDataElement e : ((GameDataCategory<?>) node)) {
+					e.link();
+				}
+			}
+		}
+		for (ProjectTreeNode node : createdContent.gameMaps.tmxMaps) {
+			((TMXMap)node).link();
+		}
+		
+		for (WorldmapSegment node : createdContent.worldmap) {
 			node.link();
 		}
-        for (WorldmapSegment node : source.worldmap) {
+		for (WorldmapSegment node : alteredContent.worldmap) {
+			node.link();
+		}
+		for (WorldmapSegment node : baseContent.worldmap) {
 			node.link();
 		}
 	}
 	
 	public void save() {
-        FileUtils.writeStringToFile(FileUtils.toJsonString(toMap()),new File(baseFolder, Project.SETTINGS_FILE_JSON), "Project " + this.name);
+		SettingsSave.saveInstance(this, new File(baseFolder, Project.SETTINGS_FILE), "Project "+this.name);
 	}
 	
 	
@@ -744,19 +763,16 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		//TODO Create a cool Project icon.
 		return DefaultIcons.getStdClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		//TODO Create a cool Project icon.
 		return DefaultIcons.getStdClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		//TODO Create a cool Project icon.
@@ -793,6 +809,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 	
 
+
 	public void makeWritable(TMXMap node) {
 		GameSource.Type type = node.getDataType();
 		if (type == null) {
@@ -836,6 +853,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 	
 	/**
+	 * 
 	 * @param node. Before calling this method, make sure that no other node with the same class and id exist in either created or altered.
 	 */
 	public void createElement(JSONElement node) {
@@ -859,6 +877,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 	
 	/**
+	 * 
 	 * @param node. Before calling this method, make sure that no other node with the same class and id exist in either created or altered.
 	 */
 	public void createElements(List<? extends JSONElement> nodes) {
@@ -886,6 +905,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 	
 	/**
+	 * 
 	 * @param node. Before calling this method, make sure that no other map with the same id exist in either created or altered.
 	 */
 	public void createElement(TMXMap node) {
@@ -915,14 +935,14 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 
 	public void moveToCreated(JSONElement target) {
 		target.childrenRemoved(new ArrayList<ProjectTreeNode>());
-        ((GameDataCategory<?>) target.getParent()).removeGeneric(target);
+		((GameDataCategory<?>)target.getParent()).remove(target);
 		target.state = GameDataElement.State.created;
 		createdContent.gameData.addElement(target);
 	}
 	
 	public void moveToAltered(JSONElement target) {
 		target.childrenRemoved(new ArrayList<ProjectTreeNode>());
-        ((GameDataCategory<?>) target.getParent()).removeGeneric(target);
+		((GameDataCategory<?>)target.getParent()).remove(target);
 		target.state = GameDataElement.State.created;
 		((JSONElement) target).jsonFile = new File(baseContent.gameData.getGameDataElement(((JSONElement)target).getClass(), target.id).jsonFile.getAbsolutePath());
 		alteredContent.gameData.addElement((JSONElement) target);
@@ -949,6 +969,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 
 
+
 	public void createWriterSketch(WriterModeData node) {
 		node.writable = true;
 		createdContent.writerModeDataSet.add(node);
@@ -987,6 +1008,11 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 
 
+	public void addSave(File selectedFile) {
+		saves.addSave(selectedFile);
+	}
+
+
 	public List<NPC> getSpawnGroup(String spawngroup_id) {
 		List<NPC> result = new ArrayList<NPC>();
 		int i = getNPCCount();
@@ -1028,8 +1054,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 	
 	public void removeElementListener(Class<? extends GameDataElement> interestingType, ProjectElementListener listener) {
-        if (projectElementListeners.get(interestingType) != null)
+		if (projectElementListeners.get(interestingType) != null) projectElementListeners.get(interestingType).remove(listener);
-            projectElementListeners.get(interestingType).remove(listener);
 	}
 	
 	public void fireElementAdded(GameDataElement element, int index) {
@@ -1054,16 +1079,10 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 			public void run() {
 				Notification.addInfo("Exporting project \""+name+"\" as "+target.getAbsolutePath());
 				
-                File tmpDir;
+				File tmpDir = exportProjectToTmpDir();
-                try {
+
-                    tmpDir = exportProjectToTmpDir();
 				FileUtils.writeToZip(tmpDir, target);
 				FileUtils.deleteDir(tmpDir);
-                } catch (IOException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-
 				Notification.addSuccess("Project \""+name+"\" exported as "+target.getAbsolutePath());
 			}
 
@@ -1077,16 +1096,10 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 			public void run() {
 				Notification.addInfo("Exporting project \""+name+"\" into "+target.getAbsolutePath());
 				
-                File tmpDir;
+				File tmpDir = exportProjectToTmpDir();
-                try {
+
-                    tmpDir = exportProjectToTmpDir();
 				FileUtils.copyOver(tmpDir, target);
 				FileUtils.deleteDir(tmpDir);
-                } catch (IOException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-
 				Notification.addSuccess("Project \""+name+"\" exported into "+target.getAbsolutePath());
 			}
 
@@ -1094,7 +1107,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		});
 	}
 	
-    public File exportProjectToTmpDir() throws IOException {
+	public File exportProjectToTmpDir() {
 		File tmpDir = new File(baseFolder, "tmp");
 		FileUtils.deleteDir(tmpDir);
 		tmpDir.mkdir();
@@ -1106,15 +1119,13 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 //		}
 		Map<Class<? extends GameDataElement>, List<String>> writtenFilesPerDataType = new LinkedHashMap<Class<? extends GameDataElement>, List<String>>();
 		List<String> writtenFiles;
-        writtenFiles = writeDataDeltaForDataType(createdContent.gameData.actorConditions, alteredContent.gameData.actorConditions, baseContent.gameData.actorConditions, ActorCondition.class,
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.actorConditions, alteredContent.gameData.actorConditions, baseContent.gameData.actorConditions, ActorCondition.class, tmpJsonDataDir);
-                                                 tmpJsonDataDir);
 		writtenFilesPerDataType.put(ActorCondition.class, writtenFiles);
 		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.dialogues, alteredContent.gameData.dialogues, baseContent.gameData.dialogues, Dialogue.class, tmpJsonDataDir);
 		writtenFilesPerDataType.put(Dialogue.class, writtenFiles);
 		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.droplists, alteredContent.gameData.droplists, baseContent.gameData.droplists, Droplist.class, tmpJsonDataDir);
 		writtenFilesPerDataType.put(Droplist.class, writtenFiles);
-        writtenFiles = writeDataDeltaForDataType(createdContent.gameData.itemCategories, alteredContent.gameData.itemCategories, baseContent.gameData.itemCategories, ItemCategory.class,
+		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.itemCategories, alteredContent.gameData.itemCategories, baseContent.gameData.itemCategories, ItemCategory.class, tmpJsonDataDir);
-                                                 tmpJsonDataDir);
 		writtenFilesPerDataType.put(ItemCategory.class, writtenFiles);
 		writtenFiles = writeDataDeltaForDataType(createdContent.gameData.items, alteredContent.gameData.items, baseContent.gameData.items, Item.class, tmpJsonDataDir);
 		writtenFilesPerDataType.put(Item.class, writtenFiles);
@@ -1128,12 +1139,12 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		writtenFiles = new LinkedList<String>();
 		for (File createdMapFile : createdContent.gameMaps.mapFolder.listFiles()) {
 			if (createdMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
-            copyTmxConverted(createdMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), createdMapFile.getName()));
+			FileUtils.copyFile(createdMapFile, new File(tmpMapDir, createdMapFile.getName()));
 			writtenFiles.add(createdMapFile.getName());
 		}
 		for (File alteredMapFile : alteredContent.gameMaps.mapFolder.listFiles()) {
 			if (alteredMapFile.getName().equalsIgnoreCase("worldmap.xml")) continue;
-            copyTmxConverted(alteredMapFile.toPath(), Paths.get(tmpMapDir.getAbsolutePath(), alteredMapFile.getName()));
+			FileUtils.copyFile(alteredMapFile, new File(tmpMapDir, alteredMapFile.getName()));
 			writtenFiles.add(alteredMapFile.getName());
 		}
 		writtenFilesPerDataType.put(TMXMap.class, writtenFiles);
@@ -1166,32 +1177,22 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		return tmpDir;
 	}
 	
-    private void copyTmxConverted(Path from, Path to) throws IOException {
-        String xml = new String(Files.readAllBytes(from), StandardCharsets.UTF_8);
-        xml = xml.replace("../../altered/spritesheets/", drawablePath);
-        xml = xml.replace("../../created/spritesheets/", drawablePath);
-        xml = xml.replace("../spritesheets/", drawablePath);
-        xml = xml.replace("../spritesheets/", drawablePath);
-        Files.write(to, xml.getBytes(StandardCharsets.UTF_8));
-    }
-
-
 	@SuppressWarnings("rawtypes")
 	public List<String> writeDataDeltaForDataType(GameDataCategory<? extends JSONElement> created, GameDataCategory<? extends JSONElement> altered, GameDataCategory<? extends JSONElement> source, Class<? extends JSONElement> gdeClass, File targetFolder) {
 		List<String> filenamesToWrite = new LinkedList<String>();
 		Map<String, List<Map>> dataToWritePerFilename = new LinkedHashMap<String, List<Map>>();
-        for (JSONElement gde : altered.toList()) {
+		for (JSONElement gde : altered) {
 			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
 				filenamesToWrite.add(gde.jsonFile.getName());
 			}
 		}
-        for (JSONElement gde : created.toList()) {
+		for (JSONElement gde : created) {
 			if (!filenamesToWrite.contains(gde.jsonFile.getName())) {
 				filenamesToWrite.add(gde.jsonFile.getName());
 			}
 		}
 		for (String fName : filenamesToWrite) {
-            for (JSONElement gde : source.toList()) {
+			for (JSONElement gde : source) {
 				if (gde.jsonFile.getName().equals(fName)) {
 					if (dataToWritePerFilename.get(fName) == null) {
 						dataToWritePerFilename.put(fName, new ArrayList<Map>());
@@ -1200,7 +1201,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 					dataToWritePerFilename.get(fName).add(getGameDataElement(gdeClass, gde.id).toJson());
 				}
 			}
-            for (JSONElement gde : created.toList()) {
+			for (JSONElement gde : created) {
 				if (gde.jsonFile.getName().equals(fName)) {
 					if (dataToWritePerFilename.get(fName) == null) {
 						dataToWritePerFilename.put(fName, new ArrayList<Map>());
@@ -1212,9 +1213,22 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 		}
 		for (String fName : dataToWritePerFilename.keySet()) {
 			File jsonFile = new File(targetFolder, fName);
-
+			StringWriter writer = new JsonPrettyWriter();
-            String textToWrite = FileUtils.toJsonString(dataToWritePerFilename.get(fName));
+			try {
-            FileUtils.writeStringToFile(textToWrite, jsonFile, "JSON file '"+jsonFile.getAbsolutePath()+"'", false);
+				JSONArray.writeJSONString(dataToWritePerFilename.get(fName), writer);
+			} catch (IOException e) {
+				//Impossible with a StringWriter
+			}
+			String textToWrite = writer.toString();
+			try {
+				FileWriter w = new FileWriter(jsonFile);
+				w.write(textToWrite);
+				w.close();
+//				Notification.addSuccess("Json file "+jsonFile.getAbsolutePath()+" saved.");
+			} catch (IOException e) {
+				Notification.addError("Error while writing json file "+jsonFile.getAbsolutePath()+" : "+e.getMessage());
+				e.printStackTrace();
+			}
 		}
 		return filenamesToWrite;
 	}
@@ -1358,4 +1372,7 @@ public class Project implements ProjectTreeNode, Serializable, JsonSerializable
 	}
 
 	
+
+
+	
 }

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

@@ -1,26 +1,23 @@
 package com.gpl.rpg.atcontentstudio.model;
 
-import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import java.awt.Image;
+import java.util.List;
 
 import javax.swing.tree.TreeNode;
-import java.awt.*;
+
-import java.util.List;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 
 public interface ProjectTreeNode extends TreeNode {
 	
 	public void childrenAdded(List<ProjectTreeNode> path);
-
 	public void childrenChanged(List<ProjectTreeNode> path);
-
 	public void childrenRemoved(List<ProjectTreeNode> path);
-
 	public void notifyCreated();
 	
 	public String getDesc();
 
 	/**
 	 * Unnecessary for anything not below a Project. Can return null.
-     *
 	 * @return the parent Project or null.
 	 */
 	public Project getProject();
@@ -28,31 +25,29 @@ public interface ProjectTreeNode extends TreeNode {
 
 	/**
 	 * Unnecessary for anything not below a GameDataSet. Can return null.
-     *
 	 * @return the parent GameDataSet or null.
 	 */
 	public GameDataSet getDataSet();
 	
 	public Image getIcon();
-
 	/**
+	 * 
 	 * @return The icon depicting this node when it is an open folder. Can be null for leaves.
 	 */
 	public Image getOpenIcon();
-
 	/**
+	 * 
 	 * @return The icon depicting this node when it is a closed folder. Can be null for leaves.
 	 */
 	public Image getClosedIcon();
-
 	/**
+	 * 
 	 * @return The icon depicting this node when it is a leaf. Should return the closed one for empty folders.
 	 */
 	public Image getLeafIcon();
 	
 	/**
 	 * Unnecessary for anything not below a GameSource. Can return null.
-     *
 	 * @return the parent GameSource or null.
 	 */
 	public GameSource.Type getDataType();

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

@@ -1,30 +1,35 @@
 package com.gpl.rpg.atcontentstudio.model;
 
+import java.awt.Image;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
 import com.gpl.rpg.atcontentstudio.io.SettingsSave;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.ProjectsTree.ProjectsTreeModel;
 import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
-import com.gpl.rpg.atcontentstudio.utils.FileUtils;
-import org.jsoup.SerializationException;
 
-import javax.swing.tree.TreeNode;
+public class Workspace implements ProjectTreeNode, Serializable {
-import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.io.*;
-import java.nio.file.Files;
-import java.util.List;
-import java.util.*;
-
-public class Workspace implements ProjectTreeNode, Serializable, JsonSerializable {
 
 	private static final long serialVersionUID = 7938633033601384956L;
 
 	public static final String WS_SETTINGS_FILE = ".workspace";
-    public static final String WS_SETTINGS_FILE_JSON = ".workspace.json";
 
 	public static Workspace activeWorkspace;
 
@@ -40,7 +45,6 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 	public transient ProjectsTreeModel projectsTreeModel = null;
 
 	public Workspace(File workspaceRoot) {
-        boolean freshWorkspace = false;
 		baseFolder = workspaceRoot;
 		if (!workspaceRoot.exists()) {
 			try {
@@ -52,70 +56,23 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 			}
 		}
 		settings = new WorkspaceSettings(this);
-        settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
+		settingsFile = new File(workspaceRoot, WS_SETTINGS_FILE);
 		if (!settingsFile.exists()) {
 			try {
 				settingsFile.createNewFile();
-                freshWorkspace = true;
 			} catch (IOException e) {
 				Notification.addError("Error creating workspace datafile: "
 						+ e.getMessage());
 				e.printStackTrace();
 			}
+		}
 		Notification.addSuccess("New workspace created: "
 				+ workspaceRoot.getAbsolutePath());
-        }
-        if (freshWorkspace)
 		save();
 	}
 
-    @Override
-    public Map toMap() {
-        Map map = new HashMap();
-        map.put("serialVersionUID", serialVersionUID);
-        map.put("preferences", preferences.toMap());
-        map.put("projectsName", (new ArrayList<String>(projectsName)));
-        map.put("projectsOpenByName", projectsOpenByName);
-        List<String> l = new ArrayList<>(knownMapSourcesFolders.size());
-        for (File f: knownMapSourcesFolders){
-            l.add(f.getPath());
-        }
-        map.put("knownMapSourcesFolders", l);
-        return map;
-    }
-
-    @Override
-    public void fromMap(Map map) {
-        if(serialVersionUID != (long) map.get("serialVersionUID")){
-            throw new SerializationException("wrong seriaVersionUID");
-        }
-
-        preferences.fromMap((Map) map.get("preferences"));
-
-        projectsName = new HashSet<>((List<String>) map.getOrDefault("projectsName", new HashSet<String>()));
-
-        projectsOpenByName = (Map<String, Boolean>) map.getOrDefault("projectsOpenByName", new HashMap<String, Boolean>() );
-
-        List<String> knownMapSourcesFolders1 = (List<String>) map.getOrDefault("knownMapSourcesFolders", new ArrayList<String>());
-        knownMapSourcesFolders = new HashSet<>();
-        if (knownMapSourcesFolders1 != null){
-            int size = knownMapSourcesFolders1.size();
-            for (String path: knownMapSourcesFolders1) {
-                //TODO: catch invalid paths...?
-                knownMapSourcesFolders.add(new File(path));
-            }
-        }
-
-    }
-
 	public static void setActive(File workspaceRoot) {
-        Workspace w;
+		Workspace w = null;
-        File f2 = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
-        if (f2.exists()) {
-            w = loadWorkspaceFromJson(workspaceRoot, f2);
-            w.refreshTransients();
-        } else {
-            Notification.addInfo("Could not find json workspace file. Checking for binary file");
 		File f = new File(workspaceRoot, WS_SETTINGS_FILE);
 		if (!workspaceRoot.exists() || !f.exists()) {
 			w = new Workspace(workspaceRoot);
@@ -124,33 +81,19 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 			if (w == null) {
 				w = new Workspace(workspaceRoot);
 			} else {
-                    w.settingsFile = f2;
-                    w.baseFolder = workspaceRoot;
-                    Notification.addInfo("Switched workspace to json format.");
 				w.refreshTransients();
 			}
-                w.save();
-            }
 		}
 		activeWorkspace = w;
 	}
 
-    private static Workspace loadWorkspaceFromJson(File workspaceRoot, File settingsFile) {
-        Workspace w = w = new Workspace(workspaceRoot);
-        Map json = FileUtils.mapFromJsonFile(settingsFile);
-        if (json!= null) {
-            w.fromMap(json);
-        }
-        return w;
-    }
-
 	public static void saveActive() {
 		activeWorkspace.save();
 	}
 
 	public void save() {
 		settings.save();
-        FileUtils.writeStringToFile(FileUtils.toJsonString(this), settingsFile, "Workspace");
+		SettingsSave.saveInstance(this, settingsFile, "Workspace");
 	}
 
 	@Override
@@ -368,6 +311,7 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 			Notification.addError("Error while deleting closed project "
 					+ cp.name + ". Files may remain in the workspace.");
 		}
+		cp = null;
 		saveActive();
 	}
 
@@ -383,6 +327,7 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 			Notification.addError("Error while deleting project " + p.name
 					+ ". Files may remain in the workspace.");
 		}
+		p = null;
 		saveActive();
 	}
 
@@ -394,7 +339,7 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 			for (File c : f.listFiles())
 				b &= delete(c);
 		}
-        return b & f.delete();
+		return b &= f.delete();
 	}
 
 	@Override
@@ -420,4 +365,5 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
 		}
 		return false;
 	}
+
 }

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

@@ -1,15 +1,21 @@
 package com.gpl.rpg.atcontentstudio.model;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.io.File;
-import com.gpl.rpg.atcontentstudio.utils.FileUtils;
+import java.io.FileReader;
-import org.json.simple.parser.JSONParser;
+import java.io.FileWriter;
-
+import java.io.IOException;
-import java.io.*;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
+
 public class WorkspaceSettings {
 	
 	public static final String VERSION_KEY = "ATCS_Version";
@@ -107,8 +113,22 @@ public class WorkspaceSettings {
 		}
 
 		json.put(VERSION_KEY, SETTINGS_VERSION);
-        String toWrite = FileUtils.toJsonString(json);
+		StringWriter writer = new JsonPrettyWriter();
-        FileUtils.writeStringToFile(toWrite, file, "Workspace settings");
+		try {
+			JSONObject.writeJSONString(json, writer);
+		} catch (IOException e) {
+			//Impossible with a StringWriter
+		}
+		String toWrite = writer.toString();
+		try {
+			FileWriter w = new FileWriter(file);
+			w.write(toWrite);
+			w.close();
+			Notification.addSuccess("Workspace settings saved.");
+		} catch (IOException e) {
+			Notification.addError("Error while saving workspace settings : "+e.getMessage());
+			e.printStackTrace();
+		}
 	}
 	
 	public void resetDefault() {
@@ -196,4 +216,5 @@ public class WorkspaceSettings {
 	}
 	
 	
+
 }

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

@@ -1,5 +1,12 @@
 package com.gpl.rpg.atcontentstudio.model.bookmarks;
 
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.Project;
@@ -8,12 +15,6 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
 import com.gpl.rpg.atcontentstudio.model.gamedata.QuestStage;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
 public class BookmarkEntry implements BookmarkNode {
 
 	public GameDataElement bookmarkedElement;
@@ -78,7 +79,6 @@ public class BookmarkEntry implements BookmarkNode {
 		path.add(0,this);
 		parent.childrenRemoved(path);
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -91,13 +91,7 @@ public class BookmarkEntry implements BookmarkNode {
 			if (text.length() > 60) {
 				text = text.substring(0, 57)+"...";
 			}
-            return ((GameDataElement) bookmarkedElement).getDataType().toString() +
+			return ((GameDataElement)bookmarkedElement).getDataType().toString()+"/"+((Quest)((QuestStage)bookmarkedElement).parent).id+"#"+((QuestStage)bookmarkedElement).progress+":"+text;
-                    "/" +
-                    ((Quest) ((QuestStage) bookmarkedElement).parent).id +
-                    "#" +
-                    ((QuestStage) bookmarkedElement).progress +
-                    ":" +
-                    text;
 		} else {
 			return ((GameDataElement)bookmarkedElement).getDataType().toString()+"/"+((GameDataElement)bookmarkedElement).getDesc();
 		}

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

@@ -1,16 +1,20 @@
 package com.gpl.rpg.atcontentstudio.model.bookmarks;
 
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.util.List;
-import java.util.*;
-
 public class BookmarkFolder implements BookmarkNode {
 
 	List<BookmarkNode> contents = new LinkedList<BookmarkNode>();
@@ -85,7 +89,6 @@ public class BookmarkFolder implements BookmarkNode {
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());

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

@@ -5,7 +5,6 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 public interface BookmarkNode extends ProjectTreeNode{
 
 	public void save();
-
 	public void delete();
 	
 }

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

@@ -1,27 +1,36 @@
 package com.gpl.rpg.atcontentstudio.model.bookmarks;
 
+import java.awt.Image;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.SavedSlotCollection;
-import com.gpl.rpg.atcontentstudio.model.gamedata.*;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Item;
+import com.gpl.rpg.atcontentstudio.model.gamedata.ItemCategory;
+import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
+import com.gpl.rpg.atcontentstudio.model.gamedata.Quest;
 import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
 import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
 public class BookmarksRoot implements BookmarkNode {
 
 	SavedSlotCollection v = new SavedSlotCollection();
 
-    public transient Project parent;
+	public transient Project parent = null;
 	
 	BookmarkFolder ac, diag, dl, it, ic, npc, q, tmx, sp, wm;
 	
@@ -81,13 +90,11 @@ public class BookmarksRoot implements BookmarkNode {
 		path.add(0, this);
 		parent.childrenAdded(path);
 	}
-
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenChanged(path);
 	}
-
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		if (path.size() == 1 && this.v.getNonEmptySize() == 1) {
@@ -97,7 +104,6 @@ public class BookmarksRoot implements BookmarkNode {
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -161,12 +167,11 @@ public class BookmarksRoot implements BookmarkNode {
 	}
 
 	@Override
-    public void delete() {
+	public void delete() {}
-    }
 	
 	public void addBookmark(GameDataElement target) {
 			BookmarkEntry node;
-        BookmarkFolder folder;
+			BookmarkFolder folder = null;
 			if (target instanceof ActorCondition) {
 				folder = ac;
 			} else if (target instanceof Dialogue) {
@@ -192,8 +197,7 @@ public class BookmarksRoot implements BookmarkNode {
 			}
 			ProjectTreeNode higherEmptyParent = folder;
 			while (higherEmptyParent != null) {
-            if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty())
+				if (higherEmptyParent.getParent() != null && ((ProjectTreeNode)higherEmptyParent.getParent()).isEmpty()) higherEmptyParent = (ProjectTreeNode)higherEmptyParent.getParent();
-                higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent();
 				else break;
 			}
 			if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;

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

@@ -1,12 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.awt.Image;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.awt.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -15,20 +9,26 @@ 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_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;
@@ -46,7 +46,10 @@ public class ActorCondition extends JSONElement {
 	}
 	
 	public static enum VisualEffectID {
-        redSplash, blueSwirl, greenSplash, miss
+		redSplash
+		,blueSwirl
+		,greenSplash
+		,miss
 	}
 	
 	public static class RoundEffect implements Cloneable {
@@ -154,7 +157,6 @@ public class ActorCondition extends JSONElement {
 	@Override
 	public void parse(Map aCondJson) {
 
-        if (aCondJson.get("description") != null) this.description = (String) aCondJson.get("description");
 		if (aCondJson.get("category") != null) this.category = ACCategory.valueOf((String) aCondJson.get("category"));
 		this.positive = JSONElement.getInteger((Number) aCondJson.get("isPositive"));
 		Map abilityEffect = (Map) aCondJson.get("abilityEffect");
@@ -192,8 +194,7 @@ public class ActorCondition extends JSONElement {
 			if (vfx != null) {
 				try {
 					this.round_effect.visual_effect = VisualEffectID.valueOf(vfx);
-                } catch (IllegalArgumentException e) {
+				} catch(IllegalArgumentException e) {}
-                }
 			}
 		}
 		Map fullRoundEffect = (Map) aCondJson.get("fullRoundEffect");
@@ -212,8 +213,7 @@ public class ActorCondition extends JSONElement {
 			if (vfx != null) {
 				try {
 					this.full_round_effect.visual_effect = VisualEffectID.valueOf(vfx);
-                } catch (IllegalArgumentException e) {
+				} catch(IllegalArgumentException e) {}
-                }
 			}
 		}
 		this.state = State.parsed;
@@ -222,19 +222,21 @@ public class ActorCondition extends JSONElement {
 	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        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);
 		}
@@ -264,7 +266,6 @@ public class ActorCondition extends JSONElement {
 		clone.state = this.state;
 		clone.id = this.id;
 		clone.display_name = this.display_name;
-        clone.description = this.description;
 		clone.icon_id = this.icon_id;
 		clone.category = this.category;
 		clone.positive = this.positive;
@@ -293,14 +294,12 @@ public class ActorCondition extends JSONElement {
 		jsonAC.put("id", this.id);
 		if (this.icon_id != null) jsonAC.put("iconID", this.icon_id);
 		if (this.display_name != null) jsonAC.put("name", this.display_name);
-        if (this.description != null) jsonAC.put("description", this.description);
 		if (this.category != null) jsonAC.put("category", this.category.toString());
 		if (this.positive != null && this.positive == 1) jsonAC.put("isPositive", this.positive);
 		if (this.stacking != null && this.stacking == 1) jsonAC.put("isStacking", this.stacking);
 		if (this.round_effect != null) {
 			Map jsonRound = new LinkedHashMap();
-            if (this.round_effect.visual_effect != null)
+			if (this.round_effect.visual_effect != null) jsonRound.put("visualEffectID", this.round_effect.visual_effect.toString());
-                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);
@@ -321,8 +320,7 @@ public class ActorCondition extends JSONElement {
 		}
 		if (this.full_round_effect != null) {
 			Map jsonFullRound = new LinkedHashMap();
-            if (this.full_round_effect.visual_effect != null)
+			if (this.full_round_effect.visual_effect != null) jsonFullRound.put("visualEffectID", this.full_round_effect.visual_effect.toString());
-                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);
@@ -343,36 +341,24 @@ public class ActorCondition extends JSONElement {
 		}
 		if (this.constant_ability_effect != null) {
 			Map jsonAbility = new LinkedHashMap();
-            if (this.constant_ability_effect.increase_attack_chance != null)
+			if (this.constant_ability_effect.increase_attack_chance != null) jsonAbility.put("increaseAttackChance", this.constant_ability_effect.increase_attack_chance);
-                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)
+				if (this.constant_ability_effect.increase_damage_min != null) jsonAD.put("min", this.constant_ability_effect.increase_damage_min);
-                    jsonAD.put("min", this.constant_ability_effect.increase_damage_min);
 				else jsonAD.put("min", 0);
-                if (this.constant_ability_effect.increase_damage_max != null)
+				if (this.constant_ability_effect.increase_damage_max != null) jsonAD.put("max", this.constant_ability_effect.increase_damage_max);
-                    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)
+			if (this.constant_ability_effect.max_hp_boost != null) jsonAbility.put("increaseMaxHP", this.constant_ability_effect.max_hp_boost);
-                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.max_ap_boost != null)
+			if (this.constant_ability_effect.increase_move_cost != null) jsonAbility.put("increaseMoveCost", this.constant_ability_effect.increase_move_cost);
-                jsonAbility.put("increaseMaxAP", this.constant_ability_effect.max_ap_boost);
+			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_move_cost != null)
+			if (this.constant_ability_effect.increase_reequip_cost != null) jsonAbility.put("increaseReequipCost", this.constant_ability_effect.increase_reequip_cost);
-                jsonAbility.put("increaseMoveCost", this.constant_ability_effect.increase_move_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_use_cost != null)
+			if (this.constant_ability_effect.increase_critical_skill != null) jsonAbility.put("increaseCriticalSkill", this.constant_ability_effect.increase_critical_skill);
-                jsonAbility.put("increaseUseItemCost", this.constant_ability_effect.increase_use_cost);
+			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_reequip_cost != null)
+			if (this.constant_ability_effect.increase_damage_resistance != null) jsonAbility.put("increaseDamageResistance", this.constant_ability_effect.increase_damage_resistance);
-                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;

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

@@ -1,384 +0,0 @@
-package com.gpl.rpg.atcontentstudio.model.gamedata;
-
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.Project;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public final class Common {
-
-    public static <T extends ActorConditionEffect> void actorConditionElementChanged(List<T> list, GameDataElement oldOne, GameDataElement newOne, GameDataElement backlink) {
-        if (list != null) {
-            for (T c : list) {
-                if (c.condition == oldOne) {
-                    oldOne.removeBacklink(backlink);
-                    c.condition = (ActorCondition) newOne;
-                    if (newOne != null) newOne.addBacklink(backlink);
-                }
-            }
-        }
-
-    }
-
-    //region link common stuff
-    public static void linkConditions(List<? extends ActorConditionEffect> conditions, Project proj, GameDataElement backlink) {
-        if (conditions != null) {
-            for (ActorConditionEffect ce : conditions) {
-                if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
-                if (ce.condition != null) ce.condition.addBacklink(backlink);
-            }
-        }
-    }
-
-    public static void linkEffects(HitEffect effect, Project proj, GameDataElement backlink) {
-        linkEffects((DeathEffect) effect, proj, backlink);
-        if (effect != null) {
-            linkConditions(effect.conditions_target, proj, backlink);
-        }
-    }
-
-    public static void linkEffects(DeathEffect effect, Project proj, GameDataElement backlink) {
-        if (effect != null) {
-            linkConditions(effect.conditions_source, proj, backlink);
-        }
-    }
-
-    public static void linkIcon(Project proj, String iconId, GameDataElement backlink) {
-        if (iconId != null) {
-            String spritesheetId = iconId.split(":")[0];
-            if (proj.getSpritesheet(spritesheetId) == null) {
-                Notification.addError("Error Spritesheet " + spritesheetId + ". has no backlink. (" + iconId + ")");
-                return;
-            }
-            proj.getSpritesheet(spritesheetId).addBacklink(backlink);
-        }
-    }
-    //endregion
-
-    //region write common stuff
-    public static void writeMinMaxToMap(Map parent, Integer min, Integer max, int defaultValue) {
-        if (min != null || max != null) {
-            if (min != null)
-                parent.put("min", min);
-            else parent.put("min", defaultValue);
-            if (max != null)
-                parent.put("max", max);
-            else parent.put("max", defaultValue);
-        }
-    }
-
-    public static void writeMinMaxToMap(Map parent, String key, Integer min, Integer max, int defaultValue) {
-        if (min != null || max != null) {
-            Map minMaxMap = new LinkedHashMap();
-            parent.put(key, minMaxMap);
-            writeMinMaxToMap(minMaxMap, min, max, defaultValue);
-        }
-    }
-
-    public static void writeDescriptionToMap(Map parent, String description) {
-        if (description != null) parent.put("description", description);
-    }
-
-    public static void writeIconToMap(Map parent, String icon_id) {
-        if (icon_id != null) parent.put("iconID", icon_id);
-    }
-
-    public static void writeHitReceivedEffectToMap(Map parent, HitReceivedEffect effect) {
-        if (effect != null) {
-            writeHitEffectToMap(parent, effect);
-            writeBasicEffectObjectToMap(effect.target, parent, "increaseAttackerCurrentHP", "increaseAttackerCurrentAP");
-        }
-    }
-
-    public static void writeHitReceivedEffectToMap(Map parent, HitReceivedEffect effect, String key) {
-        if (effect != null) {
-            Map effectJson = new LinkedHashMap();
-            parent.put(key, effectJson);
-            writeHitReceivedEffectToMap(effectJson, effect);
-        }
-    }
-
-    public static void writeHitEffectToMap(Map parent, HitEffect effect) {
-        if (effect != null) {
-            writeDeathEffectToMap(parent, effect);
-            writeTimedActorConditionEffectObjectToMap(effect.conditions_target, parent, "conditionsTarget");
-        }
-    }
-
-    public static void writeHitEffectToMap(Map parent, HitEffect effect, String key) {
-        if (effect != null) {
-            Map effectJson = new LinkedHashMap();
-            parent.put(key, effectJson);
-            writeHitEffectToMap(effectJson, effect);
-        }
-    }
-
-    public static void writeDeathEffectToMap(Map parent, DeathEffect effect) {
-        writeBasicEffectObjectToMap(effect, parent, "increaseCurrentHP", "increaseCurrentAP");
-        writeTimedActorConditionEffectObjectToMap(effect.conditions_source, parent, "conditionsSource");
-    }
-
-    public static void writeDeathEffectToMap(Map parent, DeathEffect effect, String key) {
-        if (effect != null) {
-            Map effectJson = new LinkedHashMap();
-            parent.put(key, effectJson);
-            writeDeathEffectToMap(effectJson, effect);
-        }
-    }
-
-    public static void writeBasicEffectObjectToMap(BasicEffect effect, Map parent, String keyHP, String keyAP) {
-        writeMinMaxToMap(parent, keyHP, effect.hp_boost_min, effect.hp_boost_max, 0);
-
-        writeMinMaxToMap(parent, keyAP, effect.ap_boost_min, effect.ap_boost_max, 0);
-    }
-
-    public static void writeTimedActorConditionEffectObjectToMap(List<TimedActorConditionEffect> list, Map parent, String key) {
-        if (list != null) {
-            List conditionsSourceJson = new ArrayList();
-            parent.put(key, conditionsSourceJson);
-            for (TimedActorConditionEffect condition : list) {
-                Map conditionJson = new LinkedHashMap();
-                conditionsSourceJson.add(conditionJson);
-                writeTimedConditionEffectToMap(condition, conditionJson);
-            }
-        }
-
-    }
-
-    public static void writeConditionEffectToMap(ActorConditionEffect condition, Map parent) {
-        if (condition.condition != null) {
-            parent.put("condition", condition.condition.id);
-        } else if (condition.condition_id != null) {
-            parent.put("condition", condition.condition_id);
-        }
-        if (condition.magnitude != null) {
-            parent.put("magnitude", condition.magnitude);
-        }
-    }
-
-    public static void writeTimedConditionEffectToMap(TimedActorConditionEffect condition, Map parent) {
-        writeConditionEffectToMap(condition, parent);
-        if (condition.duration != null) {
-            parent.put("duration", condition.duration);
-        }
-        if (condition.chance != null) {
-            parent.put("chance", JSONElement.printJsonChance(condition.chance));
-        }
-    }
-
-    //endregion
-    public static class TimedActorConditionEffect extends ActorConditionEffect {
-        //Available from parsed state
-        public Integer duration = null;
-        public Double chance = null;
-
-        public TimedActorConditionEffect createClone() {
-            TimedActorConditionEffect cclone = new TimedActorConditionEffect();
-            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 boolean isInfinite() {
-            return duration != null && duration.equals(ActorCondition.DURATION_FOREVER);
-        }
-
-        public boolean isImmunity() {
-            return (super.isClear()) && (duration != null && duration > ActorCondition.DURATION_NONE);
-        }
-
-        @Override
-        public boolean isClear() {
-            return (super.isClear()) && (duration == null || duration.equals(ActorCondition.DURATION_NONE));
-        }
-    }
-
-    public static class ActorConditionEffect {
-        //Available from parsed state
-        public Integer magnitude = null;
-        public String condition_id = null;
-
-        //Available from linked state
-        public ActorCondition condition = null;
-
-        public boolean isClear() {
-            return magnitude == null || magnitude.equals(ActorCondition.MAGNITUDE_CLEAR);
-        }
-    }
-
-    @SuppressWarnings("rawtypes")
-    public static ArrayList<TimedActorConditionEffect> parseTimedConditionEffects(List conditionsSourceJson) {
-        ArrayList<TimedActorConditionEffect> conditions_source;
-        if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
-            conditions_source = new ArrayList<>();
-            for (Object conditionJsonObj : conditionsSourceJson) {
-                Map conditionJson = (Map) conditionJsonObj;
-                TimedActorConditionEffect condition = new TimedActorConditionEffect();
-                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(ActorConditionEffect 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.target.hp_boost_max = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentHP")).get("max")));
-            hit_received_effect.target.hp_boost_min = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentHP")).get("min")));
-        }
-        if (hitReceivedEffect.get("increaseAttackerCurrentAP") != null) {
-            hit_received_effect.target.ap_boost_max = JSONElement.getInteger((Number) (((Map) hitReceivedEffect.get("increaseAttackerCurrentAP")).get("max")));
-            hit_received_effect.target.ap_boost_min = 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 BasicEffect {
-        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 boolean isNull() {
-            if (ap_boost_min != null) return false;
-            if (ap_boost_max != null) return false;
-            if (hp_boost_min != null) return false;
-            if (hp_boost_max != null) return false;
-            return true;
-        }
-    }
-
-    public static class DeathEffect extends BasicEffect {
-        //Available from parsed state
-        public List<TimedActorConditionEffect> conditions_source = null;
-
-        @Override
-        public boolean isNull() {
-            if (!super.isNull()) return false;
-            if (conditions_source != null) return false;
-            return true;
-        }
-    }
-
-    public static class HitEffect extends DeathEffect {
-        //Available from parsed state
-        public List<TimedActorConditionEffect> conditions_target = null;
-
-        @Override
-        public boolean isNull() {
-            if (!super.isNull()) return false;
-            if (conditions_target != null) return false;
-            return true;
-        }
-    }
-
-    public static class HitReceivedEffect extends Common.HitEffect {
-        //Available from parsed state
-        public BasicEffect target = new BasicEffect();
-
-        @Override
-        public boolean isNull() {
-            if (!super.isNull()) return false;
-            if (!target.isNull()) return false;
-            return true;
-        }
-    }
-
-
-    public static void copyDeathEffectValues(Common.DeathEffect target, Common.DeathEffect source, GameDataElement backlink) {
-        copyEffectValues(target, source);
-        if (source.conditions_source != null) {
-            target.conditions_source = new ArrayList<>();
-            for (TimedActorConditionEffect c : source.conditions_source) {
-                TimedActorConditionEffect cclone = c.createClone();
-                if (cclone.condition != null) {
-                    cclone.condition.addBacklink(backlink);
-                }
-                target.conditions_source.add(cclone);
-            }
-        }
-    }
-
-    private static void copyEffectValues(BasicEffect target, BasicEffect source) {
-        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;
-    }
-
-    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 (TimedActorConditionEffect c : source.conditions_target) {
-                TimedActorConditionEffect 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);
-        copyEffectValues(target.target, source.target);
-    }
-
-}

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

@@ -1,5 +1,19 @@
 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;
@@ -7,16 +21,6 @@ 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;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.awt.*;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.List;
-import java.util.*;
 
 
 public class Dialogue extends JSONElement {
@@ -64,8 +68,7 @@ public class Dialogue extends JSONElement {
 			deactivateSpawnArea,
 			activateMapObjectGroup,
 			deactivateMapObjectGroup,
-            changeMapFilter,
+			changeMapFilter
-            mapchange
 		}
 	}
 	
@@ -170,13 +173,10 @@ public class Dialogue extends JSONElement {
 						Requirement requirement = new Requirement();
 						requirement.jsonFile = this.jsonFile;
 						requirement.parent = this;
-                        if (requirementJson.get("requireType") != null)
+						if (requirementJson.get("requireType") != null) requirement.type = RequirementType.valueOf((String) requirementJson.get("requireType"));
-                            requirement.type = RequirementType.valueOf((String) requirementJson.get("requireType"));
 						requirement.required_obj_id = (String) requirementJson.get("requireID");
-                        if (requirementJson.get("value") != null)
+						if (requirementJson.get("value") != null) requirement.required_value = JSONElement.getInteger(Integer.parseInt(requirementJson.get("value").toString()));
-                            requirement.required_value = JSONElement.getInteger(Integer.parseInt(requirementJson.get("value").toString()));
+						if (requirementJson.get("negate") != null) requirement.negated = (Boolean) requirementJson.get("negate");
-                        if (requirementJson.get("negate") != null)
-                            requirement.negated = (Boolean) requirementJson.get("negate");
 						requirement.state = State.parsed;
 						reply.requirements.add(requirement);
 					}
@@ -190,11 +190,9 @@ public class Dialogue extends JSONElement {
 			for (Object rewardJsonObj : rewardsJson) {
 				Map rewardJson = (Map)rewardJsonObj;
 				Reward reward = new Reward();
-                if (rewardJson.get("rewardType") != null)
+				if (rewardJson.get("rewardType") != null) reward.type = Reward.RewardType.valueOf((String) rewardJson.get("rewardType"));
-                    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)
+				if (rewardJson.get("value") != null) reward.reward_value = JSONElement.getInteger((Number) rewardJson.get("value"));
-                    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);
 			}
@@ -203,12 +201,21 @@ public class Dialogue extends JSONElement {
 	}
 
 	
+	
+	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking dialogue "+id+". No parent project found.");
@@ -242,7 +249,6 @@ public class Dialogue extends JSONElement {
 					case removeSpawnArea:
 					case deactivateSpawnArea:
 					case changeMapFilter:
-                        case mapchange:
 						reward.map = reward.map_name != null ? proj.getMap(reward.map_name) : null;
 						break;
 					case actorCondition:
@@ -286,6 +292,7 @@ public class Dialogue extends JSONElement {
 	}
 	
 
+
 	@Override
 	public Image getIcon() {
 		return DefaultIcons.getDialogueIcon();

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

@@ -1,14 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.awt.Image;
-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;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.awt.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -18,6 +10,15 @@ 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 {
 
@@ -35,7 +36,7 @@ public class Droplist extends JSONElement {
 	public static class DroppedItem {
 		//Available from parsed state;
 		public String item_id = null;
-        public String chance = null;
+		public Double chance = null;
 		public Integer quantity_min = null;
 		public Integer quantity_max = null;
 		
@@ -113,8 +114,7 @@ public class Droplist extends JSONElement {
 				Map droppedItemJson = (Map)droppedItemJsonObj;
 				DroppedItem droppedItem = new DroppedItem();
 				droppedItem.item_id = (String) droppedItemJson.get("itemID");
-                //if (droppedItemJson.get("chance") != null) droppedItem.chance = JSONElement.parseChance(droppedItemJson.get("chance").toString());
+				if (droppedItemJson.get("chance") != null) droppedItem.chance = JSONElement.parseChance(droppedItemJson.get("chance").toString());
-                droppedItem.chance = (String) droppedItemJson.get("chance");
 				Map droppedItemQtyJson = (Map) droppedItemJson.get("quantity");
 				if (droppedItemQtyJson != null) {
 					droppedItem.quantity_min = JSONElement.getInteger((Number) droppedItemQtyJson.get("min"));
@@ -128,10 +128,17 @@ public class Droplist extends JSONElement {
 	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking droplist "+id+". No parent project found.");
@@ -147,6 +154,7 @@ public class Droplist extends JSONElement {
 	}
 	
 
+
 	public static Image getImage() {
 		return DefaultIcons.getDroplistImage();
 	}
@@ -209,8 +217,7 @@ public class Droplist extends JSONElement {
 				} else if (droppedItem.item_id != null) {
 					droppedItemJson.put("itemID", droppedItem.item_id);
 				}
-                //if (droppedItem.chance != null) droppedItemJson.put("chance", JSONElement.printJsonChance(droppedItem.chance));
+				if (droppedItem.chance != null) droppedItemJson.put("chance", JSONElement.printJsonChance(droppedItem.chance));
-                if (droppedItem.chance != null) droppedItemJson.put("chance", droppedItem.chance);
 				if (droppedItem.quantity_min != null || droppedItem.quantity_max != null) {
 					Map quantityJson = new LinkedHashMap();
 					droppedItemJson.put("quantity", quantityJson);

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

@@ -1,115 +1,45 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.awt.Image;
-import com.gpl.rpg.atcontentstudio.model.*;
+import java.io.File;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+import java.io.FileWriter;
-import com.gpl.rpg.atcontentstudio.utils.FileUtils;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.util.*;
-import java.util.List;
 
-public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode {
+import org.json.simple.JSONArray;
-    //region Data
-    private final ArrayList<String> keyList = new ArrayList<>();
-    private final HashMap<String, E> dataMap = new HashMap<>();
 
-    //endregion
+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.GameSource;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.SaveEvent;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
+public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implements ProjectTreeNode, Serializable {
+
+	private static final long serialVersionUID = 5486008219704443733L;
 	
 	public GameDataSet parent;
 	public String name;
 	
 	public GameDataCategory(GameDataSet parent, String name) {
+		super();
 		this.parent = parent;
 		this.name = name;
 	}
 
-    //region Helpers
-    public E get(String key) {
-        return dataMap.get(key);
-    }
-
-    public E get(int index) {
-        String key = keyList.get(index);
-        return dataMap.get(key);
-    }
-
-    public E getIgnoreCase(String key) {
-        for (String k : keyList) {
-            if (k.equalsIgnoreCase(key)) {
-                return dataMap.get(k);
-            }
-        }
-        return null;
-    }
-
-    public E put(String key, E element) {
-        if (!dataMap.containsKey(key)) {
-            keyList.add(key);
-        }
-        return dataMap.put(key, element);
-    }
-
-    public void add(E quest) {
-        String key = quest.id;
-        put(key, quest);
-    }
-
-    public E remove(String key) {
-        if (dataMap.containsKey(key)) {
-            keyList.remove(key);
-        }
-        return dataMap.remove(key);
-    }
-
-    public E remove(int index) {
-        String key = keyList.get(index);
-        keyList.remove(index);
-        return dataMap.remove(key);
-    }
-
-    public boolean removeGeneric(JSONElement element){
-        return remove((E) element);
-    }
-    public boolean remove(E element) {
-        String key = element.id;
-        int index = getProject().getNodeIndex(element);
-        boolean result = false;
-        if (dataMap.containsKey(key)) {
-            keyList.remove(key);
-            dataMap.remove(key);
-            result = true;
-        }
-        getProject().fireElementRemoved(element, index);
-        return result;
-    }
-
-    public int size() {
-        return dataMap.size();
-    }
-    public int indexOf(String key) {
-        return keyList.indexOf(key);
-    }
-    public int indexOf(E element) {
-        String key = element.id;
-        return keyList.indexOf(key);
-    }
-
-    public ArrayList<E> toList() {
-        ArrayList<E> list = new ArrayList<>();
-        for (String key : keyList) {
-            list.add(dataMap.get(key));
-        }
-        return list;
-    }
-
-    //endregion
-
-    //region copied implementation of ProjectTreeNode
-
 	@Override
 	public TreeNode getChildAt(int childIndex) {
 		return get(childIndex);
@@ -127,7 +57,7 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 
 	@Override
 	public int getIndex(TreeNode node) {
-        return indexOf((E) node);
+		return indexOf(node);
 	}
 
 	@Override
@@ -142,21 +72,18 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 
 	@Override
 	public Enumeration<E> children() {
-        return Collections.enumeration(toList());
+		return Collections.enumeration(this);
 	}
-
 	@Override
 	public void childrenAdded(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenAdded(path);
 	}
-
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenChanged(path);
 	}
-
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		if (path.size() == 1 && this.getChildCount() == 1) {
@@ -166,15 +93,13 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
-        for (E node : dataMap.values()) {
+		for (E node : this) {
 			node.notifyCreated();
 		}
 	}
-
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+this.name;
@@ -194,17 +119,14 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		return DefaultIcons.getJsonClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getJsonClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		return DefaultIcons.getJsonOpenIcon();
@@ -216,15 +138,10 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 	}
 
 	@Override
-    public GameSource.Type getDataType() {
+	public Type getDataType() {
 		return parent.getDataType();
 	}
 	
-    @Override
-    public boolean isEmpty() {
-        return dataMap.isEmpty();
-    }
-
 	@SuppressWarnings("rawtypes")
 	public void save(File jsonFile) {
 		if (getDataType() != GameSource.Type.created && getDataType() != GameSource.Type.altered) {
@@ -232,7 +149,7 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 			return;
 		}
 		List<Map> dataToSave = new ArrayList<Map>();
-        for (E element : dataMap.values()) {
+		for (E element : this) {
 			if (element.jsonFile.equals(jsonFile)) {
 				dataToSave.add(element.toJson());
 			}
@@ -246,13 +163,26 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 			
 			return;
 		}
-
+		StringWriter writer = new JsonPrettyWriter();
-        String toWrite = FileUtils.toJsonString(dataToSave);
+		try {
-        if(FileUtils.writeStringToFile(toWrite, jsonFile, "JSON file '"+jsonFile.getAbsolutePath()+"'")){
+			JSONArray.writeJSONString(dataToSave, writer);
-            for (E element : dataMap.values()) {
+		} catch (IOException e) {
+			//Impossible with a StringWriter
+		}
+		String toWrite = writer.toString();
+		try {
+			FileWriter w = new FileWriter(jsonFile);
+			w.write(toWrite);
+			w.close();
+			for (E element : this) {
 				element.state = GameDataElement.State.saved;
 			}
+			Notification.addSuccess("Json file "+jsonFile.getAbsolutePath()+" saved.");
+		} catch (IOException e) {
+			Notification.addError("Error while writing json file "+jsonFile.getAbsolutePath()+" : "+e.getMessage());
+			e.printStackTrace();
 		}
+		
 	}
 	
 
@@ -261,8 +191,7 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 		GameDataCategory<? extends JSONElement> impactedCategory = null;
 		String impactedFileName = fileName;
 		Map<String, Integer> containedIds = new LinkedHashMap<String, Integer>();
-        ArrayList<E> list = toList();
+		for (JSONElement node : this) {
-        for (JSONElement node : list) {
 			if (node.getDataType() == GameSource.Type.created && getProject().baseContent.gameData.getGameDataElement(node.getClass(), node.id) != null) {
 				if (getProject().alteredContent.gameData.getGameDataElement(node.getClass(), node.id) != null) {
 					events.add(new SaveEvent(SaveEvent.Type.moveToAltered, node, true, "Element ID matches one already present in the altered game content. Change this ID before saving."));
@@ -291,14 +220,13 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 		for (String key : containedIds.keySet()) {
 			if (containedIds.get(key) > 1) {
 				E node = null;
-                for (E n : list) {
+				for (E n : this) {
 					if (key.equals(n.id)) {
 						node = n;
 						break;
 					}
 				}
-                events.add(new SaveEvent(SaveEvent.Type.alsoSave, node, true,
+				events.add(new SaveEvent(SaveEvent.Type.alsoSave, node, true, "There are "+containedIds.get(node.id)+" elements with this ID in this category. Change the conflicting IDs before saving."));
-                                         "There are " + containedIds.get(node.id) + " elements with this ID in this category. Change the conflicting IDs before saving."));
 			}
 		}
 		if (checkImpactedCategory && impactedCategory != null) {
@@ -307,15 +235,19 @@ public class GameDataCategory<E extends JSONElement> implements ProjectTreeNode
 		return events;
 	}
 
+	public boolean remove(E o) {
+		int index = getProject().getNodeIndex(o);
+		boolean result = super.remove(o);
+		getProject().fireElementRemoved(o, index);
+		return result;
+	}
+	
 	@Override
 	public boolean needsSaving() {
-        for (E node : dataMap.values()) {
+		for (E node : this) {
 			if (node.needsSaving()) return true;
 		}
 		return false;
 	}
 	
-    //endregion
-
 }
-

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

@@ -1,5 +1,14 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
+import java.awt.Image;
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
@@ -9,14 +18,6 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.SavedSlotCollection;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
 
 public class GameDataSet implements ProjectTreeNode, Serializable {
 
@@ -67,7 +68,7 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 		items = new GameDataCategory<Item>(this, Item.getStaticDesc());
 		itemCategories = new GameDataCategory<ItemCategory>(this, ItemCategory.getStaticDesc());
 		npcs = new GameDataCategory<NPC>(this, NPC.getStaticDesc());
-        quests = new GameDataCategory<>(this, Quest.getStaticDesc());
+		quests = new GameDataCategory<Quest>(this, Quest.getStaticDesc());
 		
 		v.add(actorConditions);
 		v.add(dialogues);
@@ -183,49 +184,40 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 	public Enumeration<ProjectTreeNode> children() {
 		return v.getNonEmptyElements();
 	}
-
 	@Override
 	public boolean getAllowsChildren() {
 		return true;
 	}
-
 	@Override
 	public TreeNode getChildAt(int arg0) {
 		return v.getNonEmptyElementAt(arg0);
 	}
-
 	@Override
 	public int getChildCount() {
 		return v.getNonEmptySize();
 	}
-
 	@Override
 	public int getIndex(TreeNode arg0) {
 		return v.getNonEmptyIndexOf((ProjectTreeNode) arg0);
 	}
-
 	@Override
 	public TreeNode getParent() {
 		return parent;
 	}
-
 	@Override
 	public boolean isLeaf() {
 		return false;
 	}
-
 	@Override
 	public void childrenAdded(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenAdded(path);
 	}
-
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenChanged(path);
 	}
-
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		if (path.size() == 1 && this.v.getNonEmptySize() == 1) {
@@ -235,7 +227,6 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -243,7 +234,6 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 			node.notifyCreated();
 		}
 	}
-
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+"JSON data";
@@ -256,42 +246,82 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 	
 	public ActorCondition getActorCondition(String id) {
 		if (actorConditions == null) return null;
-        return actorConditions.get(id);
+		for (ActorCondition gde : actorConditions) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public Dialogue getDialogue(String id) {
 		if (dialogues == null) return null;
-        return dialogues.get(id);
+		for (Dialogue gde : dialogues) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public Droplist getDroplist(String id) {
 		if (droplists == null) return null;
-        return droplists.get(id);
+		for (Droplist gde : droplists) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public Item getItem(String id) {
 		if (items == null) return null;
-        return items.get(id);
+		for (Item gde : items) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public ItemCategory getItemCategory(String id) {
 		if (itemCategories == null) return null;
-        return itemCategories.get(id);
+		for (ItemCategory gde : itemCategories) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public NPC getNPC(String id) {
 		if (npcs == null) return null;
-        return npcs.get(id);
+		for (NPC gde : npcs) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public NPC getNPCIgnoreCase(String id) {
 		if (npcs == null) return null;
-        return npcs.getIgnoreCase(id);
+		for (NPC gde : npcs) {
+			if (id.equalsIgnoreCase(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	public Quest getQuest(String id) {
 		if (quests == null) return null;
-        return quests.get(id);
+		for (Quest gde : quests) {
+			if (id.equals(gde.id)){
+				return gde;
+			}
+		}
+		return null;
 	}
 	
 	@Override
@@ -304,17 +334,14 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		return DefaultIcons.getJsonClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getJsonClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		return DefaultIcons.getJsonOpenIcon();
@@ -323,8 +350,7 @@ public class GameDataSet implements ProjectTreeNode, Serializable {
 	public void addElement(JSONElement node) {
 		ProjectTreeNode higherEmptyParent = this;
 		while (higherEmptyParent != null) {
-            if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty())
+			if (higherEmptyParent.getParent() != null && ((ProjectTreeNode)higherEmptyParent.getParent()).isEmpty()) higherEmptyParent = (ProjectTreeNode)higherEmptyParent.getParent();
-                higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent();
 			else break;
 		}
 		if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;

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

@@ -1,13 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.awt.Image;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import com.gpl.rpg.atcontentstudio.model.Project;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.awt.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -17,7 +10,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.gpl.rpg.atcontentstudio.model.gamedata.Common.*;
+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;
 
 public class Item extends JSONElement {
 
@@ -36,22 +35,45 @@ public class Item extends JSONElement {
 	public String description = null;
 	public HitEffect hit_effect = null;
 	public HitReceivedEffect hit_received_effect = null;
-    public HitEffect miss_effect = null;
+	public KillEffect kill_effect = null;
-    public HitReceivedEffect miss_received_effect = null;
-    public DeathEffect kill_effect = null;
 	public EquipEffect equip_effect = null;
 	
 	//Available from linked state
 	public ItemCategory category = null;
 	
 	
+	
+	public static class KillEffect {
+		//Available from parsed state
+		public Integer hp_boost_min = null;
+		public Integer hp_boost_max = null;
+		public Integer ap_boost_min = null;
+		public Integer ap_boost_max = null;
+		public List<TimedConditionEffect> conditions_source = null;
+		
+	}
+	
+	//Inheritance for code compactness, not semantically correct.
+	public static class HitEffect extends KillEffect {
+		//Available from parsed state
+		public List<TimedConditionEffect> conditions_target = null;
+	}
+	
+	public static class HitReceivedEffect extends HitEffect {
+		//Available from parsed state
+		public Integer hp_boost_min_target = null;
+		public Integer hp_boost_max_target = null;
+		public Integer ap_boost_min_target = null;
+		public Integer ap_boost_max_target = null;
+	}
+	
 	public static class EquipEffect {
 		//Available from parsed state
 		public Integer damage_boost_min = null;
 		public Integer damage_boost_max = null;
 		public Integer max_hp_boost = null;
 		public Integer max_ap_boost = null;
-        public List<ActorConditionEffect> conditions = null;
+		public List<ConditionEffect> conditions = null;
 		public Integer increase_move_cost = null;
 		public Integer increase_use_item_cost = null;
 		public Integer increase_reequip_cost = null;
@@ -61,9 +83,22 @@ public class Item extends JSONElement {
 		public Integer increase_block_chance = null;
 		public Integer increase_damage_resistance = null;
 		public Double critical_multiplier = null;
-        public Integer damage_modifier = null;
 	}
 	
+	public static class ConditionEffect {
+		//Available from parsed state
+		public Integer magnitude = null;
+		public String condition_id = null;
+		
+		//Available from linked state
+		public ActorCondition condition = null; 
+	}
+	
+	public static class TimedConditionEffect extends ConditionEffect {
+		//Available from parsed state
+		public Integer duration = null;
+		public Double chance = null;
+	}
 	
 	public static enum DisplayType {
 		ordinary,
@@ -132,8 +167,7 @@ public class Item extends JSONElement {
 		item.icon_id = (String) itemJson.get("iconID");
 		item.id = (String) itemJson.get("id");
 		item.name = (String) itemJson.get("name");
-        if (itemJson.get("displaytype") != null)
+		if (itemJson.get("displaytype") != null) item.display_type = DisplayType.valueOf((String) itemJson.get("displaytype"));
-            item.display_type = DisplayType.valueOf((String) itemJson.get("displaytype"));
 		return item;
 	}
 	
@@ -167,16 +201,14 @@ public class Item extends JSONElement {
 			this.equip_effect.increase_damage_resistance = JSONElement.getInteger((Number) equipEffect.get("increaseDamageResistance"));
 			//TODO correct game data, to unify format.
 //			this.equip_effect.critical_multiplier = JSONElement.getDouble((Number) equipEffect.get("setCriticalMultiplier"));
-            if (equipEffect.get("setCriticalMultiplier") != null)
+			if (equipEffect.get("setCriticalMultiplier") != null) this.equip_effect.critical_multiplier = JSONElement.getDouble(Double.parseDouble(equipEffect.get("setCriticalMultiplier").toString()));
-                this.equip_effect.critical_multiplier = JSONElement.getDouble(Double.parseDouble(equipEffect.get("setCriticalMultiplier").toString()));
-            this.equip_effect.damage_modifier = JSONElement.getInteger((Number) equipEffect.get("setNonWeaponDamageModifier"));
 
 			List conditionsJson = (List) equipEffect.get("addedConditions");
 			if (conditionsJson != null && !conditionsJson.isEmpty()) {
-                this.equip_effect.conditions = new ArrayList<>();
+				this.equip_effect.conditions = new ArrayList<Item.ConditionEffect>();
 				for (Object conditionJsonObj : conditionsJson) {
 					Map conditionJson = (Map)conditionJsonObj;
-                    ActorConditionEffect condition = new ActorConditionEffect();
+					ConditionEffect condition = new ConditionEffect();
 					condition.condition_id = (String) conditionJson.get("condition");
 					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
 					this.equip_effect.conditions.add(condition);
@@ -184,25 +216,90 @@ public class Item extends JSONElement {
 			}
 		}
 		
-
 		Map hitEffect = (Map) itemJson.get("hitEffect");
 		if (hitEffect != null) {
-            this.hit_effect = parseHitEffect(hitEffect);
+			this.hit_effect = new HitEffect();
+			if (hitEffect.get("increaseCurrentHP") != null) {
+				this.hit_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentHP")).get("min")));
+				this.hit_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentHP")).get("max")));
+			}
+			if (hitEffect.get("increaseCurrentAP") != null) {
+				this.hit_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("min")));
+				this.hit_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("max")));
+			}
+			List conditionsSourceJson = (List) hitEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.hit_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_effect.conditions_source.add(condition);
+				}
+			}
+			List conditionsTargetJson = (List) hitEffect.get("conditionsTarget");
+			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
+				this.hit_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsTargetJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_effect.conditions_target.add(condition);
+				}
+			}
 		}
 		
 		Map hitReceivedEffect = (Map) itemJson.get("hitReceivedEffect");
 		if (hitReceivedEffect != null) {
-            this.hit_received_effect = parseHitReceivedEffect(hitReceivedEffect);
+			this.hit_received_effect = new HitReceivedEffect();
+			if (hitReceivedEffect.get("increaseCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("min")));
+				this.hit_received_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("max")));
+			}
+			if (hitReceivedEffect.get("increaseCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("min")));
+				this.hit_received_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("max")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("min")));
+				this.hit_received_effect.hp_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("max")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("min")));
+				this.hit_received_effect.ap_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("max")));
+			}
+			List conditionsSourceJson = (List) hitReceivedEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.hit_received_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_source.add(condition);
+				}
+			}
+			List conditionsTargetJson = (List) hitReceivedEffect.get("conditionsTarget");
+			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
+				this.hit_received_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsTargetJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_target.add(condition);
 				}
-
-        Map missEffect = (Map) itemJson.get("missEffect");
-        if (missEffect != null) {
-            this.miss_effect = parseHitEffect(missEffect);
 			}
-
-        Map missReceivedEffect = (Map) itemJson.get("missReceivedEffect");
-        if (missReceivedEffect != null) {
-            this.miss_received_effect = parseHitReceivedEffect(missReceivedEffect);
 		}
 		
 		Map killEffect = (Map) itemJson.get("killEffect");
@@ -210,7 +307,28 @@ public class Item extends JSONElement {
 			killEffect = (Map) itemJson.get("useEffect");
 		}
 		if (killEffect != null) {
-            this.kill_effect = parseDeathEffect(killEffect);
+			this.kill_effect = new KillEffect();
+			if (killEffect.get("increaseCurrentHP") != null) {
+				this.kill_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentHP")).get("min")));
+				this.kill_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentHP")).get("max")));
+			}
+			if (killEffect.get("increaseCurrentAP") != null) {
+				this.kill_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentAP")).get("min")));
+				this.kill_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)killEffect.get("increaseCurrentAP")).get("max")));
+			}
+			List conditionsSourceJson = (List) killEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.kill_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.kill_effect.conditions_source.add(condition);
+				}
+			}
 		}
 		this.state = State.parsed;
 	}
@@ -218,32 +336,68 @@ public class Item extends JSONElement {
 	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking item "+id+". No parent project found.");
 			return;
 		}
 
-        linkIcon(proj, this.icon_id, this);
+		if (this.icon_id != null) {
+			String spritesheetId = this.icon_id.split(":")[0];
+			proj.getSpritesheet(spritesheetId).addBacklink(this);
+		}
 		if (this.category_id != null) this.category = proj.getItemCategory(this.category_id);
 		if (this.category != null) this.category.addBacklink(this);
 		if (this.equip_effect != null && this.equip_effect.conditions != null) {
-            linkConditions(this.equip_effect.conditions, proj, this);
+			for (ConditionEffect ce : this.equip_effect.conditions) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_effect != null && this.hit_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.hit_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_effect != null && this.hit_effect.conditions_target != null) {
+			for (TimedConditionEffect ce : this.hit_effect.conditions_target) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_target != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_target) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.kill_effect != null && this.kill_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.kill_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
 		}
-
-        linkEffects(this.hit_effect, proj, this);
-        linkEffects(this.hit_received_effect, proj, this);
-        linkEffects(this.miss_effect, proj, this);
-        linkEffects(this.miss_received_effect, proj, this);
-        linkEffects(this.kill_effect, proj, this);
 		this.state = State.linked;
 	}
 
-
 	@Override
 	public Image getIcon() {
 		return getProject().getIcon(icon_id);
@@ -272,7 +426,6 @@ public class Item extends JSONElement {
 		clone.has_manual_price = this.has_manual_price;
 		if (this.equip_effect != null) {
 			clone.equip_effect = new EquipEffect();
-            clone.equip_effect.damage_modifier = this.equip_effect.damage_modifier;
 			clone.equip_effect.critical_multiplier = this.equip_effect.critical_multiplier;
 			clone.equip_effect.damage_boost_max = this.equip_effect.damage_boost_max;
 			clone.equip_effect.damage_boost_min = this.equip_effect.damage_boost_min;
@@ -287,9 +440,9 @@ public class Item extends JSONElement {
 			clone.equip_effect.max_ap_boost = this.equip_effect.max_ap_boost;
 			clone.equip_effect.max_hp_boost = this.equip_effect.max_hp_boost;
 			if (this.equip_effect.conditions != null) {
-                clone.equip_effect.conditions = new ArrayList<>();
+				clone.equip_effect.conditions = new ArrayList<Item.ConditionEffect>();
-                for (ActorConditionEffect c : this.equip_effect.conditions) {
+				for (ConditionEffect c : this.equip_effect.conditions) {
-                    ActorConditionEffect cclone = new ActorConditionEffect();
+					ConditionEffect cclone = new ConditionEffect();
 					cclone.magnitude = c.magnitude;
 					cclone.condition_id = c.condition_id;
 					cclone.condition = c.condition;
@@ -302,23 +455,103 @@ public class Item extends JSONElement {
 		}
 		if (this.hit_effect != null) {
 			clone.hit_effect = new HitEffect();
-            copyHitEffectValues(clone.hit_effect, this.hit_effect, clone);
+			clone.hit_effect.ap_boost_max = this.hit_effect.ap_boost_max;
+			clone.hit_effect.ap_boost_min = this.hit_effect.ap_boost_min;
+			clone.hit_effect.hp_boost_max = this.hit_effect.hp_boost_max;
+			clone.hit_effect.hp_boost_min = this.hit_effect.hp_boost_min;
+			if (this.hit_effect.conditions_source != null) {
+				clone.hit_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_effect.conditions_source.add(cclone);
+				}
+			}
+			if (this.hit_effect.conditions_target != null) {
+				clone.hit_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_effect.conditions_target) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_effect.conditions_target.add(cclone);
+				}
+			}
 		}
 		if (this.hit_received_effect != null) {
 			clone.hit_received_effect = new HitReceivedEffect();
-            copyHitReceivedEffectValues(clone.hit_received_effect, this.hit_received_effect, clone);
+			clone.hit_received_effect.ap_boost_max = this.hit_received_effect.ap_boost_max;
+			clone.hit_received_effect.ap_boost_min = this.hit_received_effect.ap_boost_min;
+			clone.hit_received_effect.hp_boost_max = this.hit_received_effect.hp_boost_max;
+			clone.hit_received_effect.hp_boost_min = this.hit_received_effect.hp_boost_min;
+			clone.hit_received_effect.ap_boost_max_target = this.hit_received_effect.ap_boost_max_target;
+			clone.hit_received_effect.ap_boost_min_target = this.hit_received_effect.ap_boost_min_target;
+			clone.hit_received_effect.hp_boost_max_target = this.hit_received_effect.hp_boost_max_target;
+			clone.hit_received_effect.hp_boost_min_target = this.hit_received_effect.hp_boost_min_target;
+			if (this.hit_received_effect.conditions_source != null) {
+				clone.hit_received_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_source.add(cclone);
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				clone.hit_received_effect.conditions_target = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_target) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_target.add(cclone);
 				}
-        if (this.miss_effect != null) {
-            clone.miss_effect = new HitEffect();
-            copyHitEffectValues(clone.miss_effect, this.miss_effect, clone);
 			}
-        if (this.miss_received_effect != null) {
-            clone.miss_received_effect = new HitReceivedEffect();
-            copyHitReceivedEffectValues(clone.miss_received_effect, this.miss_received_effect, clone);
 		}
 		if (this.kill_effect != null) {
-            clone.kill_effect = new DeathEffect();
+			clone.kill_effect = new KillEffect();
-            copyDeathEffectValues(clone.kill_effect, this.kill_effect, clone);
+			clone.kill_effect.ap_boost_max = this.kill_effect.ap_boost_max;
+			clone.kill_effect.ap_boost_min = this.kill_effect.ap_boost_min;
+			clone.kill_effect.hp_boost_max = this.kill_effect.hp_boost_max;
+			clone.kill_effect.hp_boost_min = this.kill_effect.hp_boost_min;
+			if (this.kill_effect.conditions_source != null) {
+				clone.kill_effect.conditions_source = new ArrayList<Item.TimedConditionEffect>();
+				for (TimedConditionEffect c : this.kill_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.kill_effect.conditions_source.add(cclone);
+				}
+			}
 		}
 		return clone;
 	}
@@ -330,30 +563,42 @@ public class Item extends JSONElement {
 			this.category = (ItemCategory) newOne;
 			if (newOne != null) newOne.addBacklink(this);
 		} else {
-            if (this.equip_effect != null) {
+			if (this.equip_effect != null && this.equip_effect.conditions != null) {
-                if (this.equip_effect.conditions != null) {
+				for (ConditionEffect c : this.equip_effect.conditions) {
-                    actorConditionElementChanged(this.equip_effect.conditions, oldOne, newOne, this);
+					if (c.condition == oldOne) {
+						oldOne.removeBacklink(this);
+						c.condition = (ActorCondition) newOne;
+						if (newOne != null) newOne.addBacklink(this);
 					}
 				}
-            if (this.hit_effect != null) {
-                actorConditionElementChanged(this.hit_effect.conditions_source, oldOne, newOne, this);
-                actorConditionElementChanged(this.hit_effect.conditions_target, oldOne, newOne, this);
 			}
-            if (this.hit_received_effect != null) {
+			if (this.hit_effect != null && this.hit_effect.conditions_source != null) {
-                actorConditionElementChanged(this.hit_received_effect.conditions_source, oldOne, newOne, this);
+				for (TimedConditionEffect c : this.hit_effect.conditions_source) {
-                actorConditionElementChanged(this.hit_received_effect.conditions_target, oldOne, newOne, this);
+					if (c.condition == oldOne) {
+						oldOne.removeBacklink(this);
+						c.condition = (ActorCondition) newOne;
+						if (newOne != null) newOne.addBacklink(this);
+					}
+				}
+			}
+			if (this.hit_effect != null && this.hit_effect.conditions_target != null) {
+				for (TimedConditionEffect c : this.hit_effect.conditions_target) {
+					if (c.condition == oldOne) {
+						oldOne.removeBacklink(this);
+						c.condition = (ActorCondition) newOne;
+						if (newOne != null) newOne.addBacklink(this);
 					}
-            if (this.miss_effect != null) {
-                actorConditionElementChanged(this.miss_effect.conditions_source, oldOne, newOne, this);
-                actorConditionElementChanged(this.miss_effect.conditions_target, oldOne, newOne, this);
 				}
-            if (this.miss_received_effect != null) {
-                actorConditionElementChanged(this.miss_received_effect.conditions_source, oldOne, newOne, this);
-                actorConditionElementChanged(this.miss_received_effect.conditions_target, oldOne, newOne, this);
 			}
 
-            if (this.kill_effect != null) {
+			if (this.kill_effect != null && this.kill_effect.conditions_source != null) {
-                actorConditionElementChanged(this.kill_effect.conditions_source, oldOne, newOne, this);
+				for (TimedConditionEffect c : this.kill_effect.conditions_source) {
+					if (c.condition == oldOne) {
+						oldOne.removeBacklink(this);
+						c.condition = (ActorCondition) newOne;
+						if (newOne != null) newOne.addBacklink(this);
+					}
+				}
 			}
 		}
 	}
@@ -363,7 +608,7 @@ public class Item extends JSONElement {
 	public Map toJson() {
 		Map itemJson = new LinkedHashMap();
 		itemJson.put("id", this.id);
-        writeIconToMap(itemJson, this.icon_id);
+		if (this.icon_id != null) itemJson.put("iconID", this.icon_id);
 		if (this.name != null) itemJson.put("name", this.name);
 		if(this.display_type != null) itemJson.put("displaytype", this.display_type.toString());
 		
@@ -374,67 +619,207 @@ public class Item extends JSONElement {
 		} else if (this.category_id != null) {
 			itemJson.put("category", this.category_id);
 		}
-        writeDescriptionToMap(itemJson, this.description);
+		if (this.description != null) itemJson.put("description", this.description);
 		if (this.equip_effect != null) {
 			Map equipEffectJson = new LinkedHashMap();
 			itemJson.put("equipEffect", equipEffectJson);
-            writeMinMaxToMap(equipEffectJson, "increaseAttackDamage", this.equip_effect.damage_boost_min, this.equip_effect.damage_boost_max, 0);
+			if (this.equip_effect.damage_boost_min != null || this.equip_effect.damage_boost_max != null) {
-            if (this.equip_effect.max_hp_boost != null)
+				Map damageJson = new LinkedHashMap();
-                equipEffectJson.put("increaseMaxHP", this.equip_effect.max_hp_boost);
+				equipEffectJson.put("increaseAttackDamage", damageJson);
-            if (this.equip_effect.max_ap_boost != null)
+				if (this.equip_effect.damage_boost_min != null) damageJson.put("min", this.equip_effect.damage_boost_min);
-                equipEffectJson.put("increaseMaxAP", this.equip_effect.max_ap_boost);
+				else damageJson.put("min", 0);
-            if (this.equip_effect.increase_move_cost != null)
+				if (this.equip_effect.damage_boost_max != null) damageJson.put("max", this.equip_effect.damage_boost_max);
-                equipEffectJson.put("increaseMoveCost", this.equip_effect.increase_move_cost);
+				else damageJson.put("max", 0);
-            if (this.equip_effect.increase_use_item_cost != null)
+			}
-                equipEffectJson.put("increaseUseItemCost", this.equip_effect.increase_use_item_cost);
+			if (this.equip_effect.max_hp_boost != null) equipEffectJson.put("increaseMaxHP", this.equip_effect.max_hp_boost);
-            if (this.equip_effect.increase_reequip_cost != null)
+			if (this.equip_effect.max_ap_boost != null) equipEffectJson.put("increaseMaxAP", this.equip_effect.max_ap_boost);
-                equipEffectJson.put("increaseReequipCost", this.equip_effect.increase_reequip_cost);
+			if (this.equip_effect.increase_move_cost != null) equipEffectJson.put("increaseMoveCost", this.equip_effect.increase_move_cost);
-            if (this.equip_effect.increase_attack_cost != null)
+			if (this.equip_effect.increase_use_item_cost != null) equipEffectJson.put("increaseUseItemCost", this.equip_effect.increase_use_item_cost);
-                equipEffectJson.put("increaseAttackCost", this.equip_effect.increase_attack_cost);
+			if (this.equip_effect.increase_reequip_cost != null) equipEffectJson.put("increaseReequipCost", this.equip_effect.increase_reequip_cost);
-            if (this.equip_effect.increase_attack_chance != null)
+			if (this.equip_effect.increase_attack_cost != null) equipEffectJson.put("increaseAttackCost", this.equip_effect.increase_attack_cost);
-                equipEffectJson.put("increaseAttackChance", this.equip_effect.increase_attack_chance);
+			if (this.equip_effect.increase_attack_chance != null) equipEffectJson.put("increaseAttackChance", this.equip_effect.increase_attack_chance);
-            if (this.equip_effect.increase_critical_skill != null)
+			if (this.equip_effect.increase_critical_skill != null) equipEffectJson.put("increaseCriticalSkill", this.equip_effect.increase_critical_skill);
-                equipEffectJson.put("increaseCriticalSkill", this.equip_effect.increase_critical_skill);
+			if (this.equip_effect.increase_block_chance != null) equipEffectJson.put("increaseBlockChance", this.equip_effect.increase_block_chance);
-            if (this.equip_effect.increase_block_chance != null)
+			if (this.equip_effect.increase_damage_resistance != null) equipEffectJson.put("increaseDamageResistance", this.equip_effect.increase_damage_resistance);
-                equipEffectJson.put("increaseBlockChance", this.equip_effect.increase_block_chance);
+			if (this.equip_effect.critical_multiplier != null) equipEffectJson.put("setCriticalMultiplier", this.equip_effect.critical_multiplier);
-            if (this.equip_effect.increase_damage_resistance != null)
-                equipEffectJson.put("increaseDamageResistance", this.equip_effect.increase_damage_resistance);
-            if (this.equip_effect.critical_multiplier != null)
-                equipEffectJson.put("setCriticalMultiplier", this.equip_effect.critical_multiplier);
-            if (this.equip_effect.damage_modifier != null)
-                equipEffectJson.put("setNonWeaponDamageModifier", this.equip_effect.damage_modifier);
 			if (this.equip_effect.conditions != null) {
 				List conditionsJson = new ArrayList();
 				equipEffectJson.put("addedConditions", conditionsJson);
-                for (ActorConditionEffect condition : this.equip_effect.conditions) {
+				for (ConditionEffect condition : this.equip_effect.conditions) {
 					Map conditionJson = new LinkedHashMap();
 					conditionsJson.add(conditionJson);
-                    writeConditionEffectToMap(condition, conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
 				}
 			}
 		}
-        writeHitEffectToMap(itemJson, this.hit_effect, "hitEffect");
+		if (this.hit_effect != null) {
-        writeHitReceivedEffectToMap(itemJson, this.hit_received_effect, "hitReceivedEffect");
+			Map hitEffectJson = new LinkedHashMap();
-        writeHitEffectToMap(itemJson, this.miss_effect, "missEffect");
+			itemJson.put("hitEffect", hitEffectJson);
-        writeHitReceivedEffectToMap(itemJson, this.miss_received_effect, "missReceivedEffect");
+			if (this.hit_effect.hp_boost_min != null || this.hit_effect.hp_boost_max != null) {
-
+				Map hpJson = new LinkedHashMap();
-        String key;
+				hitEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.hit_effect.hp_boost_min != null) hpJson.put("min", this.hit_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.hit_effect.hp_boost_max != null) hpJson.put("max", this.hit_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_effect.ap_boost_min != null || this.hit_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				hitEffectJson.put("increaseCurrentAP", apJson);
+				if (this.hit_effect.ap_boost_min != null) apJson.put("min", this.hit_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.hit_effect.ap_boost_max != null) apJson.put("max", this.hit_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				hitEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.hit_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+			if (this.hit_effect.conditions_target != null) {
+				List conditionsTargetJson = new ArrayList();
+				hitEffectJson.put("conditionsTarget", conditionsTargetJson);
+				for (TimedConditionEffect condition : this.hit_effect.conditions_target) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsTargetJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
+		if (this.hit_received_effect != null) {
+			Map hitReceivedEffectJson = new LinkedHashMap();
+			itemJson.put("hitReceivedEffect", hitReceivedEffectJson);
+			if (this.hit_received_effect.hp_boost_min != null || this.hit_received_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min != null) hpJson.put("min", this.hit_received_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max != null) hpJson.put("max", this.hit_received_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min != null || this.hit_received_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min != null) apJson.put("min", this.hit_received_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max != null) apJson.put("max", this.hit_received_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.hp_boost_min_target != null || this.hit_received_effect.hp_boost_max_target != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min_target != null) hpJson.put("min", this.hit_received_effect.hp_boost_min_target);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max_target != null) hpJson.put("max", this.hit_received_effect.hp_boost_max_target);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min_target != null || this.hit_received_effect.ap_boost_max_target != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min_target != null) apJson.put("min", this.hit_received_effect.ap_boost_min_target);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max_target != null) apJson.put("max", this.hit_received_effect.ap_boost_max_target);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				List conditionsTargetJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsTarget", conditionsTargetJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_target) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsTargetJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
+		if (this.kill_effect != null) {
+			Map killEffectJson = new LinkedHashMap();
 			if (this.category != null && this.category.action_type != null && this.category.action_type == ItemCategory.ActionType.equip) {
-            key = "killEffect";
+				itemJson.put("killEffect", killEffectJson);
 			} else if (this.category != null && this.category.action_type != null && this.category.action_type == ItemCategory.ActionType.use) {
-            key = "useEffect";
+				itemJson.put("useEffect", killEffectJson);
-        } else {
+			}
-            System.out.println("Could not create JSON-Map for Item: Failed to determine if the item should be used or equipped.");
+			if (this.kill_effect.hp_boost_min != null || this.kill_effect.hp_boost_max != null) {
-            key = null;
+				Map hpJson = new LinkedHashMap();
+				killEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.kill_effect.hp_boost_min != null) hpJson.put("min", this.kill_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.kill_effect.hp_boost_max != null) hpJson.put("max", this.kill_effect.hp_boost_max);
+				else hpJson.put("min", 0);
+			}
+			if (this.kill_effect.ap_boost_min != null || this.kill_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				killEffectJson.put("increaseCurrentAP", apJson);
+				if (this.kill_effect.ap_boost_min != null) apJson.put("min", this.kill_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.kill_effect.ap_boost_max != null) apJson.put("max", this.kill_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.kill_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				killEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.kill_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
 			}
-        if (key != null) {
-            writeDeathEffectToMap(itemJson, this.kill_effect, key);
 		}
-
 		return itemJson;
 	}
 
-
 	@Override
 	public String getProjectFilename() {
 		return "itemlist_"+getProject().name+".json";
@@ -446,7 +831,7 @@ public class Item extends JSONElement {
 			if (category.action_type == ItemCategory.ActionType.use) {
 				price += kill_effect == null ? 0 : calculateUseCost();
 			} else if (category.action_type == ItemCategory.ActionType.equip) {
-                price += equip_effect == null ? 0 : calculateEquipCost(isWeapon());
+				price += equip_effect == null ? 0 : calculateEquipCost(isWeapon());;
 				price += hit_effect == null ? 0 : calculateHitCost();
 				price += kill_effect == null ? 0 : calculateKillCost();
 			}
@@ -474,8 +859,7 @@ public class Item extends JSONElement {
 
 	public int calculateEquipCost(boolean isWeapon) {
 		final int costBC = (int) (3*Math.pow(Math.max(0, zeroForNull(equip_effect.increase_block_chance)), 2.5) + 28*zeroForNull(equip_effect.increase_block_chance));
-        final int costAC = (int) (0.4 * Math.pow(Math.max(0, zeroForNull(equip_effect.increase_attack_chance)), 2.5) - 6 * Math.pow(
+		final int costAC = (int) (0.4*Math.pow(Math.max(0,zeroForNull(equip_effect.increase_attack_chance)), 2.5) - 6*Math.pow(Math.abs(Math.min(0,zeroForNull(equip_effect.increase_attack_chance))),2.7));
-                Math.abs(Math.min(0, zeroForNull(equip_effect.increase_attack_chance))), 2.7));
 		final int costAP = isWeapon ?
 				(int) (0.2*Math.pow(10.0f/zeroForNull(equip_effect.increase_attack_cost), 8) - 25*zeroForNull(equip_effect.increase_attack_cost))
 				:-3125 * zeroForNull(equip_effect.increase_attack_cost);

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

@@ -1,13 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.awt.Image;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -16,6 +9,15 @@ 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;
@@ -154,16 +156,14 @@ public class ItemCategory extends JSONElement {
 		ItemCategory itemCat = new ItemCategory();
 		itemCat.id = (String) itemCatJson.get("id");
 		itemCat.name = (String) itemCatJson.get("name");
-        if (itemCatJson.get("inventorySlot") != null)
+		if (itemCatJson.get("inventorySlot") != null) itemCat.slot = InventorySlot.valueOf((String) itemCatJson.get("inventorySlot"));
-            itemCat.slot = InventorySlot.valueOf((String) itemCatJson.get("inventorySlot"));
 		return itemCat;
 	}
 	
 	@SuppressWarnings("rawtypes")
 	@Override
 	public void parse(Map itemCatJson) {
-        if (itemCatJson.get("actionType") != null)
+		if (itemCatJson.get("actionType") != null) action_type = ActionType.valueOf((String) itemCatJson.get("actionType"));
-            action_type = ActionType.valueOf((String) itemCatJson.get("actionType"));
 		if (itemCatJson.get("size") != null) size = Size.valueOf((String) itemCatJson.get("size"));
 		this.state = State.parsed;
 	
@@ -171,10 +171,17 @@ public class ItemCategory extends JSONElement {
 	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		
 		//Nothing to link to :D
 		this.state = State.linked;

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

@@ -1,17 +1,21 @@
 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;
-import com.gpl.rpg.atcontentstudio.utils.FileUtils;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.io.*;
-import java.util.List;
-import java.util.Map;
 
 public abstract class JSONElement extends GameDataElement {
 
@@ -22,7 +26,8 @@ public abstract class JSONElement extends GameDataElement {
 	
 	@SuppressWarnings("rawtypes")
 	public void parse() {
-        if (shouldSkipParse()) {
+		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();
@@ -33,16 +38,11 @@ public abstract class JSONElement extends GameDataElement {
 			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());
@@ -53,10 +53,6 @@ public abstract class JSONElement extends GameDataElement {
 		} catch (ParseException e) {
 			Notification.addError("Error while parsing JSON file "+jsonFile.getAbsolutePath()+": "+e.getMessage());
 			e.printStackTrace();
-        } catch (IllegalArgumentException e) {
-            System.out.println(id);
-            Notification.addError("Error while parsing JSON file " + jsonFile.getAbsolutePath() + ": " + e.getMessage());
-            e.printStackTrace();
 		} finally {
 			if (reader != null)
 				try {
@@ -72,11 +68,16 @@ public abstract class JSONElement extends GameDataElement {
 	
 	@SuppressWarnings("rawtypes")
 	public abstract Map toJson();
-
 	public String toJsonString() {
-        Map json = this.toJson();
+		StringWriter writer = new JsonPrettyWriter();
-        return FileUtils.toJsonString(json);
+		try {
+			JSONObject.writeJSONString(this.toJson(), writer);
+		} catch (IOException e) {
+			//Impossible with a StringWriter
 		}
+		return writer.toString();
+	}
+	
 	
 	@Override
 	public GameDataSet getDataSet() {
@@ -131,20 +132,18 @@ public abstract class JSONElement extends GameDataElement {
                 double a = 1;
                 try {
                 	a = Integer.parseInt(s.substring(0, c));
-            } catch (NumberFormatException nfe) {
+                } catch (NumberFormatException nfe) {}
-            }
                 double b = 100;
                 try {
                 	b = Integer.parseInt(s.substring(c+1));
-            } catch (NumberFormatException nfe) {
+                } catch (NumberFormatException nfe) {}
-            }
                 return a/b;
-        } else {
+        }
+        else {
         	double a = 10;
         	try {
              	a = Double.parseDouble(s);
-            } catch (NumberFormatException nfe) {
+            } catch (NumberFormatException nfe) {}
-            }
         	return a;
         }
 	}

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

@@ -1,22 +1,22 @@
 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 org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.awt.*;
-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 static com.gpl.rpg.atcontentstudio.model.gamedata.Common.*;
 
 public class NPC extends JSONElement {
 
@@ -38,7 +38,6 @@ public class NPC extends JSONElement {
 	public Integer attack_damage_min = null;
 	public String spawngroup_id = null;
 	public String faction_id = null;
-    public Integer spriteFlipChance = null;
 	public String dialogue_id = null;
 	public String droplist_id = null;
 	public Integer attack_cost = null;
@@ -74,6 +73,40 @@ public class NPC extends JSONElement {
         wholeMap
 	}
 
+	public static class DeathEffect {
+		//Available from parsed state
+		public Integer hp_boost_min = null;
+		public Integer hp_boost_max = null;
+		public Integer ap_boost_min = null;
+		public Integer ap_boost_max = null;
+		public List<TimedConditionEffect> conditions_source = null;
+	}
+	
+	public static class HitEffect extends DeathEffect {
+		//Available from parsed state
+		public List<TimedConditionEffect> conditions_target = null;
+	}
+	
+	public static class HitReceivedEffect extends HitEffect {
+		//Available from parsed state
+		public Integer hp_boost_min_target = null;
+		public Integer hp_boost_max_target = null;
+		public Integer ap_boost_min_target = null;
+		public Integer ap_boost_max_target = null;
+	}
+	
+	public static class TimedConditionEffect {
+		//Available from parsed state
+		public Integer magnitude = null;
+		public String condition_id = null;
+		public Integer duration = null;
+		public Double chance = null;
+		
+		//Available from linked state
+		public ActorCondition condition = null; 
+	
+	}
+	
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+name+" ("+id+")";
@@ -146,17 +179,14 @@ public class NPC extends JSONElement {
 		this.max_ap = JSONElement.getInteger((Number) npcJson.get("maxAP"));
 		this.move_cost = JSONElement.getInteger((Number) npcJson.get("moveCost"));
 		this.unique = JSONElement.getInteger((Number) npcJson.get("unique"));
-        if (npcJson.get("monsterClass") != null)
+		if (npcJson.get("monsterClass") != null) this.monster_class = MonsterClass.valueOf((String) npcJson.get("monsterClass"));
-            this.monster_class = MonsterClass.valueOf((String) npcJson.get("monsterClass"));
+		if (npcJson.get("movementAggressionType") != null) this.movement_type = MovementType.valueOf((String) npcJson.get("movementAggressionType"));
-        if (npcJson.get("movementAggressionType") != null)
-            this.movement_type = MovementType.valueOf((String) npcJson.get("movementAggressionType"));
 		if (npcJson.get("attackDamage") != null) {
 			this.attack_damage_min = JSONElement.getInteger((Number) (((Map)npcJson.get("attackDamage")).get("min")));
 			this.attack_damage_max = JSONElement.getInteger((Number) (((Map)npcJson.get("attackDamage")).get("max")));
 		}
 		this.spawngroup_id = (String) npcJson.get("spawnGroup");
 		this.faction_id = (String) npcJson.get("faction");
-        this.spriteFlipChance = JSONElement.getInteger((Number) npcJson.get("spriteFlipChance"));
 		this.dialogue_id = (String) npcJson.get("phraseID");
 		this.droplist_id = (String) npcJson.get("droplistID");
 		this.attack_cost = JSONElement.getInteger((Number) npcJson.get("attackCost"));
@@ -164,49 +194,184 @@ public class NPC extends JSONElement {
 		this.critical_skill = JSONElement.getInteger((Number) npcJson.get("criticalSkill"));
 		//TODO correct game data, to unify format.
 //		this.critical_multiplier = JSONElement.getDouble((Number) npcJson.get("criticalMultiplier"));
-        if (npcJson.get("criticalMultiplier") != null)
+		if (npcJson.get("criticalMultiplier") != null) this.critical_multiplier = JSONElement.getDouble(Double.parseDouble(npcJson.get("criticalMultiplier").toString()));
-            this.critical_multiplier = JSONElement.getDouble(Double.parseDouble(npcJson.get("criticalMultiplier").toString()));
 
 		this.block_chance = JSONElement.getInteger((Number) npcJson.get("blockChance"));
 		this.damage_resistance = JSONElement.getInteger((Number) npcJson.get("damageResistance"));
 		
 		Map hitEffect = (Map) npcJson.get("hitEffect");
 		if (hitEffect != null) {
-            this.hit_effect = parseHitEffect(hitEffect);
+			this.hit_effect = new HitEffect();
+			if (hitEffect.get("increaseCurrentHP") != null) {
+				this.hit_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentHP")).get("max")));
+				this.hit_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentHP")).get("min")));
+			}
+			if (hitEffect.get("increaseCurrentAP") != null) {
+				this.hit_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("max")));
+				this.hit_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitEffect.get("increaseCurrentAP")).get("min")));
+			}
+			List conditionsSourceJson = (List) hitEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.hit_effect.conditions_source = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_effect.conditions_source.add(condition);
+				}
+			}
+			List conditionsTargetJson = (List) hitEffect.get("conditionsTarget");
+			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
+				this.hit_effect.conditions_target = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsTargetJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_effect.conditions_target.add(condition);
+				}
+			}
 		}
 	
 		Map hitReceivedEffect = (Map) npcJson.get("hitReceivedEffect");
 		if (hitReceivedEffect != null) {
-            this.hit_received_effect = parseHitReceivedEffect(hitReceivedEffect);
+			this.hit_received_effect = new HitReceivedEffect();
+			if (hitReceivedEffect.get("increaseCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("max")));
+				this.hit_received_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentHP")).get("min")));
+			}
+			if (hitReceivedEffect.get("increaseCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("max")));
+				this.hit_received_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseCurrentAP")).get("min")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentHP") != null) {
+				this.hit_received_effect.hp_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("max")));
+				this.hit_received_effect.hp_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentHP")).get("min")));
+			}
+			if (hitReceivedEffect.get("increaseAttackerCurrentAP") != null) {
+				this.hit_received_effect.ap_boost_max_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("max")));
+				this.hit_received_effect.ap_boost_min_target = JSONElement.getInteger((Number) (((Map)hitReceivedEffect.get("increaseAttackerCurrentAP")).get("min")));
+			}
+			List conditionsSourceJson = (List) hitReceivedEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.hit_received_effect.conditions_source = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_source.add(condition);
+				}
+			}
+			List conditionsTargetJson = (List) hitReceivedEffect.get("conditionsTarget");
+			if (conditionsTargetJson != null && !conditionsTargetJson.isEmpty()) {
+				this.hit_received_effect.conditions_target = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsTargetJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.hit_received_effect.conditions_target.add(condition);
+				}
+			}
 		}
 		
 		Map deathEffect = (Map) npcJson.get("deathEffect");
 		if (deathEffect != null) {
-            this.death_effect = parseDeathEffect(deathEffect);
+			this.death_effect = new HitEffect();
+			if (deathEffect.get("increaseCurrentHP") != null) {
+				this.death_effect.hp_boost_max = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentHP")).get("max")));
+				this.death_effect.hp_boost_min = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentHP")).get("min")));
 			}
+			if (deathEffect.get("increaseCurrentAP") != null) {
+				this.death_effect.ap_boost_max = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentAP")).get("max")));
+				this.death_effect.ap_boost_min = JSONElement.getInteger((Number) (((Map)deathEffect.get("increaseCurrentAP")).get("min")));
+			}
+			List conditionsSourceJson = (List) deathEffect.get("conditionsSource");
+			if (conditionsSourceJson != null && !conditionsSourceJson.isEmpty()) {
+				this.death_effect.conditions_source = new ArrayList<NPC.TimedConditionEffect>();
+				for (Object conditionJsonObj : conditionsSourceJson) {
+					Map conditionJson = (Map)conditionJsonObj;
+					TimedConditionEffect condition = new TimedConditionEffect();
+					condition.condition_id = (String) conditionJson.get("condition");
+					condition.magnitude = JSONElement.getInteger((Number) conditionJson.get("magnitude"));
+					condition.duration = JSONElement.getInteger((Number) conditionJson.get("duration"));
+					if (conditionJson.get("chance") != null) condition.chance = JSONElement.parseChance(conditionJson.get("chance").toString());
+					this.death_effect.conditions_source.add(condition);
+				}
+			}
+		}
+		
 	}
 	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking item "+id+". No parent project found.");
 			return;
 		}
-        linkIcon(proj, this.icon_id, this);
+		if (this.icon_id != null) {
+			String spritesheetId = this.icon_id.split(":")[0];
+			proj.getSpritesheet(spritesheetId).addBacklink(this);
+		}
+		
 		if (this.dialogue_id != null) this.dialogue = proj.getDialogue(this.dialogue_id);
 		if (this.dialogue != null) this.dialogue.addBacklink(this);
 		
 		if (this.droplist_id != null) this.droplist = proj.getDroplist(this.droplist_id);
 		if (this.droplist != null) this.droplist.addBacklink(this);
 		
-        linkEffects(this.hit_effect, proj, this);
+		if (this.hit_effect != null && this.hit_effect.conditions_source != null) {
-        linkEffects(this.hit_received_effect, proj, this);
+			for (TimedConditionEffect ce : this.hit_effect.conditions_source) {
-        linkEffects(this.death_effect, proj, this);
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_effect != null && this.hit_effect.conditions_target != null) {
+			for (TimedConditionEffect ce : this.hit_effect.conditions_target) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.hit_received_effect != null && this.hit_received_effect.conditions_target != null) {
+			for (TimedConditionEffect ce : this.hit_received_effect.conditions_target) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
+		if (this.death_effect != null && this.death_effect.conditions_source != null) {
+			for (TimedConditionEffect ce : this.death_effect.conditions_source) {
+				if (ce.condition_id != null) ce.condition = proj.getActorCondition(ce.condition_id);
+				if (ce.condition != null) ce.condition.addBacklink(this);
+			}
+		}
 		this.state = State.linked;
 	}
 	
@@ -246,18 +411,105 @@ public class NPC extends JSONElement {
 		}
 		clone.droplist_id = this.droplist_id;
 		clone.faction_id = this.faction_id;
-        clone.spriteFlipChance = this.spriteFlipChance;
 		if (this.hit_effect != null) {
 			clone.hit_effect = new HitEffect();
-            copyHitEffectValues(clone.hit_effect, this.hit_effect, clone);
+			clone.hit_effect.ap_boost_max = this.hit_effect.ap_boost_max;
+			clone.hit_effect.ap_boost_min = this.hit_effect.ap_boost_min;
+			clone.hit_effect.hp_boost_max = this.hit_effect.hp_boost_max;
+			clone.hit_effect.hp_boost_min = this.hit_effect.hp_boost_min;
+			if (this.hit_effect.conditions_source != null) {
+				clone.hit_effect.conditions_source = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_effect.conditions_source.add(cclone);
+				}
+			}
+			if (this.hit_effect.conditions_target != null) {
+				clone.hit_effect.conditions_target = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_effect.conditions_target) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_effect.conditions_target.add(cclone);
+				}
+			}
 		}
 		if (this.hit_received_effect != null) {
 			clone.hit_received_effect = new HitReceivedEffect();
-            copyHitReceivedEffectValues(clone.hit_received_effect, this.hit_received_effect, clone);
+			clone.hit_received_effect.ap_boost_max = this.hit_received_effect.ap_boost_max;
+			clone.hit_received_effect.ap_boost_min = this.hit_received_effect.ap_boost_min;
+			clone.hit_received_effect.hp_boost_max = this.hit_received_effect.hp_boost_max;
+			clone.hit_received_effect.hp_boost_min = this.hit_received_effect.hp_boost_min;
+			clone.hit_received_effect.ap_boost_max_target = this.hit_received_effect.ap_boost_max_target;
+			clone.hit_received_effect.ap_boost_min_target = this.hit_received_effect.ap_boost_min_target;
+			clone.hit_received_effect.hp_boost_max_target = this.hit_received_effect.hp_boost_max_target;
+			clone.hit_received_effect.hp_boost_min_target = this.hit_received_effect.hp_boost_min_target;
+			if (this.hit_received_effect.conditions_source != null) {
+				clone.hit_received_effect.conditions_source = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_source.add(cclone);
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				clone.hit_received_effect.conditions_target = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.hit_received_effect.conditions_target) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.hit_received_effect.conditions_target.add(cclone);
+				}
+			}
 		}
 		if (this.death_effect != null) {
 			clone.death_effect = new DeathEffect();
-            copyDeathEffectValues(clone.death_effect, this.death_effect, clone);
+			clone.death_effect.ap_boost_max = this.death_effect.ap_boost_max;
+			clone.death_effect.ap_boost_min = this.death_effect.ap_boost_min;
+			clone.death_effect.hp_boost_max = this.death_effect.hp_boost_max;
+			clone.death_effect.hp_boost_min = this.death_effect.hp_boost_min;
+			if (this.death_effect.conditions_source != null) {
+				clone.death_effect.conditions_source = new ArrayList<TimedConditionEffect>();
+				for (TimedConditionEffect c : this.death_effect.conditions_source) {
+					TimedConditionEffect cclone = new TimedConditionEffect();
+					cclone.magnitude = c.magnitude;
+					cclone.condition_id = c.condition_id;
+					cclone.condition = c.condition;
+					cclone.chance = c.chance;
+					cclone.duration = c.duration;
+					if (cclone.condition != null) {
+						cclone.condition.addBacklink(clone);
+					}
+					clone.death_effect.conditions_source.add(cclone);
+				}
+			}
 		}
 		clone.max_ap = this.max_ap;
 		clone.max_hp = this.max_hp;
@@ -281,9 +533,23 @@ public class NPC extends JSONElement {
 				this.droplist = (Droplist) newOne;
 				if (newOne != null) newOne.addBacklink(this);
 			} else {
-                if (this.hit_effect != null) {
+				if (this.hit_effect != null && this.hit_effect.conditions_source != null) {
-                    actorConditionElementChanged(this.hit_effect.conditions_source, oldOne, newOne, this);
+					for (TimedConditionEffect tce : this.hit_effect.conditions_source) {
-                    actorConditionElementChanged(this.hit_effect.conditions_target, oldOne, newOne, this);
+						if (tce.condition == oldOne) {
+							oldOne.removeBacklink(this);
+							tce.condition = (ActorCondition) newOne;
+							if (newOne != null) newOne.addBacklink(this);
+						}
+					}
+				}
+				if (this.hit_effect != null && this.hit_effect.conditions_target != null) {
+					for (TimedConditionEffect tce : this.hit_effect.conditions_target) {
+						if (tce.condition == oldOne) {
+							oldOne.removeBacklink(this);
+							tce.condition = (ActorCondition) newOne;
+							if (newOne != null) newOne.addBacklink(this);
+						}
+					}
 				}
 			}
 		}
@@ -295,17 +561,23 @@ public class NPC extends JSONElement {
 		Map npcJson = new LinkedHashMap();
 		npcJson.put("id", this.id);
 		if (this.name != null) npcJson.put("name", this.name);
-        writeIconToMap(npcJson, this.icon_id);
+		if (this.icon_id != null) npcJson.put("iconID", this.icon_id);
 		if (this.max_hp != null) npcJson.put("maxHP", this.max_hp);
 		if (this.max_ap != null) npcJson.put("maxAP", this.max_ap);
 		if (this.move_cost != null) npcJson.put("moveCost", this.move_cost);
 		if (this.unique != null) npcJson.put("unique", this.unique);
 		if (this.monster_class != null) npcJson.put("monsterClass", this.monster_class.toString());
 		if (this.movement_type != null) npcJson.put("movementAggressionType", this.movement_type.toString());
-        writeMinMaxToMap(npcJson, "attackDamage", this.attack_damage_min, attack_damage_max, 0);
+		if (this.attack_damage_min != null || this.attack_damage_max != null) {
+			Map adJson = new LinkedHashMap();
+			npcJson.put("attackDamage", adJson);
+			if (this.attack_damage_min != null) adJson.put("min", this.attack_damage_min);
+			else adJson.put("min", 0);
+			if (this.attack_damage_max != null) adJson.put("max", this.attack_damage_max);
+			else adJson.put("max", 0);
+		}
 		if (this.spawngroup_id != null) npcJson.put("spawnGroup", this.spawngroup_id);
 		if (this.faction_id != null) npcJson.put("faction", this.faction_id);
-        if (this.spriteFlipChance != null) npcJson.put("spriteFlipChance", this.spriteFlipChance);
 		if (this.dialogue != null) {
 			npcJson.put("phraseID", this.dialogue.id);
 		} else if (this.dialogue_id != null) {
@@ -322,9 +594,162 @@ public class NPC extends JSONElement {
 		if (this.critical_multiplier != null) npcJson.put("criticalMultiplier", this.critical_multiplier);
 		if (this.block_chance != null) npcJson.put("blockChance", this.block_chance);
 		if (this.damage_resistance != null) npcJson.put("damageResistance", this.damage_resistance);
-        writeHitEffectToMap(npcJson, this.hit_effect, "hitEffect");
+		if (this.hit_effect != null) {
-        writeHitReceivedEffectToMap(npcJson, this.hit_received_effect, "hitReceivedEffect");
+			Map hitEffectJson = new LinkedHashMap();
-        writeDeathEffectToMap(npcJson, this.death_effect, "deathEffect");
+			npcJson.put("hitEffect", hitEffectJson);
+			if (this.hit_effect.hp_boost_min != null || this.hit_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				hitEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.hit_effect.hp_boost_min != null) hpJson.put("min", this.hit_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.hit_effect.hp_boost_max != null) hpJson.put("max", this.hit_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_effect.ap_boost_min != null || this.hit_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				hitEffectJson.put("increaseCurrentAP", apJson);
+				if (this.hit_effect.ap_boost_min != null) apJson.put("min", this.hit_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.hit_effect.ap_boost_max != null) apJson.put("max", this.hit_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				hitEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.hit_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+			if (this.hit_effect.conditions_target != null) {
+				List conditionsTargetJson = new ArrayList();
+				hitEffectJson.put("conditionsTarget", conditionsTargetJson);
+				for (TimedConditionEffect condition : this.hit_effect.conditions_target) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsTargetJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
+		if (this.hit_received_effect != null) {
+			Map hitReceivedEffectJson = new LinkedHashMap();
+			npcJson.put("hitReceivedEffect", hitReceivedEffectJson);
+			if (this.hit_received_effect.hp_boost_min != null || this.hit_received_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min != null) hpJson.put("min", this.hit_received_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max != null) hpJson.put("max", this.hit_received_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min != null || this.hit_received_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min != null) apJson.put("min", this.hit_received_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max != null) apJson.put("max", this.hit_received_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.hp_boost_min_target != null || this.hit_received_effect.hp_boost_max_target != null) {
+				Map hpJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentHP", hpJson);
+				if (this.hit_received_effect.hp_boost_min_target != null) hpJson.put("min", this.hit_received_effect.hp_boost_min_target);
+				else hpJson.put("min", 0);
+				if (this.hit_received_effect.hp_boost_max_target != null) hpJson.put("max", this.hit_received_effect.hp_boost_max_target);
+				else hpJson.put("max", 0);
+			}
+			if (this.hit_received_effect.ap_boost_min_target != null || this.hit_received_effect.ap_boost_max_target != null) {
+				Map apJson = new LinkedHashMap();
+				hitReceivedEffectJson.put("increaseAttackerCurrentAP", apJson);
+				if (this.hit_received_effect.ap_boost_min_target != null) apJson.put("min", this.hit_received_effect.ap_boost_min_target);
+				else apJson.put("min", 0);
+				if (this.hit_received_effect.ap_boost_max_target != null) apJson.put("max", this.hit_received_effect.ap_boost_max_target);
+				else apJson.put("max", 0);
+			}
+			if (this.hit_received_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+			if (this.hit_received_effect.conditions_target != null) {
+				List conditionsTargetJson = new ArrayList();
+				hitReceivedEffectJson.put("conditionsTarget", conditionsTargetJson);
+				for (TimedConditionEffect condition : this.hit_received_effect.conditions_target) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsTargetJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
+		if (this.death_effect != null) {
+			Map deathEffectJson = new LinkedHashMap();
+			npcJson.put("deathEffect", deathEffectJson);
+			if (this.death_effect.hp_boost_min != null || this.death_effect.hp_boost_max != null) {
+				Map hpJson = new LinkedHashMap();
+				deathEffectJson.put("increaseCurrentHP", hpJson);
+				if (this.death_effect.hp_boost_min != null) hpJson.put("min", this.death_effect.hp_boost_min);
+				else hpJson.put("min", 0);
+				if (this.death_effect.hp_boost_max != null) hpJson.put("max", this.death_effect.hp_boost_max);
+				else hpJson.put("max", 0);
+			}
+			if (this.death_effect.ap_boost_min != null || this.death_effect.ap_boost_max != null) {
+				Map apJson = new LinkedHashMap();
+				deathEffectJson.put("increaseCurrentAP", apJson);
+				if (this.death_effect.ap_boost_min != null) apJson.put("min", this.death_effect.ap_boost_min);
+				else apJson.put("min", 0);
+				if (this.death_effect.ap_boost_max != null) apJson.put("max", this.death_effect.ap_boost_max);
+				else apJson.put("max", 0);
+			}
+			if (this.death_effect.conditions_source != null) {
+				List conditionsSourceJson = new ArrayList();
+				deathEffectJson.put("conditionsSource", conditionsSourceJson);
+				for (TimedConditionEffect condition : this.death_effect.conditions_source) {
+					Map conditionJson = new LinkedHashMap();
+					conditionsSourceJson.add(conditionJson);
+					if (condition.condition != null) {
+						conditionJson.put("condition", condition.condition.id);
+					} else if (condition.condition_id != null) {
+						conditionJson.put("condition", condition.condition_id);
+					}
+					if (condition.magnitude != null) conditionJson.put("magnitude", condition.magnitude);
+					if (condition.duration != null) conditionJson.put("duration", condition.duration);
+					if (condition.chance != null) conditionJson.put("chance", JSONElement.printJsonChance(condition.chance));
+				}
+			}
+		}
 		return npcJson;
 	}
 	
@@ -348,8 +773,7 @@ public class NPC extends JSONElement {
 			avgCrit = (double)(critical_skill / 100.0) * critical_multiplier;
 		}
 		double avgAttackHP  = attacksPerTurn * ((double)(attack_chance != null ? attack_chance : 0) / 100.0) * avgDamagePotential * (1 + avgCrit);
-        double avgDefenseHP = ((max_hp != null ? max_hp : 1) * (1 + ((double) (block_chance != null ? block_chance : 0) / 100.0))) +
+		double avgDefenseHP = ((max_hp != null ? max_hp : 1) * (1 + ((double)(block_chance != null ? block_chance : 0) / 100.0))) + ( EXP_FACTOR_DAMAGERESISTANCE * (damage_resistance != null ? damage_resistance : 0));
-                (EXP_FACTOR_DAMAGERESISTANCE * (damage_resistance != null ? damage_resistance : 0));
 		double attackConditionBonus = 0;
 		if (hit_effect != null && hit_effect.conditions_target != null && hit_effect.conditions_target.size() > 0) {
 			attackConditionBonus = 50;
@@ -357,7 +781,7 @@ public class NPC extends JSONElement {
 		double experience = (((avgAttackHP * 3) + avgDefenseHP) * EXP_FACTOR_SCALING) + attackConditionBonus;
 
 		return new Double(Math.ceil(experience)).intValue();
-    }
+	};
 
 	
 }

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

@@ -1,13 +1,6 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
+import java.awt.Image;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.GameSource;
-import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.awt.*;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -17,6 +10,14 @@ 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;
@@ -112,10 +113,17 @@ public class Quest extends JSONElement {
 	
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		
 		for (QuestStage stage : stages) {
 			stage.link();
@@ -186,4 +194,5 @@ public class Quest extends JSONElement {
 		}
 		return null;
 	}
+	
 }

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

@@ -1,12 +1,12 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
+import java.awt.Image;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 public class QuestStage extends JSONElement {
 	
 	private static final long serialVersionUID = 8313645819951513431L;
@@ -59,10 +59,17 @@ public class QuestStage extends JSONElement {
 
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		
 		//Nothing to link to :D
 		this.state = State.linked;

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

@@ -1,14 +1,14 @@
 package com.gpl.rpg.atcontentstudio.model.gamedata;
 
-import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-import com.gpl.rpg.atcontentstudio.model.Project;
-
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.Project;
+
 public class Requirement extends JSONElement {
 
 	private static final long serialVersionUID = 7295593297142310955L;
@@ -26,13 +26,10 @@ 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
@@ -57,49 +54,59 @@ public class Requirement extends JSONElement {
 		spentGold,
 		consumedBonemeals,
 		hasActorCondition,
-        factionScore,
+		factionScore
-        random,
-        factionScoreEquals,
-        wearRemove,
-        date,
-        dateEquals,
-        time,
-        timeEquals
 	}
 	
 	public enum SkillID {
-        weaponChance, weaponDmg, barter, dodge, barkSkin, moreCriticals, betterCriticals, speed                // Raises max ap
+		weaponChance
-        , coinfinder, moreExp, cleave                // +10ap on kill
+		,weaponDmg
+		,barter
+		,dodge
+		,barkSkin
+		,moreCriticals
+		,betterCriticals
+		,speed				// Raises max ap
+		,coinfinder
+		,moreExp
+		,cleave				// +10ap on kill
 		,eater				// +1hp per kill
 		,fortitude			// +N hp per levelup
 		,evasion			// increase successful flee chance & reduce chance of monster attack
 		,regeneration		// +N hp per round
-        , lowerExploss, magicfinder, resistanceMental    // lowers chance to get negative active conditions by monsters (Mental like Dazed)
+		,lowerExploss
+		,magicfinder
+		,resistanceMental	// lowers chance to get negative active conditions by monsters (Mental like Dazed)
 		,resistancePhysical	// lowers chance to get negative active conditions by monsters (Physical Capacity like Minor fatigue)
 		,resistanceBlood	// lowers chance to get negative active conditions by monsters (Blood Disorder like Weak Poison)
-        , shadowBless, sporeImmunity, crit1            // lowers atk ability
+		,shadowBless
+		,crit1			// lowers atk ability
 		,crit2			// lowers def ability ,rejuvenation	// Reduces magnitudes of conditions
 		,rejuvenation	// Reduces magnitudes of conditions
 		,taunt			// Causes AP loss of attackers that miss
 		,concussion		// AC loss for monsters with (AC-BC)>N
-        , weaponProficiencyDagger, weaponProficiency1hsword, weaponProficiency2hsword, weaponProficiencyAxe, weaponProficiencyBlunt, weaponProficiencyUnarmed, weaponProficiencyPole, armorProficiencyShield, armorProficiencyUnarmored, armorProficiencyLight, armorProficiencyHeavy, fightstyleDualWield, fightstyle2hand, fightstyleWeaponShield, specializationDualWield, specialization2hand, specializationWeaponShield
+		,weaponProficiencyDagger
+		,weaponProficiency1hsword
+		,weaponProficiency2hsword
+		,weaponProficiencyAxe
+		,weaponProficiencyBlunt
+		,weaponProficiencyUnarmed
+		,armorProficiencyShield
+		,armorProficiencyUnarmored
+		,armorProficiencyLight
+		,armorProficiencyHeavy
+		,fightstyleDualWield
+		,fightstyle2hand
+		,fightstyleWeaponShield
+		,specializationDualWield
+		,specialization2hand
+		,specializationWeaponShield
 	}
 	
 	@Override
 	public String getDesc() {
-        String obj_id = "";
-        if (required_obj_id != null) {
-            obj_id = required_obj_id;
-            if (type != null && type == RequirementType.random) {
-                obj_id = " Chance " + obj_id + (required_obj_id.contains("/") ? "" : "%");
-            } else {
-                obj_id += ":";
-            }
-        }
-
 		return ((negated != null && negated) ? "NOT " : "")
 				+(type == null ? "" : type.toString()+":")
-                + obj_id
+				+(required_obj_id == null ? "" : required_obj_id+":")
 				+(required_value == null ? "" : required_value.toString());
 	}
 
@@ -122,10 +129,17 @@ public class Requirement extends JSONElement {
 
 	@Override
 	public void link() {
-        if (shouldSkipParseOrLink()) {
+		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;
 		}
-        ensureParseIfNeeded();
 		Project proj = getProject();
 		if (proj == null) {
 			Notification.addError("Error linking requirement "+getDesc()+". No parent project found.");
@@ -139,7 +153,6 @@ public class Requirement extends JSONElement {
 		case inventoryRemove:
 		case usedItem:
 		case wear:
-            case wearRemove:
 			this.required_obj = proj.getItem(required_obj_id);
 			break;
 		case killedMonster:
@@ -160,12 +173,6 @@ 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);
@@ -207,7 +214,6 @@ public class Requirement extends JSONElement {
 			}
 		}
 	}
-
 	@Override
 	public String getProjectFilename() {
 		throw new Error("Thou shalt not reach this method.");
@@ -219,11 +225,6 @@ public class Requirement extends JSONElement {
 			required_obj_id = null;
 			required_value = null;
 		}
-
-        if (destType == RequirementType.random) {
-            required_obj_id = "50/100";
-        }
-
 		type = destType;
 	}
 

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

@@ -1,17 +1,16 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Droplist;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-
 public class ContainerArea extends MapObject {
 
 	public Droplist droplist = null;
 	
-    public ContainerArea(tiled.core.MapObject obj) {
+	public ContainerArea(tiled.core.MapObject obj) {}
-    }
 	
 	@Override
 	public void link() {

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

@@ -1,18 +1,18 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-
 public class KeyArea extends MapObject {
 
-    public String dialogue_id;
+	public String dialogue_id = null;
 	public Dialogue dialogue = null;
-    public Requirement requirement;
+	public Requirement requirement = null;
-    public boolean oldSchoolRequirement;
+	public boolean oldSchoolRequirement = true;
 	
 	public KeyArea(tiled.core.MapObject obj) {
 		dialogue_id = obj.getProperties().getProperty("phrase");
@@ -101,8 +101,7 @@ public class KeyArea extends MapObject {
 
 	public void updateNameFromRequirementChange() {
 		if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
-            name = (requirement.negated != null && requirement.negated) ? "NOT " : "" + requirement.required_obj_id + ":" + ((requirement.required_value == null) ? "" : Integer.toString(
+			name = (requirement.negated != null && requirement.negated) ? "NOT " : "" + requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : Integer.toString(requirement.required_value));
-                    requirement.required_value));
 		} else if (oldSchoolRequirement) {
 			int i = 0;
 			String futureName = requirement.type.toString() + "#" + Integer.toString(i);

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

@@ -1,16 +1,17 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
 
 
 public class MapChange extends MapObject {
 
-    public String map_id;
+	public String map_id = null;
 	public TMXMap map = null;
-    public String place_id;
+	public String place_id = null;
 	
 	public MapChange(tiled.core.MapObject obj) {
 		this.map_id = obj.getProperties().getProperty("map");

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

@@ -1,10 +1,10 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 
-import java.awt.*;
-
 public abstract class MapObject {
 
 	public int x, y, w, h;

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

@@ -1,10 +1,10 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
-import com.gpl.rpg.atcontentstudio.model.GameDataElement;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+
 public class MapObjectGroup {
 
 	

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

@@ -1,17 +1,17 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
 
 public class ReplaceArea extends MapObject {
 
-    public Requirement requirement;
+	public Requirement requirement = null;
 	public boolean oldSchoolRequirement = false;
 	
 	public List<ReplaceArea.Replacement> replacements = null;
@@ -66,11 +66,25 @@ public class ReplaceArea extends MapObject {
 		requirement.elementChanged(oldOne, newOne);
 	}
 	
-    public ReplaceArea.Replacement createReplacement(String source, String target) {
+	public ReplaceArea.Replacement addReplacement(String source, String target) {
 		Replacement repl = new Replacement(source, target); 
+		addReplacement(repl);
 		return repl;
 	}
 	
+	public void addReplacement(ReplaceArea.Replacement repl) {
+		if (replacements == null) replacements = new ArrayList<ReplaceArea.Replacement>();
+		replacements.add(repl);
+	}
+	
+//	public void removeReplacement(String source, String target) {
+//		replacedLayers.remove(source);
+//	}
+	
+	public void removeReplacement(Replacement repl) {
+		replacements.remove(repl);
+	}
+	
 	@Override
 	public void savePropertiesInTmxObject(tiled.core.MapObject tmxObject) {
 		if (replacements != null) {
@@ -81,9 +95,7 @@ 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 {
-                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) {
@@ -102,8 +114,7 @@ public class ReplaceArea extends MapObject {
 	//Don't use yet !
 	public void updateNameFromRequirementChange() {
 		if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
-            name = (requirement.negated != null && requirement.negated) ? "NOT " : "" + requirement.required_obj_id + ":" + ((requirement.required_value == null) ? "" : Integer.toString(
+			name = (requirement.negated != null && requirement.negated) ? "NOT " : "" + requirement.required_obj_id+":"+((requirement.required_value == null) ? "" : Integer.toString(requirement.required_value));
-                    requirement.required_value));
 		} else if (oldSchoolRequirement) {
 			int i = 0;
 			String futureName = requirement.type.toString() + "#" + Integer.toString(i);
@@ -117,7 +128,6 @@ public class ReplaceArea extends MapObject {
 	
 	public class Replacement {
 		public String sourceLayer, targetLayer;
-
 		public Replacement(String source, String target) {
 			this.sourceLayer = source;
 			this.targetLayer = target;

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

@@ -1,19 +1,17 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-
 
 public class RestArea extends MapObject {
 
-    public RestArea(tiled.core.MapObject obj) {
+	public RestArea(tiled.core.MapObject obj) {}
-    }
 
 	@Override
-    public void link() {
+	public void link() {}
-    }
 	
 	@Override
 	public Image getIcon() {

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

@@ -1,11 +1,11 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-
 public class ScriptArea extends MapObject {
 	
 	public Dialogue dialogue = null;

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

@@ -1,11 +1,11 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-
 public class SignArea extends MapObject {
 
 	public Dialogue dialogue = null;

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

@@ -1,17 +1,17 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
 public class SpawnArea extends MapObject {
 
 	public int quantity = 1;
-    public int respawnSpeed = 10;
+	public int spawnchance = 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("respawnspeed") != null) {
+		if (obj.getProperties().getProperty("spawnchance") != null) {
-            this.respawnSpeed = Integer.parseInt(obj.getProperties().getProperty("respawnspeed"));
+			this.spawnchance = Integer.parseInt(obj.getProperties().getProperty("spawnchance"));
 		}
 		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 (respawnSpeed != 10) {
+		if (spawnchance != 10) {
-            tmxObject.getProperties().setProperty("respawnspeed", Integer.toString(respawnSpeed));
+			tmxObject.getProperties().setProperty("spawnchance", Integer.toString(spawnchance));
 		}
 		if (!this.active) {
 			tmxObject.getProperties().setProperty("active", Boolean.toString(active));
@@ -92,4 +92,5 @@ public class SpawnArea extends MapObject {
 			tmxObject.getProperties().setProperty("ignoreAreas", Boolean.toString(ignoreAreas));
 		}
 	}
+	
 }

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

@@ -1,21 +1,35 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.swing.tree.TreeNode;
+
+import tiled.io.TMXMapReader;
+import tiled.io.TMXMapWriter;
+
 import com.gpl.rpg.atcontentstudio.Notification;
-import com.gpl.rpg.atcontentstudio.model.*;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.SaveEvent;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
 import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import tiled.io.TMXMapReader;
-import tiled.io.TMXMapWriter;
-
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.*;
-import java.util.List;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 public class TMXMap extends GameDataElement {
 
@@ -40,7 +54,7 @@ public class TMXMap extends GameDataElement {
 		bluetint
 	}
 	
-    public File tmxFile;
+	public File tmxFile = null;
 	public tiled.core.Map tmxMap = null;
 	public Set<Spritesheet> usedSpritesheets = null;
 	public List<MapObjectGroup> groups = null;
@@ -182,12 +196,10 @@ public class TMXMap extends GameDataElement {
 		path.add(0,this);
 		parent.childrenRemoved(path);
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
 	}
-
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+id;
@@ -202,21 +214,14 @@ public class TMXMap extends GameDataElement {
 	public Image getIcon() {
 		return DefaultIcons.getTiledIconIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getTiledIconIcon();
 	}
-
 	@Override
-    public Image getClosedIcon() {
+	public Image getClosedIcon() {return null;}
-        return null;
-    }
-
 	@Override
-    public Image getOpenIcon() {
+	public Image getOpenIcon() {return null;}
-        return null;
-    }
 	
 	@Override
 	public GameDataSet getDataSet() {
@@ -253,7 +258,7 @@ public class TMXMap extends GameDataElement {
 			if (getDataType() == GameSource.Type.source) {
 				writer.writeMap(tmxMap, baos, tmxFile.getAbsolutePath());
 			} else {
-                writer.writeMap(tmxMap, baos, ((TMXMapSet) this.parent).mapFolder.getAbsolutePath() + File.separator + "placeholder.tmx");
+				writer.writeMap(tmxMap, baos, getProject().baseContent.gameMaps.mapFolder.getAbsolutePath()+File.separator+"placeholder.tmx");
 			}
 		} catch (Exception e) {
 			Notification.addError("Error while converting map "+getDesc()+" to XML: "+e.getMessage());
@@ -411,13 +416,11 @@ public class TMXMap extends GameDataElement {
 					if (((ContainerArea)o).droplist != null) ((ContainerArea)o).droplist.elementChanged(this, null);
 				} else if (o instanceof KeyArea) {
 					if (((KeyArea)o).dialogue != null) ((KeyArea)o).dialogue.elementChanged(this, null);
-                    if (((KeyArea) o).requirement != null && ((KeyArea) o).requirement.required_obj != null)
+					if (((KeyArea)o).requirement != null && ((KeyArea)o).requirement.required_obj != null) ((KeyArea)o).requirement.required_obj.elementChanged(this, null);
-                        ((KeyArea) o).requirement.required_obj.elementChanged(this, null);
 				} else if (o instanceof MapChange) {
 					if (((MapChange)o).map != null) ((MapChange)o).map.elementChanged(this, null);
 				} else if (o instanceof ReplaceArea) {
-                    if (((ReplaceArea) o).requirement != null && ((ReplaceArea) o).requirement.required_obj != null)
+					if (((ReplaceArea)o).requirement != null && ((ReplaceArea)o).requirement.required_obj != null) ((ReplaceArea)o).requirement.required_obj.elementChanged(this, null);
-                        ((ReplaceArea) o).requirement.required_obj.elementChanged(this, null);
 				} else if (o instanceof RestArea) {
 				} else if (o instanceof ScriptArea) {
 					if (((ScriptArea)o).dialogue != null) ((ScriptArea)o).dialogue.elementChanged(this, null);
@@ -458,7 +461,6 @@ public class TMXMap extends GameDataElement {
 	
 	public interface MapChangedOnDiskListener {
 		public void mapChanged();
-
 		public void mapReloaded();
 	}
 	

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

@@ -1,5 +1,24 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchService;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
@@ -10,15 +29,6 @@ import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.utils.FileUtils;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.*;
-import java.util.List;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 public class TMXMapSet implements ProjectTreeNode {
 
 	public static final String DEFAULT_REL_PATH_IN_SOURCE = "res"+File.separator+"xml"+File.separator;
@@ -39,7 +49,8 @@ public class TMXMapSet implements ProjectTreeNode {
 		this.parent = source;
 		if (source.type == GameSource.Type.source) {
 			this.mapFolder = new File(source.baseFolder, DEFAULT_REL_PATH_IN_SOURCE);
-        } else if (source.type == GameSource.Type.created | source.type == GameSource.Type.altered) {
+		}
+		else if (source.type == GameSource.Type.created | source.type == GameSource.Type.altered) {
 			this.mapFolder = new File(source.baseFolder, DEFAULT_REL_PATH_IN_PROJECT);
 			if (!this.mapFolder.exists()) {
 				this.mapFolder.mkdirs();
@@ -89,11 +100,9 @@ public class TMXMapSet implements ProjectTreeNode {
 					while(getProject().open) {
 						try {
 							watchService = FileSystems.getDefault().newWatchService();
-                            /*WatchKey watchKey = */
+							/*WatchKey watchKey = */folderPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY);
-                            folderPath.register(watchService, StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_CREATE);
 							WatchKey wk;
-                            validService:
+							validService: while(getProject().open) {
-                            while (getProject().open) {
 								wk = watchService.poll(10, TimeUnit.SECONDS);
 								if (wk != null) {
 									for (WatchEvent<?> event : wk.pollEvents()) {
@@ -117,8 +126,7 @@ public class TMXMapSet implements ProjectTreeNode {
 							e.printStackTrace();
 						}
 					}
-                }
+				};
-
 			};
 			watcher.start();
 		}
@@ -128,49 +136,40 @@ public class TMXMapSet implements ProjectTreeNode {
 	public Enumeration<TMXMap> children() {
 		return Collections.enumeration(tmxMaps);
 	}
-
 	@Override
 	public boolean getAllowsChildren() {
 		return true;
 	}
-
 	@Override
 	public TreeNode getChildAt(int arg0) {
 		return tmxMaps.get(arg0);
 	}
-
 	@Override
 	public int getChildCount() {
 		return tmxMaps.size();
 	}
-
 	@Override
 	public int getIndex(TreeNode arg0) {
 		return tmxMaps.indexOf(arg0);
 	}
-
 	@Override
 	public TreeNode getParent() {
 		return parent;
 	}
-
 	@Override
 	public boolean isLeaf() {
 		return false;
 	}
-
 	@Override
 	public void childrenAdded(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenAdded(path);
 	}
-
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenChanged(path);
 	}
-
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		if (path.size() == 1 && this.getChildCount() == 1) {
@@ -180,7 +179,6 @@ public class TMXMapSet implements ProjectTreeNode {
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -188,7 +186,6 @@ public class TMXMapSet implements ProjectTreeNode {
 			map.notifyCreated();
 		}
 	}
-
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+"TMX Maps";
@@ -204,17 +201,14 @@ public class TMXMapSet implements ProjectTreeNode {
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		return DefaultIcons.getTmxClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getTmxClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		return DefaultIcons.getTmxOpenIcon();
@@ -248,8 +242,7 @@ public class TMXMapSet implements ProjectTreeNode {
 	public void addMap(TMXMap node) {
 		ProjectTreeNode higherEmptyParent = this;
 		while (higherEmptyParent != null) {
-            if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty())
+			if (higherEmptyParent.getParent() != null && ((ProjectTreeNode)higherEmptyParent.getParent()).isEmpty()) higherEmptyParent = (ProjectTreeNode)higherEmptyParent.getParent();
-                higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent();
 			else break;
 		}
 		if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;

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

@@ -1,5 +1,40 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+import java.awt.Point;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.tree.TreeNode;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
@@ -7,23 +42,6 @@ import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.swing.tree.TreeNode;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.awt.*;
-import java.io.*;
-import java.util.List;
-import java.util.*;
 
 public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeNode {
 
@@ -158,7 +176,6 @@ public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeN
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+"Worldmap";
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -173,17 +190,14 @@ public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeN
 	public Image getIcon() {
 		return DefaultIcons.getMapClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return null;
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		return DefaultIcons.getMapClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		return DefaultIcons.getMapOpenIcon();
@@ -231,8 +245,7 @@ public class Worldmap extends ArrayList<WorldmapSegment> implements ProjectTreeN
 	public void addSegment(WorldmapSegment node) {
 		ProjectTreeNode higherEmptyParent = this;
 		while (higherEmptyParent != null) {
-            if (higherEmptyParent.getParent() != null && ((ProjectTreeNode) higherEmptyParent.getParent()).isEmpty())
+			if (higherEmptyParent.getParent() != null && ((ProjectTreeNode)higherEmptyParent.getParent()).isEmpty()) higherEmptyParent = (ProjectTreeNode)higherEmptyParent.getParent();
-                higherEmptyParent = (ProjectTreeNode) higherEmptyParent.getParent();
 			else break;
 		}
 		if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;

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

@@ -1,26 +1,34 @@
 package com.gpl.rpg.atcontentstudio.model.maps;
 
+import java.awt.Image;
+import java.awt.Point;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.SaveEvent;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 public class WorldmapSegment extends GameDataElement {
 
@@ -224,7 +232,6 @@ public class WorldmapSegment extends GameDataElement {
 	public Image getIcon() {
 		return DefaultIcons.getUIMapIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getUIMapIcon();

src/com/gpl/rpg/atcontentstudio/model/saves/SavedGame.java

@@ -0,0 +1,177 @@
+package com.gpl.rpg.atcontentstudio.model.saves;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+import com.gpl.rpg.andorstrainer.io.SavedGameIO;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.SaveEvent;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+public class SavedGame extends GameDataElement {
+	
+	private static final long serialVersionUID = -6443495534761084990L;
+	
+	public File savedFile;
+	transient public com.gpl.rpg.andorstrainer.model.SavedGame loadedSave = null;
+	transient public SavedGamesSet parent;
+	
+	public SavedGame(SavedGamesSet parent, File f) throws IOException {
+		savedFile = f;
+		refreshTransients(parent);
+	}
+	
+	public void refreshTransients(SavedGamesSet parent) throws IOException {
+		this.parent = parent;
+		this.loadedSave = SavedGameIO.loadFile(savedFile);
+		if (this.loadedSave == null) {
+			throw new IOException("Unable to load save: "+savedFile.getAbsolutePath());
+		}
+	}
+	
+	@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 String getDesc() {
+		return (needsSaving() ? "*" : "")+loadedSave.displayInfo;
+	}
+
+	@Override
+	public Project getProject() {
+		return parent.getProject();
+	}
+
+	@Override
+	public Image getIcon() {
+		return DefaultIcons.getHeroIcon();
+	}
+	@Override
+	public Image getLeafIcon() {
+		return DefaultIcons.getHeroIcon();
+	}
+	@Override
+	public Image getClosedIcon() {return null;}
+	@Override
+	public Image getOpenIcon() {return null;}
+	
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+	
+	@Override
+	public boolean isEmpty() {
+		return false;
+	}
+
+	@Override
+	public void parse() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void link() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public GameDataElement clone() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void elementChanged(GameDataElement oldOne, GameDataElement newOne) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public String getProjectFilename() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void save() {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	@Override
+	public List<SaveEvent> attemptSave() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

src/com/gpl/rpg/atcontentstudio/model/saves/SavedGamesSet.java

@@ -0,0 +1,180 @@
+package com.gpl.rpg.atcontentstudio.model.saves;
+
+import java.awt.Image;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.tree.TreeNode;
+
+import com.gpl.rpg.atcontentstudio.Notification;
+import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
+import com.gpl.rpg.atcontentstudio.model.Project;
+import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
+import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
+import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
+
+public class SavedGamesSet implements ProjectTreeNode, Serializable {
+
+	private static final long serialVersionUID = -6565834239789184087L;
+
+	public Vector<SavedGame> saves; //For simulations.
+
+	public Project parent;
+	
+	public SavedGamesSet(Project parent) {
+		this.parent = parent;
+		saves = new Vector<SavedGame>();
+	}
+	
+	public void refreshTransients() {
+		for (SavedGame save : saves) {
+			try {
+				save.refreshTransients(this);
+			} catch (IOException e) {
+				Notification.addError(e.getMessage());
+			}
+		}
+	}
+	
+	public void addSave(File f) {
+		try {
+			ProjectTreeNode higherEmptyParent = this;
+			while (higherEmptyParent != null) {
+				if (higherEmptyParent.getParent() != null && ((ProjectTreeNode)higherEmptyParent.getParent()).isEmpty()) higherEmptyParent = (ProjectTreeNode)higherEmptyParent.getParent();
+				else break;
+			}
+			if (higherEmptyParent == this && !this.isEmpty()) higherEmptyParent = null;
+			SavedGame node = new SavedGame(this, f); 
+			saves.add(node);
+			if (higherEmptyParent != null) higherEmptyParent.notifyCreated();
+			else node.notifyCreated();
+		} catch (IOException e) {
+			Notification.addError(e.getMessage());
+		}
+	}
+	
+	public SavedGame getSave(File f) {
+		for (SavedGame save : saves) {
+			if (save.savedFile.equals(f)) return save;
+		}
+		return null;
+	}
+		
+	@Override
+	public Enumeration<? extends ProjectTreeNode> children() {
+		return saves.elements();
+	}
+
+	@Override
+	public boolean getAllowsChildren() {
+		return true;
+	}
+
+	@Override
+	public TreeNode getChildAt(int arg0) {
+		return saves.elementAt(arg0);
+	}
+
+	@Override
+	public int getChildCount() {
+		return saves.size();
+	}
+
+	@Override
+	public int getIndex(TreeNode arg0) {
+		return saves.indexOf(arg0);
+	}
+
+	@Override
+	public TreeNode getParent() {
+		return parent;
+	}
+
+	@Override
+	public boolean isLeaf() {
+		return false;
+	}
+
+	@Override
+	public void childrenAdded(List<ProjectTreeNode> path) {
+		path.add(0, this);
+		parent.childrenAdded(path);
+	}
+	@Override
+	public void childrenChanged(List<ProjectTreeNode> path) {
+		path.add(0, this);
+		parent.childrenChanged(path);
+	}
+	@Override
+	public void childrenRemoved(List<ProjectTreeNode> path) {
+		if (path.size() == 1 && this.getChildCount() == 1) {
+			childrenRemoved(new ArrayList<ProjectTreeNode>());
+		} else {
+			path.add(0, this);
+			parent.childrenRemoved(path);
+		}
+	}
+	@Override
+	public void notifyCreated() {
+		childrenAdded(new ArrayList<ProjectTreeNode>());
+		for (SavedGame s : saves) {
+			s.notifyCreated();
+		}
+	}
+	@Override
+	public String getDesc() {
+		return (needsSaving() ? "*" : "")+"Saved games";
+	}
+
+	@Override
+	public Project getProject() {
+		return parent.getProject();
+	}
+	
+
+	@Override
+	public Image getIcon() {
+		return getOpenIcon();
+	}
+	@Override
+	public Image getClosedIcon() {
+		return DefaultIcons.getSavClosedIcon();
+	}
+	@Override
+	public Image getLeafIcon() {
+		return DefaultIcons.getSavClosedIcon();
+	}
+	@Override
+	public Image getOpenIcon() {
+		return DefaultIcons.getSavOpenIcon();
+	}
+	
+
+	@Override
+	public GameDataSet getDataSet() {
+		return null;
+	}
+	@Override
+	public Type getDataType() {
+		return null;
+	}
+	
+	@Override
+	public boolean isEmpty() {
+		return saves.isEmpty();
+	}
+	
+
+	@Override
+	public boolean needsSaving() {
+		for (ProjectTreeNode node : saves) {
+			if (node.needsSaving()) return true;
+		}
+		return false;
+	}
+}

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

@@ -1,5 +1,14 @@
 package com.gpl.rpg.atcontentstudio.model.sprites;
 
+import java.awt.Image;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
 import com.gpl.rpg.atcontentstudio.model.Project;
@@ -7,12 +16,6 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.io.File;
-import java.util.*;
-import java.util.List;
-
 public class SpriteSheetSet implements ProjectTreeNode {
 
 	public static final String DEFAULT_REL_PATH_IN_SOURCE = "res"+File.separator+"drawable"+File.separator;
@@ -26,8 +29,7 @@ public class SpriteSheetSet implements ProjectTreeNode {
 	
 	public SpriteSheetSet(GameSource source) {
 		this.parent = source;
-        if (source.type == GameSource.Type.source)
+		if (source.type == GameSource.Type.source) this.drawableFolder = new File(source.baseFolder, DEFAULT_REL_PATH_IN_SOURCE);
-            this.drawableFolder = new File(source.baseFolder, DEFAULT_REL_PATH_IN_SOURCE);
 		else if (source.type == GameSource.Type.created | source.type == GameSource.Type.altered) {
 			this.drawableFolder = new File(source.baseFolder, DEFAULT_REL_PATH_IN_PROJECT);
 			if (!this.drawableFolder.exists()) {
@@ -42,56 +44,46 @@ public class SpriteSheetSet implements ProjectTreeNode {
 				}
 			}
 		}
-        spritesheets.sort(Comparator.comparing(s -> s.id));
 	}
 	
 	@Override
 	public Enumeration<Spritesheet> children() {
 		return Collections.enumeration(spritesheets);
 	}
-
 	@Override
 	public boolean getAllowsChildren() {
 		return true;
 	}
-
 	@Override
 	public TreeNode getChildAt(int arg0) {
 		return spritesheets.get(arg0);
 	}
-
 	@Override
 	public int getChildCount() {
 		return spritesheets.size();
 	}
-
 	@Override
 	public int getIndex(TreeNode arg0) {
 		return spritesheets.indexOf(arg0);
 	}
-
 	@Override
 	public TreeNode getParent() {
 		return parent;
 	}
-
 	@Override
 	public boolean isLeaf() {
 		return false;
 	}
-
 	@Override
 	public void childrenAdded(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenAdded(path);
 	}
-
 	@Override
 	public void childrenChanged(List<ProjectTreeNode> path) {
 		path.add(0, this);
 		parent.childrenChanged(path);
 	}
-
 	@Override
 	public void childrenRemoved(List<ProjectTreeNode> path) {
 		if (path.size() == 1 && this.getChildCount() == 1) {
@@ -101,7 +93,6 @@ public class SpriteSheetSet implements ProjectTreeNode {
 			parent.childrenRemoved(path);
 		}
 	}
-
 	@Override
 	public void notifyCreated() {
 		childrenAdded(new ArrayList<ProjectTreeNode>());
@@ -109,7 +100,6 @@ public class SpriteSheetSet implements ProjectTreeNode {
 			s.notifyCreated();
 		}
 	}
-
 	@Override
 	public String getDesc() {
 		return (needsSaving() ? "*" : "")+"Spritesheets";
@@ -124,17 +114,14 @@ public class SpriteSheetSet implements ProjectTreeNode {
 	public Image getIcon() {
 		return getOpenIcon();
 	}
-
 	@Override
 	public Image getClosedIcon() {
 		return DefaultIcons.getSpriteClosedIcon();
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return DefaultIcons.getSpriteClosedIcon();
 	}
-
 	@Override
 	public Image getOpenIcon() {
 		return DefaultIcons.getSpriteOpenIcon();

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

@@ -1,5 +1,19 @@
 package com.gpl.rpg.atcontentstudio.model.sprites;
 
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+import javax.swing.tree.TreeNode;
+
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.Notification;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
@@ -9,15 +23,6 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
 import com.gpl.rpg.atcontentstudio.model.SaveEvent;
 import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
 
-import javax.imageio.ImageIO;
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.*;
-
 public class Spritesheet extends GameDataElement {
 	
 	private static final long serialVersionUID = -5981708088278528586L;
@@ -35,7 +40,7 @@ public class Spritesheet extends GameDataElement {
 		monster,
 		item,
 		actorcondition
-    }
+	};
 	
 	//Lazy initialization.
 	public BufferedImage spritesheet = null;
@@ -69,60 +74,49 @@ public class Spritesheet extends GameDataElement {
 	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 String getDesc() {
 		return (needsSaving() ? "*" : "")+spritesheetFile.getName();
@@ -196,21 +190,14 @@ public class Spritesheet extends GameDataElement {
 	public Image getIcon() {
 		return getIcon(0);
 	}
-
 	@Override
 	public Image getLeafIcon() {
 		return getIcon();
 	}
-
 	@Override
-    public Image getClosedIcon() {
+	public Image getClosedIcon() {return null;}
-        return null;
-    }
-
 	@Override
-    public Image getOpenIcon() {
+	public Image getOpenIcon() {return null;}
-        return null;
-    }
 
 
 	@Override
@@ -268,14 +255,10 @@ public class Spritesheet extends GameDataElement {
 
 	@Override
 	public void save() {
-        if (this.category != null)
+		if (this.category != null) getProject().setSpritesheetsProperty("atcs.spritesheet."+this.id+".category", this.category.toString());
-            getProject().setSpritesheetsProperty("atcs.spritesheet." + this.id + ".category", this.category.toString());
+		if (this.spriteWidth != 32) getProject().setSpritesheetsProperty("atcs.spritesheet."+this.id+".sizex", Integer.toString(this.spriteWidth));
-        if (this.spriteWidth != 32)
+		if (this.spriteHeight != 32) getProject().setSpritesheetsProperty("atcs.spritesheet."+this.id+".sizey", Integer.toString(this.spriteHeight));
-            getProject().setSpritesheetsProperty("atcs.spritesheet." + this.id + ".sizex", Integer.toString(this.spriteWidth));
+		if (this.animated)getProject().setSpritesheetsProperty("atcs.spritesheet."+this.id+".animate", Boolean.toString(this.animated));
-        if (this.spriteHeight != 32)
-            getProject().setSpritesheetsProperty("atcs.spritesheet." + this.id + ".sizey", Integer.toString(this.spriteHeight));
-        if (this.animated)
-            getProject().setSpritesheetsProperty("atcs.spritesheet." + this.id + ".animate", Boolean.toString(this.animated));
 		getProject().save();
 		
 		this.state = GameDataElement.State.saved;

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

@@ -1,7 +1,9 @@
 package com.gpl.rpg.atcontentstudio.model.tools.i18n;
 
-import java.io.*;
+import java.io.File;
-import java.nio.charset.StandardCharsets;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -15,7 +17,7 @@ public class PoPotWriter {
 	
 	public static void writePoFile(Map<String, List<String>> stringsResources, Map<String, String> translations, File destination) {
 		try {
-            Writer fw = new OutputStreamWriter(new FileOutputStream(destination), StandardCharsets.UTF_8);
+			FileWriter fw = new FileWriter(destination);
 			if (translations.get("") != null) {
 				fw.write(translations.get(""));
 				writeEndOfEntry(fw);

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

@@ -1,34 +1,41 @@
 package com.gpl.rpg.atcontentstudio.model.tools.i18n;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.swing.JOptionPane;
+
 import com.gpl.rpg.atcontentstudio.model.Project;
+
 import net.launchpad.tobal.poparser.POEntry;
 import net.launchpad.tobal.poparser.POFile;
 import net.launchpad.tobal.poparser.POParser;
 
-import javax.swing.*;
-import java.io.File;
-import java.io.FileFilter;
-import java.util.*;
-
 
 /**
+ * 
  * @author Kevin
- * <p>
+ * 
  * To use this, paste the following script in the beanshell console of ATCS.
  * Don't forget to change the project number to suit your needs.
- * <p>
- * <code>
  * 
- * import com.gpl.rpg.atcontentstudio.model.Workspace;
+import com.gpl.rpg.atcontentstudio.model.Workspace;
- * import com.gpl.rpg.atcontentstudio.model.tools.i18n.PotGenerator;
+import com.gpl.rpg.atcontentstudio.model.tools.i18n.PotGenerator;
- * import com.gpl.rpg.atcontentstudio.model.tools.i18n.PotComparator;
+import com.gpl.rpg.atcontentstudio.model.tools.i18n.PotComparator;
+ 
+proj = Workspace.activeWorkspace.projects.get(7);
+PotGenerator.generatePotFileForProject(proj);
+comp = new PotComparator(proj);
+comp.compare();
+comp.updatePoFiles(proj);
+ * 
+ * 
  *
- * proj = Workspace.activeWorkspace.projects.get(7);
- * PotGenerator.generatePotFileForProject(proj);
- * comp = new PotComparator(proj);
- * comp.compare();
- * comp.updatePoFiles(proj);
- * </code>
  */
 public class PotComparator {
 
@@ -149,8 +156,7 @@ public class PotComparator {
 				}
 			}
 		}
-        removedStrings:
+		removedStrings: for (String oldString : stringsResourcesOld.keySet())  {
-        for (String oldString : stringsResourcesOld.keySet()) {
 			if (stringsResourcesNew.get(oldString) == null) {
 				List<String> allOldResources = stringsResourcesOld.get(oldString);
 				if (allOldResources.size() >= 1) {