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

Appraisal tools check for cargo bounty completion (#23760)

Browse Source 
Co-authored-by: ike709 <ike709@github.com>
This commit is contained in:
ike709
2024-01-08 21:18:50 -07:00
committed by GitHub
parent a34ee7c300
commit b8e8e6141a
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Cargo/Systems/PriceGunSystem.cs
View File

@@ -15,6 +15,7 @@ public sealed class PriceGunSystem : EntitySystem
[Dependency] private readonly UseDelaySystem _useDelay = default!; [Dependency] private readonly UseDelaySystem _useDelay = default!;
[Dependency] private readonly PricingSystem _pricingSystem = default!; [Dependency] private readonly PricingSystem _pricingSystem = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly CargoSystem _bountySystem = default!;
/// <inheritdoc/> /// <inheritdoc/>
public override void Initialize() public override void Initialize()
@@ -55,9 +56,17 @@ public sealed class PriceGunSystem : EntitySystem
if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay))) if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
return; return;
var price = _pricingSystem.GetPrice(args.Target.Value); // Check if we're scanning a bounty crate
if (_bountySystem.IsBountyComplete(args.Target.Value, (EntityUid?) null, out _))
{
_popupSystem.PopupEntity(Loc.GetString("price-gun-bounty-complete"), args.User, args.User);
}
else // Otherwise appraise the price
{
double price = _pricingSystem.GetPrice(args.Target.Value);
_popupSystem.PopupEntity(Loc.GetString("price-gun-pricing-result", ("object", Identity.Entity(args.Target.Value, EntityManager)), ("price", $"{price:F2}")), args.User, args.User);
}
_popupSystem.PopupEntity(Loc.GetString("price-gun-pricing-result", ("object", Identity.Entity(args.Target.Value, EntityManager)), ("price", $"{price:F2}")), args.User, args.User);
_useDelay.TryResetDelay((uid, useDelay)); _useDelay.TryResetDelay((uid, useDelay));
args.Handled = true; args.Handled = true;
} }

1
Resources/Locale/en-US/cargo/price-gun-component.ftl
View File

@@ -1,3 +1,4 @@
price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos. price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos.
price-gun-verb-text = Appraisal price-gun-verb-text = Appraisal
price-gun-verb-message = Appraise {THE($object)}. price-gun-verb-message = Appraise {THE($object)}.
price-gun-bounty-complete = The device confirms that the bounty contained within is completed.

2
Resources/Prototypes/Entities/Objects/Tools/appraisal.yml
View File

@@ -2,7 +2,7 @@
parent: BaseItem parent: BaseItem
id: AppraisalTool id: AppraisalTool
name: appraisal tool name: appraisal tool
description: A beancounter's best friend, with a quantum connection to the galactic market and the ability to appraise even the toughest items. description: A beancounter's best friend, with a quantum connection to the galactic market and the ability to appraise even the toughest items. It will also tell you if a crate contains a completed bounty.
components: components:
- type: Sprite - type: Sprite
sprite: Objects/Tools/appraisal-tool.rsi sprite: Objects/Tools/appraisal-tool.rsi