From 57b8209b2668430eca5fc7f9ee41bd38246c75c1 Mon Sep 17 00:00:00 2001 From: Zukero Date: Thu, 21 Jul 2016 16:39:55 +0200 Subject: [PATCH] v0.4.6 ! Oh so many bugfixes... --- packaging/Linux/ATCS/ATCS.cmd | 2 +- packaging/Linux/ATCS/ATCS.sh | 2 +- packaging/Windows/ATCS.cmd | 2 +- packaging/Windows/ATCS_Installer.nsi | 2 +- src/com/gpl/rpg/atcontentstudio/ATContentStudio.java | 2 +- .../rpg/atcontentstudio/model/gamedata/GameDataCategory.java | 2 +- src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java | 2 ++ src/com/gpl/rpg/atcontentstudio/ui/JSONCreationWizard.java | 2 ++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packaging/Linux/ATCS/ATCS.cmd b/packaging/Linux/ATCS/ATCS.cmd index ce61ece..a245836 100644 --- a/packaging/Linux/ATCS/ATCS.cmd +++ b/packaging/Linux/ATCS/ATCS.cmd @@ -1 +1 @@ -start "" "javaw.exe" -Xmx512M -cp "lib\ATCS_v0.4.5.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 diff --git a/packaging/Linux/ATCS/ATCS.sh b/packaging/Linux/ATCS/ATCS.sh index d58e09a..0b401c4 100644 --- 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.5.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 diff --git a/packaging/Windows/ATCS.cmd b/packaging/Windows/ATCS.cmd index d54f56d..a245836 100644 --- 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.5.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 diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi index c267e35..40ca537 100644 --- a/packaging/Windows/ATCS_Installer.nsi +++ b/packaging/Windows/ATCS_Installer.nsi @@ -1,6 +1,6 @@ !include MUI2.nsh -!define VERSION "0.4.5" +!define VERSION "0.4.6" !define JAVA_BIN "java" Name "Andor's Trail Content Studio v${VERSION}" diff --git a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java index 2a56f54..97fafac 100644 --- 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.5"; + public static final String APP_VERSION = "v0.4.6"; public static boolean STARTED = false; public static StudioFrame frame = null; diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/GameDataCategory.java index 0b8983d..bc659ba 100644 --- 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 extends ArrayList implem dataToSave.add(element.toJson()); } } - if (dataToSave.isEmpty()) { + if (dataToSave.isEmpty() && jsonFile.exists()) { if (jsonFile.delete()) { Notification.addSuccess("File "+jsonFile.getAbsolutePath()+" deleted."); } else { diff --git a/src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java b/src/com/gpl/rpg/atcontentstudio/model/gamedata/Item.java index 4eb9f1b..cb1d45f 100644 --- 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) { diff --git a/src/com/gpl/rpg/atcontentstudio/ui/JSONCreationWizard.java b/src/com/gpl/rpg/atcontentstudio/ui/JSONCreationWizard.java index 47099ca..3ca35da 100644 --- 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);