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

Connect zombies via copy-from - Part 1 #71170

Merged
merged 22 commits into from
Mar 20, 2024
Merged

Conversation

Karol1223
Copy link
Contributor

@Karol1223 Karol1223 commented Jan 22, 2024

Summary

None

Purpose of change

copy-from for monsters specifically works fairly well, and when recently I considered auditing default human body sizes... I found out our zombies aren't linked, so to audit the sizes for them I'd have to go through all of them manually. I am not aware of any reason for this, so I opted to give them the same treatment I did for ferals by chaining them to a base monster that they'd be able to copy from.

Describe the solution

  • Add a new abstract baseline zombie (identical to the default zombie, but without CLASSIC category, since otherwise I'd have to have most zombies overwrite that field); same for abstract baseline children
  • zed-classic
  • zed-acid
  • zed-burned
  • zed-children
  • zed-command
  • zed-dormant - NOTHING CHANGED - ONE MONSTER AND IT ALREADY COPIES FROM DEFAULT ZOMBIES
  • zed-electric
  • zed-explosive
  • zed-ferrous
  • zed-fusion
  • zed-lab
  • zed-misc
  • zed-radiation
  • zed-skeletal
  • zed-soldiers
  • zed-survivor
  • zed-medical
  • zed-pupating
  • zed-winged

OTHER CHANGES

  • Increased the weight and volume of the fat zombie by 50% via proportional
  • Added RANGED_ATTACKER to the corrosive zombie
  • Took away RANGED_ATTACKER from acidic zombie and the wretched puker because they weren't actually ranged
  • Took away SMELLS from some zombies that didn't make sense to have it, like generic acidics or children (nor did they have scents defined, so it didn't work to my knowledge)
  • Spread bites and scratches around the child arsenal
  • Switched the weight and volume for kids to be 50% lowered by proportional
  • Removed scents defined from monsters that don't smell (and don't have KEENNOSE)

TODO

  • Double check if NO_FUNG_DMG flag negates fungalizes_into field, figure out how to overwrite the field otherwise

Describe alternatives you've considered

Testing

Additional context

  1. I specifically omitted animals, amalgamations, and the shadow, because I believe they're fundamentally different enough not to benefit from this much

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 22, 2024
@Karol1223 Karol1223 force-pushed the zembeh branch 2 times, most recently from cd60e5c to 17b0f58 Compare February 5, 2024 20:58
@Karol1223 Karol1223 force-pushed the zembeh branch 2 times, most recently from e3454e6 to 16eed79 Compare February 13, 2024 08:31
@Karol1223 Karol1223 changed the title [WIP] Connect zombies via copy-from Connect zombies via copy-from - Part 1 Feb 23, 2024
@Karol1223
Copy link
Contributor Author

I would like to have this be merged first before trying to start a part 2. And I think that with all the other PRs setting ground this should be ready save for one thing.

I need to figure out what's causing the tileset regression in resort staff zombies mentioned in #71199...

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 24, 2024
@Karol1223 Karol1223 marked this pull request as ready for review March 20, 2024 15:23
@kevingranade kevingranade merged commit ad3bea0 into CleverRaven:master Mar 20, 2024
26 of 31 checks passed
@GuardianDll GuardianDll deleted the zembeh branch March 20, 2024 16:18
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 [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.

2 participants