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.

Sign up for GitHub

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

Jump to bottom

feat: allow reloading non-watertight containers with solids #4893

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

feat: allow reloading non-watertight containers with solids #4893

wants to merge 4 commits into from
+22 −21

Conversation

chaosvolt
Copy link
Member

Checklist

Required

Purpose of change

This aims to finally allow loading containers at will with any available solid ammo or comestibles. WIP for now as it's turning out to be a fair bit more complicated than last reload-related PR I did, I wanted to be able to set it aside to work with intermittently.

Describe the solution

To be filled out when completed.

Describe alternatives you've considered

Screaming.

Testing

Testing to ensue as implementation does. Right now it compiles but proper interaction of reload command isn't fully functional yet.

Additional context

@github-actions github-actions bot added the src changes related to source code. label Jun 26, 2024
@Relgar
Copy link
Contributor

Relgar commented Jun 27, 2024

Godspeed you mad lad

Ps this is #563

@chaosvolt
Copy link
Member Author

Current issues found so far:

  1. Trying to reload containers with solids currently just fails. In particular, trying to reload non-watertight containers says it refills successfully but doesn't actually do so.
  2. After trying and failing to reload a non-watertight container, examining it in the inventory screen implodes the game with:
    image

@chaosvolt
Copy link
Member Author

Aight, I've fixed it imploding on examining a plastic bag and not being able to fill watertight containers with solid items, but two problems:

  1. It still doesn't actually load non-watertight containers despite the message claiming it works fine.
  2. It also fails to add uncontained solid ammo/comestibles to the reload menu.

@autofix-ci autofix.ci
Copy link
Contributor

autofix-ci bot commented Jun 30, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@RoyalFox2140
Copy link
Collaborator

If we can reload anything it would be nice to have cartons of cigarettes which would just be a pack that holds more. They don't necessarily need to spawn we could just allow them craftable from 10 empty packs, otherwise it would increase the spawns of cigs in the game due to how many cartons hold (the standard carton contains 200 cigs max.) I think most of our other bases are covered because the boxes that flour and salt comes can store a massive amount.

@chaosvolt
Copy link
Member Author

We'll have to see yeah, right now I'm a bit stuck on fixing all the weird lil jank in this so no telling when it'll be ready.

@RoyalFox2140
Copy link
Collaborator

Will fix #563

@chaosvolt
Copy link
Member Author

If I can resume working on it yeah. @.@

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
src changes related to source code.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chaosvolt @Relgar @RoyalFox2140