Add wolf variants to balloon animals

Gamemode4Dev / GM4_Datapacks

Gamemode 4 is a collection of modular Minecraft Datapacks that change or expand on the vanilla experience whilst keeping the vanilla feel. Our modules are developed with a focus on usability and efficiency.

https://gm4.co

GNU General Public License v3.0

115 stars 58 forks source link

Add wolf variants to balloon animals #1040

Closed catter1 closed 1 month ago

catter1 commented 2 months ago

Variants

Wolf variants are now supported. When a wolf is picked, one of the 9 varaints are chosen at random. This is done by creating a custom init_wolf function that is a duplicate of init_animal, but adds the random selection. This could be simplified by using macros, but I felt more comfortable with this implementation for now.

As an extra note: Currently the wolf variants are hardcoded in the generate.py. Can easily be moved to a csv if needed.

Changelog Checklist

[x] ~~Add armadillo to animal pool~~
[x] Create custom wolf init function to support variants

misode commented 2 months ago

Oh rip, Sheepe had also added Armadillos in #1039

catter1 commented 2 months ago

Note: #1039 also adds the Armadillos to the animal pool. This was done after I had done the change myself (but before I made the PR). For merging, feel free to scrap my commit on that specific part, or maybe selectively merge just the names.

misode commented 2 months ago

FYI: in the future you should use a separate branch than master, so you can create multiple PRs without constantly resetting your own master branch

catter1 commented 2 months ago

Yeah, just realized that mistake 😅 Will be doing that for the next PRs

misode commented 2 months ago

I reverted the armadillo addition, hopefully to help deal with the merge conflict, and to give #1039 full control on the names

catter1 commented 2 months ago

Should be fixed now with c59ee31, at least with my own testing