-
Notifications
You must be signed in to change notification settings - Fork 172
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
Add Mawranth's Hair stuff #2360
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So those hairstyle are not in the game, is there a correspongding PR to the game repo to add them?
...ckXotto+/pngs_tiles_32x32/character/overlay/mutations/hair/overlay_female_mutation_hair.json
Outdated
Show resolved
Hide resolved
...hockXotto+/pngs_tiles_32x32/character/overlay/mutations/hair/overlay_male_mutation_hair.json
Outdated
Show resolved
Hide resolved
"id": "overlay_female_mutation_hair_crewcut_var_black", | ||
"fg": [ "overlay_female_mutation_hair_black_crewcut" ], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this part should not have been removed, as you can see the id and fg field there are not the same.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those aren't mine. I was under the impression that you only wanted the PNGs. Thus, I removed the files themselves. Since they aren't mine, they should already be in the repo (otherwise, this would raise some very interesting questions). Unless this commit of mine would remove them entirely. In which case, I could add them back without the IDs that I added.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing the file in your PR removes it from the repo. So yes adding them back without the new stuff should fix this.
I'll merge the sprites into the tileset if/when the hair styles are actually added to the game |
That's fine. It's not like these files are going anywhere. |
Not merged yet but the PR adding them to the game can be found here if you want to check that everything is set up correctly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The 1,240 lines of removed JSON need to be restored before this is merged. Otherwise I believe this is ready since the matching PR has been merged in DDA
Merged in #2372 |
Summary
Multiple hair styles & colour variations.
Content of the change
Changes to JSON data files and the individual PNGs of the hair styles.
Additional information
I've never done this before. Let me know if I did anything wrong.