Fix moving retainers, add InventoryNotificationNode
This commit is contained in:
Zeffuro
@@ -243,65 +243,24 @@ public class InventoryCategoryNode : SimpleComponentNode
|
||||
};
|
||||
}
|
||||
|
||||
private void OnPayloadAccepted(DragDropNode node, DragDropPayload payload, ItemInfo targetItemInfo)
|
||||
private void OnPayloadAccepted(DragDropNode _, DragDropPayload payload, ItemInfo targetItemInfo)
|
||||
{
|
||||
if (payload.Type != DragDropType.Item && payload.Type != DragDropType.Inventory_Item)
|
||||
Services.Logger.Debug($"[OnPayload] Received payload of type {payload.Type}, Int1={payload.Int1}, Int2={payload.Int2}, RefIndex={payload.ReferenceIndex}, Text={payload.Text}");
|
||||
if (!payload.IsValidInventoryPayload)
|
||||
return;
|
||||
|
||||
Services.Logger.Debug($"[OnPayload] Received payload of type {payload.Type}, Int1={payload.Int1}, Int2={payload.Int2}, RefIndex={payload.ReferenceIndex}, Text={payload.Text}");
|
||||
var (sourceContainer, sourceSlot) = ResolveSourceFromPayload(payload);
|
||||
InventoryLocation sourceLocation = payload.InventoryLocation;
|
||||
|
||||
if (sourceContainer == 0)
|
||||
if (!sourceLocation.IsValid)
|
||||
{
|
||||
Services.Logger.Warning($"[OnPayload] Could not resolve source from payload");
|
||||
return;
|
||||
}
|
||||
|
||||
InventoryType targetContainer = targetItemInfo.Item.Container;
|
||||
ushort targetSlot = (ushort)targetItemInfo.Item.Slot;
|
||||
InventoryLocation targetLocation = new InventoryLocation(targetItemInfo.Item.Container, (ushort)targetItemInfo.Item.Slot);
|
||||
|
||||
Services.Logger.Debug($"[OnPayload] Moving {sourceContainer}@{sourceSlot} -> {targetContainer}@{targetSlot}");
|
||||
Services.Logger.Debug($"[OnPayload] Moving {sourceLocation.ToString()} -> {targetLocation.ToString()}");
|
||||
|
||||
InventoryMoveHelper.MoveItem(sourceContainer, sourceSlot, targetContainer, targetSlot);
|
||||
}
|
||||
|
||||
private static (InventoryType Container, ushort Slot) ResolveSourceFromPayload(DragDropPayload payload)
|
||||
{
|
||||
if (payload.Type == DragDropType.Inventory_Item)
|
||||
{
|
||||
return ((InventoryType)payload.Int1, (ushort)payload.Int2);
|
||||
}
|
||||
|
||||
int containerId = payload.Int1;
|
||||
int uiSlot = payload.Int2;
|
||||
|
||||
InventoryType sourceContainer = InventoryType.GetInventoryTypeFromContainerId(containerId);
|
||||
|
||||
if (sourceContainer == 0)
|
||||
return (0, 0);
|
||||
|
||||
// Retainers have special handling: UI has 5 tabs × 35 slots, data has 7 pages × 25 slots
|
||||
if (sourceContainer. IsRetainer)
|
||||
{
|
||||
// Container IDs 52-56 = UI tabs 0-4
|
||||
int uiTabIndex = containerId - 52;
|
||||
|
||||
// Convert to global data index
|
||||
int globalDataIndex = (uiTabIndex * 35) + uiSlot;
|
||||
|
||||
// Calculate data page and slot
|
||||
int dataPage = globalDataIndex / 25;
|
||||
int dataSlot = globalDataIndex % 25;
|
||||
|
||||
InventoryType dataContainer = InventoryType.RetainerPage1 + (uint)dataPage;
|
||||
|
||||
// Now resolve through sorter for the actual storage location
|
||||
var (realContainer, realSlot) = dataContainer.GetRealItemLocation(dataSlot);
|
||||
return (realContainer, realSlot);
|
||||
}
|
||||
|
||||
// For non-retainers, use the standard resolution
|
||||
var (realContainerOther, realSlotOther) = sourceContainer.GetRealItemLocation(uiSlot);
|
||||
return (realContainerOther, realSlotOther);
|
||||
InventoryMoveHelper.MoveItem(sourceLocation.Container, sourceLocation.Slot, targetLocation.Container, targetLocation.Slot);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Numerics;
|
||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||
using KamiToolKit;
|
||||
using KamiToolKit.Classes;
|
||||
using KamiToolKit.Classes.Timelines;
|
||||
using KamiToolKit.Nodes;
|
||||
using Lumina.Excel;
|
||||
using Lumina.Excel.Sheets;
|
||||
using Lumina.Text;
|
||||
using Lumina.Text.ReadOnly;
|
||||
|
||||
namespace AetherBags.Nodes.Inventory;
|
||||
|
||||
public sealed class InventoryNotificationNode : SimpleComponentNode
|
||||
{
|
||||
private readonly SimpleNineGridNode glowNode;
|
||||
private readonly TextNode titleTextNode;
|
||||
private readonly TextNode messageTextNode;
|
||||
|
||||
private Dictionary<InventoryNotificationType, InventoryNotificationInfo> notificationCache = null!;
|
||||
|
||||
public InventoryNotificationNode()
|
||||
{
|
||||
PopulateNotificationCache();
|
||||
|
||||
AddTimeline(ParentLabels);
|
||||
|
||||
glowNode = new SimpleNineGridNode {
|
||||
TexturePath = "ui/uld/Inventory.tex",
|
||||
TextureSize = new Vector2(56.0f, 56.0f),
|
||||
TextureCoordinates = new Vector2(88.0f, 0.0f),
|
||||
TopOffset = 10,
|
||||
BottomOffset = 10,
|
||||
LeftOffset = 26,
|
||||
RightOffset = 26,
|
||||
};
|
||||
glowNode.AttachNode(this);
|
||||
glowNode.AddTimeline(GlowKeyFrames);
|
||||
|
||||
titleTextNode = new TextNode
|
||||
{
|
||||
Position = new Vector2(0, 10f),
|
||||
FontType = FontType.MiedingerMed,
|
||||
FontSize = 18,
|
||||
TextColor = ColorHelper.GetColor(50),
|
||||
TextOutlineColor = ColorHelper.GetColor(37),
|
||||
TextFlags = TextFlags.Edge,
|
||||
AlignmentType = AlignmentType.Center,
|
||||
};
|
||||
titleTextNode.AttachNode(this);
|
||||
titleTextNode.AddTimeline(TextKeyFrames);
|
||||
|
||||
messageTextNode = new TextNode
|
||||
{
|
||||
Position = new Vector2(0, -10f),
|
||||
FontType = FontType.Axis,
|
||||
FontSize = 14,
|
||||
TextColor = ColorHelper.GetColor(50),
|
||||
TextOutlineColor = ColorHelper.GetColor(37),
|
||||
TextFlags = TextFlags.Edge,
|
||||
AlignmentType = AlignmentType.Center,
|
||||
};
|
||||
messageTextNode.AttachNode(this);
|
||||
messageTextNode.AddTimeline(TextKeyFrames);
|
||||
|
||||
Timeline?.PlayAnimation(17);
|
||||
}
|
||||
|
||||
protected override void OnSizeChanged()
|
||||
{
|
||||
base.OnSizeChanged();
|
||||
|
||||
glowNode.Size = Size with { Y = 40 };
|
||||
titleTextNode.Size = Size with { Y = 20 };
|
||||
messageTextNode.Size = Size with { Y = 16 };
|
||||
}
|
||||
|
||||
private void PopulateNotificationCache()
|
||||
{
|
||||
ExcelSheet<Addon> addonSheet = Services.DataManager.GetExcelSheet<Addon>();
|
||||
notificationCache = new Dictionary<InventoryNotificationType, InventoryNotificationInfo>
|
||||
{
|
||||
{
|
||||
InventoryNotificationType.SaddleBag,
|
||||
new InventoryNotificationInfo(addonSheet.GetRow(891).Text, addonSheet.GetRow(892).Text)
|
||||
},
|
||||
{
|
||||
InventoryNotificationType.RetainerEntrust,
|
||||
new InventoryNotificationInfo(addonSheet.GetRow(910).Text, addonSheet.GetRow(3573).Text)
|
||||
},
|
||||
{
|
||||
InventoryNotificationType.RetainerEquip,
|
||||
new InventoryNotificationInfo(addonSheet.GetRow(910).Text, addonSheet.GetRow(3585).Text)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public InventoryNotificationType NotificationType
|
||||
{
|
||||
get;
|
||||
set
|
||||
{
|
||||
field = value;
|
||||
if (value == InventoryNotificationType.None)
|
||||
{
|
||||
titleTextNode.String = string.Empty;
|
||||
messageTextNode.String = string.Empty;
|
||||
Timeline?.PlayAnimation(17); // Hide
|
||||
}
|
||||
else if (notificationCache.TryGetValue(value, out var texts))
|
||||
{
|
||||
titleTextNode.SeString = texts.Title;
|
||||
messageTextNode.SeString = texts.Message;
|
||||
Timeline?.PlayAnimation(101); // Show
|
||||
}
|
||||
}
|
||||
} = InventoryNotificationType.None;
|
||||
|
||||
// Future Zeff, this always goes on a parent
|
||||
private Timeline ParentLabels => new TimelineBuilder()
|
||||
.BeginFrameSet(1, 59)
|
||||
.AddLabel(1, 17, AtkTimelineJumpBehavior.PlayOnce, 0)
|
||||
.AddLabel(10, 101, AtkTimelineJumpBehavior.Start, 0)
|
||||
.AddLabel(25, 102, AtkTimelineJumpBehavior.Start, 0)
|
||||
.AddLabel(59, 0, AtkTimelineJumpBehavior.LoopForever, 102)
|
||||
.EndFrameSet()
|
||||
.Build();
|
||||
|
||||
// Future Zeff, this always goes on a child
|
||||
private Timeline GlowKeyFrames => new TimelineBuilder().BeginFrameSet(15, 59)
|
||||
.AddFrame(10, scale: new Vector2(1.4f, 1.0f), alpha: 0, addColor: new Vector3(128, 128, 128))
|
||||
.AddFrame(15, scale: new Vector2(1.0f, 1.0f), alpha: 255, addColor: new Vector3(128, 128, 128))
|
||||
.AddFrame(21, scale: new Vector2(1.0f, 1.0f), alpha: 255, addColor: new Vector3(0, 0, 0))
|
||||
.AddFrame(40, scale: new Vector2(1.0f, 1.0f), alpha: 255, addColor: new Vector3(0, 0, 0))
|
||||
.AddFrame(46, scale: new Vector2(1.0f, 1.0f), alpha: 255, addColor: new Vector3(10, 10, 10))
|
||||
.AddFrame(59, scale: new Vector2(1.0f, 1.0f), alpha: 255, addColor: new Vector3(0, 0, 0))
|
||||
.EndFrameSet()
|
||||
.Build();
|
||||
|
||||
// Future Zeff, this always goes on a child
|
||||
private Timeline TextKeyFrames => new TimelineBuilder().BeginFrameSet(15, 59)
|
||||
.AddFrame(15, alpha: 0, addColor: new Vector3(128, 128, 128))
|
||||
.AddFrame(18, alpha: 255, addColor: new Vector3(64, 64, 64))
|
||||
.AddFrame(25, alpha: 255, addColor: new Vector3(0, 0, 0))
|
||||
.AddFrame(40, alpha: 255, addColor: new Vector3(0, 0, 0))
|
||||
.AddFrame(46, alpha: 255, addColor: new Vector3(64, 64, 64))
|
||||
.AddFrame(59, alpha: 255, addColor: new Vector3(0, 0, 0))
|
||||
.EndFrameSet()
|
||||
.Build();
|
||||
|
||||
|
||||
private record InventoryNotificationInfo(ReadOnlySeString Title, ReadOnlySeString Message);
|
||||
}
|
||||
|
||||
public enum InventoryNotificationType
|
||||
{
|
||||
None,
|
||||
SaddleBag,
|
||||
RetainerEntrust,
|
||||
RetainerEquip
|
||||
}
|
||||
Reference in New Issue
Block a user