ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change phyb and sklb resolving for item swap.

Browse source
This commit is contained in:
Ottermandias 2023-03-03 13:43:20 +01:00
parent 1f942491ac
commit cdc4ee6991
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Penumbra/Mods/ItemSwap/EquipmentSwap.cs
View file

@ -64,6 +64,12 @@ public static class EquipmentSwap
var imcFileTo = new ImcFile( imcManip); var imcFileTo = new ImcFile( imcManip);
var isAccessory = slot.IsAccessory(); var isAccessory = slot.IsAccessory();
var estType = slot switch
{
EquipSlot.Head => EstManipulation.EstType.Head,
EquipSlot.Body => EstManipulation.EstType.Body,
_ => ( EstManipulation.EstType )0,
};
var skipFemale = false; var skipFemale = false;
var skipMale = false; var skipMale = false;
@ -83,6 +89,7 @@ public static class EquipmentSwap
continue; continue;
} }
try try
{ {
var eqdp = CreateEqdp( redirections, manips, slot, gr, idFrom, idTo, mtrlVariantTo ); var eqdp = CreateEqdp( redirections, manips, slot, gr, idFrom, idTo, mtrlVariantTo );
@ -90,6 +97,13 @@ public static class EquipmentSwap
{ {
swaps.Add( eqdp ); swaps.Add( eqdp );
} }
var ownMdl = eqdp?.SwapApplied.Eqdp.Entry.ToBits( slot ).Item2 ?? false;
var est = ItemSwap.CreateEst( redirections, manips, estType, gr, idFrom, idTo, ownMdl );
if( est != null )
{
swaps.Add( est );
}
} }
catch( ItemSwap.MissingFileException e ) catch( ItemSwap.MissingFileException e )
{ {
@ -128,19 +142,6 @@ public static class EquipmentSwap
{ {
var mdl = CreateMdl( redirections, slot, gr, idFrom, idTo, mtrlTo ); var mdl = CreateMdl( redirections, slot, gr, idFrom, idTo, mtrlTo );
meta.ChildSwaps.Add( mdl ); meta.ChildSwaps.Add( mdl );
var estType = slot switch
{
EquipSlot.Head => EstManipulation.EstType.Head,
EquipSlot.Body => EstManipulation.EstType.Body,
_ => ( EstManipulation.EstType )0,
};
var est = ItemSwap.CreateEst( redirections, manips, estType, gr, idFrom, idTo );
if( est != null )
{
meta.ChildSwaps.Add( est );
}
} }
else if( !ownMtrl && meta.SwapAppliedIsDefault ) else if( !ownMtrl && meta.SwapAppliedIsDefault )
{ {

4
Penumbra/Mods/ItemSwap/ItemSwap.cs
View file

@ -159,7 +159,7 @@ public static class ItemSwap
/// <remarks> metaChanges is not manipulated, but IReadOnlySet does not support TryGetValue. </remarks> /// <remarks> metaChanges is not manipulated, but IReadOnlySet does not support TryGetValue. </remarks>
public static MetaSwap? CreateEst( Func< Utf8GamePath, FullPath > redirections, Func< MetaManipulation, MetaManipulation > manips, EstManipulation.EstType type, public static MetaSwap? CreateEst( Func< Utf8GamePath, FullPath > redirections, Func< MetaManipulation, MetaManipulation > manips, EstManipulation.EstType type,
GenderRace genderRace, SetId idFrom, SetId idTo ) GenderRace genderRace, SetId idFrom, SetId idTo, bool ownMdl )
{ {
if( type == 0 ) if( type == 0 )
{ {
@ -171,7 +171,7 @@ public static class ItemSwap
var toDefault = new EstManipulation( gender, race, type, idTo.Value, EstFile.GetDefault( type, genderRace, idTo.Value ) ); var toDefault = new EstManipulation( gender, race, type, idTo.Value, EstFile.GetDefault( type, genderRace, idTo.Value ) );
var est = new MetaSwap( manips, fromDefault, toDefault ); var est = new MetaSwap( manips, fromDefault, toDefault );
if( est.SwapApplied.Est.Entry >= 2 ) if( ownMdl && est.SwapApplied.Est.Entry >= 2 )
{ {
var phyb = CreatePhyb( redirections, type, genderRace, est.SwapApplied.Est.Entry ); var phyb = CreatePhyb( redirections, type, genderRace, est.SwapApplied.Est.Entry );
est.ChildSwaps.Add( phyb ); est.ChildSwaps.Add( phyb );

2
Penumbra/Mods/ItemSwap/ItemSwapContainer.cs
View file

@ -145,7 +145,7 @@ public class ItemSwapContainer
}; };
var metaResolver = MetaResolver( collection ); var metaResolver = MetaResolver( collection );
var est = ItemSwap.CreateEst( pathResolver, metaResolver, type, race, from, to ); var est = ItemSwap.CreateEst( pathResolver, metaResolver, type, race, from, to, true );
Swaps.Add( mdl ); Swaps.Add( mdl );
if( est != null ) if( est != null )