2da29783fd
Mined Ore now has an ongoing sink: a ledger-fed Fabricator converts Ore->Charge (1 Ore -> 3 Charge / 30t) and turrets spend Charge per shot, soft-failing (no shot, no cooldown burn) when the shared pool runs dry. - ResourceId.Charge=4 rides the existing [GhostField] StorageEntry ledger (no new wire). - TurretFireSystem: single ledger resolve + atomic spend / soft-fail / partial-refund. - Fabricator.InputFromLedger (byte, server-only) feeds input from the shared ledger, read live in-loop so two machines split a finite pool; both modes deposit to ledger. - HudSystem: violet Charge chip + global quiet-turret cue when siege && Charge==0. - StorageMath.TotalOf backs the affordability read; catalog re-enables the Fabricator (4 entries). See DR-033. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
76 lines
2.9 KiB
C#
76 lines
2.9 KiB
C#
using Unity.Entities;
|
|
|
|
namespace ProjectM.Simulation
|
|
{
|
|
/// <summary>
|
|
/// Pure, deterministic merge logic for a shared storage container's <see cref="StorageEntry"/> buffer.
|
|
/// No RNG / wall-clock, so server and (future) prediction agree. Deposit merges into an existing row
|
|
/// for the same item or appends a new row; Withdraw decrements and drops a row that hits zero, clamping
|
|
/// to available. DynamicBuffer is a handle, so mutations apply to the underlying entity buffer.
|
|
/// Unit-tested in EditMode via a plain Entities world.
|
|
/// </summary>
|
|
public static class StorageMath
|
|
{
|
|
/// <summary>Add <paramref name="count"/> of <paramref name="itemId"/>, merging into an existing row if present. No-op for count <= 0 or itemId 0.</summary>
|
|
public static void Deposit(DynamicBuffer<StorageEntry> buffer, ushort itemId, int count)
|
|
{
|
|
if (count <= 0 || itemId == 0)
|
|
return;
|
|
|
|
for (int i = 0; i < buffer.Length; i++)
|
|
{
|
|
if (buffer[i].ItemId == itemId)
|
|
{
|
|
var entry = buffer[i];
|
|
entry.Count += count;
|
|
buffer[i] = entry;
|
|
return;
|
|
}
|
|
}
|
|
|
|
buffer.Add(new StorageEntry { ItemId = itemId, Count = count });
|
|
}
|
|
|
|
/// <summary>
|
|
/// Remove up to <paramref name="count"/> of <paramref name="itemId"/>, clamped to what is available.
|
|
/// Drops the row when it reaches zero. Returns the amount actually withdrawn (0 if none). No-op for
|
|
/// count <= 0 or itemId 0.
|
|
/// </summary>
|
|
public static int Withdraw(DynamicBuffer<StorageEntry> buffer, ushort itemId, int count)
|
|
{
|
|
if (count <= 0 || itemId == 0)
|
|
return 0;
|
|
|
|
for (int i = 0; i < buffer.Length; i++)
|
|
{
|
|
if (buffer[i].ItemId == itemId)
|
|
{
|
|
var entry = buffer[i];
|
|
int taken = entry.Count < count ? entry.Count : count;
|
|
entry.Count -= taken;
|
|
if (entry.Count <= 0)
|
|
buffer.RemoveAt(i);
|
|
else
|
|
buffer[i] = entry;
|
|
return taken;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/// <summary>Total count of <paramref name="itemId"/> across the buffer (0 if absent / itemId 0). EB-2 ledger
|
|
/// affordability read; mirrors MachineSlotMath.TotalOf. Pure, non-generic, Burst-safe.</summary>
|
|
public static int TotalOf(DynamicBuffer<StorageEntry> buffer, ushort itemId)
|
|
{
|
|
if (itemId == 0)
|
|
return 0;
|
|
int total = 0;
|
|
for (int i = 0; i < buffer.Length; i++)
|
|
if (buffer[i].ItemId == itemId)
|
|
total += buffer[i].Count;
|
|
return total;
|
|
}
|
|
}
|
|
}
|