Fixed Cargo Bounties #1010

blueDev2 · 2024-03-26T17:51:59Z

About the PR

Fixed Cargo Bounties

Why / Balance

Players tend to want the bounties to work so that they don't have to depend on mail for funds.

Technical details

Made bounty label components also hold the station where it was printed, so that the main station's bounty DB is used instead of the automated trade station's bounty DB

Media

TODO

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

Fixes #955

🆑 blueDev2

fix: Cargo Bounties actually work. Cargo Rejoice!

Content.Server/Cargo/Systems/CargoSystem.Bounty.cs

FluffiestFloof · 2024-03-26T18:48:52Z

Should probably add markers to note what is being changed, and that those are deltav changes.
Also shouldn't this be directly fixed upstream if it's an overall issue?

Adrian16199 · 2024-03-26T19:17:14Z

Should probably add markers to note what is being changed, and that those are deltav changes. Also shouldn't this be directly fixed upstream if it's an overall issue?

To the first thing, yeah, I didnt said much as this is a draft and alot can change so I would wait till its functional.
Regarding the second thing, this is not an upstream issue as debug made automated trading station be different aka it spawning on a different universe compared to the station that you work on in here.

deltanedas · 2024-03-26T19:33:12Z

this still would be nice for upstream so it would support multi station sharing a trade station but using each stations bounties

Adrian16199 · 2024-03-26T19:37:55Z

this still would be nice for upstream so it would support multi station sharing a trade station but using each stations bounties

You are not wrong.

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Signed-off-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>

… Bounty-Fix

blueDev2 · 2024-03-26T21:23:08Z

Should probably add markers to note what is being changed, and that those are deltav changes. Also shouldn't this be directly fixed upstream if it's an overall issue?

I'm not sure what markers you are talking about.

blueDev2 · 2024-03-26T21:25:45Z

Do you think I really should make this an upstream PR?

Adrian16199 · 2024-03-26T21:29:28Z

Should probably add markers to note what is being changed, and that those are deltav changes. Also shouldn't this be directly fixed upstream if it's an overall issue?

I'm not sure what markers you are talking about.

The markers are pretty much just notes that indicate that an upstream file was touched that usually goes like: # DELTA V-Fixes Cargo Bountys

Adrian16199 · 2024-03-26T21:31:56Z

Do you think I really should make this an upstream PR?

It would be a good attempt as deltanedas suggested, it would fix it and less upstream file touched that are different from wizden.
I would keep this in draft and just open it if they wont accept it upstream.
I dont think they would deny it as it basicly makes bountys not just go kapoot just because its not on the same galaxy and the code could be used aswell on any other thing for any future ideas.

blueDev2 · 2024-03-27T03:54:01Z

Should probably add markers to note what is being changed, and that those are deltav changes. Also shouldn't this be directly fixed upstream if it's an overall issue?

I'm not sure what markers you are talking about.

The markers are pretty much just notes that indicate that an upstream file was touched that usually goes like: # DELTA V-Fixes Cargo Bountys

Where am I supposed to mark that down?

Adrian16199 · 2024-03-27T08:23:12Z

Where am I supposed to mark that down?

So basicly

{
(Wizden code but changed on delta V) # Delta V- Fixes cargo bountys [aka the point of PR, helps with github blame]
(Wizden code)
(Wizden code but changed on delta V) # Delta V- Fixes cargo bountys
}
Second example
{
(Wizden code but changed on delta V) # Delta V- Start of Fixes cargo bountys
(Wizden code but changed on delta V)
(Wizden code but changed on delta V) # Delta V- End of Fixes cargo bountys
}

NullWanderer

Here's just a few I had time for right now

Content.Server/Cargo/Components/CargoBountyLabelComponent.cs

NullWanderer · 2024-03-27T08:52:53Z

Content.Server/Cargo/Components/CargoBountyLabelComponent.cs

@@ -17,4 +19,10 @@ public sealed partial class CargoBountyLabelComponent : Component
    /// Used to prevent recursion in calculating the price.
    /// </summary>
    public bool Calculating;
+
+    /// <summary>
+    /// The Station System to check and remove bounties from


Suggested change

/// The Station System to check and remove bounties from

/// DeltaV - The Station System to check and remove bounties from

Content.Server/Cargo/Systems/CargoSystem.Bounty.cs

NullWanderer · 2024-03-27T08:53:26Z

Content.Server/Cargo/Systems/CargoSystem.Bounty.cs

@@ -65,16 +67,17 @@ private void OnPrintLabelMessage(EntityUid uid, CargoBountyConsoleComponent comp

        var label = Spawn(component.BountyLabelId, Transform(uid).Coordinates);
        component.NextPrintTime = _timing.CurTime + component.PrintDelay;
-        SetupBountyLabel(label, bounty.Value);
+        SetupBountyLabel(label, station, bounty.Value);


Suggested change

SetupBountyLabel(label, station, bounty.Value);

SetupBountyLabel(label, station, bounty.Value); // DeltaV - Track owning station

Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

blueDev2 · 2024-03-27T15:49:44Z

I'm gonna wait until a final decision is made on the upstream PR before adding code markers.
I do appreciate you giving me some examples though.

stellar-novas · 2024-03-27T15:53:47Z

Do you think I really should make this an upstream PR?

Yes, this is a flaw with the bounty system that would also affect wizden, and their downstreams, if they put the station on a different map.

If they don't accept it for whatever reason, which I doubt, can just reopen this pr.

blueDev2 · 2024-03-28T14:45:40Z

Upstream PR merged: space-wizards/space-station-14#26469
I will close this PR and make a new PR by pulling the 3 applicable upstream files.

Bounties work, but aren't removed and replaced

54e3f4e

github-actions bot added the Changes: C# Changes any cs files label Mar 26, 2024

Adrian16199 reviewed Mar 26, 2024

View reviewed changes

Content.Server/Cargo/Systems/CargoSystem.Bounty.cs Outdated Show resolved Hide resolved

blueDev2 and others added 4 commits March 26, 2024 17:17

Slight format fix

6e8ff2c

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Signed-off-by: blueDev2 <89804215+blueDev2@users.noreply.github.com>

Removed debug logging

a849177

Merge branch 'Bounty-Fix' of https://github.com/blueDev2/Delta-v into…

7b31de4

… Bounty-Fix

Removed "station" check for emiting a EntitySoldEvent

af832ca

Merge branch 'master' into Bounty-Fix

03fa9d9

Mirroring PR changes

079c289

NullWanderer requested changes Mar 27, 2024

View reviewed changes

blueDev2 added 2 commits March 27, 2024 11:46

Removal of unneeded imports

0df52ab

Missed one

00fef72

blueDev2 closed this Mar 28, 2024

blueDev2 deleted the Bounty-Fix branch March 28, 2024 14:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed Cargo Bounties #1010

Fixed Cargo Bounties #1010

blueDev2 commented Mar 26, 2024 •

edited

Loading

FluffiestFloof commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

deltanedas commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

blueDev2 commented Mar 26, 2024 •

edited

Loading

blueDev2 commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

blueDev2 commented Mar 27, 2024

Adrian16199 commented Mar 27, 2024

NullWanderer left a comment

NullWanderer Mar 27, 2024

NullWanderer Mar 27, 2024

blueDev2 commented Mar 27, 2024

stellar-novas commented Mar 27, 2024

blueDev2 commented Mar 28, 2024

	/// The Station System to check and remove bounties from
	/// DeltaV - The Station System to check and remove bounties from

	SetupBountyLabel(label, station, bounty.Value);
	SetupBountyLabel(label, station, bounty.Value); // DeltaV - Track owning station

Fixed Cargo Bounties #1010

Fixed Cargo Bounties #1010

Conversation

blueDev2 commented Mar 26, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Breaking changes

FluffiestFloof commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

deltanedas commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

blueDev2 commented Mar 26, 2024 • edited Loading

blueDev2 commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

Adrian16199 commented Mar 26, 2024

blueDev2 commented Mar 27, 2024

Adrian16199 commented Mar 27, 2024

NullWanderer left a comment

Choose a reason for hiding this comment

NullWanderer Mar 27, 2024

Choose a reason for hiding this comment

NullWanderer Mar 27, 2024

Choose a reason for hiding this comment

blueDev2 commented Mar 27, 2024

stellar-novas commented Mar 27, 2024

blueDev2 commented Mar 28, 2024

blueDev2 commented Mar 26, 2024 •

edited

Loading

blueDev2 commented Mar 26, 2024 •

edited

Loading