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

feat(mods/pride_flags): add an in-repo mod for pride flags #4362

Merged
merged 6 commits into from
Mar 18, 2024

Conversation

RobbieNeko
Copy link
Contributor

Purpose of change

Pride flags seemed like an appropriate thing to add in an in-repo mod and based on our community, it seemed like it would be appreciated.

Describe the solution

  • Adds transgender, aromantic, asexual, bisexual, intersex, lesbian non-binary, pansexual, gay (men), and genderfluid pride flags as well as the original rainbow flag.
  • Adds recipes for the above flags (adapted from the recipe for a blanket)
  • Adds an itemgroup containing these flags to the major itemgroup containing American flags

Describe alternatives you've considered

  • Making it mainline instead of a mod
    Considering our lack of a variants system and how we all saw the drama that came up in the DDA PR to add pride flags to their mainline, I believe an in-repo mod is a better solution.

  • Adapt the DDA uncraft recipe as our crafting recipe for the pride flags
    7 sheets just looked really excessive to me.

Testing

The game loads, pride flags show, the crafting is a go, and the itemgroups behave as usual.

Additional context

image
image
image

Wrath flags when?
@github-actions github-actions bot added JSON related to game datas in JSON format. mods PR changes related to mods. labels Mar 17, 2024
@RobbieNeko RobbieNeko changed the title feat(content): Add an in-repo mod for pride flags feat(content, mods): Add an in-repo mod for pride flags Mar 17, 2024
chaosvolt
chaosvolt previously approved these changes Mar 17, 2024
@chaosvolt chaosvolt changed the title feat(content, mods): Add an in-repo mod for pride flags feat(content, mods/prideflags): add an in-repo mod for pride flags Mar 17, 2024
@chaosvolt
Copy link
Member

Semantic PR titles continue to baffle me, hecc

@RobbieNeko
Copy link
Contributor Author

Ehh, oh well. Semantic PR is gonna get caught up over semantics

@scarf005 scarf005 changed the title feat(content, mods/prideflags): add an in-repo mod for pride flags feat(content,mods/prideflags): add an in-repo mod for pride flags Mar 17, 2024
@scarf005
Copy link
Member

semantic PR complains because semantic.yml isn't updated yet.

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- transFlag
+ trans_flag

a bit of a nitpick, but generally mod id and item ids follow snake_case convention.
it's not a rule set in stone, but being consistent is nice.

@RobbieNeko
Copy link
Contributor Author

Figured, haha. I'm just used to using camel case. Will go on ahead and change it to snake_case on your suggestion

@scarf005
Copy link
Member

also don't worry about semantic PR failing, it'll fail till it's merged (because the check is done using main branch's semantic.yaml not this PR's semantic.yaml)

@scarf005 scarf005 self-assigned this Mar 17, 2024
Sometimes conformity is good when it comes to programming
@RobbieNeko
Copy link
Contributor Author

RobbieNeko commented Mar 17, 2024

There, the case should now hopefully be appropriately snaked
Including the mod Id, so might want to adjust it in that semantic.yml file again

@scarf005
Copy link
Member

thanks, one more tiny nitpick: directory name isn't snake_case but Kebab-Case.

@RobbieNeko
Copy link
Contributor Author

To be fair, the directory names seem to have more variance with regards to that. But I will gladly comply

@scarf005 scarf005 changed the title feat(content,mods/prideflags): add an in-repo mod for pride flags feat(content,mods/pride_flags): add an in-repo mod for pride flags Mar 17, 2024
@scarf005 scarf005 changed the title feat(content,mods/pride_flags): add an in-repo mod for pride flags feat(mods/pride_flags): add an in-repo mod for pride flags Mar 17, 2024
@scarf005 scarf005 requested a review from chaosvolt March 17, 2024 17:53
@scarf005
Copy link
Member

scarf005 commented Mar 17, 2024

@chaosvolt i think it'll be ready to merge after loadtest, failure in semantic PR check can be ig ored (due to limitation it always fail when adding new mod)

chaosvolt
chaosvolt previously approved these changes Mar 17, 2024
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Load-tested with mod.
  2. Spawned in the last flag sprited in the mod_tileset to confirm it was the expected sprite.
    image
    Layering will as always make me screm but there's nothing one can really do to fix that, you wear your messenger bag over blankets and US flags too and the layering looks equally odd anyway:
    image

@RobbieNeko
Copy link
Contributor Author

Oops, chaos accidentally revealed that that sprite got offset on the y-axis somehow
Lemme just fix that, sorry

Wrong kind of fluid, it shouldn't be dripping of the page
@RobbieNeko
Copy link
Contributor Author

Good thing Chaos happened to choose that one specific flag to test with, given that only it had its y-axis wonky xD

@RobbieNeko
Copy link
Contributor Author

RobbieNeko commented Mar 17, 2024

@chaosvolt So sorry, could you please re-review/approve this? Your testing just happened to reveal that the genderfluid flag's sprites somehow got offset on the y-axis, so I had to fix that real quick

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@chaosvolt chaosvolt merged commit ce27bd8 into cataclysmbnteam:main Mar 18, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants