Replace ark-tools import with C# native ark file reader ArkSavegameTo…

…olkit derived from ark-tools. ArkSavegameToolkit is added to the project as Git submodule and needs "git submodule update --init" to fetch its files
cadon · Nov 3, 2018 · 21a741c · 21a741c
1 parent 39c492a
commit 21a741c
Show file tree

Hide file tree

Showing 22 changed files with 20,237 additions and 609 deletions.
diff --git a/.gitignore b/.gitignore
@@ -211,3 +211,4 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
+/_publish/
diff --git a/.gitmodules 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
@@ -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
@@ -9,10 +9,25 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ARKBreedingStats</RootNamespace>
     <AssemblyName>ARK Smart Breeding</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -79,6 +94,7 @@
     <Compile Include="ExportedCreatureList.Designer.cs">
       <DependentUpon>ExportedCreatureList.cs</DependentUpon>
     </Compile>
+    <Compile Include="ImportSavegame.cs" />
     <Compile Include="ImportExported.cs" />
     <Compile Include="local\strings.fr.Designer.cs">
       <DependentUpon>strings.fr.resx</DependentUpon>
@@ -118,7 +134,6 @@
       <DependentUpon>StatsMultiplierTesting.cs</DependentUpon>
     </Compile>
     <Compile Include="testCases\ExtractionTestCase.cs" />
-    <Compile Include="Importer.cs" />
     <Compile Include="ocr\ArkOCR.cs" />
     <Compile Include="ARKOverlay.cs">
       <SubType>Form</SubType>
@@ -555,6 +570,9 @@
     <None Include="json\aliases.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="json\ark_data.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="json\classicFlyers.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -579,7 +597,6 @@
     <None Include="json\ocr_3440x1440_100.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
     <None Include="Resources\kofi.png" />
     <Content Include="Resources\ARKExtractor.ico" />
     <Content Include="Resources\lock.png" />
@@ -646,6 +663,36 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ArkSavegameToolkit\SavegameToolkitAdditions\SavegameToolkitAdditions.csproj">
+      <Project>{b1009ebc-95c7-4a9f-aff3-cd3254f5d602}</Project>
+      <Name>SavegameToolkitAdditions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ArkSavegameToolkit\SavegameToolkit\SavegameToolkit.csproj">
+      <Project>{4353eda3-8092-4641-9b69-347f7da9fd59}</Project>
+      <Name>SavegameToolkit</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DuoVia.FuzzyStrings">
+      <Version>1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>11.0.2</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -6,12 +6,12 @@
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
     <userSettings>
         <ARKBreedingStats.Properties.Settings>
             <setting name="LastSaveFile" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="consideredStats" serializeAs="String">
                 <value>51</value>
@@ -50,13 +50,13 @@
                 <value>ShooterGame</value>
             </setting>
             <setting name="soundStarving" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="soundWakeup" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="soundBirth" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="SpeechRecognition" serializeAs="String">
                 <value>False</value>
@@ -80,7 +80,7 @@
                 <value>{species} {sex_short}{n}</value>
             </setting>
             <setting name="soundCustom" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="playAlarmTimes" serializeAs="String">
                 <value>60,0</value>
@@ -89,16 +89,13 @@
                 <value>True</value>
             </setting>
             <setting name="LastImportFile" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="showColorsInLibrary" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="arkToolsPath" serializeAs="String">
-                <value/>
-            </setting>
             <setting name="savegameExtractionPath" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="importChangeCreatureStatus" serializeAs="String">
                 <value>True</value>
@@ -110,22 +107,22 @@
                 <value>False</value>
             </setting>
             <setting name="LastSaveFileTestCases" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="ExportCreatureFolder" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="IgnoreSexInBreedingPlan" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="DefaultOwnerName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="OwnerNameLocked" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="DefaultTribeName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="TribeNameLocked" serializeAs="String">
                 <value>False</value>
@@ -134,7 +131,7 @@
                 <value>False</value>
             </setting>
             <setting name="language" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="UpgradeRequired" serializeAs="String">
                 <value>True</value>

diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs