Skip to content

Commit

Permalink
Merge pull request #1 from DeathWeasel1337/master
Browse files Browse the repository at this point in the history
AI Girl and Koikatsu port
  • Loading branch information
OrangeSpork authored Sep 29, 2020
2 parents 9bf5cf1 + 2de8920 commit 8f8f521
Show file tree
Hide file tree
Showing 25 changed files with 533 additions and 156 deletions.
107 changes: 107 additions & 0 deletions AI_AdvIKPlugin/AI_AdvIKPlugin.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DF02420F-FD24-47AA-945E-D3FDCD2979B2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AdvIKPlugin</RootNamespace>
<AssemblyName>AI_AdvIKPlugin</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.0.6\lib\net35\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AIAPI, Version=1.13.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionModdingAPI.AIAPI.1.13.2\lib\net46\AIAPI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AI_ExtensibleSaveFormat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ExtensibleSaveFormat.AIGirl.16.0.0\lib\net46\AI_ExtensibleSaveFormat.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\lib\net46\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.Assembly-CSharp-firstpass.2020.5.29\lib\net35\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="BepInEx, Version=5.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.BepInEx.5.3.0\lib\net35\BepInEx.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="BepInEx.Harmony, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.BepInEx.Harmony.2.0.6\lib\net35\BepInEx.Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="UniRx, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.UniRx.2020.5.29\lib\net46\UniRx.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Unity.TextMeshPro, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.Unity.TextMeshPro.2018.2.21.1\lib\net46\Unity.TextMeshPro.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.UnityEngine.CoreModule.2018.2.21.1\lib\net46\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.UnityEngine.CoreModule.2018.2.21.1\lib\net46\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.UnityEngine.ImageConversionModule.2018.2.21.1\lib\net46\UnityEngine.ImageConversionModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\IllusionLibs.AIGirl.UnityEngine.UI.2018.2.21.1\lib\net46\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<EmbeddedResource Include="Resources\Panel.png" />
</ItemGroup>
<Import Project="..\AdvIKPlugin\AdvIKPlugin.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
2 changes: 2 additions & 0 deletions AI_AdvIKPlugin/AI_AdvIKPlugin.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=resources/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("AdvIKPlugin")]
[assembly: AssemblyTitle("AI_AdvIKPlugin")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("AdvIKPlugin")]
[assembly: AssemblyProduct("AI_AdvIKPlugin")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand All @@ -19,7 +20,7 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("bc53b810-edf4-4f67-8d5b-8088b382475e")]
[assembly: Guid("df02420f-fd24-47aa-945e-d3fdcd2979b2")]

// Version information for an assembly consists of the following four values:
//
Expand All @@ -31,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion(AdvIKPlugin.AdvIKPlugin.Version)]
[assembly: AssemblyFileVersion(AdvIKPlugin.AdvIKPlugin.Version)]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
File renamed without changes
14 changes: 14 additions & 0 deletions AI_AdvIKPlugin/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ExtensibleSaveFormat.AIGirl" version="16.0.0" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.Assembly-CSharp" version="2020.5.29" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.Assembly-CSharp-firstpass" version="2020.5.29" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.UniRx" version="2020.5.29" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.Unity.TextMeshPro" version="2018.2.21.1" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.UnityEngine.CoreModule" version="2018.2.21.1" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.UnityEngine.ImageConversionModule" version="2018.2.21.1" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.AIGirl.UnityEngine.UI" version="2018.2.21.1" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.BepInEx" version="5.3.0" targetFramework="net46" developmentDependency="true" />
<package id="IllusionLibs.BepInEx.Harmony" version="2.0.6" targetFramework="net46" developmentDependency="true" />
<package id="IllusionModdingAPI.AIAPI" version="1.13.2" targetFramework="net46" developmentDependency="true" />
</packages>
127 changes: 0 additions & 127 deletions AdvIKPlugin.csproj

This file was deleted.

32 changes: 26 additions & 6 deletions AdvIKPlugin.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,43 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30517.126
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvIKPlugin", "AdvIKPlugin.csproj", "{BC53B810-EDF4-4F67-8D5B-8088B382475E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HS2_AdvIKPlugin", "HS2_AdvIKPlugin\HS2_AdvIKPlugin.csproj", "{3589C113-F6EA-4CB1-A596-DA81152204E3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KK_AdvIKPlugin", "KK_AdvIKPlugin\KK_AdvIKPlugin.csproj", "{ACAE99EE-8A51-426A-9760-FFD7971C7BC9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AI_AdvIKPlugin", "AI_AdvIKPlugin\AI_AdvIKPlugin.csproj", "{DF02420F-FD24-47AA-945E-D3FDCD2979B2}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AdvIKPlugin", "AdvIKPlugin\AdvIKPlugin.shproj", "{BAD3984D-C8B8-4B87-A57D-EC935611554A}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
AdvIKPlugin\AdvIKPlugin.projitems*{3589c113-f6ea-4cb1-a596-da81152204e3}*SharedItemsImports = 4
AdvIKPlugin\AdvIKPlugin.projitems*{acae99ee-8a51-426a-9760-ffd7971c7bc9}*SharedItemsImports = 4
AdvIKPlugin\AdvIKPlugin.projitems*{bad3984d-c8b8-4b87-a57d-ec935611554a}*SharedItemsImports = 13
AdvIKPlugin\AdvIKPlugin.projitems*{df02420f-fd24-47aa-945e-d3fdcd2979b2}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BC53B810-EDF4-4F67-8D5B-8088B382475E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC53B810-EDF4-4F67-8D5B-8088B382475E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC53B810-EDF4-4F67-8D5B-8088B382475E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC53B810-EDF4-4F67-8D5B-8088B382475E}.Release|Any CPU.Build.0 = Release|Any CPU
{3589C113-F6EA-4CB1-A596-DA81152204E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3589C113-F6EA-4CB1-A596-DA81152204E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3589C113-F6EA-4CB1-A596-DA81152204E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3589C113-F6EA-4CB1-A596-DA81152204E3}.Release|Any CPU.Build.0 = Release|Any CPU
{ACAE99EE-8A51-426A-9760-FFD7971C7BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACAE99EE-8A51-426A-9760-FFD7971C7BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACAE99EE-8A51-426A-9760-FFD7971C7BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACAE99EE-8A51-426A-9760-FFD7971C7BC9}.Release|Any CPU.Build.0 = Release|Any CPU
{DF02420F-FD24-47AA-945E-D3FDCD2979B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF02420F-FD24-47AA-945E-D3FDCD2979B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF02420F-FD24-47AA-945E-D3FDCD2979B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF02420F-FD24-47AA-945E-D3FDCD2979B2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {11568ACE-F3C8-4808-8346-60D6C3551EF5}
SolutionGuid = {1A471B27-0434-4BF0-9210-DC400883951C}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using KKAPI.Chara;
using KKAPI;
Expand All @@ -21,7 +20,7 @@ public class AdvIKCharaController : CharaCustomFunctionController

private ShoulderRotator _shoulderRotator;
private IKSolverFullBodyBiped _ikSolver;


public bool ShoulderRotationEnabled
{
Expand All @@ -40,7 +39,7 @@ public bool ShoulderRotationEnabled
RemoveShoulderRotator();
_shoulderRotator = null;
}

}
}

Expand All @@ -50,7 +49,7 @@ public float ShoulderWeight
set
{
_shoulderWeight = value;
if (_shoulderRotator!= null)
if (_shoulderRotator != null)
{
_shoulderRotator.weight = _shoulderWeight;
}
Expand Down Expand Up @@ -117,7 +116,7 @@ protected override void OnReload(GameMode currentGameMode, bool maintainState)

private GameObject FindAnimator()
{
return this.gameObject.transform.Find("BodyTop/p_cf_anim")?.gameObject;
return ChaControl.objAnim;
}

private void AddShoulderRotator()
Expand Down
Loading

0 comments on commit 8f8f521

Please sign in to comment.