From 00c05e7507f69b571b5ba044af0cc42f4e2212f8 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Mon, 17 Sep 2018 20:55:18 +0200
Subject: [PATCH] Fixed Dialogue Tree bug and spacing issues. v0.6.14 released.
 Dialogue Tree bug caused by copy-pasting code created NPEs when not
 activating translator mode. Made Dialogue Tree node spacing double when
 activating translator mode.

---
 ATCS_JAR.jardesc                                              | 2 +-
 packaging/ATCS_latest                                         | 2 +-
 packaging/Windows/ATCS_Installer.nsi                          | 2 +-
 src/com/gpl/rpg/atcontentstudio/ATContentStudio.java          | 2 +-
 .../ui/gamedataeditors/dialoguetree/DialogueGraphView.java    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ATCS_JAR.jardesc b/ATCS_JAR.jardesc
index 6986435..0624630 100644
--- a/ATCS_JAR.jardesc
+++ b/ATCS_JAR.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="ATContentStudio/ATCS_v0.6.13.jar"/>
+    <jar path="ATContentStudio/ATCS_v0.6.14.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/ATContentStudio/ATCS_JAR.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/packaging/ATCS_latest b/packaging/ATCS_latest
index 78760e8..19d7022 100644
--- a/packaging/ATCS_latest
+++ b/packaging/ATCS_latest
@@ -1 +1 @@
-v0.6.13
\ No newline at end of file
+v0.6.14
\ No newline at end of file
diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi
index c9579e7..3e98602 100644
--- a/packaging/Windows/ATCS_Installer.nsi
+++ b/packaging/Windows/ATCS_Installer.nsi
@@ -1,6 +1,6 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.13"
+!define VERSION "0.6.14"
 !define TRAINER_VERSION "0.1.4"
 !define JAVA_BIN "javaw"
 
diff --git a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
index 1a8adb0..2ea2d4f 100644
--- a/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
+++ b/src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
@@ -43,7 +43,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.6.13";
+	public static final String APP_VERSION = "v0.6.14";
 	
 	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
 	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java
index 4f2ee93..d091d8b 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java
@@ -160,7 +160,7 @@ public class DialogueGraphView extends Display {
         
         // now create the main layout routine
         ActionList layout = new ActionList();//Activity.INFINITY);
-        NodeLinkTreeLayout treeLayout = new NodeLinkTreeLayout(GRAPH, prefuse.Constants.ORIENT_LEFT_RIGHT, 120, 40, 40);
+        NodeLinkTreeLayout treeLayout = new NodeLinkTreeLayout(GRAPH, prefuse.Constants.ORIENT_LEFT_RIGHT, 120, translatorMode ? 80 : 40, translatorMode ? 80 : 40);
         treeLayout.setLayoutAnchor(new Point2D.Double(25,300));
         layout.add(treeLayout);
         layout.add(new EdgesLabelDecoratorLayout(EDGES_LABELS));
@@ -252,7 +252,7 @@ public class DialogueGraphView extends Display {
 					};
 				};
 			} else {
-				label = dialogue.message;
+				label = r.text;
 			}
 			rNode.setString(LABEL, label);
 			if (t != null) t.start();