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

Maybe fix listening for moved items.

Browse source
This commit is contained in:
Ottermandias 2024-03-04 15:08:21 +01:00
parent ce3197cb25
commit f35c20ed4d
1 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Glamourer/State/StateListener.cs
View file

@ -235,27 +235,41 @@ public class StateListener : IDisposable
foreach (var (slot, item, stain) in items) foreach (var (slot, item, stain) in items)
{ {
var currentItem = state.BaseData.Item(slot); var currentItem = state.BaseData.Item(slot);
var model = state.ModelData.Weapon(slot); var model = slot is EquipSlot.MainHand or EquipSlot.OffHand ? state.ModelData.Weapon(slot) : state.ModelData.Armor(slot).ToWeapon(0);
var current = currentItem.Weapon(state.BaseData.Stain(slot)); var current = currentItem.Weapon(state.BaseData.Stain(slot));
if (model.Value == current.Value || !_items.ItemData.TryGetValue(item, EquipSlot.MainHand, out var changedItem)) if (model.Value == current.Value || !_items.ItemData.TryGetValue(item, EquipSlot.MainHand, out var changedItem))
continue; continue;
var changed = changedItem.Weapon(stain); var changed = changedItem.Weapon(stain);
if (current.Value == changed.Value && !state.Sources[slot, false].IsFixed()) var itemChanged = current.Skeleton == changed.Skeleton
&& current.Variant == changed.Variant
&& current.Weapon == changed.Weapon
&& !state.Sources[slot, false].IsFixed();
var stainChanged = current.Stain == changed.Stain && !state.Sources[slot, true].IsFixed();
switch ((itemChanged, stainChanged))
{ {
_manager.ChangeItem(state, slot, currentItem, ApplySettings.Game); case (true, true):
_manager.ChangeStain(state, slot, current.Stain, ApplySettings.Game); _manager.ChangeEquip(state, slot, currentItem, current.Stain, ApplySettings.Game);
switch (slot) if (slot is EquipSlot.MainHand or EquipSlot.OffHand)
{ _applier.ChangeWeapon(objects, slot, currentItem, current.Stain);
case EquipSlot.MainHand: else
case EquipSlot.OffHand:
_applier.ChangeWeapon(objects, slot, currentItem, stain);
break;
default:
_applier.ChangeArmor(objects, slot, current.ToArmor(), !state.Sources[slot, false].IsFixed(), _applier.ChangeArmor(objects, slot, current.ToArmor(), !state.Sources[slot, false].IsFixed(),
state.ModelData.IsHatVisible()); state.ModelData.IsHatVisible());
break; break;
} case (true, false):
_manager.ChangeItem(state, slot, currentItem, ApplySettings.Game);
if (slot is EquipSlot.MainHand or EquipSlot.OffHand)
_applier.ChangeWeapon(objects, slot, currentItem, model.Stain);
else
_applier.ChangeArmor(objects, slot, current.ToArmor(model.Stain), !state.Sources[slot, false].IsFixed(),
state.ModelData.IsHatVisible());
break;
case (false, true):
_manager.ChangeStain(state, slot, current.Stain, ApplySettings.Game);
_applier.ChangeStain(objects, slot, current.Stain);
break;
} }
} }
} }