RandomCharacterGenerator KKS port

IllusionMods · Dec 23, 2021 · 007c637 · 007c637
1 parent 7b72006
commit 007c637
Show file tree

Hide file tree

Showing 11 changed files with 265 additions and 7 deletions.
diff --git a/KK_Plugins.sln b/KK_Plugins.sln
@@ -505,6 +505,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Core.FadeAdjuster", "src\Fa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KKS.FadeAdjuster", "src\FadeAdjuster.KKS\KKS.FadeAdjuster.csproj", "{88EFE9CF-459C-4ABF-A59F-5F8FB53A7E79}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Core.RandomCharacterGenerator", "src\RandomCharacterGenerator.Core\Core.RandomCharacterGenerator.shproj", "{825E0C5D-2125-401F-A457-54EBACD6068E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KKS.RandomCharacterGenerator", "src\RandomCharacterGenerator.KKS\KKS.RandomCharacterGenerator.csproj", "{7B2557EE-0C49-4931-B32D-82B01DD42890}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\Shared.projitems*{002aa641-4dc8-4fef-83dd-a7fab3af6daf}*SharedItemsImports = 4
@@ -703,6 +707,8 @@ Global
 		src\Pushup.Core\Pushup.Core.projitems*{79bc0e60-bb08-4a5b-928f-8475a2977aa2}*SharedItemsImports = 4
 		src\Shared\Shared.projitems*{79bc0e60-bb08-4a5b-928f-8475a2977aa2}*SharedItemsImports = 4
 		src\HCharaAdjustment.Core\HCharaAdjustment.Core.projitems*{7a7d2306-8e32-4016-8562-b5d45eaa633f}*SharedItemsImports = 13
+		src\RandomCharacterGenerator.Core\RandomCharacterGenerator.Core.projitems*{7b2557ee-0c49-4931-b32d-82b01dd42890}*SharedItemsImports = 4
+		src\Shared\Shared.projitems*{7b2557ee-0c49-4931-b32d-82b01dd42890}*SharedItemsImports = 4
 		src\EyeShaking.Core\EyeShaking.Core.projitems*{7b514b4e-a0bc-4da9-b2a8-0b72515e8033}*SharedItemsImports = 4
 		src\Shared\Shared.projitems*{7b514b4e-a0bc-4da9-b2a8-0b72515e8033}*SharedItemsImports = 4
 		src\InvisibleBody.Core.Studio\Core.InvisibleBody.Studio.projitems*{7c091568-6504-40c9-8928-7bb0f1dfdc52}*SharedItemsImports = 4
@@ -713,6 +719,7 @@ Global
 		src\Shared\Shared.projitems*{7cd43c9b-d042-479a-8fd5-82a87b0f2963}*SharedItemsImports = 4
 		src\UncensorSelector.Core.Studio\Core.UncensorSelector.Studio.projitems*{7cd43c9b-d042-479a-8fd5-82a87b0f2963}*SharedItemsImports = 4
 		src\UncensorSelector.Core\Core.UncensorSelector.projitems*{7cd43c9b-d042-479a-8fd5-82a87b0f2963}*SharedItemsImports = 4
+		src\RandomCharacterGenerator.Core\RandomCharacterGenerator.Core.projitems*{7e21e1cc-356e-41bb-abdd-bd0f99710361}*SharedItemsImports = 4
 		src\Shared\Shared.projitems*{7e21e1cc-356e-41bb-abdd-bd0f99710361}*SharedItemsImports = 4
 		src\Shared\Shared.projitems*{808eedec-4707-45a1-929c-9e5506180204}*SharedItemsImports = 4
 		src\StudioSceneSettings.Core\Core.StudioSceneSettings.projitems*{808eedec-4707-45a1-929c-9e5506180204}*SharedItemsImports = 4
@@ -723,6 +730,7 @@ Global
 		src\UIUtility\UIUtility.projitems*{81c5bb6f-1182-4395-80a9-eaa47cf83a1c}*SharedItemsImports = 4
 		src\FKIK.Core\Core.FKIK.projitems*{81d88c3e-4094-436c-8eed-ba18a81a96a4}*SharedItemsImports = 13
 		src\InvisibleBody.Core.Studio\Core.InvisibleBody.Studio.projitems*{81de7d3b-a8a0-43c2-ac9d-f65ac528b997}*SharedItemsImports = 13
+		src\RandomCharacterGenerator.Core\RandomCharacterGenerator.Core.projitems*{825e0c5d-2125-401f-a457-54ebacd6068e}*SharedItemsImports = 13
 		src\Colliders.Core\Core.Colliders.projitems*{83d27765-5c0a-4909-b4dc-fb6b20ece642}*SharedItemsImports = 4
 		src\Shared\Shared.projitems*{83d27765-5c0a-4909-b4dc-fb6b20ece642}*SharedItemsImports = 4
 		src\AccessoryClothes.Core\AccessoryClothes.Core.projitems*{84060175-95bd-4ad7-ba46-508dc8959b32}*SharedItemsImports = 4
@@ -1537,6 +1545,10 @@ Global
 		{88EFE9CF-459C-4ABF-A59F-5F8FB53A7E79}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88EFE9CF-459C-4ABF-A59F-5F8FB53A7E79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88EFE9CF-459C-4ABF-A59F-5F8FB53A7E79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B2557EE-0C49-4931-B32D-82B01DD42890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B2557EE-0C49-4931-B32D-82B01DD42890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B2557EE-0C49-4931-B32D-82B01DD42890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B2557EE-0C49-4931-B32D-82B01DD42890}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1741,6 +1753,8 @@ Global
 		{EAB8EF2C-0401-4A16-850B-E3F6A12B7881} = {28131092-2FE4-4763-A925-F0A315905AA8}
 		{36E9F31D-A68D-4BD2-B2E9-EA11CE8CE54F} = {7E7FAD27-BC88-4BD1-A5C6-BDB87BA433F1}
 		{88EFE9CF-459C-4ABF-A59F-5F8FB53A7E79} = {7E7FAD27-BC88-4BD1-A5C6-BDB87BA433F1}
+		{825E0C5D-2125-401F-A457-54EBACD6068E} = {DF8AC77E-F7A3-4A32-9B2E-EF73D3F68D12}
+		{7B2557EE-0C49-4931-B32D-82B01DD42890} = {DF8AC77E-F7A3-4A32-9B2E-EF73D3F68D12}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D0F79985-4CB7-46CB-BEC2-FF89C476ED20}

diff --git a/...erGenerator.KK/Properties/AssemblyInfo.cs → ...omCharacterGenerator.Core/AssemblyInfo.cs b/...erGenerator.KK/Properties/AssemblyInfo.cs → ...omCharacterGenerator.Core/AssemblyInfo.cs
diff --git a/src/RandomCharacterGenerator.Core/Core.RandomCharacterGenerator.shproj b/src/RandomCharacterGenerator.Core/Core.RandomCharacterGenerator.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>825e0c5d-2125-401f-a457-54ebacd6068e</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="RandomCharacterGenerator.Core.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/RandomCharacterGenerator.Core/RandomCharacterGenerator.Core.projitems b/src/RandomCharacterGenerator.Core/RandomCharacterGenerator.Core.projitems
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>825e0c5d-2125-401f-a457-54ebacd6068e</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>RandomCharacterGenerator.Core</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RandomCharacterGenerator.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RandomizerBody.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RandomizerFace.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RandomizerHair.cs" />
+  </ItemGroup>
+</Project>
diff --git a/...nerator.KK/KK.RandomCharacterGenerator.cs → ...enerator.Core/RandomCharacterGenerator.cs b/...nerator.KK/KK.RandomCharacterGenerator.cs → ...enerator.Core/RandomCharacterGenerator.cs
diff --git a/...omCharacterGenerator.KK/RandomizerBody.cs → ...CharacterGenerator.Core/RandomizerBody.cs b/...omCharacterGenerator.KK/RandomizerBody.cs → ...CharacterGenerator.Core/RandomizerBody.cs
@@ -13,7 +13,11 @@ private class RandomizerBody
 
             public static void RandomizeBody()
             {
+#if KK
                 var chaListCtrl = Singleton<Character>.Instance.chaListCtrl;
+#elif KKS
+                var chaListCtrl = Character.chaListCtrl;
+#endif
                 var body = Custom.body;
 
                 var categoryInfo = chaListCtrl.GetCategoryInfo(ChaListDefine.CategoryNo.mt_body_detail);

diff --git a/...omCharacterGenerator.KK/RandomizerFace.cs → ...CharacterGenerator.Core/RandomizerFace.cs b/...omCharacterGenerator.KK/RandomizerFace.cs → ...CharacterGenerator.Core/RandomizerFace.cs
@@ -13,7 +13,11 @@ private class RandomizerFace
 
             public static void RandomizeEyes()
             {
+#if KK
                 var chaListCtrl = Singleton<Character>.Instance.chaListCtrl;
+#elif KKS
+                var chaListCtrl = Character.chaListCtrl;
+#endif
                 var face = Custom.face;
 
                 Dictionary<int, ListInfoBase> categoryInfo;
@@ -54,7 +58,11 @@ public static void RandomizeEyes()
 
             public static void RandomizeEtc()
             {
+#if KK
                 var chaListCtrl = Singleton<Character>.Instance.chaListCtrl;
+#elif KKS
+                var chaListCtrl = Character.chaListCtrl;
+#endif
                 var face = Custom.face;
 
                 var categoryInfo = chaListCtrl.GetCategoryInfo(ChaListDefine.CategoryNo.bo_head);

diff --git a/...omCharacterGenerator.KK/RandomizerHair.cs → ...CharacterGenerator.Core/RandomizerHair.cs b/...omCharacterGenerator.KK/RandomizerHair.cs → ...CharacterGenerator.Core/RandomizerHair.cs
@@ -10,7 +10,11 @@ private class RandomizerHair
         {
             public static void RandomizeType()
             {
+#if KK
                 var chaListCtrl = Singleton<Character>.Instance.chaListCtrl;
+#elif KKS
+                var chaListCtrl = Character.chaListCtrl;
+#endif
                 var hair = Custom.hair;
 
                 var categoryInfo = chaListCtrl.GetCategoryInfo(ChaListDefine.CategoryNo.bo_hair_b);
@@ -67,7 +71,11 @@ public static void RandomizeColor()
 
             public static void RandomizeEtc()
             {
+#if KK
                 var chaListCtrl = Singleton<Character>.Instance.chaListCtrl;
+#elif KKS
+                var chaListCtrl = Character.chaListCtrl;
+#endif
                 var hair = Custom.hair;
                 for (var i = 0; i < 4; i++)
                 {

diff --git a/src/RandomCharacterGenerator.KK/KK.RandomCharacterGenerator.csproj b/src/RandomCharacterGenerator.KK/KK.RandomCharacterGenerator.csproj
@@ -81,13 +81,6 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="KK.RandomCharacterGenerator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RandomizerBody.cs" />
-    <Compile Include="RandomizerFace.cs" />
-    <Compile Include="RandomizerHair.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
@@ -97,7 +90,11 @@
     <Analyzer Include="..\..\packages\KoikatuCompatibilityAnalyzer.1.0.1\analyzers\dotnet\cs\KoikatuCompatibilityAnalyzer.dll" />
     <Analyzer Include="..\..\packages\Microsoft.Unity.Analyzers.1.11.0\analyzers\dotnet\cs\Microsoft.Unity.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="..\Shared\Shared.projitems" Label="Shared" />
+  <Import Project="..\RandomCharacterGenerator.Core\RandomCharacterGenerator.Core.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF EXIST "$(TargetDir)$(TargetName).pdb" IF EXIST "$(SolutionDir)pdb2mdb.exe" CALL "$(SolutionDir)pdb2mdb.exe" "$(TargetPath)"