Merge pull request #1251 from cadon/dev

release

ARKBreedingStats.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2015
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32002.261
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARKBreedingStats", "ARKBreedingStats\ARKBreedingStats.csproj", "{991563CE-6B2C-40AE-BC80-A14F090A4D26}"
 	ProjectSection(ProjectDependencies) = postProject

ARKBreedingStats/ARKBreedingStats.csproj

@@ -985,6 +985,9 @@
 if $(ConfigurationName) == Release (
   del "$(TargetDir)*.pdb" 2>nul
   del "$(TargetDir)*.xml" 2>nul
+
+  if not exist "$(SolutionDir)_publish" mkdir "$(SolutionDir)_publish"
+
   powershell -nologo -noprofile -command "$version = (Get-Item '$(TargetPath)').VersionInfo.FileVersion; Compress-Archive -Force -Path '$(TargetDir)*' -DestinationPath """$(SolutionDir)_publish\ARK.Smart.Breeding_$version.zip""" "
 
   if exist "%25ProgramFiles(x86)%25\Inno Setup 5\ISCC.exe" (

ARKBreedingStats/Form1.cs

@@ -1327,16 +1327,7 @@ private void SetMessageLabelText(string text = null, MessageBoxIcon icon = Messa
 
         private void lbLibrarySelectionInfo_Click(object sender, EventArgs e)
         {
-            bool isFile = false;
-            if (string.IsNullOrEmpty(_librarySelectionInfoClickPath)) return;
-
-            if (File.Exists(_librarySelectionInfoClickPath))
-                isFile = true;
-            else if (!Directory.Exists(_librarySelectionInfoClickPath))
-                return;
-
-            Process.Start("explorer.exe",
-                $"{(isFile ? "/select, " : string.Empty)}\"{_librarySelectionInfoClickPath}\"");
+            OpenFolderInExplorer(_librarySelectionInfoClickPath);
         }
 
         private void listBoxSpeciesLib_SelectedIndexChanged(object sender, EventArgs e)
@@ -3116,10 +3107,24 @@ private void StatsMultiplierTesting1_OnApplyMultipliers()
 
         private void openFolderOfCurrentFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(_currentFileName)) return;
-            string path = Path.GetDirectoryName(_currentFileName);
+            OpenFolderInExplorer(_currentFileName);
+        }
+
+        /// <summary>
+        /// Opens the folder in the explorer. If it's a file, it will be selected.
+        /// </summary>
+        private static void OpenFolderInExplorer(string path)
+        {
             if (string.IsNullOrEmpty(path)) return;
-            Process.Start(path);
+            bool isFile = false;
+
+            if (File.Exists(path))
+                isFile = true;
+            else if (!Directory.Exists(path))
+                return;
+
+            Process.Start("explorer.exe",
+                $"{(isFile ? "/select, " : string.Empty)}\"{path}\"");
         }
 
         private void customStatOverridesToolStripMenuItem_Click(object sender, EventArgs e)

ARKBreedingStats/Form1.library.cs

@@ -383,6 +383,9 @@ private void CalculateTopStats(List<Creature> creatures)
 
                 foreach (var c in speciesCreatures)
                 {
+                    if (c.flags.HasFlag(CreatureFlags.Placeholder))
+                        continue;
+
                     // reset topBreeding stats for this creature
                     c.topBreedingStats = new bool[Values.STATS_COUNT];
                     c.topBreedingCreature = false;

ARKBreedingStats/Program.cs

@@ -62,9 +62,8 @@ private static void UnhandledExceptionHandler(object sender, UnhandledExceptionE
             {
                 if (System.Diagnostics.Debugger.IsAttached) throw e;
                 string message = e.Message
-                    + "\n\nException type: " + e.GetType()
-                    + "\n\nException in " + e.Source
-                    + "\n\nMethod throwing the error: " + e.TargetSite.DeclaringType.FullName + "." + e.TargetSite.Name
+                    + "\n\n" + e.GetType() + " in " + e.Source + " (" + Utils.ApplicationNameVersion + ")"
+                    + "\n\nMethod throwing the error: " + e.TargetSite.DeclaringType?.FullName + "." + e.TargetSite.Name
                     + "\n\nStackTrace:\n" + e.StackTrace
                     + (e.InnerException != null ? "\n\nInner Exception:\n" + e.InnerException.Message : string.Empty)
                     ;

ARKBreedingStats/Properties/AssemblyInfo.cs

@@ -30,6 +30,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.49.0.0")]
+[assembly: AssemblyFileVersion("0.49.1.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

ARKBreedingStats/_manifest.json

@@ -4,7 +4,7 @@
     "ARK Smart Breeding": {
       "Id": "ARK Smart Breeding",
       "Category": "main",
-      "version": "0.49.0.0"
+      "version": "0.49.1.0"
     },
     "SpeciesColorImages": {
       "Id": "SpeciesColorImages",

ARKBreedingStats/json/values/_manifest.json

@@ -6,7 +6,7 @@
 			"mod": { "id": "1083349027", "tag": "SpeedyFlyers", "title": "Najs Speedy Flyers" }
 		},
 		"1090809604-Pyria.json": {
-			"version": "340.3.1637922401",
+			"version": "341.56.1640371266",
 			"mod": { "id": "1090809604", "tag": "Pyria", "title": "Pyria: Mythos Evolved" }
 		},
 		"1092784125-Gryphons.json": {
@@ -18,7 +18,7 @@
 			"mod": { "id": "111111111", "tag": "PrimitivePlus", "title": "PrimitivePlus" }
 		},
 		"1125442531-Gaia.json": {
-			"version": "340.3.1630493486",
+			"version": "340.3.1630493486.1",
 			"mod": { "id": "1125442531", "tag": "Gaia", "title": "Gaia" }
 		},
 		"1136390783-PhoenixBreeding.json": {
@@ -51,11 +51,11 @@
 			"mod": { "id": "1356703358", "tag": "Primal_Fear_Noxious_Creatures", "title": "Primal Fear Noxious Creatures" }
 		},
 		"1373744537-AC2.json": {
-			"version": "340.3.1627870513",
+			"version": "340.3.1639467821",
 			"mod": { "id": "1373744537", "tag": "AC2", "title": "Additional Creatures 2: Wild Ark" }
 		},
 		"1405944717-Project_Evolution.json": {
-			"version": "340.3.1597323120",
+			"version": "340.3.1597323120.1",
 			"mod": { "id": "1405944717", "tag": "Project_Evolution", "title": "JP's Server Tweaks" }
 		},
 		"1420423699-ARKaeologyDinos.json": {
@@ -79,15 +79,15 @@
 			"mod": { "id": "1522327484", "tag": "Additions_Pack", "title": "ARK Additions!" }
 		},
 		"1523045986-Paranoia.json": {
-			"version": "340.3.1630831208",
+			"version": "341.33.1639976254",
 			"mod": { "id": "1523045986", "tag": "Paranoia", "title": "Additional Creatures 2: Paranoia!" }
 		},
 		"1565015734-BetterDinosTest.json": {
-			"version": "340.3.1635604601",
+			"version": "340.3.1635604601.1",
 			"mod": { "id": "1565015734", "tag": "BetterDinosTest", "title": "Better Dinos" }
 		},
 		"1576299694-ElementalDinos.json": {
-			"version": "340.3.1636977089",
+			"version": "341.22.1638360729",
 			"mod": { "id": "1576299694", "tag": "ElementalDinos", "title": "Elemental Ark" }
 		},
 		"1587391872-FasterFlyers.json": {
@@ -108,7 +108,7 @@
 			"mod": { "id": "1633860796", "tag": "DE_Breedable_RockDrakes", "title": "Dark Edges Breedable Rock Drakes" }
 		},
 		"1652120435-AtlasPort.json": {
-			"version": "340.3.1637193449",
+			"version": "341.22.1639498418",
 			"mod": { "id": "1652120435", "tag": "AtlasPort", "title": "Shad's Atlas Imports" }
 		},
 		"1654255131-AtlasImports.json": {
@@ -124,7 +124,7 @@
 			"mod": { "id": "1675895024", "tag": "NoUntameables", "title": "No Untameables" }
 		},
 		"1676159020-Aquaria.json": {
-			"version": "340.3.1637623516",
+			"version": "341.33.1639976335",
 			"mod": { "id": "1676159020", "tag": "Aquaria", "title": "Additional Creatures: Aquaria" }
 		},
 		"1681125667-Primal_Fear_EX.json": {
@@ -145,7 +145,7 @@
 			"mod": { "id": "1729512589", "tag": "Brachiosaurus", "title": "ARK Additions: Brachiosaurus!" }
 		},
 		"1734595558-Pyria2.json": {
-			"version": "340.3.1636588007",
+			"version": "341.56.1640371557",
 			"mod": { "id": "1734595558", "tag": "Pyria2", "title": "Pyria: The Second Chapter" }
 		},
 		"1768499278-BalancedJPE.json": {
@@ -202,7 +202,7 @@
 			"mod": { "id": "1984936918", "tag": "MarniiModsWildlife", "title": "MarniiMods:Wildlife" }
 		},
 		"2000326197-ExtraResources.json": {
-			"version": "340.3.1589585703",
+			"version": "340.3.1589585703.1",
 			"mod": { "id": "2000326197", "tag": "ExtraResources", "title": "Event Assets" }
 		},
 		"2019846325-ApexMod.json": {
@@ -218,7 +218,7 @@
 			"mod": { "id": "2110243671", "tag": "GrandHunt", "title": "Additional Creatures: Grand Hunt" }
 		},
 		"2112724006-DarkArk.json": {
-			"version": "340.3.1624371883",
+			"version": "340.3.1624371883.1",
 			"mod": { "id": "2112724006", "tag": "DarkArk", "title": "The Hunted" }
 		},
 		"2117881804-FiresFixes.json": {
@@ -238,11 +238,11 @@
 			"mod": { "id": "814833973", "tag": "Wyvern_Mating", "title": "Wyvern Mating" }
 		},
 		"839162288-Primal_Fear.json": {
-			"version": "340.3.1624738849",
+			"version": "341.22.1624738849",
 			"mod": { "id": "839162288", "tag": "Primal_Fear", "title": "Primal Fear" }
 		},
 		"893735676-AE.json": {
-			"version": "340.3.1635395904",
+			"version": "341.22.1635395904",
 			"mod": { "id": "893735676", "tag": "AE", "title": "ARK: Eternal" }
 		},
 		"895711211-ClassicFlyers.json": {
@@ -266,7 +266,7 @@
 			"mod": { "id": "CrystalIsles", "tag": "CrystalIsles", "title": "CrystalIsles" }
 		},
 		"values.json": {
-			"version": "340.3.7761957.1"
+			"version": "341.22.7885939"
 		}
 	}
 }