v0.4.6 ! Oh so many bugfixes...

Map Object Group in a new game in a map, and the associated rewards
((de)activateMapObjectGroup) in dialogues that replace
(de)activateMapChangeArea.

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

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.6.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

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

packaging/Windows/ATCS_Installer.nsi

@@ -1,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.4.4"
+!define VERSION "0.4.6"
 !define JAVA_BIN "java"
 
 Name "Andor's Trail Content Studio v${VERSION}"

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.6";
 
 	public static boolean STARTED = false;
 	public static StudioFrame frame = null;

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

@@ -63,8 +63,8 @@ public class Dialogue extends JSONElement {
 			spawnAll,
 			removeSpawnArea,
 			deactivateSpawnArea,
-			activateMapChangeArea,
+			activateMapObjectGroup,
-			deactivateMapChangeArea
+			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 activateMapObjectGroup:
-					case deactivateMapChangeArea:
+					case deactivateMapObjectGroup:
 					case spawnAll:
 					case removeSpawnArea:
 					case deactivateSpawnArea:

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 {

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) {

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) {

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

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) {
+		if (spawngroup_id != null) {
-			spawnGroup = parentMap.getProject().getSpawnGroup(name);
+			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));
 		}

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

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

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

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

@@ -320,8 +320,13 @@ public class DialogueEditor extends JSONElementEditor {
 		}
 		if (reward.type != null) {
 			switch (reward.type) {
-			case activateMapChangeArea:
+			case activateMapObjectGroup:
-			case deactivateMapChangeArea:
+			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 +737,9 @@ public class DialogueEditor extends JSONElementEditor {
 				rewardObjDesc = reward.reward_obj_id;
 			}
 			switch (reward.type) {
-			case activateMapChangeArea:
+			case activateMapObjectGroup:
-				label.setText("Activate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
+				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 +751,13 @@ public class DialogueEditor extends JSONElementEditor {
 			case createTimer:
 				label.setText("Create timer "+rewardObjDesc);
 				break;
-			case deactivateMapChangeArea:
+			case deactivateMapObjectGroup:
-				label.setText("Deactivate mapchange area "+rewardObjDesc+" on map "+reward.map_name);
+				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 +773,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 +1037,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;

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

@@ -124,6 +124,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 +148,7 @@ public class TMXMapEditor extends Editor {
 	private JComboBox evaluateTriggerBox;
 	private JSpinner quantityField;
 	private JCheckBox activeForNewGame;
+	private JTextField spawngroupField;
 	private JList npcList;
 	private SpawnGroupNpcListModel npcListModel;
 
@@ -307,6 +309,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 +542,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);
@@ -1681,6 +1685,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 +1699,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 +1709,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 +1717,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) {