Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontier Mail #1652

Merged
merged 41 commits into from Sep 2, 2024
Merged

Frontier Mail #1652

merged 41 commits into from Sep 2, 2024

Conversation

ghost
Copy link

@ghost ghost commented Aug 18, 2024

About the PR

Fixes #1031, sort of.
Ports changes made to mail that have been made by Frontier, that clean up the code of the mail system nicely by tweaking C#. Needs to be tested a bit more, but seems to run smoothly for the most part.
What this PR does:

  • Adds the Mail RPDS, and gives the courierdrobe two of it. Couriers now have access to the mail gun
  • Adds a shit ton of Frontier Mail, overhauls existing Nyano Mail, localizes mail.yml, all of the files for department mail yaml and mailDeliveries.yml to DeltaV folders. Obliterates a bunch of nyano files as a result, and rebalances the mail table.
  • creates frontierMigrations.yml because Velcro mapped a mail prototype (WHY?!)

Some things that need to be done later, out of the scope of this PR maybe:

  • Localization of mail papers
  • Just make more mail tbh. I need people to be sent more fucked up things. If you have any ideas for mail that can provoke RP i'm open

Why / Balance

Mail is old, and Frontier made some nice changes to mail, and I want the courier to be able to shoot people with the mail china lake.
Furthermore, mail can be used to combat people meta-ing certain items like syndie clothes if you put those in the mail.

Technical details

Changes MailSystem C#, creates an entirely new mail table that shares a load of stuff with Frontier, creates frontierMigrations. Mostly C#, YAML, and I guess map changes because frontierMigrations.

Media

mailPR1RPDS
mailpr2smallenvelope
mailPR3largemail
variousmailcontents

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 Whatstone, dvir001, ErhardSteinhauer, Adeinitas

  • tweak: New ads are in the mail and various mail has been expanded upon.
  • add: You may find larger parcels in the mail.
  • add: The mail RPDS is now in the courierdrobe - shoot your friends (and enemies) with the mail gun today!!!

adeinitas and others added 3 commits June 28, 2024 16:39
* Mail RPDS

* removed sizes, more items go in capsules

* fixed error

* capsule resprite, added it to service techfab

* Update after upstream merge

* glass

* Update frontier.yml

* tag fix

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
* MailUp

* Update base_mail.yml

* Update base_mail.yml

* Update MailTeleporterComponent.cs

* Update MailComponent.cs

* Update base_mail.yml

* Update base_mail.yml

* Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml

Sure

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Aug 18, 2024
Copy link
Contributor

github-actions bot commented Aug 18, 2024

RSI Diff Bot; head commit 813e771 merging into 28859af
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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

State Old New Status
icon-cash Added
icon-empty Added
icon-food Added
icon-mail Added
spent Added

Resources/Textures/_NF/Objects/Specific/Mail/mail_large.rsi

State Old New Status
broken Added
fragile Added
icon Added
inhand-left Added
inhand-right Added
locked Added
priority Added
priority_inactive Added
trash Added

Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi

State Old New Status
bolt-open Added
equipped-BACKPACK Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 813e771

@dvir001
Copy link
Contributor

dvir001 commented Aug 18, 2024

You probably missing some of the mail related PR's from our side.
Also we just had another PR to fix some issues with the mail app code and port it.

@ghost
Copy link
Author

ghost commented Aug 18, 2024

You probably missing some of the mail related PR's from our side. Also we just had another PR to fix some issues with the mail app code and port it.

I'm draft PRing this because I intend on working on it again. It's 2 months old. I gave up on it because the frontier mail table PR closed and I was having trouble cherrypicking specific shit from that.
I am missing the one that made a number of fixes to mail because it was part of the mail table ( that's frontier-station-14's #1477 ) and then I need to track down the rest of the mail fixes, nuke the frontier-specific calculations that account for addressing to the multiple ships (since this is only one station, i think), and then create the DV mail table.

whatston3 and others added 10 commits August 19, 2024 05:24
* Mail table, system for smoke prank

* Format mail messages

* DelayedItemSystem cleanup, more mail table entries

* More mail table entries

* Remove hoverbike from mail pool

* Add large mail.

FIXME: mail_large.rsi has no copyright info

* Default mail isLarge to false, comment cleanup

* More mail types

* Add optional large mail flag to admin mailto cmd

* mail_large copyright

* admin cmd fix, new mail types, const cleanup

* Mail: new components, weighting, a few new items

* Fix merge conflict, add placeholder pipebomb mail

* Format mail text, separate sword mail from knives

* Mail: fix exp. welder ID, split up Dan's cigs

* Fourth muffin, decrease captain's sabre chance

* yaml fixes

* Add ShowJobIcons component to mail hud

* Reorganize mail items, add build-a-buddy mail

* Build-a-Buddy fixes, slime & vulp versions, text

* Reptillian->Reptilian

* More signatures, label necrosol bottle, bigger emp

* lowercase i

* extra premium cigars, premium liquors

* Cleanup

* Fixups And Edits

* Remove kendo hakama, jabroni comment, fix cigars

* Platinum cigars, fix sprites

* fix premium absinthe ID

* Remove cyberpen, add BibleUserImplanter, ATV mail

Also adjusts weights for TacticalMaid (missing a zero), Restraints (cut
in half)

* kendo mail order, more mail comments

* Remove Nyano mail lists & parcels, move into _NF/

* True to true, cigars aren't fragile

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Whatstone <whatstone3@gmail.com>
FUCK YOU BUILD ERROR !!! EAT SHIT
Adei versus the one silly
@ghost
Copy link
Author

ghost commented Aug 22, 2024

Okay, I think this is complete enough to be opened and reviewed, but not merged whatsoever. The one thing it seems to be continuing to throw up whenever I open my devenv and test things is the platinum cigar's RSI, even though I exploded the cigar and it's gone. Look in at your own peril - I definitely need more eyes on this because there's just so many mistakes and there may or may not be things I either forgot to add from the frontier mail PR or things that break when opened.

@ghost ghost marked this pull request as ready for review August 22, 2024 07:05
adeinitas added 2 commits August 22, 2024 04:12
Since there's no intent for it to spawn in the mail, might as well.
@ghost
Copy link
Author

ghost commented Aug 22, 2024

Wow, the linter has came for me, and it's throwing fucking hard punches. Jesus christ.

Does some shit to the mail / courierdrobe and gets rid of string keys. Thanks Milon
Copy link
Contributor

@MilonPL MilonPL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't looked at the yaml mail tables but I trust these are fine.

@ghost
Copy link
Author

ghost commented Aug 23, 2024

All checks have passed, and with that, I think I'm finally done. Sorry for the commit spam, now an actual maint can review this and merge.

ANOTHER COMMIT FOR THE PILE.
Copy link
Contributor

@MilonPL MilonPL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nospawn: true is obsolete and will be completely removed soon, should be replaced with categories: [ HideSpawnMenu ], which isn't needed because it's inhereted from BaseMail.

@ghost
Copy link
Author

ghost commented Aug 25, 2024

nospawn: true is obsolete and will be completely removed soon, should be replaced with categories: [ HideSpawnMenu ], which isn't needed because it's inhereted from BaseMail.

FUCK

@ghost
Copy link
Author

ghost commented Aug 26, 2024

Okay, now this is Really Actually the end of me commit spamming this, trust.

@ghost ghost requested review from deltanedas and therealDLondon and removed request for IamVelcroboy August 27, 2024 07:19
@ghost
Copy link
Author

ghost commented Aug 27, 2024

Don't need Velcro's insight because it's not a direct map change, anymore. Velcro, you're still free to look though, but the adding you to the PR was accidental
I'd like insight from the carp man and the other yamltainer to see what they think of this!
I'd also like insight from the Game Directors, once they are able to review.

@ghost ghost removed the Changes: Map label Aug 27, 2024
@ghost ghost requested review from Lyndomen, A-z-z-y, noctyrnal and Colin-Tel August 31, 2024 03:55
Copy link
Member

@therealDLondon therealDLondon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm Fox, and this is my favourite PR on the Repo.

Tests pass, Milon nods, the fish man weeps silently somewhere

@deltanedas deltanedas merged commit 952f368 into DeltaV-Station:master Sep 2, 2024
19 checks passed
VMSolidus pushed a commit to Simple-Station/Einstein-Engines that referenced this pull request Oct 13, 2024
# Description
Showing some love to our hard-working couriers.

This cherry-picks the following PRs from delta-v:
- DeltaV-Station/Delta-v#1472 - Adds a
MailMetrics PDA cartridge for couriers and the LO
- DeltaV-Station/Delta-v#1652 - Ports mail
tweaks from frontier to delta-v, adding large packages, RPDs (mail
cannons), and more mail
- DeltaV-Station/Delta-v#1788 - Adding a couple
more packages
- DeltaV-Station/Delta-v#1925 - Fixing the
non-functional "last known location" part of mail descriptions

Some mail items, such as the opporozidone syringe and rainbow
joints/blunts, had to be disabled because we don't have them (yet?)

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/2299ffc3-17ce-4743-886c-7705e8789e96)


![image](https://github.com/user-attachments/assets/a2ee1a07-d765-41e7-8f70-f94a50412398)


![image](https://github.com/user-attachments/assets/03b16b8e-0eff-4332-99ad-d4a201ee8f2b)


![image](https://github.com/user-attachments/assets/44d2e5c2-db79-4d8d-8877-693648edd35d)


![image](https://github.com/user-attachments/assets/f3d7bdbb-fc14-4f2f-bf30-aa54fdf49099)


![image](https://github.com/user-attachments/assets/b1e4c53f-c9d8-496b-a72e-f4f4b702e368)

</p>
</details>

---

# Changelog
:cl:
- add: The Courier and Logistics Officer now have a new program in their
PDA for tracking mail delivery performance, including earnings and
percent of packages opened, damaged, or expired.
- add: The list of possible mail packages has been greately expanded,
and now includes large parcels.
- add: The CourierDrobe now offers a rapid mail delivery device, along
with capsules for it.

---------

Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com>
Co-authored-by: byte <50130120+huckleton@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Whatstone <whatstone3@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: Milon <plmilonpl@gmail.com>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 26, 2025
more than likely this is just because of invalid loadouts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mail Loot Pool needs to be looked at.
7 participants