tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delivery system now has the possibility of penalisation (#36660)

Browse Source 
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* minor tweaks

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
J
2025-04-24 16:05:32 +00:00
committed by GitHub
parent 5371dbe9a7
commit 1f722bcc44
6 changed files with 127 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Shared/Delivery/DeliveryComponent.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.Cargo.Prototypes;
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
namespace Content.Shared.Delivery;
@@ -23,10 +25,16 @@ public sealed partial class DeliveryComponent : Component
public bool IsLocked = true;
/// <summary>
/// The amount of spesos that gets added to the station bank account on unlock.
/// The base amount of spesos that gets added to the station bank account on unlock.
/// </summary>
[DataField, AutoNetworkedField]
public int SpesoReward = 500;
public int BaseSpesoReward = 500;
/// <summary>
/// The base amount of spesos that will be removed from the station bank account on a penalized delivery
/// </summary>
[DataField, AutoNetworkedField]
public int BaseSpesoPenalty = 250;
/// <summary>
/// The name of the recipient of this delivery.
@@ -48,6 +56,19 @@ public sealed partial class DeliveryComponent : Component
[DataField, AutoNetworkedField]
public EntityUid? RecipientStation;
/// <summary>
/// The bank account ID of the account to subtract funds from in case of penalization
/// </summary>
[DataField, AutoNetworkedField]
public ProtoId<CargoAccountPrototype> PenaltyBankAccount = "Cargo";
/// <summary>
/// Whether this delivery has already received a penalty.
/// Used to avoid getting penalized several times.
/// </summary>
[DataField, AutoNetworkedField]
public bool WasPenalized;
/// <summary>
/// The sound to play when the delivery is unlocked.
/// </summary>