Use typed item rows for blueprint pricing

This commit is contained in:
Meta Vens 2026-06-14 05:56:41 +01:00
commit c68dc15c3e
4 changed files with 32 additions and 22 deletions

View file

@ -199,6 +199,22 @@ public class ItemManager
: (int) (GameplaySettings.QualityPriceModifier.Evaluate(item.Quality) * typedItem.Price);
}
public int GetPrice(ItemInstance item)
{
var typedItem = GetRuntimeItem(item);
if (typedItem == null)
{
return 0;
}
return item switch
{
CraftedItemInstance crafted => (int)(GameplaySettings.QualityPriceModifier.Evaluate(crafted.Quality) * typedItem.Price),
SimpleCommodity commodity => typedItem.Price * commodity.Quantity,
_ => typedItem.Price
};
}
public SimpleCommodity CreateInstance(SimpleCommodityData item, int count)
{
if (item != null)

View file

@ -133,9 +133,9 @@ public static class RuntimeEntityBlueprintProjector
if(!instantiate)
entity.Armor = blueprint.Armor;
var hullData = itemManager.GetData(entity.Hull);
foreach(var v in hullData.Shape.Coordinates)
var hullShape = itemManager.GetRuntimeShape(entity.Hull);
foreach(var v in hullShape.Coordinates)
entity.HullConductivity[v.x,v.y] = blueprint.Conductivity[v.x,v.y];
entity.WeaponGroups = blueprint.WeaponGroups.Select(itemIndices =>
@ -186,34 +186,26 @@ public abstract class RuntimeEntityBlueprint
{
if (_price != 0) return _price;
var hullData = itemManager.GetData(Hull);
_price = hullData.Price;
_price = itemManager.GetPrice(Hull);
foreach (var (_, item) in Equipment)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
_price += itemManager.GetPrice(item);
}
foreach (var (_, item) in CargoBays)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
_price += itemManager.GetPrice(item);
}
foreach (var (_, item) in DockingBays)
{
var itemData = itemManager.GetData(item);
_price += itemData.Price;
_price += itemManager.GetPrice(item);
}
foreach (var t in CargoContents)
{
foreach (var (_, item) in t)
{
var itemData = itemManager.GetData(item);
if (item is SimpleCommodity s)
_price += itemData.Price * s.Quantity;
else
_price += itemData.Price;
_price += itemManager.GetPrice(item);
}
}
@ -221,11 +213,7 @@ public abstract class RuntimeEntityBlueprint
{
foreach (var (_, item) in t)
{
var itemData = itemManager.GetData(item);
if (item is SimpleCommodity s)
_price += itemData.Price * s.Quantity;
else
_price += itemData.Price;
_price += itemManager.GetPrice(item);
}
}