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

feat: ACIDBLOOD monsters yield acid when harvesting blood, related fixes #5397

Merged
merged 1 commit into from
Sep 22, 2024

Conversation

chaosvolt
Copy link
Member

Checklist

Required

Optional

Purpose of change

I noted previously that acid causing multi-tile spills when dropped on the ground was the main obstacle to giving acid-blooded monsters concentrated acid as a harvest yield, but I was talked into fixing that. Along the way I fixed another odd problem and some assorted other related things that came up.

Describe the solution

C++ changes:

  1. In activity_handlers.cpp, changed the two calls to liquid_handler::handle_all_liquid in extract_or_wreck_cbms and butchery_drops_harvest to use PICKUP_RANGE as the container radius instead of just 1, same as all other calls to handle_all_liquid in the source files.

JSON changes:
. Defined the following harvest entries: mutant_human_acid, zombie_acid, and zombie_maybe_mil_bionics_acid. Based off related harvest entries but drops acid instead of blood.
. Human snails changed from harvest entry human to mutant_human_acid.
. changed harvest entries of acidic zombies, corrosive zombies, spitter zombies, and wretched pukers from zombie to zombie_acid.
. Changed harvest entries of acid-sniper zombies and from zombie_maybe_mil_bionics to zombie_maybe_mil_bionics_acid.
. Removed scale_qty from the drop_action of concentrated acid, so that if the player is forced into dumping any leftover acid blood from bleeding a corpse, they won't have it spread out across multiple tiles and most likely unavoidably spread acid directly under their feet.
. Updated mods: changed puker necromorph's harvest from zombie to zombie_acid, defined harvest entry zed_dino_feather_acid to spawn acid blood, updated two acidic zinos with it, and also in a misc change belatedly added blood to all existing harvest entries in mods that warrant it.

Describe alternatives you've considered

screm

Testing

  1. Checked affected JSON files for syntax and lint errors.
  2. Compiled and load-tested.
  3. Confirmed that bleeding a corpse now lets me put the blood in containers a few tiles away from me.
  4. Dumped some acid taken from an acidic zombie, no longer spreads beyond the tile I picked to dump it on.
  5. Checked affected C++ file for astyle.

image
image

Additional context

@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. mods PR changes related to mods. labels Sep 21, 2024
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need Lyle to look at the dinomod changes but nothing stands out.

@chaosvolt chaosvolt merged commit 9c03e98 into cataclysmbnteam:main Sep 22, 2024
12 checks passed
@chaosvolt chaosvolt deleted the acid-for-the-acid-god branch September 22, 2024 01:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. mods PR changes related to mods. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants