Merge branch 'dev-untested' into development

NPBruce · Jul 4, 2017 · 1ee5eab · 1ee5eab
2 parents 615e86c + 8283e16
commit 1ee5eab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/unity/Assets/Resources/Text/Localization.txt b/unity/Assets/Resources/Text/Localization.txt
@@ -30,7 +30,7 @@ ACTIVATIONS,Activations,Activaciones,Activations,Aktivierungen,Attivazioni,Ativa
 ADD_COMPONENTS,Add Components:,Añadir Componentes:,Ajouter éléments :,Komponente hinzufügen:,Aggiungi Componente,Adicionar Componentes,,,
 COMPONENTS,Components,Componentes,,Komponenten,,,,,
 RENAME,Rename,Renombrar,,Umbenennen,,,,,
-TEST,Test,,,,,,,,
+SAVE_TEST,Save & Test,,,,,,,,
 SOURCE,Source,Origen,,Quelle,,,,,
 COMMENT,Comment,Comentar,,Kommentar,,,,,
 TRUE,True,Verdadero,,,,,,,

diff --git a/unity/Assets/Scripts/QuestEditor/ToolsButton.cs b/unity/Assets/Scripts/QuestEditor/ToolsButton.cs
@@ -27,8 +27,8 @@ public ToolsButton()
         new UIElementBorder(ui);
 
         ui = new UIElement(Game.QUESTUI);
-        ui.SetLocation(UIScaler.GetRight(-14), 0, 4, 1);
-        ui.SetText(new StringKey("val", "TEST"));
+        ui.SetLocation(UIScaler.GetRight(-18), 0, 8, 1);
+        ui.SetText(new StringKey("val", "SAVE_TEST"));
         ui.SetButton(Test);
         new UIElementBorder(ui);
     }
@@ -37,6 +37,8 @@ public void Test()
     {
         if (GameObject.FindGameObjectWithTag(Game.DIALOG) != null) return;
 
+        QuestEditor.Save();
+
         Game game = Game.Get();
         string path = game.quest.questPath;
         Destroyer.Destroy();