sample

(via Git-Bash)

.gitignore

@@ -1,3 +1,7 @@
 /ATCS_v*.jar
 /Project
 /bin
+/packaging/tmp/
+packaging/common/lib
+packaging/common/ATCS.jar
+packaging/ATCS_*.zip

ATCS_JAR.jardesc

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

build-and-run.sh

@@ -0,0 +1,4 @@
+export MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio
+export CP="lib/*:src:res:hacked-libtiled:siphash-zackehh/src/main/java/:."
+javac -cp $CP ./src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
+java -cp $CP $MAIN_CLASS

packaging/ATCS_latest

@@ -1 +1 @@
-v0.6.18
+v0.6.19

packaging/Manifest.txt

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

packaging/Windows/ATCS_Installer.nsi

@@ -1,8 +1,8 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.18"
+!define VERSION "0.6.20"
 !define TRAINER_VERSION "0.1.5"
-!define JAVA_BIN "javaw"
+!define JAVA_BIN "java"
 
 Name "Andor's Trail Content Studio v${VERSION}"
 OutFile "ATCS_v${VERSION}_Setup.exe"
@@ -88,7 +88,7 @@ Section install
   file "C:\AT\ATCS_source\lib\AndorsTrainer_v${TRAINER_VERSION}.jar"
   file "C:\AT\ATCS_source\lib\junit-4.10.jar"
   file "C:\AT\ATCS_source\lib\json_simple-1.1.jar"
-  file "C:\AT\temp\ATCS_v0.6.18\ATCS_v${VERSION}.jar"
+  file "C:\AT\temp\ATCS_v0.6.20\ATCS_v${VERSION}.jar"
   file "C:\AT\ATCS_source\lib\rsyntaxtextarea.jar"
   file "C:\AT\ATCS_source\lib\prefuse.jar"
   file "C:\AT\ATCS_source\lib\bsh-2.0b4.jar"
@@ -172,4 +172,4 @@ Function GetJRE
  JreFound:
   Pop $R1
   Exch $R0
-FunctionEnd
+FunctionEnd

packaging/common/ATCS.cmd

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

packaging/common/ATCS.env

@@ -0,0 +1,4 @@
+#MAX_MEM=512M
+#JAVA=java
+#JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true
+

packaging/common/ATCS.sh

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

packaging/package-windows.sh

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

packaging/package.sh

@@ -0,0 +1,84 @@
+#windows or linux
+if [ "$1" = "-windows" ] ; then
+    echo "Got '-windows' flag. Running Windows version"
+    LINUX=false
+else
+    echo "No '-windows' flag. Running linux version"
+    LINUX=true
+fi
+
+#read the folder this script should be in (should be the packaging folder inside the ATCS source)
+PACKAGING_DIR=$(dirname $(readlink -f "$0" || greadlink -f "$0" || stat -f "$0"))
+ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}")
+TEMP_DIR=${PACKAGING_DIR}/tmp
+echo "Packaging dir: ${PACKAGING_DIR}"
+echo "ATCS_SOURCE_DIR: ${ATCS_SOURCE_DIR}"
+#ATContentStudio
+JAR_LOCATION="${PACKAGING_DIR}/common/ATCS.jar"
+MANIFEST_LOCATION=${PACKAGING_DIR}/Manifest.txt
+echo ""
+
+echo "Getting version"
+VERSION=$(cat ${PACKAGING_DIR}/ATCS_latest)
+echo "Got version ${VERSION}"
+
+echo "Removing tmp folder"
+rm -rf ${PACKAGING_DIR}/tmp/
+echo "recreating tmp folder"
+mkdir ${PACKAGING_DIR}/tmp/
+#ATCS_SOURCE_DIR="${PACKAGING_DIR}/.."
+echo ""
+#copy manifest to temp folder for editing
+cp ${MANIFEST_LOCATION} ${TEMP_DIR}
+MANIFEST_LOCATION=${TEMP_DIR}/Manifest.txt
+
+#copy lib files to packaged folder?
+echo 'copying lib files'
+mkdir -p ${PACKAGING_DIR}/common/lib/
+cp ${ATCS_SOURCE_DIR}/lib/* ${PACKAGING_DIR}/common/lib/
+
+cd $ATCS_SOURCE_DIR
+#set ClassPath variable to use in the building etc.
+echo 'setting class path'
+#linux needs a : as seperator while windows needs ;
+if [ "$LINUX" = true ] ; then
+    CP="lib/*:src:hacked-libtiled:siphash-zackehh/src/main/java"
+else
+    CP="lib/*;src;hacked-libtiled;siphash-zackehh/src/main/java"
+fi
+echo "ClassPath: "
+echo ${CP}
+echo ""
+
+#set build the classes
+echo 'building java classes'
+#javac -cp $CP *.java
+javac -cp $CP ${ATCS_SOURCE_DIR}/src/com/gpl/rpg/atcontentstudio/*.java -d ${TEMP_DIR}
+echo javac -cp $CP ${ATCS_SOURCE_DIR}/src/com/gpl/rpg/atcontentstudio/*.java -d ${TEMP_DIR}
+echo ""
+LIB_PATHS=$(find lib -name '*.jar' | paste -sd' ')
+echo "LIB_PATHS: ${LIB_PATHS}"
+# add all lib files to the class path in the temp Manifest
+echo "Class-Path: . lib/* ${LIB_PATHS}" >>${MANIFEST_LOCATION}
+
+echo ""
+echo "creating jar at location: ${JAR_LOCATION}"
+
+# create the jar file
+# the command with those parameters requires this format:
+# jar vmfc <Manifest file> <Jar file (target location)> <all things to add to the jar file>
+# the things to add always use the whole relative path from the current dir,
+# so when that is not wanted, the -C <location> thing will change to that dir
+jar mfc ${MANIFEST_LOCATION} ${JAR_LOCATION} -C ${PACKAGING_DIR}/tmp/ com/gpl/rpg/atcontentstudio/ -C res . -C ${ATCS_SOURCE_DIR}/src .
+
+echo ''
+echo "Done creating jar"
+
+if [ "$LINUX" = true ] ; then
+    cd ${PACKAGING_DIR}
+    echo "Creating archive"
+    tar caf "ATCS_${VERSION}.tar.gz" "common"
+    echo "Created archive at ${PACKAGING_DIR}/ATCS_${VERSION}.tar.gz"
+else
+	echo "Can't create zip files on windows yet. Please pack the content of the '${PACKAGING_DIR}/common/' folder yourself"
+fi

res/spritesheets.properties

@@ -30,7 +30,10 @@ 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
@@ -42,16 +45,20 @@ 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_gisons.category=monster
 atcs.spritesheet.monsters_guynmart.category=monster
+
 atcs.spritesheet.monsters_insects.category=monster
 atcs.spritesheet.monsters_karvis1.category=monster
 atcs.spritesheet.monsters_karvis2.category=monster
@@ -65,9 +72,11 @@ 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
@@ -79,7 +88,6 @@ atcs.spritesheet.monsters_skeleton1.category=monster
 atcs.spritesheet.monsters_skeleton2.category=monster
 atcs.spritesheet.monsters_snakes.category=monster
 atcs.spritesheet.monsters_tometik1.category=monster
-atcs.spritesheet.monsters_tometik10.category=monster
 atcs.spritesheet.monsters_tometik2.category=monster
 atcs.spritesheet.monsters_tometik3.category=monster
 atcs.spritesheet.monsters_tometik4.category=monster
@@ -88,6 +96,7 @@ atcs.spritesheet.monsters_tometik6.category=monster
 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
@@ -112,3 +121,12 @@ atcs.spritesheet.monsters_giantbasilisk.sizey=64
 atcs.spritesheet.monsters_hydra1.category=monster
 atcs.spritesheet.monsters_hydra1.sizex=64
 atcs.spritesheet.monsters_hydra1.sizey=64
+atcs.spritesheet.monsters_newb_2.category=monster
+atcs.spritesheet.monsters_newb_2.sizex=64
+atcs.spritesheet.monsters_newb_2.sizey=32
+atcs.spritesheet.monsters_newb_3.category=monster
+atcs.spritesheet.monsters_newb_3.sizex=64
+atcs.spritesheet.monsters_newb_3.sizey=64
+atcs.spritesheet.monsters_newb_4.category=monster
+atcs.spritesheet.monsters_newb_4.sizex=32
+atcs.spritesheet.monsters_newb_4.sizey=64

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

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

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

@@ -68,7 +68,8 @@ public class Dialogue extends JSONElement {
 			deactivateSpawnArea,
 			activateMapObjectGroup,
 			deactivateMapObjectGroup,
-			changeMapFilter
+			changeMapFilter,
+			mapchange
 		}
 	}
 	
@@ -249,6 +250,7 @@ public class Dialogue extends JSONElement {
 					case removeSpawnArea:
 					case deactivateSpawnArea:
 					case changeMapFilter:
+					case mapchange:
 						reward.map = reward.map_name != null ? proj.getMap(reward.map_name) : null;
 						break;
 					case actorCondition:

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

@@ -60,7 +60,11 @@ public class Requirement extends JSONElement {
 		factionScore,
 		random,
 		factionScoreEquals,
-		wearRemove
+		wearRemove,
+		date,
+		dateEquals,
+		time,
+		timeEquals
 	}
 	
 	public enum SkillID {
@@ -196,6 +200,10 @@ public class Requirement extends JSONElement {
 		case factionScore:
 		case factionScoreEquals:
 		case random:
+		case date:
+		case dateEquals:
+		case time:
+		case timeEquals:
 			break;
 		}
 		if (this.required_obj != null) this.required_obj.addBacklink((GameDataElement) this.parent);

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

@@ -11,7 +11,7 @@ import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 public class SpawnArea extends MapObject {
 
 	public int quantity = 1;
-	public int spawnchance = 10;
+	public int respawnSpeed = 10;
 	public boolean active = true;
 	public boolean ignoreAreas = false;
 	public String spawngroup_id;
@@ -21,8 +21,8 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("quantity") != null) {
 			this.quantity = Integer.parseInt(obj.getProperties().getProperty("quantity"));
 		}
-		if (obj.getProperties().getProperty("spawnchance") != null) {
+		if (obj.getProperties().getProperty("respawnspeed") != null) {
-			this.spawnchance = Integer.parseInt(obj.getProperties().getProperty("spawnchance"));
+			this.respawnSpeed = Integer.parseInt(obj.getProperties().getProperty("respawnspeed"));
 		}
 		if (obj.getProperties().getProperty("active") != null) {
 			this.active = Boolean.parseBoolean(obj.getProperties().getProperty("active"));
@@ -82,8 +82,8 @@ public class SpawnArea extends MapObject {
 		if (quantity != 1) {
 			tmxObject.getProperties().setProperty("quantity", Integer.toString(quantity));
 		}
-		if (spawnchance != 10) {
+		if (respawnSpeed != 10) {
-			tmxObject.getProperties().setProperty("spawnchance", Integer.toString(spawnchance));
+			tmxObject.getProperties().setProperty("respawnspeed", Integer.toString(respawnSpeed));
 		}
 		if (!this.active) {
 			tmxObject.getProperties().setProperty("active", Boolean.toString(active));
@@ -92,5 +92,4 @@ public class SpawnArea extends MapObject {
 			tmxObject.getProperties().setProperty("ignoreAreas", Boolean.toString(ignoreAreas));
 		}
 	}
-	
 }

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

@@ -260,6 +260,14 @@ public class DefaultIcons {
 	public static Image getTimerImage() { return getImage(TIMER_RES); }
 	public static Image getTimerIcon() { return getIcon(TIMER_RES); }
 	
+	private static String DATE_RES = "/com/gpl/rpg/atcontentstudio/img/date.png";
+	public static Image getDateImage() { return getImage(DATE_RES); }
+	public static Image getDateIcon() { return getIcon(DATE_RES); }
+	
+	private static String TIME_RES = "/com/gpl/rpg/atcontentstudio/img/date.png";
+	public static Image getTimeImage() { return getImage(TIME_RES); }
+	public static Image getTimeIcon() { return getIcon(TIME_RES); }
+	
 	private static String ALIGNMENT_RES = "/com/gpl/rpg/atcontentstudio/img/alignment.png";
 	public static Image getAlignmentImage() { return getImage(ALIGNMENT_RES); }
 	public static Image getAlignmentIcon() { return getIcon(ALIGNMENT_RES); }
@@ -273,7 +281,7 @@ public class DefaultIcons {
 	public static Image getStatusOrangeIcon() { return getIcon(STATUS_ORANGE_RES); }
 	
 	private static String STATUS_GREEN_RES = "/com/gpl/rpg/atcontentstudio/img/status_green.png";
-	public static Image getStatusGreenImage() { return getImage(STATUS_GREEN_RES); }
+	public static Image getStatusGreenImage() { return getImage(STATUS_GREEN_RES); } 
 	public static Image getStatusGreenIcon() { return getIcon(STATUS_GREEN_RES); }
 	
 	private static String STATUS_BLUE_RES = "/com/gpl/rpg/atcontentstudio/img/status_blue.png";

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

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

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

@@ -384,6 +384,13 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardObj = null;
 				rewardValue = null;
 				break;
+			case mapchange:
+				rewardMap = addMapBox(pane, ((Dialogue)target).getProject(), "Map Name: ", reward.map, writable, listener);
+				rewardObjId = addTextField(pane, "Place: ", reward.reward_obj_id, writable, listener);
+				rewardObjIdCombo = null;
+				rewardObj = null;
+				rewardValue = null;
+				break;
 			case deactivateSpawnArea:
 			case removeSpawnArea:
 			case spawnAll:
@@ -777,6 +784,26 @@ public class DialogueEditor extends JSONElementEditor {
 				requirementObjId = addTextField(pane, "Faction ID:", requirement.required_obj_id, writable, listener);
 				requirementValue = addIntegerField(pane, "Exact value: ", requirement.required_value, true, writable, listener);
 				break;
+			case date:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Date type YYYYMMTT:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum date value: ", requirement.required_value, true, writable, listener);
+				break;
+			case dateEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Date type YYYYMMTT:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact date value: ", requirement.required_value, true, writable, listener);
+				break;
+			case time:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Minimum time value: ", requirement.required_value, true, writable, listener);
+				break;
+			case timeEquals:
+				requirementObj = null;
+				requirementObjId = addTextField(pane, "Time type HHMMSS:", requirement.required_obj_id, writable, listener);
+				requirementValue = addIntegerField(pane, "Exact time value: ", requirement.required_value, true, writable, listener);
+				break;
 			}
 			requirementNegated = addBooleanBasedCheckBox(pane, "Negate this requirement.", requirement.negated, writable, listener);
 		}
@@ -943,6 +970,10 @@ public class DialogueEditor extends JSONElementEditor {
 				label.setText("Change map filter to "+rewardObjDesc+" on map "+reward.map_name);
 				label.setIcon(new ImageIcon(DefaultIcons.getReplaceIcon()));
 				break;
+			case mapchange:
+				label.setText("Teleport to "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getMapchangeIcon()));
+				break;
 			}
 		} else {
 			label.setText("New, undefined reward");
@@ -1178,6 +1209,9 @@ public class DialogueEditor extends JSONElementEditor {
 			label.setIcon(new ImageIcon(DefaultIcons.getTimerIcon()));
 		} else if (req.type == Requirement.RequirementType.factionScore || req.type == Requirement.RequirementType.factionScoreEquals) {
 			label.setIcon(new ImageIcon(DefaultIcons.getAlignmentIcon()));
+		} else if (req.type == Requirement.RequirementType.date || req.type == Requirement.RequirementType.dateEquals || 
+				   req.type == Requirement.RequirementType.time || req.type == Requirement.RequirementType.timeEquals) {
+			label.setIcon(new ImageIcon(DefaultIcons.getDateIcon()));
 		}
 		if (req.type == null) {
 			label.setText("New, undefined requirement.");

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

@@ -99,6 +99,7 @@ public class SpriteChooser extends JDialog {
 		int i;
 		BufferedImage img;
 		group = new ButtonGroup();
+		//For every sprite find a free space in panel:
 		for (Spritesheet sheet : spritesheets) {
             i = -1;
             while ((img = sheet.getImage(++i)) != null) {
@@ -125,14 +126,20 @@ public class SpriteChooser extends JDialog {
 							for (int y = c.gridy; y < c.gridy + c.gridwidth; y++) {
 								if (reservedSlots.contains(new Point(x, y))) {
 									slotOk = false;
+									break;
 								}
 							}
+							if (!slotOk) {
+								break;
+							}
 						}
-						if (slotOk && c.gridx + c.gridwidth > MAX_PER_ROW) {
+						if (c.gridx + c.gridwidth > MAX_PER_ROW) {
 							c.gridx = 0;
 							c.gridy++;
 							slotOk = false;
-						}
+						} else if (!slotOk) {
+							c.gridx++;
+						}						
 					}
 					pane.add(button, c);
 					for (int x = c.gridx; x < c.gridx + c.gridwidth; x++) {