From 21a741c27420efd37576b42807f58dd2c9799caf Mon Sep 17 00:00:00 2001 From: Flachdachs Date: Sat, 3 Nov 2018 10:42:44 +0100 Subject: [PATCH] Replace ark-tools import with C# native ark file reader ArkSavegameToolkit derived from ark-tools. ArkSavegameToolkit is added to the project as Git submodule and needs "git submodule update --init" to fetch its files --- .gitignore | 1 + .gitmodules | 3 + ARKBreedingStats.sln | 18 + ARKBreedingStats/ARKBreedingStats.csproj | 53 +- ARKBreedingStats/App.config | 29 +- ARKBreedingStats/Form1.Designer.cs | 51 +- ARKBreedingStats/Form1.cs | 185 +- ARKBreedingStats/ImportSavegame.cs | 177 + ARKBreedingStats/Importer.cs | 265 - ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- .../Properties/Settings.Designer.cs | 14 +- ARKBreedingStats/Properties/Settings.settings | 3 - ARKBreedingStats/json/ark_data.json | 19773 ++++++++++++++++ ARKBreedingStats/local/strings.Designer.cs | 9 + ARKBreedingStats/local/strings.de.resx | 3 + ARKBreedingStats/local/strings.resx | 3 + ARKBreedingStats/packages.config | 5 - .../settings/Settings.Designer.cs | 241 +- ARKBreedingStats/settings/Settings.cs | 6 +- ARKBreedingStats/settings/Settings.resx | 2 +- ARKBreedingStats/ver.txt | 2 +- ArkSavegameToolkit | 1 + 22 files changed, 20237 insertions(+), 609 deletions(-) create mode 100644 .gitmodules create mode 100644 ARKBreedingStats/ImportSavegame.cs delete mode 100644 ARKBreedingStats/Importer.cs create mode 100644 ARKBreedingStats/json/ark_data.json delete mode 100644 ARKBreedingStats/packages.config create mode 160000 ArkSavegameToolkit diff --git a/.gitignore b/.gitignore index 5e77a612..e9e457f6 100644 --- a/.gitignore +++ b/.gitignore @@ -211,3 +211,4 @@ FakesAssemblies/ GeneratedArtifacts/ _Pvt_Extensions/ ModelManifest.xml +/_publish/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..c098f11a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ArkSavegameToolkit"] + path = ArkSavegameToolkit + url = https://github.com/Flachdachs/ArkSavegameToolkit.git diff --git a/ARKBreedingStats.sln b/ARKBreedingStats.sln index c5a4672c..065d252b 100644 --- a/ARKBreedingStats.sln +++ b/ARKBreedingStats.sln @@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARKBreedingStats", "ARKBree EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASB Updater", "ASB-Updater\ASB Updater.csproj", "{03708FF0-F790-4618-B3D0-E59AEB74F022}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArkSavegameToolkit", "ArkSavegameToolkit", "{74D3CB19-BAE4-456A-B45E-0711091AECD9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SavegameToolkit", "ArkSavegameToolkit\SavegameToolkit\SavegameToolkit.csproj", "{4353EDA3-8092-4641-9B69-347F7DA9FD59}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SavegameToolkitAdditions", "ArkSavegameToolkit\SavegameToolkitAdditions\SavegameToolkitAdditions.csproj", "{B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,10 +27,22 @@ Global {03708FF0-F790-4618-B3D0-E59AEB74F022}.Debug|Any CPU.Build.0 = Debug|Any CPU {03708FF0-F790-4618-B3D0-E59AEB74F022}.Release|Any CPU.ActiveCfg = Release|Any CPU {03708FF0-F790-4618-B3D0-E59AEB74F022}.Release|Any CPU.Build.0 = Release|Any CPU + {4353EDA3-8092-4641-9B69-347F7DA9FD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4353EDA3-8092-4641-9B69-347F7DA9FD59}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4353EDA3-8092-4641-9B69-347F7DA9FD59}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4353EDA3-8092-4641-9B69-347F7DA9FD59}.Release|Any CPU.Build.0 = Release|Any CPU + {B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B1009EBC-95C7-4A9F-AFF3-CD3254F5D602}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {4353EDA3-8092-4641-9B69-347F7DA9FD59} = {74D3CB19-BAE4-456A-B45E-0711091AECD9} + {B1009EBC-95C7-4A9F-AFF3-CD3254F5D602} = {74D3CB19-BAE4-456A-B45E-0711091AECD9} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F5A412CA-3116-4544-A452-7C5827D3B824} EndGlobalSection diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj index 6cd4d8b4..3b392a6b 100644 --- a/ARKBreedingStats/ARKBreedingStats.csproj +++ b/ARKBreedingStats/ARKBreedingStats.csproj @@ -9,10 +9,25 @@ Properties ARKBreedingStats ARK Smart Breeding - v4.7.1 + v4.7.2 512 true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -79,6 +94,7 @@ ExportedCreatureList.cs + strings.fr.resx @@ -118,7 +134,6 @@ StatsMultiplierTesting.cs - Form @@ -555,6 +570,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -579,7 +597,6 @@ PreserveNewest - @@ -646,6 +663,36 @@ Designer + + + {b1009ebc-95c7-4a9f-aff3-cd3254f5d602} + SavegameToolkitAdditions + + + {4353eda3-8092-4641-9b69-347f7da9fd59} + SavegameToolkit + + + + + 1.0.1 + + + 11.0.2 + + + + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + +