added setting for naming-pattern

cadon · May 12, 2017 · 334ea8e · 334ea8e
1 parent 03ca2f3
commit 334ea8e
Show file tree

Hide file tree

Showing 6 changed files with 672 additions and 626 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -76,12 +76,12 @@
             <setting name="ocrFile" serializeAs="String">
                 <value>json/ocr.json</value>
             </setting>
-            <setting name="waitBeforeScreenCapture" serializeAs="String">
-                <value>500</value>
-            </setting>
             <setting name="sequentialUniqueNamePattern" serializeAs="String">
                 <value>{species} {sex_short}{n}</value>
             </setting>
+            <setting name="waitBeforeScreenCapture" serializeAs="String">
+                <value>500</value>
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/CreatureInfoInput.cs b/ARKBreedingStats/CreatureInfoInput.cs
@@ -333,7 +333,7 @@ private void btnGenerateUniqueName_Click(object sender, EventArgs e)
                 { "sex", CreatureSex.ToString() },
                 { "sex_short", CreatureSex.ToString().Substring(0, 1) }
             };
-            var r = new Regex("\\{(?<key>" + string.Join("|", tokendict.Keys.Select(x => Regex.Escape(x))) + ")\\}", 
+            var r = new Regex("\\{(?<key>" + string.Join("|", tokendict.Keys.Select(x => Regex.Escape(x))) + ")\\}",
                 RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.ExplicitCapture);
             var pattern = r.Replace(Properties.Settings.Default.sequentialUniqueNamePattern, (m) =>
             {

diff --git a/ARKBreedingStats/Values.cs b/ARKBreedingStats/Values.cs
@@ -80,7 +80,10 @@ public bool loadValues()
                 {
                     _V.version = new Version(_V.ver);
                 }
-                catch { }
+                catch
+                {
+                    _V.version = new Version(0, 0);
+                }
                 _V.speciesNames = new List<string>();
                 foreach (Species sp in _V.species)
                 {

diff --git a/ARKBreedingStats/json/values.json b/ARKBreedingStats/json/values.json