merge to master

cadon · Dec 27, 2019 · 9c0508f · 9c0508f
1 parent 9e55813
commit 9c0508f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.36.0.0")]
+[assembly: AssemblyFileVersion("0.36.1.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/ARKBreedingStats/json/values/_manifest.json b/ARKBreedingStats/json/values/_manifest.json
@@ -130,7 +130,7 @@
 			"mod": { "id": "919470289", "tag": "SSFlyer", "title": "SSFlyer" }
 		},
 		"values.json": {
-			"version": "304.1.4503755"
+			"version": "304.23.4517691"
 		}
 	}
 }
diff --git a/ARKBreedingStats/json/values/values.json b/ARKBreedingStats/json/values/values.json
@@ -1,6 +1,6 @@
 {
 	"format": "1.12",
-	"version": "304.1.4503755",
+	"version": "304.23.4517691",
 	"species": [
 		{
 			"name": "Rockwell",
@@ -18268,7 +18268,7 @@
 			},
 			"colors": [
 				{
-					"name": "Fur Mane",
+					"name": "Fur Main",
 					"colors": [
 						"Black",
 						"Dark Grey",
@@ -18321,7 +18321,7 @@
 					]
 				},
 				{
-					"name": "Unknown",
+					"name": "Underside",
 					"colors": [
 						"Black",
 						"Dark Grey",

diff --git a/ARKBreedingStats/uiControls/NamePatterns.cs b/ARKBreedingStats/uiControls/NamePatterns.cs
@@ -337,6 +337,8 @@ public static Dictionary<string, string> CreateTokenDictionary(Creature creature
             int mutasn = creature.Mutations;
             string mutas = mutasn > 99 ? "99" : mutasn.ToString().PadLeft(2, '0');
 
+            string old_name = creature.name;
+
             string firstWordOfOldest = "";
             if (speciesCreatures.Count > 0)
             {
@@ -345,16 +347,11 @@ public static Dictionary<string, string> CreateTokenDictionary(Creature creature
                 {
                     firstWordOfOldest = firstWordOfOldest.Substring(0, firstWordOfOldest.IndexOf(" "));
                 }
-            }
 
-            string old_name = string.Empty;
-            if (creature.guid != Guid.Empty)
-            {
-                old_name = speciesCreatures.FirstOrDefault(c => c.guid == creature.guid).name ?? creature.name;
-            }
-            else
-            {
-                old_name = creature.name;
+                if (creature.guid != Guid.Empty)
+                {
+                    old_name = speciesCreatures.FirstOrDefault(c => c.guid == creature.guid).name ?? creature.name;
+                }
             }
 
             string speciesShort6 = creature.Species.name.Replace(" ", "").Replace("Aberrant", "Ab");