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

Improve handling of gasses #61839

Merged
merged 7 commits into from
Oct 25, 2022

Conversation

RenechCDDA
Copy link
Member

Summary

Bugfixes "Player cannot handle gasses like solids"

Purpose of change

Closes #61605

Describe the solution

This prevents the player from doing the following with uncontained gasses: Picking up, consuming, wielding, moving with AIM (either individually or with move all), hauling, or loot zone sorting. Ugh

All existing gasses that I found with grep had NO_DROP added, this will cause them to vanish(be destroyed) if they should ever find themselves outside a container. But just in case they don't, or new gasses are added without NO_DROP... the player should not be able to interact with them in any untoward ways.

Describe alternatives you've considered

Making an item with PHASE_ID::GAS instantly be destroyed when uncontained, as if they all had NO_DROP flagged. Decided against it because I already had enough fun looking through functions and testing.

Testing

Compiled locally each step of the way and confirmed the changes function as advertised. Spawned in all the items and made some acetlyene (a NO_DROP item), then further crafted it into oxyacetlyene, confirmed I was able.

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Oct 21, 2022
src/activity_actor.cpp Outdated Show resolved Hide resolved
src/advanced_inv.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 21, 2022
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 22, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 22, 2022
@Rivet-the-Zombie Rivet-the-Zombie merged commit a6edcec into CleverRaven:master Oct 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Loose gaseous items will sit on the ground until you bottle them up with an airtight container
3 participants