Skip to content

Commit

Permalink
[CTA] Fix some hooks erronously working on normal accessories
Browse files Browse the repository at this point in the history
  • Loading branch information
@ManlyMarco
ManlyMarco committed Apr 18, 2022
1 parent 186a493 commit d600896
Showing 1 changed file with 23 additions and 8 deletions.
31 changes: 23 additions & 8 deletions src/ClothesToAccessories.Common/ClothesToAccessoriesPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public partial class ClothesToAccessoriesPlugin : BaseUnityPlugin
public const string GUID = "ClothesToAccessories";
public const string PluginName = "Clothes To Accessories";
public const string PluginNameInternal = "KKS_ClothesToAccessories";
public const string Version = "1.0";
public const string Version = "1.0.1";

internal static new ManualLogSource Logger;

Expand Down Expand Up @@ -451,7 +451,7 @@ private static GameObject LoadCharaFbxDataLeech(ChaControl instance, bool _hiPol
string createName, bool copyDynamicBone, byte copyWeights, Transform trfParent, int defaultId, bool worldPositionStays)
{
var spawnedObject = instance.LoadCharaFbxData(_hiPoly, category, id, createName, copyDynamicBone, copyWeights, trfParent, defaultId, worldPositionStays);
CovertToChaAccessoryComponent(spawnedObject, spawnedObject.GetComponent<ListInfoComponent>().data, instance, (ChaListDefine.CategoryNo)category);
ConvertToChaAccessoryComponent(spawnedObject, spawnedObject.GetComponent<ListInfoComponent>().data, instance, (ChaListDefine.CategoryNo)category);
return spawnedObject;
}

Expand All @@ -461,7 +461,7 @@ private static IEnumerator LoadCharaFbxDataAsyncLeech(ChaControl instance, Actio
GameObject spawnedObject = null;
var newActObj = new Action<GameObject>(o => spawnedObject = o);
var result = instance.LoadCharaFbxDataAsync(actObj + newActObj, _hiPoly, category, id, createName, copyDynamicBone, copyWeights, trfParent, defaultId, AsyncFlags, worldPositionStays);
return result.AppendCo(() => CovertToChaAccessoryComponent(spawnedObject, spawnedObject.GetComponent<ListInfoComponent>()?.data, instance, (ChaListDefine.CategoryNo)category));
return result.AppendCo(() => ConvertToChaAccessoryComponent(spawnedObject, spawnedObject.GetComponent<ListInfoComponent>()?.data, instance, (ChaListDefine.CategoryNo)category));
}
#elif KKS
private static GameObject LoadCharaFbxDataLeech(ChaControl instance, Action<ListInfoBase> actListInfo, bool _hiPoly, int category, int id,
Expand All @@ -470,7 +470,7 @@ private static GameObject LoadCharaFbxDataLeech(ChaControl instance, Action<List
ListInfoBase spawnedLib = null;
var newActList = new Action<ListInfoBase>(lib => spawnedLib = lib);
var spawnedObject = instance.LoadCharaFbxData(actListInfo + newActList, _hiPoly, category, id, createName, copyDynamicBone, copyWeights, trfParent, defaultId, worldPositionStays);
CovertToChaAccessoryComponent(spawnedObject, spawnedLib, instance, (ChaListDefine.CategoryNo)category);
ConvertToChaAccessoryComponent(spawnedObject, spawnedLib, instance, (ChaListDefine.CategoryNo)category);
return spawnedObject;
}

Expand All @@ -482,18 +482,24 @@ private static IEnumerator LoadCharaFbxDataAsyncLeech(ChaControl instance, Actio
ListInfoBase spawnedLib = null;
var newActList = new Action<ListInfoBase>(lib => spawnedLib = lib);
var result = instance.LoadCharaFbxDataAsync(actObj + newActObj, actListInfo + newActList, _hiPoly, category, id, createName, copyDynamicBone, copyWeights, trfParent, defaultId, AsyncFlags, worldPositionStays);
return result.AppendCo(() => CovertToChaAccessoryComponent(spawnedObject, spawnedLib, instance, (ChaListDefine.CategoryNo)category));
return result.AppendCo(() => ConvertToChaAccessoryComponent(spawnedObject, spawnedLib, instance, (ChaListDefine.CategoryNo)category));
}
#endif

private static void CovertToChaAccessoryComponent(GameObject instance, ListInfoBase listInfoBase, ChaControl chaControl, ChaListDefine.CategoryNo category)
private static readonly HashSet<GameObject> _ConvertedAccessoryObjects = new HashSet<GameObject>();
private static void ConvertToChaAccessoryComponent(GameObject instance, ListInfoBase listInfoBase, ChaControl chaControl, ChaListDefine.CategoryNo category)
{
if (category >= ChaListDefine.CategoryNo.ao_none && category <= ChaListDefine.CategoryNo.ao_kokan) return;

var cac = instance.GetComponent<ChaAccessoryComponent>();
if (cac != null) return;

var ccc = instance.GetComponent<ChaClothesComponent>();
if (ccc != null)
{
#if DEBUG
Logger.LogInfo($"Converting ChaClothesComponent to acessory id={listInfoBase.Id} kind={listInfoBase.Kind} category={listInfoBase.Category}");
#endif
cac = instance.AddComponent<ChaAccessoryComponent>();
cac.defColor01 = ccc.defMainColor01;
cac.defColor02 = ccc.defMainColor02;
Expand Down Expand Up @@ -523,12 +529,18 @@ private static void CovertToChaAccessoryComponent(GameObject instance, ListInfoB
var adapter = instance.AddComponent<ClothesToAccessoriesAdapter>();
adapter.Initialize(chaControl, ccc, cac, listInfoBase, category);
}

_ConvertedAccessoryObjects.RemoveWhere(o => o == null);
_ConvertedAccessoryObjects.Add(instance);
return;
}

var chc = instance.GetComponent<ChaCustomHairComponent>();
if (chc != null)
{
#if DEBUG
Logger.LogInfo($"Converting ChaCustomHairComponent to acessory id={listInfoBase.Id} kind={listInfoBase.Kind} category={listInfoBase.Category}");
#endif
cac = instance.AddComponent<ChaAccessoryComponent>();

cac.initialize = chc.initialize;
Expand Down Expand Up @@ -568,13 +580,15 @@ private static void CovertToChaAccessoryComponent(GameObject instance, ListInfoB
if (positions.Length >= 2) positions[1].name = "N_move2";
if (positions.Length >= 3) Logger.LogWarning($"More than 2 move transforms found! id={listInfoBase.Id} kind={listInfoBase.Kind} category={listInfoBase.Category} transforms={string.Join(", ", positions.Select(x => x.name).ToArray())}");

_ConvertedAccessoryObjects.RemoveWhere(o => o == null);
_ConvertedAccessoryObjects.Add(instance);
return;
}

if (listInfoBase != null)
Logger.LogWarning($"CovertToChaAccessoryComponent failed for id={listInfoBase.Id} kind={listInfoBase.Kind} category={listInfoBase.Category}");
Logger.LogWarning($"ConvertToChaAccessoryComponent failed for id={listInfoBase.Id} kind={listInfoBase.Kind} category={listInfoBase.Category}");
else
Logger.LogWarning("CovertToChaAccessoryComponent failed, unknown item kind and its ListInfoComponent is missing");
Logger.LogWarning("ConvertToChaAccessoryComponent failed, unknown item kind and its ListInfoComponent is missing");
}

private static bool UpdateAccessoryMoveFromInfoAndReassignBones(ChaControl instance, int slotNo)
Expand All @@ -584,6 +598,7 @@ private static bool UpdateAccessoryMoveFromInfoAndReassignBones(ChaControl insta
try
{
var accObj = instance.objAccessory[slotNo];
if (!_ConvertedAccessoryObjects.Contains(accObj)) return result;

if (accObj.GetComponent<ChaClothesComponent>())
{
Expand Down

0 comments on commit d600896

Please sign in to comment.