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

Inheritable Vessel and POI Prototypes #2632

Merged
merged 11 commits into from
Dec 28, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Dec 28, 2024

About the PR

Makes VesselPrototype and PointOfInterestPrototype inheritable.

Pushes commonly defined items in Vessel and POI prototypes into base parents.

The NFSD outpost is a slightly lighter brown for map readability, the cook role's been removed from the Empress, and engine info for the Tyne and Paladin were added.

Why / Balance

#2631 wouldn't have been needed with this.

How to test

Check Tinnia's, make sure the bus stops there (grid has StationTransitComponent) and it can't be moved (linear & angular damping in ShuttleComponent set to 999999).

Check LPBravo, make sure it's hidden.

Purchase regular ships, they should have their IFF label on and appear white.

Purchase pirate ships, they should have their IFF label off and still appear white.

Media

N/A

Requirements

Breaking changes

Existing shuttle PRs could use an update.

Changelog
Nothing player facing, no changelog.

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Dec 28, 2024
@dvir001 dvir001 mentioned this pull request Dec 28, 2024
2 tasks
@whatston3
Copy link
Contributor

whatston3 commented Dec 28, 2024

Getting ideas to "paper":
A more holistic approach might be useful here.
If VesselPrototype had inheritance, we could push most of this into parents (assuming ComponentRegistry allows it - lessons to learn from EntityPrototype)
Then Menace and friends can inherit from BasePirateShip and have very few unique components, and ShipyardSystem doesn't need to worry about setting up special IFF flags or colours.

Recommending to put this to draft for now.

@github-actions github-actions bot added the C# label Dec 28, 2024
@whatston3 whatston3 changed the title Fix blackmarket and syndicate shuttle IFF Inheritable Vessel and POI Prototypes Dec 28, 2024
@whatston3
Copy link
Contributor

whatston3 commented Dec 28, 2024

Might've goofed something up, but the scaffolding's there, and it seems to work okay under very minimal tests.

Things that aren't particularly related:

  • NFSD/Courthouse brown is now lighter
  • A few vessels missing engine types now have them listed.

Diff's now closer to not adding extra lines, hooray.

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.

Seems fine under test.

Cleaned out the Menace's IFF in-map changes.

Would like a double check that I haven't missed any ships or POIs, but this seems good.

Cook changes to the Empress' job list makes sense.

@dvir001 dvir001 merged commit 63df41f into new-frontiers-14:master Dec 28, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C# Map-Shuttle Map - Shuttle No C# Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants