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

Expedition Early Finish #1380

Merged
merged 37 commits into from
Aug 24, 2024
Merged

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented May 17, 2024

About the PR

Based on code from Frontier Corvax.

Corvax-Frontier@4cf5a6a

Why / Balance

Allow ending expo without having to wait for the timer to end.

How to test

Spawn expo ship, start expo, the computer will now allow you to end expo from it.

Media

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

image

Breaking changes

N/A

Changelog
🆑

  • tweak: Restored the option to end expedition before the timer run out, using the expedition computer itself.

@dvir001 dvir001 marked this pull request as ready for review May 17, 2024 12:50
Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

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

this needs a check to make sure that all the participants are on board so that malicious actors cant perma delete people like that

Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs Outdated Show resolved Hide resolved
@dvir001
Copy link
Contributor Author

dvir001 commented May 18, 2024

this needs a check to make sure that all the participants are on board so that malicious actors cant perma delete people like that

Fair, as a side note it will need Humanoid and also to make sure it has a mind since it used to "bug" from cult and syndicates (A more simple fix will be to ignore them since they have contraband comp)

Will do.

@dvir001 dvir001 added S: Awaiting Changes This PR has changes that need to be made before merging S: DO NOT MERGE labels May 19, 2024
@Vonsant
Copy link
Contributor

Vonsant commented May 27, 2024

Corvax-Frontier#155
@dvir001 look at this. Here was a problem when peoples just vaporized wheh expeditions ended fast. This is fix it.

@ErhardSteinhauer ErhardSteinhauer linked an issue Jul 16, 2024 that may be closed by this pull request
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Aug 23, 2024
@dvir001 dvir001 requested a review from whatston3 August 23, 2024 14:10
@github-actions github-actions bot added S: Needs Review This PR is awaiting reviews and removed S: Awaiting Changes This PR has changes that need to be made before merging labels Aug 23, 2024
@github-actions github-actions bot added the YML label Aug 23, 2024
@whatston3 whatston3 added S: Awaiting Changes This PR has changes that need to be made before merging and removed S: Needs Review This PR is awaiting reviews S: DO NOT MERGE labels Aug 23, 2024
@whatston3
Copy link
Contributor

Still needs a small fix to the expedition console to print out a "not everyone is onboard" message on hitting the finish early button, but apart from that, this should be good to go.

@whatston3 whatston3 added S: Needs Review This PR is awaiting reviews and removed S: Awaiting Changes This PR has changes that need to be made before merging labels Aug 23, 2024
@dvir001 dvir001 requested a review from Cheackraze August 24, 2024 10:37
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Cleaned up the bit I added for the salvage cvar listener and set, the stateless one should be less prone to bugs. Tested on my side, happy with how this works.

@dvir001 dvir001 merged commit 23f283b into new-frontiers-14:master Aug 24, 2024
12 checks passed
FrontierATC added a commit that referenced this pull request Aug 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C# FTL S: Needs Review This PR is awaiting reviews UI YML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to leave expedition manually
4 participants