v0.4.7 !

Implemented all colorfilters in TMXMapEditor, thanks to the new
MatrixComposite that really emulates the ColorMatrixColorFilter of Android ! Hi-fidelity filter emulation !
2025-12-27 14:58:55 +01:00 · 2016-08-10 18:03:11 +02:00 · 2016-08-10 16:20:48 +02:00 · 2016-08-08 16:31:38 +02:00 · 2016-07-21 16:39:55 +02:00 · 2016-07-19 18:49:42 +02:00
28 changed files with 576 additions and 64 deletions
--- a/hacked-libtiled/tiled/core/Tile.java
+++ b/hacked-libtiled/tiled/core/Tile.java
@@ -29,6 +29,7 @@
 package tiled.core;

 import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.util.Properties;

 /**
@@ -36,7 +37,7 @@ import java.util.Properties;
 */
 public class Tile
 {
-    private Image image;
+    private BufferedImage image;
    private int id = -1;
    private Properties properties;
    private TileSet tileset;
@@ -76,7 +77,7 @@ public class Tile
     *
     * @param i the new image of the tile
     */
-    public void setImage(Image i) {
+    public void setImage(BufferedImage i) {
        image = i;
    }

@@ -133,7 +134,7 @@ public class Tile
     *
     * @return Image
     */
-    public Image getImage() {
+    public BufferedImage getImage() {
    	if (tileset != null && tileset.sheet != null) return tileset.sheet.getImage(getId());
        return image;
    }
--- a/hacked-libtiled/tiled/core/TileSet.java
+++ b/hacked-libtiled/tiled/core/TileSet.java
@@ -161,7 +161,7 @@ public class TileSet implements Iterable<Tile>
            tilesPerRow = basicTileCutter.getTilesPerRow();
        }

-        Image tileImage = cutter.getNextTile();
+        BufferedImage tileImage = cutter.getNextTile();
        while (tileImage != null) {
            Tile tile = new Tile();
            tile.setImage(tileImage);
@@ -220,7 +220,7 @@ public class TileSet implements Iterable<Tile>
        tileDimensions = new Rectangle(tileCutter.getTileDimensions());

        int id = 0;
-        Image tileImage = tileCutter.getNextTile();
+        BufferedImage tileImage = tileCutter.getNextTile();
        while (tileImage != null) {
            Tile tile = getTile(id);
            tile.setImage(tileImage);
--- a/hacked-libtiled/tiled/io/TMXMapReader.java
+++ b/hacked-libtiled/tiled/io/TMXMapReader.java
@@ -31,6 +31,7 @@ package tiled.io;
 import java.awt.Color;
 import java.awt.Image;
 import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -223,9 +224,9 @@ public class TMXMapReader
        return o;
    }

-    private Image unmarshalImage(Node t, String baseDir) throws IOException
+    private BufferedImage unmarshalImage(Node t, String baseDir) throws IOException
    {
-        Image img = null;
+    	BufferedImage img = null;

        String source = getAttributeValue(t, "source");

@@ -253,7 +254,7 @@ public class TMXMapReader
                        // size, somehow makes drawing of the tiles a lot
                        // faster on various systems (seen on Linux, Windows
                        // and MacOS X).
-                        img = img.getScaledInstance(
+                        img = (BufferedImage) img.getScaledInstance(
                                img.getWidth(null), img.getHeight(null),
                                Image.SCALE_FAST);
                    }
@@ -534,7 +535,7 @@ public class TMXMapReader
            Node child = children.item(i);
            if ("image".equalsIgnoreCase(child.getNodeName())) {
                int id = getAttribute(child, "id", -1);
-                Image img = unmarshalImage(child, baseDir);
+                BufferedImage img = unmarshalImage(child, baseDir);
                tile.setImage(img);
            } else if ("animation".equalsIgnoreCase(child.getNodeName())) {
                // TODO: fill this in once TMXMapWriter is complete
--- a/hacked-libtiled/tiled/util/BasicTileCutter.java
+++ b/hacked-libtiled/tiled/util/BasicTileCutter.java
@@ -64,7 +64,7 @@ public class BasicTileCutter implements TileCutter
        this.image = image;
    }

-    public Image getNextTile() {
+    public BufferedImage getNextTile() {
        if (nextY + tileHeight + tileMargin <= image.getHeight()) {
            BufferedImage tile =
                image.getSubimage(nextX, nextY, tileWidth, tileHeight);
--- a/hacked-libtiled/tiled/util/TileCutter.java
+++ b/hacked-libtiled/tiled/util/TileCutter.java
@@ -48,7 +48,7 @@ public interface TileCutter
     * @return the next tile image, or <code>null</code> when no more tile
     *         images are available
     */
-    public Image getNextTile();
+    public BufferedImage getNextTile();

    /**
     * Resets the tile cutter so that the next call to <code>getNextTile</code>
--- a/hacked-libtiled/tiled/view/MapRenderer.java
+++ b/hacked-libtiled/tiled/view/MapRenderer.java
@@ -30,6 +30,7 @@ package tiled.view;
 import tiled.core.TileLayer;

 import java.awt.*;
+import java.awt.image.BufferedImageOp;

 /**
 * An interface defining methods to render a map.
@@ -50,5 +51,5 @@ public interface MapRenderer
     * @param g     the graphics context to paint to
     * @param layer the layer to paint
     */
-    public void paintTileLayer(Graphics2D g, TileLayer layer);
+    public void paintTileLayer(Graphics2D g, TileLayer layer, BufferedImageOp filter);
 }
--- a/hacked-libtiled/tiled/view/OrthogonalRenderer.java
+++ b/hacked-libtiled/tiled/view/OrthogonalRenderer.java
@@ -32,6 +32,8 @@ import tiled.core.Tile;
 import tiled.core.TileLayer;

 import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;

 /**
 * The orthogonal map renderer. This is the most basic map renderer, dealing
@@ -51,7 +53,7 @@ public class OrthogonalRenderer implements MapRenderer
                map.getHeight() * map.getTileHeight());
    }

-    public void paintTileLayer(Graphics2D g, TileLayer layer) {
+    public void paintTileLayer(Graphics2D g, TileLayer layer, BufferedImageOp filter ) {
        final Rectangle clip = g.getClipBounds();
        final int tileWidth = map.getTileWidth();
        final int tileHeight = map.getTileHeight();
@@ -74,15 +76,17 @@ public class OrthogonalRenderer implements MapRenderer
                final Tile tile = layer.getTileAt(x, y);
                if (tile == null)
                    continue;
-                final Image image = tile.getImage();
+                final BufferedImage image = tile.getImage();
                if (image == null)
                    continue;

+                
+                
                g.drawImage(
                        image,
+                        filter,
                        x * tileWidth,
-                        (y + 1) * tileHeight - image.getHeight(null),
-                        null);
+                        (y + 1) * tileHeight - image.getHeight(null));
            }
        }

--- a/packaging/Linux/ATCS/ATCS.cmd
+++ b/packaging/Linux/ATCS/ATCS.cmd
@@ -1 +1 @@
-start "" "javaw.exe" -Xmx512M -cp "lib\ATCS_v0.4.4.jar;lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
+start "" "javaw.exe" -Xmx512M -cp "lib\ATCS_v0.4.7.jar;lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
--- a/packaging/Linux/ATCS/ATCS.sh
+++ b/packaging/Linux/ATCS/ATCS.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Xmx512M -cp lib/AndorsTrainer_v0.1.2.jar:lib/ATCS_v0.4.4.jar:lib/prefuse.jar:lib/json_simple-1.1.jar:lib/jide-oss.jar:lib/ui.jar:lib/junit-4.10.jar:lib/rsyntaxtextarea.jar:lib/bsh-2.0b4.jar com.gpl.rpg.atcontentstudio.ATContentStudio
+java -Xmx512M -cp lib/AndorsTrainer_v0.1.2.jar:lib/ATCS_v0.4.7.jar:lib/prefuse.jar:lib/json_simple-1.1.jar:lib/jide-oss.jar:lib/ui.jar:lib/junit-4.10.jar:lib/rsyntaxtextarea.jar:lib/bsh-2.0b4.jar com.gpl.rpg.atcontentstudio.ATContentStudio
--- a/packaging/Windows/ATCS.cmd
+++ b/packaging/Windows/ATCS.cmd
@@ -1 +1 @@
-start "" "javaw.exe" -Xmx512M -cp "lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\ATCS_v0.4.3.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
+start "" "javaw.exe" -Xmx512M -cp "lib\ATCS_v0.4.6.jar;lib\jide-oss.jar;lib\ui.jar;lib\junit-4.10.jar;lib\json_simple-1.1.jar;lib\rsyntaxtextarea.jar;lib\prefuse.jar;lib\AndorsTrainer_v0.1.2.jar;lib\bsh-2.0b4.jar" com.gpl.rpg.atcontentstudio.ATContentStudio
--- a/packaging/Windows/ATCS_Installer.nsi
+++ b/packaging/Windows/ATCS_Installer.nsi
@@ -1,6 +1,6 @@
 !include MUI2.nsh

-!define VERSION "0.4.4"
+!define VERSION "0.4.7"
 !define JAVA_BIN "java"

 Name "Andor's Trail Content Studio v${VERSION}"
--- a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
+++ b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
@@ -18,7 +18,7 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 public class ATContentStudio {

 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.4.4";
+	public static final String APP_VERSION = "v0.4.7";

 	public static boolean STARTED = false;
 	public static StudioFrame frame = null;
--- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Dialogue.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Dialogue.java
@@ -63,8 +63,8 @@ public class Dialogue extends JSONElement {
 			spawnAll,
 			removeSpawnArea,
 			deactivateSpawnArea,
-			activateMapChangeArea,
-			deactivateMapChangeArea
+			activateMapObjectGroup,
+			deactivateMapObjectGroup
 		}
 	}
 	
@@ -242,8 +242,8 @@ public class Dialogue extends JSONElement {
 			for (Reward reward : rewards) {
 				if (reward.reward_obj_id != null) {
 					switch (reward.type) {
-					case activateMapChangeArea:
-					case deactivateMapChangeArea:
+					case activateMapObjectGroup:
+					case deactivateMapObjectGroup:
 					case spawnAll:
 					case removeSpawnArea:
 					case deactivateSpawnArea:
--- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java
@@ -154,7 +154,7 @@ public class GameDataCategory<E extends JSONElement> extends ArrayList<E> implem
 				dataToSave.add(element.toJson());
 			}
 		}
-		if (dataToSave.isEmpty()) {
+		if (dataToSave.isEmpty() && jsonFile.exists()) {
 			if (jsonFile.delete()) {
 				Notification.addSuccess("File "+jsonFile.getAbsolutePath()+" deleted.");
 			} else {
--- a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java
@@ -496,6 +496,8 @@ public class Item extends JSONElement {
 		itemJson.put("id", this.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());
+		
 		if (this.has_manual_price != null) itemJson.put("hasManualPrice", this.has_manual_price);
 		if (this.base_market_cost != null) itemJson.put("baseMarketCost", this.base_market_cost);
 		if (this.category != null) {
--- a/src/com/gpl/rpg/atcontentstudio/model/maps/KeyArea.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/maps/KeyArea.java
@@ -35,7 +35,7 @@ public class KeyArea extends MapObject {
 			oldSchoolRequirement = false;
 		}
 		requirement = new Requirement();
-		requirement.type = Requirement.RequirementType.valueOf(requireType);
+		if (requireType != null) requirement.type = Requirement.RequirementType.valueOf(requireType);
 		requirement.required_obj_id = requireId;
 		if (requireValue != null) requirement.required_value = Integer.parseInt(requireValue);
 		requirement.state = GameDataElement.State.parsed;
@@ -77,7 +77,9 @@ public class KeyArea extends MapObject {
 			if (oldSchoolRequirement && Requirement.RequirementType.questProgress.equals(requirement.type) && (requirement.negated == null || !requirement.negated)) {
 				tmxObject.setName(requirement.required_obj_id+":"+Integer.toString(requirement.required_value));
 			} else {
-				tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
+				if (requirement.type != null) {
+					tmxObject.getProperties().setProperty("requireType", requirement.type.toString());
+				}
 				if (requirement.required_obj != null) {
 					tmxObject.getProperties().setProperty("requireId", requirement.required_obj.id);
 				} else if (requirement.required_obj_id != null) {
--- a/src/com/gpl/rpg/atcontentstudio/model/maps/MapObjectGroup.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/maps/MapObjectGroup.java
@@ -13,12 +13,18 @@ public class MapObjectGroup {
 	public String name;
 	public boolean visible;
 	public List<MapObject> mapObjects = new ArrayList<MapObject>();
+	public Boolean active;
 	
 	public MapObjectGroup(tiled.core.ObjectGroup layer, TMXMap map) {
 		this.tmxGroup = layer;
 		this.name = layer.getName();
 		this.visible = layer.isVisible();
 		this.parentMap = map;
+		if (layer.getProperties().get("active") != null) {
+			active = new Boolean(((String) layer.getProperties().get("active")));
+		} else {
+			active = true;
+		}
 		for (tiled.core.MapObject obj : layer.getObjectsList()) {
 			mapObjects.add(MapObject.buildObject(obj, map));
 		}
@@ -44,6 +50,9 @@ public class MapObjectGroup {
 		}
 		tmxGroup.setVisible(visible);
 		tmxGroup.setName(name);
+		if (!active) {
+			tmxGroup.getProperties().put("active", Boolean.toString(active));
+		}
 		for (MapObject object : mapObjects) {
 			tmxGroup.addObject(object.toTmxObject());
 		}
--- a/src/com/gpl/rpg/atcontentstudio/model/maps/SpawnArea.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/maps/SpawnArea.java
@@ -13,6 +13,7 @@ public class SpawnArea extends MapObject {
 	public int quantity = 1;
 	public int spawnchance = 10;
 	public boolean active = true;
+	public String spawngroup_id;
 	public List<NPC> spawnGroup = new ArrayList<NPC>();
 	
 	public SpawnArea(tiled.core.MapObject obj) {
@@ -25,12 +26,17 @@ public class SpawnArea extends MapObject {
 		if (obj.getProperties().getProperty("active") != null) {
 			this.active = Boolean.parseBoolean(obj.getProperties().getProperty("active"));
 		}
+		if (obj.getProperties().getProperty("spawngroup") != null) {
+			this.spawngroup_id = obj.getProperties().getProperty("spawngroup");
+		} else if (obj.getName() != null ){
+			this.spawngroup_id = obj.getName();
+		}
 	}

 	@Override
 	public void link() {
-		if (name != null) {
-			spawnGroup = parentMap.getProject().getSpawnGroup(name);
+		if (spawngroup_id != null) {
+			spawnGroup = parentMap.getProject().getSpawnGroup(spawngroup_id);
 		} else {
 			spawnGroup = new ArrayList<NPC>();
 		}
@@ -65,6 +71,9 @@ public class SpawnArea extends MapObject {
 	
 	@Override
 	public void savePropertiesInTmxObject(tiled.core.MapObject tmxObject) {
+		if (spawngroup_id != null) {
+			tmxObject.getProperties().setProperty("spawngroup", spawngroup_id);
+		}
 		if (quantity != 1) {
 			tmxObject.getProperties().setProperty("quantity", Integer.toString(quantity));
 		}
--- a/src/com/gpl/rpg/atcontentstudio/model/maps/TMXMap.java
+++ b/src/com/gpl/rpg/atcontentstudio/model/maps/TMXMap.java
@@ -38,6 +38,17 @@ public class TMXMap extends GameDataElement {
 	public static final String ABOVE_LAYER_NAME = "Above";
 	public static final String WALKABLE_LAYER_NAME = "Walkable";
 	
+	public enum ColorFilter {
+		black20,
+		black40,
+		black60,
+		black80,
+		invert,
+		bw,
+		redtint,
+		greentint,
+		bluetint
+	}
 	
 	public File tmxFile = null;
 	public tiled.core.Map tmxMap = null;
@@ -46,6 +57,7 @@ public class TMXMap extends GameDataElement {
 	
 	public ProjectTreeNode parent;
 	public Integer outside = null;
+	public ColorFilter colorFilter = null;

 	public boolean writable = false;

@@ -62,8 +74,11 @@ public class TMXMap extends GameDataElement {
 			usedSpritesheets = new HashSet<Spritesheet>();
 			try {
 				tmxMap = new TMXMapReader().readMap(tmxFile.getAbsolutePath(), this);
-				if (tmxMap.getProperties().get("outside") != null) {
-					outside = new Integer(((String) tmxMap.getProperties().get("outside")));
+				if (tmxMap.getProperties().get("outdoors") != null) {
+					outside = new Integer(((String) tmxMap.getProperties().get("outdoors")));
+				}
+				if (tmxMap.getProperties().get("colorfilter") != null) {
+					colorFilter = ColorFilter.valueOf(((String) tmxMap.getProperties().get("colorfilter")));
 				}
 			} catch (FileNotFoundException e) {
 				Notification.addError("Impossible to load TMX map file "+tmxFile.getAbsolutePath());
@@ -97,8 +112,11 @@ public class TMXMap extends GameDataElement {
 		try {
 			clone.usedSpritesheets = new HashSet<Spritesheet>();
 			clone.tmxMap = new TMXMapReader().readMap(new StringReader(this.toXml()), clone);
-			if (clone.tmxMap.getProperties().get("outside") != null) {
-				clone.outside = new Integer(((String) clone.tmxMap.getProperties().get("outside")));
+			if (clone.tmxMap.getProperties().get("outdoors") != null) {
+				clone.outside = new Integer(((String) clone.tmxMap.getProperties().get("outdoors")));
+			}
+			if (clone.tmxMap.getProperties().get("colorfilter") != null) {
+				clone.colorFilter = ColorFilter.valueOf(((String) tmxMap.getProperties().get("colorfilter")));
 			}
 			for (tiled.core.MapLayer layer : clone.tmxMap.getLayers()) {
 				if (layer instanceof tiled.core.ObjectGroup) {
@@ -210,6 +228,17 @@ public class TMXMap extends GameDataElement {
 	}

 	public String toXml() {
+		if (outside != null && outside == 1) {
+			tmxMap.getProperties().put("outdoors", Integer.toString(outside));
+		} else {
+			tmxMap.getProperties().remove("outdoors");
+		}
+		if (colorFilter != null) {
+			tmxMap.getProperties().put("colorfilter", colorFilter.toString());
+		} else {
+			tmxMap.getProperties().remove("colorfilter");
+		}
+		
 		for (MapObjectGroup group : groups) {
 			group.pushBackToTiledProperties();
 			if (!tmxMap.containsLayer(group.tmxGroup)) {
--- a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
@@ -36,7 +36,7 @@ public class AboutEditor extends Editor {
 			"<br/>" +
 			"Play <a href=\"https://play.google.com/store/apps/details?id=com.gpl.rpg.AndorsTrail\">Andor's Trail</a> for free on your Android device.<br/>" +
 			"Visit <a href=\"http://andorstrail.com/\">the official forum</a> to give or receive help.<br/>" +
-			"Open the project's <a href=\"https://code.google.com/p/andors-trail/\">Google Code page</a> to check out the game's source code.<br/>" +
+			"Open the project's <a href=\"https://github.com/Zukero/andors-trail/\">GitHub project page</a> to check out the game's source code.<br/>" +
 			"<br/>" +
 			"For content creation help, make sure to use the following resources:<br/>" +
 			"<a href=\"http://andorstrail.com/viewtopic.php?f=6&t=4560\">The contribution guide on the forums</a><br/>" +
--- a/src/com/gpl/rpg/atcontentstudio/ui/Editor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/Editor.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;

 import javax.swing.AbstractListModel;
 import javax.swing.ComboBoxModel;
@@ -29,6 +30,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
 import javax.swing.JSpinner.NumberEditor;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.ListModel;
 import javax.swing.SpinnerNumberModel;
@@ -147,6 +149,51 @@ public abstract class Editor extends JPanel implements ProjectElementListener {
 		});
 		return tfField;
 	}
+	
+	public static JTextArea addTextArea(JPanel pane, String label, String initialValue, boolean editable, final FieldUpdateListener listener) {
+		String text= initialValue == null ? "" : initialValue.replaceAll("\\n", "\n");
+		
+		JPanel tfPane = new JPanel();
+		tfPane.setLayout(new JideBoxLayout(tfPane, JideBoxLayout.LINE_AXIS, 6));
+		JLabel tfLabel = new JLabel(label);
+		tfPane.add(tfLabel, JideBoxLayout.FIX);
+		final JTextArea tfArea = new JTextArea(text);
+		tfArea.setEditable(editable);
+		tfPane.add(new JScrollPane(tfArea), JideBoxLayout.VARY);
+		JButton nullify = new JButton(new ImageIcon(DefaultIcons.getNullifyIcon()));
+		tfPane.add(nullify, JideBoxLayout.FIX);
+		nullify.setEnabled(editable);
+		pane.add(tfPane, JideBoxLayout.FIX);
+		
+		nullify.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				tfArea.setText("");
+				listener.valueChanged(tfArea, null);
+			}
+		});
+		tfArea.getDocument().addDocumentListener(new DocumentListener() {
+			@Override
+			public void removeUpdate(DocumentEvent e) {
+				listener.valueChanged(tfArea, tfArea.getText().replaceAll("\n", Matcher.quoteReplacement("\n")));
+			}
+			@Override
+			public void insertUpdate(DocumentEvent e) {
+				listener.valueChanged(tfArea, tfArea.getText().replaceAll("\n", Matcher.quoteReplacement("\n")));
+			}
+			@Override
+			public void changedUpdate(DocumentEvent e) {
+				listener.valueChanged(tfArea, tfArea.getText().replaceAll("\n", Matcher.quoteReplacement("\n")));
+			}
+		});
+//		tfArea.addActionListener(new ActionListener() {
+//			@Override
+//			public void actionPerformed(ActionEvent e) {
+//				listener.valueChanged(tfArea, tfArea.getText().replaceAll("\n", "\\n"));
+//			}
+//		});
+		return tfArea;
+	}

 //	public static JSpinner addIntegerField(JPanel pane, String label, Integer initialValue, boolean allowNegatives, boolean editable) {
 //		return addIntegerField(pane, label, initialValue, allowNegatives, editable, nullListener);
--- a/src/com/gpl/rpg/atcontentstudio/ui/JSONCreationWizard.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/JSONCreationWizard.java
@@ -27,6 +27,7 @@ import javax.swing.event.ListDataListener;

 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.GameDataElement.State;
 import com.gpl.rpg.atcontentstudio.model.GameSource;
 import com.gpl.rpg.atcontentstudio.model.Project;
 import com.gpl.rpg.atcontentstudio.model.gamedata.ActorCondition;
@@ -293,6 +294,7 @@ public class JSONCreationWizard extends JDialog {
 				creation.id = idField.getText();
 				JSONCreationWizard.this.setVisible(false);
 				JSONCreationWizard.this.dispose();
+				creation.state = State.created;
 				proj.createElement(creation);
 				notifyCreated();
 				ATContentStudio.frame.selectInTree(creation);
--- a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceActions.java
@@ -370,7 +370,7 @@ public class WorkspaceActions {
 		}

 		@Override
-		public void putValue(String key, Object value) {
+		public synchronized void putValue(String key, Object value) {
 			PropertyChangeEvent event = new PropertyChangeEvent(this, key, values.get(key), value);
 			values.put(key,  value);
 			for (PropertyChangeListener l : listeners) {
@@ -379,7 +379,7 @@ public class WorkspaceActions {
 		}

 		@Override
-		public void setEnabled(boolean b) {
+		public synchronized void setEnabled(boolean b) {
 			PropertyChangeEvent event = new PropertyChangeEvent(this, "enabled", isEnabled(), b);
 			enabled = b;
 			for (PropertyChangeListener l : listeners) {
@@ -395,12 +395,12 @@ public class WorkspaceActions {
 		private Set<PropertyChangeListener> listeners = new HashSet<PropertyChangeListener>();
 		
 		@Override
-		public void addPropertyChangeListener(PropertyChangeListener listener) {
+		public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
 			listeners.add(listener);
 		}

 		@Override
-		public void removePropertyChangeListener(PropertyChangeListener listener) {
+		public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
 			listeners.remove(listener);
 		}
 		
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
@@ -23,6 +23,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
@@ -79,7 +80,7 @@ public class DialogueEditor extends JSONElementEditor {
 	private static final int SHOP_INDEX = 5;
 	
 	private JTextField idField;
-	private JTextField messageField;
+	private JTextArea messageField;
 	private MyComboBox switchToNpcBox;
 	
 	private RewardsListModel rewardsListModel;
@@ -127,7 +128,7 @@ public class DialogueEditor extends JSONElementEditor {
 		createButtonPane(pane, dialogue.getProject(), dialogue, Dialogue.class, dialogue.getImage(), null, listener);
 		
 		idField = addTextField(pane, "Internal ID: ", dialogue.id, dialogue.writable, listener);
-		messageField = addTextField(pane, "Message: ", dialogue.message, dialogue.writable, listener);
+		messageField = addTextArea(pane, "Message: ", dialogue.message, dialogue.writable, listener);
 		switchToNpcBox = addNPCBox(pane, dialogue.getProject(), "Switch active NPC to: ", dialogue.switch_to_npc, dialogue.writable, listener);
 		
 		CollapsiblePanel rewards = new CollapsiblePanel("Reaching this phrase gives the following rewards: ");
@@ -320,8 +321,13 @@ public class DialogueEditor extends JSONElementEditor {
 		}
 		if (reward.type != null) {
 			switch (reward.type) {
-			case activateMapChangeArea:
-			case deactivateMapChangeArea:
+			case activateMapObjectGroup:
+			case deactivateMapObjectGroup:
+				rewardMap = addMapBox(pane, ((Dialogue)target).getProject(), "Map Name: ", reward.map, writable, listener);
+				rewardObjId = addTextField(pane, "Group ID: ", reward.reward_obj_id, writable, listener);
+				rewardObj = null;
+				rewardValue = null;
+				break;
 			case deactivateSpawnArea:
 			case removeSpawnArea:
 			case spawnAll:
@@ -732,8 +738,9 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardObjDesc = reward.reward_obj_id;
 			}
 			switch (reward.type) {
-			case activateMapChangeArea:
-				label.setText("Activate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
+			case activateMapObjectGroup:
+				label.setText("Activate map object group "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getObjectLayerIcon()));
 				break;
 			case actorCondition:
 				label.setText("Give actor condition "+rewardObjDesc+" for "+reward.reward_value+" turns");
@@ -745,11 +752,13 @@ public class DialogueEditor extends JSONElementEditor {
 			case createTimer:
 				label.setText("Create timer "+rewardObjDesc);
 				break;
-			case deactivateMapChangeArea:
-				label.setText("Deactivate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
+			case deactivateMapObjectGroup:
+				label.setText("Deactivate map object group "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getObjectLayerIcon()));
 				break;
 			case deactivateSpawnArea:
 				label.setText("Deactivate spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getNPCIcon()));
 				break;
 			case dropList:
 				label.setText("Give contents of droplist "+rewardObjDesc);
@@ -765,12 +774,14 @@ public class DialogueEditor extends JSONElementEditor {
 				break;
 			case removeSpawnArea:
 				label.setText("Remove all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getNPCIcon()));
 				break;
 			case skillIncrease:
 				label.setText("Increase skill "+rewardObjDesc+" level");
 				break;
 			case spawnAll:
 				label.setText("Respawn all monsters in spawnarea area "+rewardObjDesc+" on map "+reward.map_name);
+				label.setIcon(new ImageIcon(DefaultIcons.getNPCIcon()));
 				break;
 			}
 		} else {
@@ -1027,6 +1038,10 @@ public class DialogueEditor extends JSONElementEditor {
 			} else if (source == rewardTypeCombo) {
 				if (selectedReward.type != value) {
 					selectedReward.type = (Dialogue.Reward.RewardType) value;
+					if (selectedReward.map != null) {
+						selectedReward.map.removeBacklink(dialogue);
+					}
+					selectedReward.map = null;
 					selectedReward.map_name = null;
 					selectedReward.reward_obj = null;
 					selectedReward.reward_obj_id = null;
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/QuestEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/QuestEditor.java
@@ -1,24 +1,32 @@
 package com.gpl.rpg.atcontentstudio.ui.gamedataeditors;

 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;

+import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableModel;

+import org.fife.ui.rtextarea.ColorBackgroundPainterStrategy;
+
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
 import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
@@ -79,6 +87,7 @@ public class QuestEditor extends JSONElementEditor {
 		stagesTable.getColumnModel().getColumn(3).setMinWidth(130);
 		stagesTable.getColumnModel().getColumn(3).setMaxWidth(130);
 		stagesTable.setCellSelectionEnabled(true);
+		stagesTable.getColumnModel().getColumn(1).setCellRenderer(new MultilineCellRenderer());
 		stagesPane.add(new JScrollPane(stagesTable), BorderLayout.CENTER);
 		if (quest.writable) {
 			JPanel buttonPane = new JPanel();
@@ -330,6 +339,48 @@ public class QuestEditor extends JSONElementEditor {
 			updateJsonViewText(quest.toJsonString());
 		}
 		
+		
+	}
+
+	public class MultilineCellRenderer extends JTextArea implements TableCellRenderer {
+		private static final long serialVersionUID = 6539816623608859506L;
+		
+		public MultilineCellRenderer() {
+			setLineWrap(true);
+			setWrapStyleWord(true);
+			//setOpaque(true);
+		}
+		
+		@Override
+		public Component getTableCellRendererComponent(JTable table,
+				Object value, boolean isSelected, boolean hasFocus,
+				int row, int column) {
+			if (isSelected) {
+				setForeground(stagesTable.getSelectionForeground());
+				setBackground(stagesTable.getSelectionBackground());
+			} else {
+				setForeground(stagesTable.getForeground());
+				setBackground(stagesTable.getBackground());
+			}
+			setFont(stagesTable.getFont());
+			if (hasFocus) {
+				setBorder(UIManager.getBorder("Table.focusCellHighlightBorder"));
+				if (stagesTable.isCellEditable(row, column)) {
+					setForeground(UIManager.getColor("Table.focusCellForeground"));
+					setBackground(UIManager.getColor("Table.focusCellBackground"));
+				}
+			} else {
+				setBorder(BorderFactory.createLineBorder(getBackground(), 1)); 
+			}
+			setText((value == null ? "" : value.toString()));
+			
+			int fh = getFontMetrics(getFont()).getHeight();
+//			int tl = getText().length();
+			setSize(stagesTable.getWidth(), fh);
+			stagesTable.setRowHeight(row, getPreferredSize().height);
+			
+			return this;
+		}
 	}
 	

--- a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
@@ -3,6 +3,7 @@ package com.gpl.rpg.atcontentstudio.ui.map;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Composite;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -18,8 +19,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImageOp;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -101,6 +102,7 @@ import com.gpl.rpg.atcontentstudio.ui.Editor;
 import com.gpl.rpg.atcontentstudio.ui.FieldUpdateListener;
 import com.gpl.rpg.atcontentstudio.ui.IntegerBasedCheckBox;
 import com.gpl.rpg.atcontentstudio.ui.ScrollablePanel;
+import com.gpl.rpg.atcontentstudio.ui.tools.MatrixComposite;
 import com.jidesoft.swing.JideBoxLayout;
 import com.jidesoft.swing.JideTabbedPane;

@@ -115,6 +117,7 @@ public class TMXMapEditor extends Editor {
 	private RSyntaxTextArea editorPane;
 	
 	private IntegerBasedCheckBox outsideBox;
+	private JComboBox colorFilterBox;
 	private LayerListModel layerListModel;
 	private JList layerList;
 	private tiled.core.MapLayer selectedLayer;
@@ -124,6 +127,7 @@ public class TMXMapEditor extends Editor {
 	
 	private JPanel layerDetailsPane;
 	private BooleanBasedCheckBox layerVisibleBox;
+	private BooleanBasedCheckBox activeLayerBox;
 	private JTextField layerNameField;
 	private MapObjectsListModel groupObjectsListModel;
 	private JList groupObjectsList;
@@ -147,6 +151,7 @@ public class TMXMapEditor extends Editor {
 	private JComboBox evaluateTriggerBox;
 	private JSpinner quantityField;
 	private JCheckBox activeForNewGame;
+	private JTextField spawngroupField;
 	private JList npcList;
 	private SpawnGroupNpcListModel npcListModel;

@@ -204,6 +209,7 @@ public class TMXMapEditor extends Editor {
 		addLabelField(pane, "TMX File: ", ((TMXMap)target).tmxFile.getAbsolutePath());
 		createButtonPane(pane, map.getProject(), map, listener);
 		outsideBox = addIntegerBasedCheckBox(pane, "Map is outdoors", map.outside, map.writable, listener);
+		colorFilterBox = addEnumValueBox(pane, "Color Filter", TMXMap.ColorFilter.values(), map.colorFilter, map.writable, listener);
 		
 		JSplitPane layersViewSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
 		layerListModel = new LayerListModel(map); 
@@ -307,6 +313,7 @@ public class TMXMapEditor extends Editor {
 					break;
 				}
 			}
+			activeForNewGame = addBooleanBasedCheckBox(groupDetailPane, "Active for new game", objGroup.active, map.writable, listener);
 			groupObjectsListModel = new MapObjectsListModel(objGroup);
 			groupObjectsList = new JList(groupObjectsListModel);
 			groupObjectsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -539,14 +546,15 @@ public class TMXMapEditor extends Editor {
 			
 			
 		} else if (selected instanceof RestArea) {
-			pane.add(new JLabel("Rest areas have no parameters"), JideBoxLayout.FIX);
+			areaField = addTextField(pane, "Area ID: ", ((RestArea)selected).name, ((TMXMap)target).writable, listener);
 		} else if (selected instanceof ScriptArea) {
 			evaluateTriggerBox = addEnumValueBox(pane, "Evaluate on every: ", ScriptArea.EvaluationTrigger.values(), ((ScriptArea)selected).trigger_type, ((TMXMap)target).writable, listener);
 			dialogueBox = addDialogueBox(pane, ((TMXMap)target).getProject(), "Script: ", ((ScriptArea)selected).dialogue, ((TMXMap)target).writable, listener);
 		} else if (selected instanceof SignArea) {
 			dialogueBox = addDialogueBox(pane, ((TMXMap)target).getProject(), "Message: ", ((SignArea)selected).dialogue, ((TMXMap)target).writable, listener);
 		} else if (selected instanceof SpawnArea) {
-			areaField = addTextField(pane, "Spawn group ID: ", ((SpawnArea)selected).name, ((TMXMap)target).writable, listener);
+			areaField = addTextField(pane, "Spawn area ID: ", ((SpawnArea)selected).name, ((TMXMap)target).writable, listener);
+			spawngroupField = addTextField(pane, "Spawn group ID: ", ((SpawnArea)selected).spawngroup_id, ((TMXMap)target).writable, listener);
 			quantityField = addIntegerField(pane, "Number of spawned NPCs: ", ((SpawnArea)selected).quantity, false, ((TMXMap)target).writable, listener);
 			activeForNewGame = addBooleanBasedCheckBox(pane, "Active in a new game: ", ((SpawnArea)selected).active, ((TMXMap)target).writable, listener);
 			npcListModel = new SpawnGroupNpcListModel((SpawnArea) selected);
@@ -1238,12 +1246,51 @@ public class TMXMapEditor extends Editor {
 	
 	}
 	
+	private static final BufferedImageOp colorFilterBlack20 = null;
+	private static final BufferedImageOp colorFilterBlack40 = null;
+	private static final BufferedImageOp colorFilterBlack60 = null;
+	private static final BufferedImageOp colorFilterBlack80 = null;
+	private static final BufferedImageOp colorFilterInvert = null;
+	private static final BufferedImageOp colorFilterBW = null;
+
+	
+//	private static final BufferedImageOp colorFilterBlack20 = createGrayScaleColorFilter(0.8f);
+//	private static final BufferedImageOp colorFilterBlack40 = createGrayScaleColorFilter(0.6f);
+//	private static final BufferedImageOp colorFilterBlack60 = createGrayScaleColorFilter(0.4f);
+//	private static final BufferedImageOp colorFilterBlack80 = createGrayScaleColorFilter(0.2f);
+//	private static final BufferedImageOp colorFilterInvert = createInvertColorFilter();
+//	private static final BufferedImageOp colorFilterBW = createBWColorFilter();
+//
+//    private static BufferedImageOp createGrayScaleColorFilter(float f) {
+//		byte[] gs = new byte[256];
+//		for (int i=0; i < 256; i++) {
+//			gs[i] = (byte)( i * f);
+//		}
+//    	return new LookupOp(new ByteLookupTable(0, gs), null);
+//	}
+//    
+//    private static BufferedImageOp createInvertColorFilter() {
+//    	byte[] invert = new byte[256];
+//		for (int i=0; i < 256; i++) {
+//			invert[i] =  (byte) (255 - i);
+//		}
+//    	return new LookupOp(new ByteLookupTable(0, invert), null);
+//	}
+//    
+//    
+//    private static BufferedImageOp createBWColorFilter() {
+//		return new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY), null);
+//	}
+	
 	public class TMXViewer extends JPanel implements Scrollable {
 		
 		private static final long serialVersionUID = 2845032142029325865L;
+
+		
 		public tiled.core.MapObject highlighted = null;
 	    private MapRenderer renderer;
 	    private FieldUpdateListener listener;
+	    private TMXMap map;
 	    
 	    public boolean resizing = false;
 	    public boolean moving = false;
@@ -1253,7 +1300,8 @@ public class TMXMapEditor extends Editor {
 	    	return new Rectangle(selectedMapObject.x + selectedMapObject.w - 16, selectedMapObject.y + selectedMapObject.h - 16, 16, 16);
 	    }
 	    
-	    public Rectangle getMoveHitArea() {
+
+		public Rectangle getMoveHitArea() {
 	    	//16x16 px square in the upper left corner of area
 	    	return new Rectangle(selectedMapObject.x, selectedMapObject.y, 16, 16);
 	    }
@@ -1266,6 +1314,7 @@ public class TMXMapEditor extends Editor {
 	    public TMXViewer(final TMXMap map, FieldUpdateListener listener) {
 	    	this.listener = listener;
 	        renderer = createRenderer(map.tmxMap);
+	        this.map = map;

 	        setPreferredSize(renderer.getMapSize());
 	        setOpaque(true);
@@ -1379,20 +1428,150 @@ public class TMXMapEditor extends Editor {
 		public void paintComponent(Graphics g) {
 	        final Graphics2D g2d = (Graphics2D) g.create();
 	        final Rectangle clip = g2d.getClipBounds();
+	        
+	        BufferedImageOp filter = null;
+	        
+	        if (map.colorFilter != null) {
+	        	switch(map.colorFilter) {
+				case black20:
+					filter=colorFilterBlack20;
+					break;
+				case black40:
+					filter=colorFilterBlack40;
+					break;
+				case black60:
+					filter=colorFilterBlack60;
+					break;
+				case black80:
+					filter=colorFilterBlack80;
+					break;
+				case bw:
+					filter=colorFilterBW;
+					break;
+				case invert:
+					filter=colorFilterInvert;
+					break;
+				default:
+					break;
+	        
+	        	}
+	        }

 	        // Draw a gray background
 	        g2d.setPaint(new Color(100, 100, 100));
 	        g2d.fill(clip);

 	        // Draw each tile map layer
-	        boolean paintSelected = false;
 	        for (tiled.core.MapLayer layer : ((TMXMap)target).tmxMap) {
 	            if (layer instanceof tiled.core.TileLayer && layer.isVisible()) {
-	                renderer.paintTileLayer(g2d, (tiled.core.TileLayer) layer);
-	            } else if (layer instanceof tiled.core.ObjectGroup && layer.isVisible()) {
+	                renderer.paintTileLayer(g2d, (tiled.core.TileLayer) layer, filter);
+	            } 
+	        }
+	        
+	        if (map.colorFilter != null) {
+	        	Composite oldComp = g2d.getComposite();
+	        	MatrixComposite newComp = null;
+				float f=0.0f;
+	        	switch(map.colorFilter) {
+				case black20:
+					f=0.8f;
+					newComp = new MatrixComposite(new float[]{
+							f,     0.00f, 0.00f, 0.0f, 0.0f,
+							0.00f, f,     0.00f, 0.0f, 0.0f,
+							0.00f, 0.00f, f,     0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case black40:
+					f=0.6f;
+					newComp = new MatrixComposite(new float[]{
+							f,     0.00f, 0.00f, 0.0f, 0.0f,
+							0.00f, f,     0.00f, 0.0f, 0.0f,
+							0.00f, 0.00f, f,     0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case black60:
+					f=0.4f;
+					newComp = new MatrixComposite(new float[]{
+							f,     0.00f, 0.00f, 0.0f, 0.0f,
+							0.00f, f,     0.00f, 0.0f, 0.0f,
+							0.00f, 0.00f, f,     0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case black80:
+					f=0.2f;
+					newComp = new MatrixComposite(new float[]{
+							f,     0.00f, 0.00f, 0.0f, 0.0f,
+							0.00f, f,     0.00f, 0.0f, 0.0f,
+							0.00f, 0.00f, f,     0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case bw:
+					newComp = new MatrixComposite(new float[]{
+							0.33f, 0.59f, 0.11f, 0.0f, 0.0f,
+							0.33f, 0.59f, 0.11f, 0.0f, 0.0f,
+							0.33f, 0.59f, 0.11f, 0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case invert:
+					newComp = new MatrixComposite(new float[]{
+							-1.00f, 0.00f, 0.00f, 0.0f, 255.0f,
+							0.00f, -1.00f, 0.00f, 0.0f, 255.0f,
+							0.00f, 0.00f, -1.00f, 0.0f, 255.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case redtint:
+					newComp = new MatrixComposite(new float[]{
+							1.20f, 0.20f, 0.20f, 0.0f, 25.0f,
+							0.00f, 0.80f, 0.00f, 0.0f, 0.0f,
+							0.00f, 0.00f, 0.80f, 0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case greentint:
+					newComp = new MatrixComposite(new float[]{
+							0.85f, 0.00f, 0.00f, 0.0f, 0.0f,
+							0.15f, 1.15f, 0.15f, 0.0f, 15.0f,
+							0.00f, 0.00f, 0.85f, 0.0f, 0.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				case bluetint:
+					newComp = new MatrixComposite(new float[]{
+							0.70f, 0.00f, 0.00f, 0.0f, 0.0f,
+							0.00f, 0.70f, 0.00f, 0.0f, 0.0f,
+							0.30f, 0.30f, 1.30f, 0.0f, 40.0f,
+							0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+					});
+					break;
+				default:
+					break;
+	        
+	        	}
+	        	if (newComp != null) {
+	        		g2d.setComposite(newComp);
+					g2d.setPaint(new Color(1.0f, 1.0f, 1.0f, 1.0f));
+					g2d.fill(clip);
+					g2d.setComposite(oldComp);
+	        	}
+	        }
+	        
+	        
+	        // Draw each map object layer
+	        boolean paintSelected = false;
+	        for (tiled.core.MapLayer layer : ((TMXMap)target).tmxMap) {
+	            if (layer instanceof tiled.core.ObjectGroup && layer.isVisible()) {
 	                paintSelected |= paintObjectGroup(g2d, (tiled.core.ObjectGroup) layer);
 	            }
 	        }
+	        
+	        
+	        
 	        if (paintSelected) {
 	        	//TODO make this less ugly..... visually speaking.
 	        	g2d.setColor(new Color(190, 20, 20));
@@ -1681,6 +1860,11 @@ public class TMXMapEditor extends Editor {
 				modified = false;
 				tmxViewer.revalidate();
 				tmxViewer.repaint();
+			}  else if (source == activeForNewGame) {
+				if (selectedLayer instanceof tiled.core.ObjectGroup) {
+					map.getGroup((tiled.core.ObjectGroup) selectedLayer).active = activeForNewGame.isSelected();
+				}
+				modified = true;
 			} else if (source == layerList) {
 				modified = false;
 				tmxViewer.revalidate();
@@ -1690,6 +1874,9 @@ public class TMXMapEditor extends Editor {
 				tmxViewer.revalidate();
 				tmxViewer.repaint();
 			} else if (source == areaField) {
+				selectedMapObject.name = (String) value;
+				groupObjectsListModel.objectChanged(selectedMapObject);
+			} else if (source == spawngroupField) {
 				if (selectedMapObject instanceof SpawnArea) {
 					SpawnArea area = (SpawnArea)selectedMapObject;
 					if (area.spawnGroup != null && !area.spawnGroup.isEmpty()) {
@@ -1697,7 +1884,7 @@ public class TMXMapEditor extends Editor {
 							npc.removeBacklink(map);
 						}
 					}
-					area.name = (String) value;
+					area.spawngroup_id = (String) value;
 					selectedMapObject.link();
 					npcList.setModel(new SpawnGroupNpcListModel(area));
 					groupObjectsListModel.objectChanged(area);
@@ -1705,10 +1892,6 @@ public class TMXMapEditor extends Editor {
 					npcList.repaint();
 					tmxViewer.revalidate();
 					tmxViewer.repaint();
-				} else if (selectedMapObject instanceof MapChange) {
-					MapChange area = (MapChange) selectedMapObject;
-					area.name = (String) value;
-					groupObjectsListModel.objectChanged(area);
 				}
 			} else if (source == targetAreaCombo) {
 				if (selectedMapObject instanceof MapChange) {
@@ -1717,6 +1900,10 @@ public class TMXMapEditor extends Editor {
 				}
 			} else if (source == outsideBox) {
 				map.outside = (Integer)value;
+			} else if (source == colorFilterBox) {
+				map.colorFilter = (TMXMap.ColorFilter) value;
+				tmxViewer.revalidate();
+				tmxViewer.repaint();
 			} else if (source == droplistBox) {
 				if (selectedMapObject instanceof ContainerArea) {
 					ContainerArea area = (ContainerArea)selectedMapObject;
@@ -2042,6 +2229,34 @@ public class TMXMapEditor extends Editor {
 	        final Graphics2D g2d = (Graphics2D) g.create();
 	        final Rectangle clip = g2d.getClipBounds();

+	        BufferedImageOp filter = null;
+	        
+	        if (map.colorFilter != null) {
+	        	switch(map.colorFilter) {
+				case black20:
+					filter=colorFilterBlack20;
+					break;
+				case black40:
+					filter=colorFilterBlack40;
+					break;
+				case black60:
+					filter=colorFilterBlack60;
+					break;
+				case black80:
+					filter=colorFilterBlack80;
+					break;
+				case bw:
+					filter=colorFilterBW;
+					break;
+				case invert:
+					filter=colorFilterInvert;
+					break;
+				default:
+					break;
+	        
+	        	}
+	        }
+	        
 	        // Draw a gray background
 	        g2d.setPaint(new Color(100, 100, 100));
 	        g2d.fill(clip);
@@ -2049,19 +2264,19 @@ public class TMXMapEditor extends Editor {
 	        // Draw each tile map layer
 	        
 	        if (ground != null) {
-	        	renderer.paintTileLayer(g2d, ground);
+	        	renderer.paintTileLayer(g2d, ground, filter);
 	        }
 	        
 	        if (objects != null) {
-	        	renderer.paintTileLayer(g2d, objects);
+	        	renderer.paintTileLayer(g2d, objects, filter);
 	        }
 	        
 	        if (above != null) {
-	        	renderer.paintTileLayer(g2d, above);
+	        	renderer.paintTileLayer(g2d, above, filter);
 	        }
 	        
 	        if (walkable != null && showWalkable) {
-	        	renderer.paintTileLayer(g2d, walkable);
+	        	renderer.paintTileLayer(g2d, walkable, filter);
 	        }
 	        
 	        if (highlighted != null) {
--- a/src/com/gpl/rpg/atcontentstudio/ui/map/WorldMapView.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/map/WorldMapView.java
@@ -81,7 +81,7 @@ public class WorldMapView extends JComponent implements Scrollable {
        	for (tiled.core.MapLayer layer : ((TMXMap)map).tmxMap) {
        		if (layer instanceof tiled.core.TileLayer && layer.isVisible()) {
        			if (layer.getName().equalsIgnoreCase("walkable")) continue;
-        			renderer.paintTileLayer(g2, (tiled.core.TileLayer) layer);
+        			renderer.paintTileLayer(g2, (tiled.core.TileLayer) layer, null);
        		} else if (layer instanceof tiled.core.ObjectGroup && layer.isVisible()) {
 //        			paintObjectGroup(g2, map, (tiled.core.ObjectGroup) layer);
        		}
--- a/src/com/gpl/rpg/atcontentstudio/ui/tools/MatrixComposite.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/tools/MatrixComposite.java
@@ -0,0 +1,124 @@
+package com.gpl.rpg.atcontentstudio.ui.tools;
+
+import java.awt.Composite;
+import java.awt.CompositeContext;
+import java.awt.RenderingHints;
+import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.Raster;
+import java.awt.image.WritableRaster;
+
+/**
+ * This Composite emulates the behaviour of Android's ColorMatrixColorFilter,
+ * except that you have to use this one a posteriori instead of a filtering paint.
+ * 
+ * It applies a ColorMatrix to the destination pixels, regardless of potential "source" pixels.
+ * Once created and activated through Graphics2D.setComposite(), just paint anything over the pixels you want "filtered".
+ * 
+ * Works on a per-pixel basis, no sampling of surrounding pixels, or anything.
+ * 
+ * @author pochat
+ *
+ */
+public class MatrixComposite implements Composite {
+
+	
+	final float[] matrix = new float[20];
+	
+	
+	/**
+	 * Dismisses the source pixels. Just paint it black, or white, it only affects the dest RGB with the following formulae.
+	 * 
+	 * R' = a*R + b*G + c*B + d*A + e;
+	 * G' = f*R + g*G + h*B + i*A + j;
+	 * B' = k*R + l*G + m*B + n*A + o;
+	 * A' = p*R + q*G + r*B + s*A + t;
+	 * 
+	 * @param matrix a flat float[20] array, giving the a..t values;
+	 */
+	public MatrixComposite(float[] matrix) {
+		if (matrix.length != this.matrix.length) {
+			throw new Error("MatrixComposite matrix must be of length "+this.matrix.length);
+		}
+		System.arraycopy(matrix, 0, this.matrix, 0, this.matrix.length);
+	}
+	
+	@Override
+	public CompositeContext createContext(ColorModel srcColorModel,
+			ColorModel dstColorModel, RenderingHints hints) {
+		return new MatrixCompositeContext(this);
+	}
+	
+	class MatrixCompositeContext implements CompositeContext {
+
+		MatrixComposite composite;
+		
+		public MatrixCompositeContext(MatrixComposite composite) {
+			this.composite = composite;
+		}
+		
+		@Override
+		public void dispose() {
+		}
+
+		@Override
+		public void compose(Raster src, Raster dstIn, WritableRaster dstOut) {
+			if (src.getSampleModel().getDataType() != DataBuffer.TYPE_INT ||
+	                dstIn.getSampleModel().getDataType() != DataBuffer.TYPE_INT ||
+	                dstOut.getSampleModel().getDataType() != DataBuffer.TYPE_INT) {
+	                throw new IllegalStateException(
+	                        "Source and destination must store pixels as INT.");
+	            }
+
+	            int width = Math.min(src.getWidth(), dstIn.getWidth());
+	            int height = Math.min(src.getHeight(), dstIn.getHeight());
+
+	            float alpha = 1.0f;
+
+	            int[] srcPixel = new int[4];
+	            int[] dstPixel = new int[4];
+	            int[] srcPixels = new int[width];
+	            int[] dstPixels = new int[width];
+
+	            for (int y = 0; y < height; y++) {
+	                src.getDataElements(0, y, width, 1, srcPixels);
+	                dstIn.getDataElements(0, y, width, 1, dstPixels);
+	                for (int x = 0; x < width; x++) {
+	                    // pixels are stored as INT_ARGB
+	                    // our arrays are [R, G, B, A]
+	                    int pixel = srcPixels[x];
+	                    srcPixel[0] = (pixel >> 16) & 0xFF;
+	                    srcPixel[1] = (pixel >>  8) & 0xFF;
+	                    srcPixel[2] = (pixel      ) & 0xFF;
+	                    srcPixel[3] = (pixel >> 24) & 0xFF;
+
+	                    pixel = dstPixels[x];
+	                    dstPixel[0] = (pixel >> 16) & 0xFF;
+	                    dstPixel[1] = (pixel >>  8) & 0xFF;
+	                    dstPixel[2] = (pixel      ) & 0xFF;
+	                    dstPixel[3] = (pixel >> 24) & 0xFF;
+
+	                    int[] result = applyMatrix(matrix, dstPixel);
+
+	                    // mixes the result with the opacity
+	                    dstPixels[x] = ((int) (dstPixel[3] + (result[3] - dstPixel[3]) * alpha) & 0xFF) << 24 |
+	                                   ((int) (dstPixel[0] + (result[0] - dstPixel[0]) * alpha) & 0xFF) << 16 |
+	                                   ((int) (dstPixel[1] + (result[1] - dstPixel[1]) * alpha) & 0xFF) <<  8 |
+	                                    (int) (dstPixel[2] + (result[2] - dstPixel[2]) * alpha) & 0xFF;
+	                }
+	                dstOut.setDataElements(0, y, width, 1, dstPixels);
+	            }
+		}
+		
+		private int[] applyMatrix(float[] matrix, int[] dstPixel) {
+			int[] result = new int[4];
+			result[0] =  Math.max(0, Math.min(255, (int) (matrix[ 0] * dstPixel[0] + matrix[ 1] * dstPixel[1] + matrix[ 2] * dstPixel[2] + matrix[ 3] * dstPixel[3] + matrix[ 4]) ));
+			result[1] =  Math.max(0, Math.min(255, (int) (matrix[ 5] * dstPixel[0] + matrix[ 6] * dstPixel[1] + matrix[ 7] * dstPixel[2] + matrix[ 8] * dstPixel[3] + matrix[ 9]) ));
+			result[2] =  Math.max(0, Math.min(255, (int) (matrix[10] * dstPixel[0] + matrix[11] * dstPixel[1] + matrix[12] * dstPixel[2] + matrix[13] * dstPixel[3] + matrix[14]) ));
+			result[3] =  Math.max(0, Math.min(255, (int) (matrix[15] * dstPixel[0] + matrix[16] * dstPixel[1] + matrix[17] * dstPixel[2] + matrix[18] * dstPixel[3] + matrix[19]) ));
+			return result;
+		}
+		
+	}
+
+}
Author	SHA1	Message	Date
Zukero	1a70f87897	v0.4.7 !	2016-08-10 18:03:11 +02:00
Zukero	c07fb4ddf3	Implemented all colorfilters in TMXMapEditor, thanks to the new MatrixComposite that really emulates the ColorMatrixColorFilter of Android ! Hi-fidelity filter emulation !	2016-08-10 16:20:48 +02:00
Zukero	1458fb0aaa	Bug fix for the map's "outside" property that wasn't handled properly. Added support for the new "colorfilter" map property. Due to Java2D having no correct color filter support, only the "blackXX" values can be previwed. "bw" and "invert" cannot, the performance cost was simply way too high.	2016-08-08 16:31:38 +02:00
Zukero	57b8209b26	v0.4.6 ! Oh so many bugfixes...	2016-07-21 16:39:55 +02:00
Zukero	a7224755ff	Fixed NPE in KeyArea creation. Rest areas can be renamed.	2016-07-19 18:49:42 +02:00
Zukero	e97168c62e	v0.4.5 complete with packaging.	2016-07-19 17:57:02 +02:00
Zukero	1e8dd405c3	Addedchanges to match new datamodel in AT. Notably, ability to disable a Map Object Group in a new game in a map, and the associated rewards ((de)activateMapObjectGroup) in dialogues that replace (de)activateMapChangeArea.	2016-07-19 17:37:54 +02:00
Zukero	830e9de56b	v0.4.5 to cope with changes to spawnareas definition in game code. replaced gcode references by github repo.	2016-07-18 18:55:16 +02:00