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

No more corpse of holding #61575

Merged
merged 10 commits into from
Nov 14, 2022
Merged

Conversation

Fris0uman
Copy link
Contributor

@Fris0uman Fris0uman commented Oct 9, 2022

Summary

Bugfixes "Corpses can't be used as bag of holding anymore"

Purpose of change

  • Let the squirrels rest in peace
  • Corpses can't be used as bag of holding anymore

Describe the solution

  • Monster with no loot to drop did not get their pocket set to disallowed so first fix that
    - [ ] Fix allowed not being saved or loaded(?) properly
  • Move allowed to pocket_data so we don't need to save and load it and rename it forbidden
  • Add more check for is_corpse and is_forbidden to not display pocket info when not necessary
  • Add more check fr is_forbidden to make sure we can't stuff in there when grabbing items of the ground
  • fix AIM max volume displayed
  • Force insert item in corpse at mapgen

Describe alternatives you've considered

Since we're using force_insert_item to put the loot into corpses, we could make that pocket be 0 ml and 0 g and get rid of the rest of the implementation, no need for a allowed variable in that case or for extra checks. But 0 volume and 0 weight pocket do generate a bunch of error on load

Testing

  • Kill zombie > loot is in the zombie and there's no erro
  • let it revive > loot is in the zombie
  • re kill the zombie > no error and loot is in the zombie
  • one more cycle > no issue
  • wield a squirrel corpse > no extra volume/length/weight capacity displayer inth g picksu menu or in AIM menu
  • try to grab a halberd with g > no room to put it
  • tryo to grab it with AIM > no room either
  • save and reload > zombie still has its loot

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Items: Containers Things that hold other things <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 BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Oct 9, 2022
@Fris0uman Fris0uman marked this pull request as ready for review October 10, 2022 19:41
@Fris0uman Fris0uman marked this pull request as draft October 10, 2022 20:30
@Fris0uman Fris0uman marked this pull request as ready for review October 11, 2022 16:24
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod Spawn Creatures, items, vehicles, locations appearing on map BasicBuildPassed This PR builds correctly, label assigned by github actions labels Oct 11, 2022
@Fris0uman Fris0uman removed Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod labels Oct 12, 2022
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Oct 25, 2022
@dseguin dseguin merged commit 2594fd9 into CleverRaven:master Nov 14, 2022
@Fris0uman Fris0uman deleted the squirel_final_rest branch November 14, 2022 16:29
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` <Documentation> Design documents, internal info, guides and help. Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants