Fix neck motion in KK/KKS. Retuned default neck motion in HS2/AI.

OrangeSpork · Feb 12, 2022 · bae72a9 · bae72a9
1 parent a8ce68d
commit bae72a9
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/AI_AdvIKPlugin/AI_AdvIKPlugin.csproj b/AI_AdvIKPlugin/AI_AdvIKPlugin.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;AI</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -29,7 +29,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;AI</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/AdvIKPlugin/AdvIKGUI.cs b/AdvIKPlugin/AdvIKGUI.cs
@@ -699,6 +699,14 @@ public static void SetupBreathShapeControls()
                     }
                 });
 
+#if KOIKATSU || KKS
+// KK Skeleton does not require neck adjustments for upper chest movement as the upper chest has a different scaling center system.
+
+                neckMotionSliderText.gameObject.SetActive(false);
+                NeckMotionSlider.gameObject.SetActive(false);
+
+#endif
+
                 // Clear controls
                 foreach (Transform child in BreathShapePanel.transform)
                 {

diff --git a/AdvIKPlugin/AdvIKHooks.cs b/AdvIKPlugin/AdvIKHooks.cs
@@ -1,8 +1,13 @@
-using HarmonyLib;
+#if !KKS && !KOIKATSU
+using AIChara;
+#endif
+using HarmonyLib;
+using IllusionUtility.GetUtility;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using UnityEngine;
 
 namespace AdvIKPlugin
 {

diff --git a/AdvIKPlugin/AdvIKPlugin.cs b/AdvIKPlugin/AdvIKPlugin.cs
@@ -26,7 +26,7 @@ public partial class AdvIKPlugin : BaseUnityPlugin
     {
         public const string GUID = "orange.spork.advikplugin";
         public const string PluginName = "AdvIKPlugin";
-        public const string Version = "1.7.0";
+        public const string Version = "1.7.1";
 
         public static AdvIKPlugin Instance { get; set; }
 

diff --git a/AdvIKPlugin/Algos/BreathingBoneEffect.cs b/AdvIKPlugin/Algos/BreathingBoneEffect.cs
@@ -177,7 +177,7 @@ public override BoneModifierData GetEffect(string bone, BoneController origin, C
                 newUpperChestPos.z = ((1 + newUpperChestPos.z) * appliedUpperBreathScale.z) - ((1 + newUpperChestPos.z));
                 newUpperChestPos.y = ((1 + newUpperChestPos.y) * appliedUpperBreathScale.y) - ((1 + newUpperChestPos.y));
 
-                Vector3 newNeckPos = new Vector3(0, newUpperChestPos.y + (newUpperChestPos.y * NeckMotionDampeningFactor), 0);
+                Vector3 newNeckPos = new Vector3(0, (newUpperChestPos.y * NeckMotionDampeningFactor), 0);
 
                 // Same with lower chest
                 Vector3 newLowerChestPos = new Vector3(0, 0, 0);
@@ -285,12 +285,17 @@ public override BoneModifierData GetEffect(string bone, BoneController origin, C
             }
             else if (bone.Equals(Neck))
             {
+#if KOIKATSU || KKS
+// Upper Chest doesn't move in KK so this isn't needed/useful.
+                return null;
+#else
                 // Looks like applying a 0 position offset to a bone with a length adjustment causes ABMX to incorrectly revert the length adjustment
                 // Work around by supplying a very small position offset instead
                 if (FrameEffects.NeckAdj.y == 0)
                     return UpdateBoneModifier(bone, Vector3.one, new Vector3(0f, 0.001f, 0f));
                 else
                     return UpdateBoneModifier(bone, Vector3.one, FrameEffects.NeckAdj);
+#endif
             }
             else
             {

diff --git a/HS2_AdvIKPlugin/HS2_AdvIKPlugin.csproj b/HS2_AdvIKPlugin/HS2_AdvIKPlugin.csproj
@@ -20,17 +20,18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;HS2</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>
+    <DefineConstants>TRACE;HS2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">