Expose item reference API on runtime instances

This commit is contained in:
Meta Vens 2026-06-14 11:19:27 +01:00
commit 22e7d0a972
5 changed files with 25 additions and 12 deletions

View file

@ -1626,7 +1626,7 @@ public class EquippedCargoBay : EquippedItem
// For simple commodities, search for existing item stacks to add to
foreach (var cargoItem in Cargo.Keys)
{
if (item.Data != cargoItem.Data) continue;
if (item.ItemId != cargoItem.ItemId) continue;
var cargoCommodity = (SimpleCommodity) cargoItem;
if (cargoCommodity.Quantity >= maxStack) continue;
@ -1722,7 +1722,7 @@ public class EquippedCargoBay : EquippedItem
ItemsOfType[item.ItemId] = new List<ItemInstance>();
ItemsOfType[item.ItemId].Add(item);
}
else if (Occupancy[cargoCoord.x, cargoCoord.y] is SimpleCommodity cargoCommodity && cargoCommodity.Data == item.Data)
else if (Occupancy[cargoCoord.x, cargoCoord.y] is SimpleCommodity cargoCommodity && cargoCommodity.ItemId == item.ItemId)
{
if (cargoCommodity.Quantity + item.Quantity <= maxStack)
{
@ -1799,7 +1799,7 @@ public class EquippedCargoBay : EquippedItem
item.Quantity -= quantity;
Mass -= GetUnitMass(item) * quantity;
ThermalMass -= GetUnitThermalMass(item) * quantity;
return new SimpleCommodity{Data = item.Data, Quantity = quantity, Rotation = item.Rotation};
return new SimpleCommodity{Reference = item.Reference, Quantity = quantity, Rotation = item.Rotation};
}
public void Remove(CraftedItemInstance item)

View file

@ -14,6 +14,12 @@ public abstract class ItemInstance
{
public RuntimeItemReference Data;
public ItemRotation Rotation;
public RuntimeItemReference Reference
{
get => Data;
set => Data = value;
}
public Guid ItemId => Data?.ItemId ?? Guid.Empty;
}

View file

@ -398,7 +398,7 @@ public class ItemManager
{
return new SimpleCommodity
{
Data = CreateReference(itemId),
Reference = CreateReference(itemId),
Quantity = count
};
}
@ -444,14 +444,14 @@ public class ItemManager
{
return new ConsumableItem
{
Data = CreateReference(itemId),
Reference = CreateReference(itemId),
Quality = quality
};
}
return new CompoundCommodity
{
Data = CreateReference(itemId),
Reference = CreateReference(itemId),
Quality = quality
};
}
@ -471,7 +471,7 @@ public class ItemManager
return new EquippableItem
{
Data = CreateReference(itemId),
Reference = CreateReference(itemId),
Quality = quality,
Durability = item.Durability > 0 ? (float)item.Durability : 1f
};