Chill bounties + fixes (#23411)

* Chill bounties + fixes

* localize

* fix arbitage
This commit is contained in:
Nemanja
2024-01-03 19:34:47 -05:00
committed by GitHub
parent 9d8ac7846a
commit 4662d463b8
22 changed files with 284 additions and 182 deletions

View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Cargo.Prototypes;
/// that must be sold together in a labeled container in order
/// to receive a monetary reward.
/// </summary>
[Prototype("cargoBounty"), Serializable, NetSerializable]
[Prototype, Serializable, NetSerializable]
public sealed partial class CargoBountyPrototype : IPrototype
{
/// <inheritdoc/>
@@ -19,20 +19,26 @@ public sealed partial class CargoBountyPrototype : IPrototype
/// <summary>
/// The monetary reward for completing the bounty
/// </summary>
[DataField("reward", required: true)]
[DataField(required: true)]
public int Reward;
/// <summary>
/// A description for flava purposes.
/// </summary>
[DataField("description")]
public string Description = string.Empty;
[DataField]
public LocId Description = string.Empty;
/// <summary>
/// The entries that must be satisfied for the cargo bounty to be complete.
/// </summary>
[DataField("entries", required: true)]
[DataField( required: true)]
public List<CargoBountyItemEntry> Entries = new();
/// <summary>
/// A prefix appended to the beginning of a bounty's ID.
/// </summary>
[DataField]
public string IdPrefix = "NT";
}
[DataDefinition, Serializable, NetSerializable]
@@ -41,7 +47,7 @@ public readonly partial record struct CargoBountyItemEntry()
/// <summary>
/// A whitelist for determining what items satisfy the entry.
/// </summary>
[DataField("whitelist", required: true)]
[DataField(required: true)]
public EntityWhitelist Whitelist { get; init; } = default!;
// todo: implement some kind of simple generic condition system
@@ -49,12 +55,12 @@ public readonly partial record struct CargoBountyItemEntry()
/// <summary>
/// How much of the item must be present to satisfy the entry
/// </summary>
[DataField("amount")]
[DataField]
public int Amount { get; init; } = 1;
/// <summary>
/// A player-facing name for the item.
/// </summary>
[DataField("name")]
public string Name { get; init; } = string.Empty;
[DataField]
public LocId Name { get; init; } = string.Empty;
}