Skip to content

Add 2 quality of life features #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
InoryS wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add 2 quality of life features #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b759797
Support * as a wildcard in menu conditional statements.
InoryS Jan 25, 2026
dd66296
When the condition is not met, skip the processing of shapekey, so ot…
InoryS Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions ShapekeyMaster/CategorySlotHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;

namespace ShapeKeyMaster
{
Expand Down Expand Up @@ -44,6 +45,8 @@ internal class SlotChecker

internal static bool CheckIfSlotDisableApplies(ShapeKeyEntry entry, Maid maid)
{
var allSlots = (DisableWhenEquipped[])Enum.GetValues(typeof(DisableWhenEquipped));

#if (DEBUG)
ShapeKeyMaster.pluginLogger.LogDebug("Running slot check...");
#endif
Expand All @@ -54,7 +57,7 @@ internal static bool CheckIfSlotDisableApplies(ShapeKeyEntry entry, Maid maid)
ShapeKeyMaster.pluginLogger.LogDebug("WhenAll");
#endif
//When all is equipped disable key
foreach (var slot in Enum.GetValues(typeof(DisableWhenEquipped)).Cast<DisableWhenEquipped>())
foreach (var slot in allSlots)
{
#if (DEBUG)
ShapeKeyMaster.pluginLogger.LogDebug($"Checking {slot}");
Expand Down Expand Up @@ -83,10 +86,17 @@ internal static bool CheckIfSlotDisableApplies(ShapeKeyEntry entry, Maid maid)
#if (DEBUG)
ShapeKeyMaster.pluginLogger.LogDebug($"Checking {menu}");
#endif
// support for * wildcard
string pattern = menu.Contains("*")
? "^" + Regex.Escape(menu).Replace("\\*", ".*") + "$"
: Regex.Escape(menu);

Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);

var bodySkins = maid.body0
.FetchGoSlot()
.Select(tbody => tbody)
.Where(str => str.m_mp != null && str.m_mp.strFileName.Contains(menu, StringComparison.OrdinalIgnoreCase))
.Where(slot => slot?.m_mp?.strFileName != null && regex.IsMatch(slot.m_mp.strFileName))
.ToArray();

if (!bodySkins.Any())
Expand All @@ -107,7 +117,7 @@ internal static bool CheckIfSlotDisableApplies(ShapeKeyEntry entry, Maid maid)
#endif

//When any is equipped disable key
foreach (var slot in Enum.GetValues(typeof(DisableWhenEquipped)).Cast<DisableWhenEquipped>())
foreach (var slot in allSlots)
{
#if (DEBUG)
ShapeKeyMaster.pluginLogger.LogDebug($"Checking {slot}");
Expand All @@ -127,10 +137,19 @@ internal static bool CheckIfSlotDisableApplies(ShapeKeyEntry entry, Maid maid)
#if (DEBUG)
ShapeKeyMaster.pluginLogger.LogDebug($"Checking {menu}");
#endif
// support for * wildcard
string pattern = menu.Contains("*")
? "^" + Regex.Escape(menu).Replace("\\*", ".*") + "$"
: Regex.Escape(menu);

Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);

var bodySkins = maid.body0
.FetchGoSlot()
.Select(tbody => tbody)
.Where(str => str.m_mp != null && str.m_mp.strFileName.Contains(menu, StringComparison.OrdinalIgnoreCase));
.Where(slot => slot?.m_mp?.strFileName != null && regex.IsMatch(slot.m_mp.strFileName))
.ToArray();


if (bodySkins.Any(skin => maid.body0.GetMask(skin.SlotId)))
{
Expand Down
44 changes: 41 additions & 3 deletions ShapekeyMaster/HarmonyPatchers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ internal class HarmonyPatchers

private static float[] _previousBlends;

private static Dictionary<ShapeKeyEntry, bool> _ignoreFlag = new Dictionary<ShapeKeyEntry, bool>();

[HarmonyPatch(typeof(TMorph), MethodType.Constructor, typeof(TBodySkin))]
[HarmonyPostfix]
private static void NotifyOfLoad(ref TMorph __instance)
Expand Down Expand Up @@ -121,14 +123,50 @@ private static void VerifyBlendValuesBeforeSet(ref TMorph __instance)
__instance.BlendValues[index] = 0;
__instance.BlendValuesBackup[index] = 0;
}
else if (shapeKeyEntry.ConditionalsToggle && __instance.bodyskin != null && __instance.bodyskin.body && __instance.bodyskin.body.maid && SlotChecker.CheckIfSlotDisableApplies(shapeKeyEntry, __instance.bodyskin.body.maid))
else if (shapeKeyEntry.ConditionalsToggle && __instance.bodyskin != null && __instance.bodyskin.body && __instance.bodyskin.body.maid)
{
#if (DEBUG)
ShapeKeyMaster.pluginLogger.LogDebug($"Applying Conditional State @ {__instance.bodyskin.body.maid.status.fullNameJpStyle} :: {__instance.Category} ::: {shapeKeyEntry.EntryName} :::: {shapeKeyEntry.ShapeKey}");
#endif

__instance.BlendValues[index] = shapeKeyEntry.DisabledDeform / 100;
__instance.BlendValuesBackup[index] = shapeKeyEntry.DisabledDeform / 100;
// When the condition is not met, skip the processing of shapekey, so other programs can use this shape key
if (SlotChecker.CheckIfSlotDisableApplies(shapeKeyEntry, __instance.bodyskin.body.maid))
{
if (_ignoreFlag.ContainsKey(shapeKeyEntry) && _ignoreFlag[shapeKeyEntry] == true)
{
continue;
}

__instance.BlendValues[index] = shapeKeyEntry.DisabledDeform / 100;
__instance.BlendValuesBackup[index] = shapeKeyEntry.DisabledDeform / 100;


// Check if values are approximately equal, because sometimes there will be problems with values not being applied
bool isBlendValueEqual = Math.Abs(__instance.BlendValues[index] - (shapeKeyEntry.DisabledDeform / 100)) < 0.01;
bool isBlendBackupEqual = Math.Abs(__instance.BlendValuesBackup[index] - (shapeKeyEntry.DisabledDeform / 100)) < 0.01;

if (isBlendValueEqual && isBlendBackupEqual)
{
_ignoreFlag[shapeKeyEntry] = true;
}
}
else
{
_ignoreFlag[shapeKeyEntry] = false;

if (shapeKeyEntry.AnimateWithExcitement &&
YotogiLvls.Contains(SceneManager.GetActiveScene().name))
{
var deform = shapeKeyEntry.CalculateExcitementDeformation();
__instance.BlendValues[index] = deform / 100;
__instance.BlendValuesBackup[index] = deform / 100;
}
else
{
__instance.BlendValues[index] = shapeKeyEntry.Deform / 100;
__instance.BlendValuesBackup[index] = shapeKeyEntry.Deform / 100;
}
}
}
else if (shapeKeyEntry.AnimateWithExcitement && YotogiLvls.Contains(SceneManager.GetActiveScene().name))
{
Expand Down