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

Support states better in merged designs.

Browse source
This commit is contained in:
Ottermandias 2024-01-21 00:48:02 +01:00
parent 5ec112d896
commit 2422295e67
2 changed files with 61 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Glamourer/Designs/Links/DesignMerger.cs
View file

@ -3,6 +3,7 @@ using Glamourer.Events;
using Glamourer.GameData; using Glamourer.GameData;
using Glamourer.Services; using Glamourer.Services;
using Glamourer.State; using Glamourer.State;
using Glamourer.Unlocks;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
@ -28,14 +29,38 @@ public sealed class MergedDesign
public readonly DesignBase Design; public readonly DesignBase Design;
public readonly WeaponDict Weapons = new(4); public readonly WeaponDict Weapons = new(4);
public readonly StateSource Source = new(); public readonly StateSource Source = new();
public StateChanged.Source GetSource(EquipSlot slot, bool stain, StateChanged.Source actualSource)
=> GetSource(Source[slot, stain], actualSource);
public StateChanged.Source GetSource(CrestFlag slot, StateChanged.Source actualSource)
=> GetSource(Source[slot], actualSource);
public StateChanged.Source GetSource(CustomizeIndex type, StateChanged.Source actualSource)
=> GetSource(Source[type], actualSource);
public StateChanged.Source GetSource(MetaIndex index, StateChanged.Source actualSource)
=> GetSource(Source[index], actualSource);
public StateChanged.Source GetSource(CustomizeParameterFlag flag, StateChanged.Source actualSource)
=> GetSource(Source[flag], actualSource);
public static StateChanged.Source GetSource(StateChanged.Source given, StateChanged.Source actualSource)
=> given is StateChanged.Source.Game ? StateChanged.Source.Game : actualSource;
} }
public class DesignMerger(DesignManager designManager, CustomizeService _customize) public class DesignMerger(
DesignManager designManager,
CustomizeService _customize,
Configuration _config,
ItemUnlockManager _itemUnlocks,
CustomizeUnlockManager _customizeUnlocks)
{ {
public MergedDesign Merge(IEnumerable<(DesignBase?, ApplicationType)> designs, in DesignData baseRef) public MergedDesign Merge(IEnumerable<(DesignBase?, ApplicationType)> designs, in DesignData baseRef, bool respectOwnership)
{ {
var ret = new MergedDesign(designManager); var ret = new MergedDesign(designManager);
CustomizeFlag fixFlags = 0; CustomizeFlag fixFlags = 0;
respectOwnership &= _config.UnlockedItemMode;
foreach (var (design, type) in designs) foreach (var (design, type) in designs)
{ {
if (type is 0) if (type is 0)
@ -49,10 +74,10 @@ public class DesignMerger(DesignManager designManager, CustomizeService _customi
var (equipFlags, customizeFlags, crestFlags, parameterFlags, applyHat, applyVisor, applyWeapon, applyWet) = type.ApplyWhat(design); var (equipFlags, customizeFlags, crestFlags, parameterFlags, applyHat, applyVisor, applyWeapon, applyWet) = type.ApplyWhat(design);
ReduceMeta(data, applyHat, applyVisor, applyWeapon, applyWet, ret, source); ReduceMeta(data, applyHat, applyVisor, applyWeapon, applyWet, ret, source);
ReduceCustomize(data, customizeFlags, ref fixFlags, ret, source); ReduceCustomize(data, customizeFlags, ref fixFlags, ret, source, respectOwnership);
ReduceEquip(data, equipFlags, ret, source); ReduceEquip(data, equipFlags, ret, source, respectOwnership);
ReduceMainhands(data, equipFlags, ret, source); ReduceMainhands(data, equipFlags, ret, source, respectOwnership);
ReduceOffhands(data, equipFlags, ret, source); ReduceOffhands(data, equipFlags, ret, source, respectOwnership);
ReduceCrests(data, crestFlags, ret, source); ReduceCrests(data, crestFlags, ret, source);
ReduceParameters(data, parameterFlags, ret, source); ReduceParameters(data, parameterFlags, ret, source);
} }
@ -129,7 +154,8 @@ public class DesignMerger(DesignManager designManager, CustomizeService _customi
} }
} }
private static void ReduceEquip(in DesignData design, EquipFlag equipFlags, MergedDesign ret, StateChanged.Source source) private void ReduceEquip(in DesignData design, EquipFlag equipFlags, MergedDesign ret, StateChanged.Source source,
bool respectOwnership)
{ {
equipFlags &= ~ret.Design.ApplyEquip; equipFlags &= ~ret.Design.ApplyEquip;
if (equipFlags == 0) if (equipFlags == 0)
@ -138,9 +164,12 @@ public class DesignMerger(DesignManager designManager, CustomizeService _customi
foreach (var slot in EquipSlotExtensions.EqdpSlots) foreach (var slot in EquipSlotExtensions.EqdpSlots)
{ {
var flag = slot.ToFlag(); var flag = slot.ToFlag();
if (equipFlags.HasFlag(flag)) if (equipFlags.HasFlag(flag))
{ {
ret.Design.GetDesignDataRef().SetItem(slot, design.Item(slot)); var item = design.Item(slot);
if (!respectOwnership || _itemUnlocks.IsUnlocked(item.Id, out _))
ret.Design.GetDesignDataRef().SetItem(slot, item);
ret.Design.SetApplyEquip(slot, true); ret.Design.SetApplyEquip(slot, true);
ret.Source[slot, false] = source; ret.Source[slot, false] = source;
} }
@ -166,29 +195,45 @@ public class DesignMerger(DesignManager designManager, CustomizeService _customi
} }
} }
private static void ReduceMainhands(in DesignData design, EquipFlag equipFlags, MergedDesign ret, StateChanged.Source source) private void ReduceMainhands(in DesignData design, EquipFlag equipFlags, MergedDesign ret, StateChanged.Source source, bool respectOwnership)
{ {
if (!equipFlags.HasFlag(EquipFlag.Mainhand)) if (!equipFlags.HasFlag(EquipFlag.Mainhand))
return; return;
ret.Design.SetApplyEquip(EquipSlot.MainHand, true);
var weapon = design.Item(EquipSlot.MainHand); var weapon = design.Item(EquipSlot.MainHand);
if (respectOwnership && !_itemUnlocks.IsUnlocked(weapon.Id, out _))
return;
if (!ret.Design.DoApplyEquip(EquipSlot.MainHand))
{
ret.Design.SetApplyEquip(EquipSlot.MainHand, true);
ret.Design.GetDesignDataRef().SetItem(EquipSlot.MainHand, weapon);
}
ret.Weapons.TryAdd(weapon.Type, (weapon, source)); ret.Weapons.TryAdd(weapon.Type, (weapon, source));
} }
private static void ReduceOffhands(in DesignData design, EquipFlag equipFlags, MergedDesign ret, StateChanged.Source source) private void ReduceOffhands(in DesignData design, EquipFlag equipFlags, MergedDesign ret, StateChanged.Source source, bool respectOwnership)
{ {
if (!equipFlags.HasFlag(EquipFlag.Offhand)) if (!equipFlags.HasFlag(EquipFlag.Offhand))
return; return;
ret.Design.SetApplyEquip(EquipSlot.OffHand, true);
var weapon = design.Item(EquipSlot.OffHand); var weapon = design.Item(EquipSlot.OffHand);
if (respectOwnership && !_itemUnlocks.IsUnlocked(weapon.Id, out _))
return;
if (!ret.Design.DoApplyEquip(EquipSlot.OffHand))
{
ret.Design.SetApplyEquip(EquipSlot.OffHand, true);
ret.Design.GetDesignDataRef().SetItem(EquipSlot.OffHand, weapon);
}
if (weapon.Valid) if (weapon.Valid)
ret.Weapons.TryAdd(weapon.Type, (weapon, source)); ret.Weapons.TryAdd(weapon.Type, (weapon, source));
} }
private void ReduceCustomize(in DesignData design, CustomizeFlag customizeFlags, ref CustomizeFlag fixFlags, MergedDesign ret, private void ReduceCustomize(in DesignData design, CustomizeFlag customizeFlags, ref CustomizeFlag fixFlags, MergedDesign ret,
StateChanged.Source source) StateChanged.Source source, bool respectOwnership)
{ {
customizeFlags &= ~ret.Design.ApplyCustomizeRaw; customizeFlags &= ~ret.Design.ApplyCustomizeRaw;
if (customizeFlags == 0) if (customizeFlags == 0)
@ -237,6 +282,9 @@ public class DesignMerger(DesignManager designManager, CustomizeService _customi
if (!CustomizeService.IsCustomizationValid(set, face, index, value, out var data)) if (!CustomizeService.IsCustomizationValid(set, face, index, value, out var data))
continue; continue;
if (data.HasValue && respectOwnership && !_customizeUnlocks.IsUnlocked(data.Value, out _))
continue;
customize[index] = data?.Value ?? value; customize[index] = data?.Value ?? value;
ret.Design.SetApplyCustomize(index, true); ret.Design.SetApplyCustomize(index, true);
ret.Source[index] = source; ret.Source[index] = source;

1
Glamourer/State/StateManager.cs
View file

@ -1,5 +1,4 @@
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Shader;
using Glamourer.Designs; using Glamourer.Designs;
using Glamourer.Events; using Glamourer.Events;
using Glamourer.GameData; using Glamourer.GameData;