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

Dont show liquids from held or worn container in AIM [I]nventory-panel #79560

Merged
merged 3 commits into from
Feb 7, 2025

Conversation

marilynias
Copy link
Contributor

@marilynias marilynias commented Feb 6, 2025

Summary

Interface "Dont show liquids from held or worn container"

Purpose of change

Having liquids show up as any other item in AIM leads to some weird behavior like #79559.
would fix #79559.

Describe the solution

Instead of making a special case for every action, I suggest not showing the content of held or worn containers from [I]nventory pane if it's liquid, since I don't see any use-case for liquids outside of the [c]ontainer pane.

Additionally move the liquid check outside the dpane.get_area() == AIM_INVENTORY check for move_all in case there is another way to have liquids show up in the inventory screen. If you want to move liquids to a container you can still use the (u)nload function in AIM.

Describe alternatives you've considered

Add a query that the liquids will be spilled similar to [d]ropping liquids

Testing

When wielding or wearing a canteen of water you no longer see water in the inventory pane.

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Feb 6, 2025
@marilynias marilynias changed the title Dont show liquids from held container in AIM [I]nventory-panel Dont show liquids from held or worn container in AIM [I]nventory-panel Feb 6, 2025
@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 6, 2025
@Maleclypse Maleclypse merged commit baa0ca2 into CleverRaven:master Feb 7, 2025
29 checks passed
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` Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Liquids get spilled without warning moving all whith AIM while wielding filled tank
2 participants