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

Doggo JSON cleanup #74645

Merged
merged 6 commits into from
Jun 21, 2024
Merged

Doggo JSON cleanup #74645

merged 6 commits into from
Jun 21, 2024

Conversation

BarndoBoi
Copy link
Contributor

@BarndoBoi BarndoBoi commented Jun 18, 2024

Summary

None

Purpose of change

Definitions for each breed of dog contained many duplicated entries and none of the puppies were using copy-from despite having lots of overlapping information. This was causing issues with a feature I was toying with as each dog was overwriting their flags instead of using "extend" or "delete".

Describe the solution

Add copy-from fields to each puppy type and removed duplicate entries in each dog breed.

Describe alternatives you've considered

Modifying each dog breed with the desired flags, but no thank you. That sounds like pain.

Testing

Spawned several dogs and tested that they could still be tamed and butchered into the right harvests. I tried it with labrador mutt, german shepard, plus the beagle and everything seemed to work smoothly with no changes.
After the changes to the "zombifies-into" field I tested killing a few of the puppy breeds and confirmed that they do not revive into zombie dogs as was intended. As per Karol's suggestion, this fixes #62019

Additional context

Each breed of dog had their flags duplicated instead of extending or deleting the unused flags from the base monster.
Updated all of the puppies to copy from the base mon_dog_pup so I could rip all the duplicated entries out.
Petfood was defined on every adult dog, oof. Also went through and removed eat_food specials that were duplicated and combed through the chihuahuas. :3
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jun 18, 2024
data/json/monsters/mammal.json Outdated Show resolved Hide resolved
data/json/monsters/mammal.json Show resolved Hide resolved
data/json/monsters/mammal.json Outdated Show resolved Hide resolved
BarndoBoi and others added 3 commits June 18, 2024 15:43
In addition to applying the suggestions Karol sent, I made the executive decision that all dogs are decent in packs and retain the SWARMS and GROUP_MORALE flags.
Dogs almost always spawn in small packs so it makes sense for them to have more pack mentality reflected in their definitions.
In addition to applying the suggestions Karol sent, I made the executive decision that all dogs are decent in packs and retain the SWARMS and GROUP_MORALE flags.
Dogs almost always spawn in small packs so it makes sense for them to have more pack mentality reflected in their definitions.

Co-Authored-By: Karol1223 <[email protected]>
@Karol1223
Copy link
Contributor

Feel free to include 'Fixes #62019' in your PR description for a free serotonin boost

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 19, 2024
@Maleclypse Maleclypse merged commit 8a43e0c into CleverRaven:master Jun 21, 2024
25 checks passed
@BarndoBoi BarndoBoi deleted the doggo-cleanup branch June 21, 2024 23:37
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.

Small dogs still zombify, despite delete field used in their JSON definition
3 participants