Merge pull request #1402

2.5.0 Release

.gitignore

@@ -9,3 +9,6 @@
 /libraries/ValkyrieTools/obj
 unity/Assets/StreamingAssets/crashlytics-build.properties
 unity/Assets/StreamingAssets/crashlytics-build.properties.meta
+.idea/
+unity/Assets/Plugins/Editor/JetBrains/
+unity/Assets/Plugins/Editor/JetBrains.meta

build.bat

@@ -31,8 +31,15 @@ echo --- ERROR --- ANDROID_BUILD_TOOLS path not set : please set android bu
 exit /B
 )
 
+rem set unity editor location
+IF "%UNITY_EDITOR_HOME%"=="" SET UNITY_EDITOR_HOME=%ProgramFiles%\Unity\Editor
+IF NOT EXIST "%UNITY_EDITOR_HOME%" (
+echo --- ERROR --- UNITY_EDITOR_HOME path not set : please set unity editor path in build.bat or create a similar environment variable
+exit /B
+)
+
 rem you can get NSIS from https://nsis.sourceforge.io/Main_Page
-SET PATH=%PATH%;%JDK_HOME%\bin;%ProgramFiles%\Unity\Editor;%ProgramFiles%\7-Zip;%WinDir%/Microsoft.NET/Framework/v4.0.30319;%ProgramFiles(x86)%\NSIS;%~dp0libraries\SetVersion\bin\Release;%ANDROID_BUILD_TOOLS%
+SET PATH=%PATH%;%JDK_HOME%\bin;%UNITY_EDITOR_HOME%;%ProgramFiles%\7-Zip;%WinDir%/Microsoft.NET/Framework/v4.0.30319;%ProgramFiles(x86)%\NSIS;%~dp0libraries\SetVersion\bin\Release;%ANDROID_BUILD_TOOLS%
 @echo on
 
 rem cleanup
@@ -113,15 +120,17 @@ rem delete previous build
 del build\valkyrie-windows-%version%.exe
 del build\valkyrie-windows-%version%.zip
 del build\valkyrie-windows-%version%.7z
-del build\valkyrie-macos-%version%.zip
+del build\valkyrie-macos-%version%.tar.gz
 del build\valkyrie-linux-%version%.tar.gz
 
 rem create windows zip
 7z a "%~dp0build\valkyrie-windows-%version%.7z" "%~dp0build\batch\*" -r
 rem create windows 7z
 7z a "%~dp0build\valkyrie-windows-%version%.zip" "%~dp0build\batch\*" -r
-rem create macos zip
-7z a "%~dp0build\valkyrie-macos-%version%.zip" "%~dp0build\batchMac\*" -r
+rem create macos tar ball
+7z a "%~dp0build\batchMac\valkyrie-macos-%version%.tar" "%~dp0build\batchMac\*" -r
+7z a "%~dp0build\valkyrie-macos-%version%.tar.gz" "%~dp0build\batchMac\valkyrie-macos-%version%.tar"
+del "%~dp0build\batchMac\valkyrie-macos-%version%.tar"
 rem create linux tar ball
 7z a "%~dp0build\batchLinux\valkyrie-linux-%version%.tar" "%~dp0build\batchLinux\*" -r
 7z a "%~dp0build\valkyrie-linux-%version%.tar.gz" "%~dp0build\batchLinux\valkyrie-linux-%version%.tar"

unity/Assets/Plugins/Android/Firebase/res/values/crashlytics_build_id.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">c9cb4a08-54f9-437b-a571-b8774fbaeb05</string></resources>
+<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">1d572069-282f-430c-b012-1705160e9bdd</string></resources>

unity/Assets/Plugins/Android/Firebase/res/values/crashlytics_unity_version.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><resources><string name="com.google.firebase.crashlytics.unity_version" translatable="false">2018.4.27f1</string></resources>
+<?xml version="1.0" encoding="utf-8"?><resources><string name="com.google.firebase.crashlytics.unity_version" translatable="false">2018.4.29f1</string></resources>

unity/Assets/Resources/prod_version.txt

@@ -1 +1 @@
-2.4.10
+2.5.0

unity/Assets/Resources/version.txt

@@ -1 +1 @@
-2.4.10
+2.5.0

unity/Assets/Scripts/Audio.cs

@@ -75,7 +75,7 @@ public void PlayMusic(List<string> fileNames)
     public void PlayTrait(string trait)
     {
         List<string> files = new List<string>();
-        foreach (AudioData ad in Game.Get().cd.audio.Values)
+        foreach (AudioData ad in Game.Get().cd.Values<AudioData>())
         {
             if (ad.ContainsTrait(trait))
             {

unity/Assets/Scripts/ConfigFile.cs

@@ -1,4 +1,8 @@
-using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Assets.Scripts.Content;
 using ValkyrieTools;
 
 // Class to control user configuration of Valkyrie
@@ -20,6 +24,29 @@ public ConfigFile()
         }
     }
 
+    public IEnumerable<string> GetPacks(string gameType)
+    {
+        return data.Get(gameType + "Packs")?.Keys ?? Enumerable.Empty<string>();
+    }
+    public Dictionary<string, string> GetPackLanguages(string gameType)
+    {
+        return data.Get(gameType + "Packs") ?? new Dictionary<string, string>();
+    }
+
+    public void RemovePack(string gameType, string pack)
+    {
+        data.Remove(gameType + "Packs", pack);
+        LocalizationRead.SetGroupTranslationLanguage(pack, "");
+        Save();
+    }
+
+    public void AddPack(string gameType, string pack, string language = "")
+    {
+        data.Add(gameType + "Packs", pack, language);
+        LocalizationRead.SetGroupTranslationLanguage(pack, language);
+        Save();
+    }
+
     // Save the configuration in memory to disk
     public void Save()
     {

unity/Assets/Scripts/Content/CommonStringKeys.cs

@@ -22,6 +22,7 @@ public class CommonStringKeys
         public static readonly StringKey POSITION_FREE = new StringKey(VAL, "POSITION_FREE");
         public static readonly StringKey PLUS = new StringKey(null,"+", false);
         public static readonly StringKey MINUS = new StringKey(null,"-", false);
+        public static readonly StringKey CONDITION = new StringKey(null,"?", false);
         public static readonly StringKey HASH = new StringKey(null,"#", false);
         public static readonly StringKey TAB = new StringKey(null, "➤", false);
         public static readonly StringKey UP = new StringKey(null, "▲", false);
@@ -32,17 +33,34 @@ public class CommonStringKeys
         public static readonly StringKey NONE = new StringKey(VAL, "NONE");
         public static readonly StringKey TRAITS = new StringKey(VAL, "TRAITS");
         public static readonly StringKey PLACEMENT = new StringKey(VAL, "PLACEMENT");
+        public static readonly StringKey CONTINUE = new StringKey("val", "CONTINUE");
 
         public static readonly StringKey FINISHED = new StringKey(VAL, "FINISHED");
 
         public static readonly StringKey SKILL = new StringKey(VAL, "SKILL");
         public static readonly StringKey MOVES = new StringKey(VAL, "MOVES");
         public static readonly StringKey TOTAL_MOVES = new StringKey(VAL, "TOTAL_MOVES");
 
+        public static readonly StringKey TRUE = new StringKey(VAL, "TRUE");
+        public static readonly StringKey FALSE = new StringKey(VAL, "FALSE");
+        public static readonly StringKey TESTS = new StringKey("val", "TESTS");
+        public static readonly StringKey VAR = new StringKey("val", "VAR");
+        public static readonly StringKey OP = new StringKey("val", "OP");
+        public static readonly StringKey VALUE = new StringKey("val", "VALUE");
+        public static readonly StringKey ASSIGN = new StringKey("val", "ASSIGN");
+        public static readonly StringKey VAR_NAME = new StringKey("val", "VAR_NAME");
+        public static readonly StringKey AND = new StringKey("val", "AND");
+        public static readonly StringKey OR = new StringKey("val", "OR");
+
+        public static readonly StringKey FILE = new StringKey(VAL, "FILE");
         public static readonly StringKey BASE = new StringKey(VAL, "BASE");
         public static readonly StringKey TYPE = new StringKey(VAL, "TYPE");
         public static readonly StringKey SOURCE = new StringKey(VAL, "SOURCE");
         public static readonly StringKey SELECT_ITEM = new StringKey(VAL, "SELECT_ITEM");
+        public static readonly StringKey SELECT_VAR = new StringKey(VAL, "SELECT", VAR);
+        public static readonly StringKey SELECT_OP = new StringKey(VAL, "SELECT", OP);
+        public static readonly StringKey SELECT_FILE = new StringKey(VAL, "SELECT", FILE);
+        public static readonly StringKey CHOOSE_LANGUAGE = new StringKey(VAL, "CHOOSE_LANG");
 
         public static readonly StringKey QUEST = new StringKey(VAL, "QUEST");
         public static readonly StringKey TILE = new StringKey(VAL, "TILE");
@@ -71,9 +89,6 @@ public class CommonStringKeys
         public static readonly StringKey LOG = new StringKey(VAL, "LOG");
         public static readonly StringKey SET = new StringKey(VAL, "SET");
         public static readonly StringKey RESET = new StringKey(VAL, "RESET");
-        public static readonly StringKey FILE = new StringKey(VAL, "FILE");
 
-        public static readonly StringKey TRUE = new StringKey(VAL, "TRUE");
-        public static readonly StringKey FALSE = new StringKey(VAL, "FALSE");
     }
 }