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

[Ultica] New hoisted versions of default pride & state flags #2473

Merged
merged 1 commit into from
Aug 9, 2024

Conversation

p4nc4k3z
Copy link
Contributor

@p4nc4k3z p4nc4k3z commented Aug 8, 2024

Summary

The hoisted American flag looks great, but I'd love to see even more! Unfortunately, it seems that currently only the "base" versions of items with variants are supported (e.g. "pride_flag" in layering.json triggers for all variants such as the trans flag, binary flag, etc.). This PR would at least support the defaults for the "pride flag" and "state flag" items, and someday I'd hope to include the rest of the variants if they're ever supported.

Content of the change

Two new sprites created using the existing hoisted flag .xcf template, plus an edit to Ultica's layering.json to enable them to "fly" on metal & wooden flagpoles.

Testing

Built from source (experimental-2024-08-06-0149 & last CDDA-Tilesets) and confirmed that the American, rainbow pride, and Massachusetts flags all "fly" correctly on both types of flagpoles.

Additional information

flags_ultica

@Fris0uman
Copy link
Collaborator

Won't this make every state flag show as Massachusetts and every pride flag show as the rainbow?

@p4nc4k3z
Copy link
Contributor Author

p4nc4k3z commented Aug 9, 2024

Won't this make every state flag show as Massachusetts and every pride flag show as the rainbow?

Yes, sadly, that’s correct. But I figure it’s still better than having no support for these flags on flagpoles at all, and as no pride or state flags are currently generated on flagpoles on maps, there shouldn’t be any mismatches until the player attempts to hang flags themselves.

Also, I plan to see if I can get support for sprite variants added to layering.json myself soon, and will create a new issue if it’s beyond my abilities.

@Fris0uman Fris0uman merged commit ca881dd into I-am-Erk:master Aug 9, 2024
3 checks passed
@p4nc4k3z p4nc4k3z deleted the ultica-hoisted-flags branch August 12, 2024 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants