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

Combine vehicle + mech + storage air #32082

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

Psychpsyo
Copy link
Contributor

@Psychpsyo Psychpsyo commented Sep 11, 2024

About the PR

This unifies the air previously stored in MechAirComponents, EntityStorageComponents, DisposalUnitComponents, DisposalHolderComponents and CryoPodComponents into a single, new InternalAirComponent.
This fixes #19692 and is part of #28412.

Why / Balance

I would like vehicles to return.

Technical details

Same as above.
The new component is pretty much just a holder for internal air, the other systems still need to do a lot of the specifics manually. (containers need to take in air when opened, for example)

Furthermore, this removes the need for EntityStorageComponents and DisposalUnitComponents to be split between the client and server. They both have been reduced to a single, identical component in Shared. (The only difference before was that the Air was store server-side only, which is now handled by the InternalAirComponent being in Server.)

Media

Nothing visible has changed, really. The game still behaves the same.
Technically, the amount of air in crates and lockers and stuff has gone from 200 down to 100 and the air in mechs has gone up from 70 to 100.
The exact numbers here don't really matter so I didn't write them all out in the yml files.
The numbers for the gas tanks remain identical to what they used to be though.

Requirements

Breaking changes

"many such cases"

What broke?

Most components that used to have an Air property now no longer do.
The Air property has been moved to a new InternalAirComponent.

How to fix it?

Add this new component to any broken entity that needs it and update code to reference it instead of the now non-existent Air property on the other component.

Changelog
I would love to tease the return of vehicles here but, knowing my motivation, that's probably a bad idea.

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted Changes: UI Changes: Might require knowledge of UI design or code. labels Sep 11, 2024
@Kadeo64
Copy link
Contributor

Kadeo64 commented Sep 11, 2024

ripley mk2 real 100% no fake

It does not seem to do anything.
@Golinth
Copy link
Contributor

Golinth commented Sep 11, 2024

ripley mk2 real 100% no fake

H.O.N.K air-tight when?

@Kadeo64
Copy link
Contributor

Kadeo64 commented Sep 11, 2024

H.O.N.K air-tight when?

wyci :trollface:

@Psychpsyo
Copy link
Contributor Author

Honestly quite incredible that there has not been a merge conflict yet.

Copy link
Contributor

github-actions bot commented Nov 2, 2024

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

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Nov 2, 2024
@UbaserB
Copy link
Member

UbaserB commented Nov 12, 2024

you coming back to this?

@Psychpsyo
Copy link
Contributor Author

you coming back to this?

Yes, I want to, just been busy. Will get to this after work today.

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Nov 12, 2024
@Psychpsyo
Copy link
Contributor Author

Actually, I don't have the energy or motivation to look into that failed test right now.
I might get to it someday, but if anyone wants to pick this up before then, feel free.

@SlamBamActionman SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024
@beck-thompson beck-thompson added T: Bugfix Type: Bugs and/or bugfixes S: Help Wanted Status: Requesting additional help for this to be completed. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D1: High Difficulty: Extensive codebase knowledge required. A: Core Tech Area: Underlying core tech for the game and the Github repository. size/L Denotes a PR that changes 1000-4999 lines. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Nov 20, 2024
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Dec 4, 2024
Copy link
Contributor

github-actions bot commented Dec 4, 2024

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

@FlippenPage FlippenPage mentioned this pull request Mar 9, 2025
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Core Tech Area: Underlying core tech for the game and the Github repository. Changes: UI Changes: Might require knowledge of UI design or code. D1: High Difficulty: Extensive codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Help Wanted Status: Requesting additional help for this to be completed. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted S: Needs Review Status: Requires additional reviews before being fully accepted size/L Denotes a PR that changes 1000-4999 lines. T: Bugfix Type: Bugs and/or bugfixes T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vehicle + mech + storage air needs combining
8 participants