Added timeline interpolable slider

thojmr · May 7, 2022 · 619b34c · 619b34c
1 parent 874bcf0
commit 619b34c
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 26 deletions.
diff --git a/PregnancyPlus/AI_PregnancyPlus/AI_PregnancyPlus.csproj b/PregnancyPlus/AI_PregnancyPlus/AI_PregnancyPlus.csproj
@@ -39,36 +39,37 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="System.Xml" />
     <Reference Include="0Harmony,  Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.2.0.1\lib\net35\0Harmony.dll</HintPath>
+      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.5.4\lib\net35\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0,  Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\IllusionLibs.AIGirl.Assembly-CSharp.2020.5.29.2\lib\net46\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="BepInEx, Version=5.4.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\IllusionLibs.BepInEx.5.4.4\lib\net35\BepInEx.dll</HintPath>
+    <Reference Include="BepInEx, Version=5.4.15, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\IllusionLibs.BepInEx.5.4.15\lib\net35\BepInEx.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="BepInEx.Harmony,  Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.0.3.1\lib\net35\BepInEx.Harmony.dll</HintPath>
+      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.5.4\lib\net35\BepInEx.Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="AIABMX,  Culture=neutral, processorArchitecture=MSIL" >
       <HintPath>..\..\packages\ABMX.AIABMX.4.4.1\lib\net46\AIABMX.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="AIAPI, Version=1.17,  Culture=neutral, processorArchitecture=MSIL" >
-      <HintPath>..\..\packages\IllusionModdingAPI.AIAPI.1.17.0\lib\net46\AIAPI.dll</HintPath>
+    <Reference Include="AIAPI, Culture=neutral, processorArchitecture=MSIL" >
+      <HintPath>..\..\packages\IllusionModdingAPI.AIAPI.1.30.0\lib\net46\AIAPI.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="AI_ExtensibleSaveFormat,  Culture=neutral, processorArchitecture=MSIL" >
-      <HintPath>..\..\packages\ExtensibleSaveFormat.AIGirl.16.2.0.2\lib\net46\AI_ExtensibleSaveFormat.dll</HintPath>
+      <HintPath>..\..\packages\ExtensibleSaveFormat.AIGirl.16.8.0\lib\net46\AI_ExtensibleSaveFormat.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>

diff --git a/PregnancyPlus/AI_PregnancyPlus/packages.config b/PregnancyPlus/AI_PregnancyPlus/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="IllusionLibs.BepInEx" version="5.4.4" targetFramework="net35" />
-  <package id="IllusionLibs.BepInEx.Harmony" version="2.2.0.1" targetFramework="net46" />
+  <package id="IllusionLibs.BepInEx" version="5.4.15" targetFramework="net35" />
+  <package id="IllusionLibs.BepInEx.Harmony" version="2.5.4" targetFramework="net46" />
   <package id="ABMX.AIABMX" version="4.4.1" targetFramework="net46" developmentDependency="true" />
-  <package id="ExtensibleSaveFormat.AIGirl" version="16.2.0.2" targetFramework="net46" developmentDependency="true" />
-  <package id="IllusionModdingAPI.AIAPI" version="1.17.0" targetFramework="net46" developmentDependency="true" />
+  <package id="ExtensibleSaveFormat.AIGirl" version="16.8" targetFramework="net46" developmentDependency="true" />
+  <package id="IllusionModdingAPI.AIAPI" version="1.30" targetFramework="net46" developmentDependency="true" />
   <package id="MonoMod.RuntimeDetour" version="20.5.21.5" targetFramework="net35" />
 
   <package id="IllusionLibs.AIGirl.Assembly-CSharp" version="2020.5.29.2" targetFramework="net46" developmentDependency="true" />

diff --git a/PregnancyPlus/HS2_PregnancyPlus/HS2_PregnancyPlus.csproj b/PregnancyPlus/HS2_PregnancyPlus/HS2_PregnancyPlus.csproj
@@ -39,9 +39,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="System.Xml" />
     <Reference Include="0Harmony,  Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.0.3.1\lib\net35\0Harmony.dll</HintPath>
+      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.5.4\lib\net35\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp,  Culture=neutral, processorArchitecture=MSIL">
@@ -53,26 +54,26 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="BepInEx,  Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\IllusionLibs.BepInEx.5.1.0\lib\net35\BepInEx.dll</HintPath>
+      <HintPath>..\..\packages\IllusionLibs.BepInEx.5.4.15\lib\net35\BepInEx.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="BepInEx.Harmony,  Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.0.3.1\lib\net35\BepInEx.Harmony.dll</HintPath>
+      <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.5.4\lib\net35\BepInEx.Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="HS2ABMX,  Culture=neutral, processorArchitecture=MSIL" >
       <HintPath>..\..\packages\ABMX.HS2ABMX.4.4.1\lib\net46\HS2ABMX.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="HS2API, Version=1.15,  Culture=neutral, processorArchitecture=MSIL" >
-      <HintPath>..\..\packages\IllusionModdingAPI.HS2API.1.15.0\lib\net46\HS2API.dll</HintPath>
+    <Reference Include="HS2API,  Culture=neutral, processorArchitecture=MSIL" >
+      <HintPath>..\..\packages\IllusionModdingAPI.HS2API.1.30.0\lib\net46\HS2API.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="HS2_ExtensibleSaveFormat,  Culture=neutral, processorArchitecture=MSIL" >
-      <HintPath>..\..\packages\ExtensibleSaveFormat.HoneySelect2.16.2.0.2\lib\net46\HS2_ExtensibleSaveFormat.dll</HintPath>
+      <HintPath>..\..\packages\ExtensibleSaveFormat.HoneySelect2.16.8.0\lib\net46\HS2_ExtensibleSaveFormat.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>

diff --git a/PregnancyPlus/HS2_PregnancyPlus/packages.config b/PregnancyPlus/HS2_PregnancyPlus/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="IllusionLibs.BepInEx" version="5.1.0" targetFramework="net35" />
-  <package id="IllusionLibs.BepInEx.Harmony" version="2.2.0.1" targetFramework="net46" />
-  <package id="IllusionModdingAPI.HS2API" version="1.15.0" targetFramework="net46" developmentDependency="true" />
+  <package id="IllusionLibs.BepInEx" version="5.4.15" targetFramework="net35" />
+  <package id="IllusionLibs.BepInEx.Harmony" version="2.5.4" targetFramework="net46" />
+  <package id="IllusionModdingAPI.HS2API" version="1.30" targetFramework="net46" developmentDependency="true" />
   <package id="ABMX.HS2ABMX" version="4.4.1" targetFramework="net46" developmentDependency="true" />
-  <package id="ExtensibleSaveFormat.HoneySelect2" version="16.2.0.2" targetFramework="net46" developmentDependency="true" />
+  <package id="ExtensibleSaveFormat.HoneySelect2" version="16.8" targetFramework="net46" developmentDependency="true" />
   <package id="MonoMod.RuntimeDetour" version="20.5.21.5" targetFramework="net35" />
 
   <package id="IllusionLibs.HoneySelect2.Assembly-CSharp" version="2020.5.29.2" targetFramework="net46" developmentDependency="true" />

diff --git a/PregnancyPlus/KKS_PregnancyPlus/KKS_PregnancyPlus.csproj b/PregnancyPlus/KKS_PregnancyPlus/KKS_PregnancyPlus.csproj
@@ -39,6 +39,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="System.Xml" />
     <Reference Include="0Harmony, Version=2.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\IllusionLibs.BepInEx.Harmony.2.5.4\lib\net35\0Harmony.dll</HintPath>
       <Private>False</Private>
@@ -60,11 +61,11 @@
       <Private>False</Private>
     </Reference> -->
     <Reference Include="KKS_ExtensibleSaveFormat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ExtensibleSaveFormat.KoikatsuSunshine.16.3.0\lib\net46\KKS_ExtensibleSaveFormat.dll</HintPath>
+      <HintPath>..\..\packages\ExtensibleSaveFormat.KoikatsuSunshine.16.8.0\lib\net46\KKS_ExtensibleSaveFormat.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="KKSAPI, Version=1.24.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\IllusionModdingAPI.KKSAPI.1.24.0\lib\net46\KKSAPI.dll</HintPath>
+    <Reference Include="KKSAPI, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\IllusionModdingAPI.KKSAPI.1.30.0\lib\net46\KKSAPI.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Sirenix.Serialization, Culture=neutral, processorArchitecture=MSIL">

diff --git a/PregnancyPlus/KKS_PregnancyPlus/packages.config b/PregnancyPlus/KKS_PregnancyPlus/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="IllusionLibs.BepInEx" version="5.4.15" targetFramework="net46" developmentDependency="true" />
   <package id="IllusionLibs.BepInEx.Harmony" version="2.5.4" targetFramework="net46" developmentDependency="true" />
-  <package id="IllusionModdingAPI.KKSAPI" version="1.24" targetFramework="net35" developmentDependency="true" />
-  <package id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.3" targetFramework="net35" developmentDependency="true" />
+  <package id="IllusionModdingAPI.KKSAPI" version="1.30" targetFramework="net35" developmentDependency="true" />
+  <package id="ExtensibleSaveFormat.KoikatsuSunshine" version="16.8" targetFramework="net35" developmentDependency="true" />
   <package id="MonoMod.RuntimeDetour" version="20.5.21.5" targetFramework="net35" />
 
   <package id="IllusionLibs.KoikatsuSunshine.UniRx" version="2021.8.27" targetFramework="net46" />  

diff --git a/PregnancyPlus/PregnancyPlus.Core/PPPlugin.cs b/PregnancyPlus/PregnancyPlus.Core/PPPlugin.cs
@@ -6,6 +6,7 @@
 using KKAPI.Studio;
 using KKAPI.Maker;
 using KKAPI.Chara;
+using KKAPI.Utilities;
 #if KKS || AI
     using KKAPI.MainGame;
 #endif
@@ -71,6 +72,26 @@ internal void Start()
             //Set up studio/malker GUI sliders
             PregnancyPlusGui.InitStudio(hi, this);
             PregnancyPlusGui.InitMaker(hi, this);       
+
+
+            //Requires KKAPI 1.30+ and Bepinex 5.4.15 to use the timeline interpolable, but its just a soft depencendy for this plugin
+            try {
+                //Set up the timeline imterpolable tool
+                if (TimelineCompatibility.IsTimelineAvailable())
+                {
+                    const string timelineGUID = "PregnancyPlus";//Never change
+
+                    TimelineCompatibility.AddCharaFunctionInterpolable<int, PregnancyPlusCharaController>(
+                        timelineGUID, 
+                        "0", 
+                        "Pregnancy+",
+                        (oci, ctrl, leftValue, rightValue, factor) => ctrl.MeshInflate(factor * 40, "timeline_interpolable"),
+                        null,
+                        (oci, ctrl) => (int)ctrl.infConfig.inflationSize/40
+                        );
+                }
+            }
+            catch {}
         }