Smuggling Revamp: The Syndicate Broker #1655

Ed-Head · 2024-07-11T20:26:50Z

About the PR

Adds 2 new jobs: The Syndicate Broker and Syndicate Bodyguard a soft antag group in charge of distributing dead drops from a POI they commandeer.
I wrote a more exhaustive description on the discord ideas section under the same name to prevent cluttering this PR.

Reworked the deaddrop system to allow printing jobs from fax machines that have the component while still allowing dead drop posters to exist.

Also as a note, the broker starting with cash is a band-aid fix until those NFSD ship vouchers get added because then I can just reskin one for the broker. The cheapest ship there costs 50K and sells for far less.

Why / Balance

Smuggling as it is, is an RP wasteland, for both smugglers and NFSD. Not only that, making smuggling have greater ramifications for the sector as well as soft antag syndie jobs have been discussed and wished for ad-nauseam.

How to test

Boot server and join as the Syndicate Broker, observe the new fax machine they start with.

Media

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

Breaking changes

Changelog

add: The Syndicate is now hiring for a new "public relations" position at listening point bravo.

ErhardSteinhauer · 2024-07-12T04:04:04Z

You deffo should link the discort convo before it's lost to ether

Ed-Head · 2024-07-12T04:42:45Z

Good thinking

https://discord.com/channels/1123826877245694004/1261045523931074650

Ed-Head · 2024-07-12T04:48:24Z

As it stands the outcome of the conversation can be summarized as

Add a contraband cargo catalogue to lpb that runs on telecrystals
Add telecrystals to the dead drops
reduce the distance dead drops spawn at
Probably remove the IFF, the broker team probably cant get away with trying to hide a whole POI
Make the NFSD channel tattle message more vague to give the team deniability

Im going to be whittling down these things over time, but of course feel free to let me know if you think up anything relevant to this. Also I guess this should probably be marked WIP or something until its ready at last.

dvir001 · 2024-07-12T10:08:39Z

Resources/Prototypes/_NF/Roles/Jobs/Syndicate/syndicate_broker.yml

+    suitstorage: WeaponSubMachineGunC20r
+    gloves: ClothingHandsGlovesCombat
+  inhand:
+    - BriefcaseSyndicateBrokerBundleFilled


Cannot use suitstorage since fucking vox errors on next update (Even when its not a vox testing might fail)
You have to use loadouts or no bank.

Salvantrix · 2024-07-12T13:33:24Z

Just gonna write this down so I don't forget, a neat take instead of taking over a POI could be the addition of a Syndicate fake mailman that then delivers the notes to the various POIs. Adding just a bit less chance its going to be meta'd by NFSD and adding some more dynamic shenanigans.

github-actions · 2024-07-12T16:03:32Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…station-14 into smuggle-broker

whatston3

Did a code review pass of it, left some thoughts. Haven't yet tested it yet, but it's interesting.

Requesting changes for some cleanup, might have other thoughts later - need to come back to this.

whatston3 · 2024-07-12T19:24:06Z

Content.Server/_NF/Smuggling/DeadDropSystem.cs

        component.NextDrop = _timing.CurTime + TimeSpan.FromSeconds(_random.Next(component.MinimumCoolDown, component.MaximumCoolDown));
+        if (!HasComp<FaxMachineComponent>(uid))
+            component.NextDrop = component.NextDrop * 3;


You aren't multiplying the relative time difference by three, you're multiplying the absolute time by three, I don't think this is what you want. Also, just apply this logic to the fax machine's component

whatston3 · 2024-07-12T19:26:17Z

Content.Server/_NF/Smuggling/DeadDropSystem.cs

+        var usedVerb = "";
+        if (isFax == true)
+            usedVerb = Loc.GetString("deaddrop-print-text");
+        else
+            usedVerb = Loc.GetString("deaddrop-search-text");


Push this into the component.

whatston3 · 2024-07-12T19:29:55Z

Content.Server/_NF/Smuggling/DeadDropSystem.cs

@@ -116,14 +130,24 @@ private void SendDeadDrop(EntityUid uid, DeadDropComponent component, EntityUid
        dropHint.AppendLine(dropLocation.ToString());
        dropHint.AppendLine();
        dropHint.AppendLine(Loc.GetString("deaddrop-hint-posttext"));
+        var printout = new FaxPrintout(dropHint.ToString(),Loc.GetString("deaddrop-hint-name"),null,null);


Push printout into the if block, only used on one branch.

whatston3 · 2024-07-12T19:33:11Z

Resources/Prototypes/_NF/Roles/Jobs/Syndicate/syndicate_broker.yml

+  hideConsoleVisibility: true
+  canBeAntag: true
+  icon: "JobIconMercenary"
+  supervisors: job-supervisors-syndicate-broker


Surely the broker reports to The Spinward Syndicate itself. Could give 'em a syndie red phone for RP reasons (or maybe they just get faxes through the dead drop machine?)

whatston3 · 2024-07-13T16:31:01Z

Content.Server/_NF/Smuggling/Components/DeadDropComponent.cs

+    public int MinimumCoolDown = 900; // 900 / 60 = 10 minutes

    /// <summary>
    ///     Max wait time in seconds to wait for the next dead drop.
    /// </summary>
    [DataField("maximumCoolDown")]
-    public int MaximumCoolDown = 5400; // 5400 / 60 = 90 minutes
+    public int MaximumCoolDown = 1350; // 1350 / 60 = 20 minutes


These are defaults that will change with any value specified in YAML prototypes.
You should change those as well if there's a change needed.
Also, 1350/60 is 22.5, and 900 / 60 is 15.

whatston3 · 2024-07-13T16:35:40Z

Resources/Prototypes/Catalog/uplink_catalog.yml

+#- type: listing
+#  id: UplinkUplinkImplanter # uplink uplink real
+#  name: uplink-uplink-implanter-name
+#  description: uplink-uplink-implanter-desc
+#  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio }
+#  productEntity: UplinkImplanter
+#  cost:
+#    Telecrystal: 2
+#  categories:
+#  - UplinkImplants
+#  conditions:
+#    - !type:StoreWhitelistCondition
+#      blacklist:
+#        tags:
+#          - NukeOpsUplink


You're touching an upstream file here, state that it's a Frontier change to remove this, and ideally give a reason why.

Why was this commented out?

whatston3 · 2024-07-13T16:42:09Z

Resources/Prototypes/_NF/Catalog/Fills/Backpacks/loot_telecrystals.yml

+      - id: Telecrystal5
+      - id: Telecrystal5
+        prob: 0.4
+      - id: Telecrystal5
+        prob: 0.2
+      - id: Telecrystal5
+        prob: 0.01


When doing something like this, it's tricky to figure out the exact distribution you get.
Consider orGroups with different payouts and a set of probabilities that add to 1.

whatston3 · 2024-07-13T16:45:10Z

Resources/Prototypes/_NF/Roles/Jobs/Syndicate/syndicate_broker.yml

+  alwaysUseSpawner: true
+  hideConsoleVisibility: true
+  canBeAntag: true
+  icon: "JobIconMercenary"


This should be a syndicate job icon, no? If they want to fit in, have 'em get an agent ID card. They're a syndie. True for the bodyguard as well.

whatston3 · 2024-07-13T16:59:23Z

Content.Shared/Emag/Components/EmagComponent.cs

+    /// <summary>
+    // Frontier - Print Dead Drops from supported Fax Machines
+    /// </sumary>
+    [DataField("dropprinter")]


Defaults to "dropPrinter", more consistent with others.

Suggested change

[DataField("dropprinter")]

[DataField]

whatston3 · 2024-07-13T17:02:50Z

Content.Server/_NF/Smuggling/DeadDropSystem.cs

+    {   TryComp<HandsComponent>(args.UserUid, out var hands);
+        if (hands == null || HasComp<FaxMachineComponent>(args.TargetUid) == false)
+        {
+            return;
+        }
+        args.Handled = SendDeadDrop(args.TargetUid, comp, uid, hands);


Shouldn't really need a hand component in this case. Maybe either the argument should be nullable and you pass null, or you have a fax-specific version of SendDeadDrop that omits it.

github-actions · 2024-07-13T20:10:59Z

RSI Diff Bot; head commit cd11805 merging into 27890bd
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi

State	Old	New	Status
liquidator			Modified
bazaar			Added

Resources/Textures/_NF/Interface/Misc/job_icons.rsi

State	Old	New	Status
nfsdcadet			Modified
nfsddeputy			Modified
nfsdsergeant			Modified

Resources/Textures/_NF/Objects/Misc/id_cards.rsi

State	Old	New	Status
idnfsdbrigmed			Modified
idnfsdcadet			Modified
idnfsddeputy			Modified
idnfsdsergeant			Modified
nfsdvoucher			Added
vouchernfsdbailiff			Added
vouchernfsdsergeant			Added

github-actions · 2024-07-20T13:11:34Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…-station-14 into smuggle-broker

github-actions · 2024-08-07T10:55:32Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Cheackraze · 2024-11-11T17:23:05Z

this is still a compelling direction to take the smuggling system, as of now we have the notices just being sent to a 'random' fax machine, but with the other smuggling changes that happened we are getting feedback to finalize and this would still make for an interesting gameplay option. My only concern is, how do we ensure that whoever takes the 'broker' role doesnt merely try to turn it into a solo experience and just do the smuggling themselves, and how we can make it so they are more running the poi and handing out the certs and not doing the smuggling themselves etc.

dvir001 · 2024-11-11T17:37:15Z

Been putting work into smaller PR's to make it possible, as I talk to @Ed-Head one of the ideas will be to have a mailman syndicate with a syndicate bank to support more of a random aspect, with the edition of the option to buy specific items for re-selling base on packages delivered for more specific items.

dvir001 · 2025-01-12T13:26:10Z

Im closing this for now but going to rework this PR right after we done with the MOM medical PR.

Ed-Head added 7 commits July 10, 2024 23:48

Smuggling Overhaul

ef3b99c

Remove now unused stuff

ebdc472

Role Requirements

a5cf3ed

Limited starting slots

25d41b5

Give them gloves

1c9ff94

Keep posters with lowered spawn chance

26894cc

Classy Briefcase

3112a8b

github-actions bot added Map-POI Map - POI C# FTL labels Jul 11, 2024

whatston3 self-assigned this Jul 11, 2024

dvir001 reviewed Jul 12, 2024

View reviewed changes

Merge branch 'master' into smuggle-broker

7b80675

github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Jul 12, 2024

Ed-Head added 2 commits July 13, 2024 06:26

Uplink Store and Drop Signaller

34a435d

Merge branch 'smuggle-broker' of https://github.com/Ed-Head/frontier-…

87db140

…station-14 into smuggle-broker

whatston3 requested changes Jul 13, 2024

View reviewed changes

Ed-Head added 2 commits July 13, 2024 13:53

Merge new stuff

1b54ee0

Syndie Ship Voucher

cd11805

github-actions bot added Docs Improvements or additions to documentation S: Merge Conflict This PR has conflicts that prevent merging Map-Shuttle Map - Shuttle Map-Bluespace Map - Bluespace Event Sprites and removed S: Merge Conflict This PR has conflicts that prevent merging labels Jul 13, 2024

github-actions bot added the UI label Jul 13, 2024

github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Jul 13, 2024

Merge branch 'master' into smuggle-broker

a9b70cc

github-actions bot added YML S: Merge Conflict This PR has conflicts that prevent merging and removed Docs Improvements or additions to documentation Map-Shuttle Map - Shuttle Map-POI Map - POI Map-Bluespace Map - Bluespace Event Sprites UI labels Jul 15, 2024

Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

707bc0b

…-station-14 into smuggle-broker

github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Aug 6, 2024

whatston3 added 2 commits August 6, 2024 16:50

Minor YAML fixes

46c3384

fix syndicate computer formatting

1e0706f

github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Aug 7, 2024

dvir001 closed this Jan 12, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Smuggling Revamp: The Syndicate Broker #1655

Smuggling Revamp: The Syndicate Broker #1655

Ed-Head commented Jul 11, 2024

ErhardSteinhauer commented Jul 12, 2024

Ed-Head commented Jul 12, 2024

Ed-Head commented Jul 12, 2024

dvir001 Jul 12, 2024

Salvantrix commented Jul 12, 2024

github-actions bot commented Jul 12, 2024

whatston3 left a comment

whatston3 Jul 12, 2024

whatston3 Jul 12, 2024

whatston3 Jul 12, 2024

whatston3 Jul 12, 2024

whatston3 Jul 13, 2024

whatston3 Jul 13, 2024

whatston3 Jul 13, 2024

whatston3 Jul 13, 2024

whatston3 Jul 13, 2024

whatston3 Jul 13, 2024

github-actions bot commented Jul 13, 2024

github-actions bot commented Jul 20, 2024

github-actions bot commented Aug 7, 2024

Cheackraze commented Nov 11, 2024

dvir001 commented Nov 11, 2024

dvir001 commented Jan 12, 2025

Smuggling Revamp: The Syndicate Broker #1655

Smuggling Revamp: The Syndicate Broker #1655

Conversation

Ed-Head commented Jul 11, 2024

About the PR

Why / Balance

How to test

Media

Breaking changes

ErhardSteinhauer commented Jul 12, 2024

Ed-Head commented Jul 12, 2024

Ed-Head commented Jul 12, 2024

Choose a reason for hiding this comment

Salvantrix commented Jul 12, 2024

github-actions bot commented Jul 12, 2024

whatston3 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jul 13, 2024

github-actions bot commented Jul 20, 2024

github-actions bot commented Aug 7, 2024

Cheackraze commented Nov 11, 2024

dvir001 commented Nov 11, 2024

dvir001 commented Jan 12, 2025