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.

Sign up for GitHub

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

Jump to bottom

Rename Dungeon Master Laws to not run into copyright problems #33678

Merged
merged 4 commits into from
Dec 16, 2024
Merged

Rename Dungeon Master Laws to not run into copyright problems #33678

merged 4 commits into from
Dec 16, 2024

Conversation

Litraxx
Copy link
Contributor

@Litraxx Litraxx commented Dec 1, 2024 •
edited
Loading

About the PR

Changed the Dungeon Master lawset and related prototypes to a more generic name, because of copyright concerns.

Why / Balance

Resolves #33671

Technical details

Basic renaming nothing fancy

Requirements

Breaking changes

  • Renamed DungeonMasterCircuitBoard to GameMasterCircuitBoard
  • Renamed DungeonMasterLawset to GameMasterLawset
  • Renamed laws in DungeonMasterLawset from Dungeon<Number> to Game<Number>
  • Renamed law string resources from law-dungeon-<Number> to law-game-<Number>

Changelog

🆑

  • fix: Renamed the Dungeon Master lawset to Game Master lawset

@Litraxx Litraxx requested a review from DrSmugleaf as a code owner December 1, 2024 16:40
@ss14-map-server
Copy link

This PR contains new or changed maps:

  • bagel.yml
  • box.yml
  • cog.yml
  • fland.yml
  • marathon.yml
  • meta.yml
  • oasis.yml
  • omega.yml
  • packed.yml

Maps are being rendered. This comment will be updated if rendering them is done.
12/01/24 16:40

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. S: Needs Review Status: Requires additional reviews before being fully accepted Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Map Changes: Might require knowledge of mapping. size/L Denotes a PR that changes 1000-4999 lines. and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Dec 1, 2024
slarticodefast
slarticodefast requested changes Dec 1, 2024
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Don't directly edit the map files, please revert all changes to the maps, including the whitespace.
Instead add the renamed entity prototype IDs to migrations.yml so that is done automatically.

@ss14-map-server
Copy link

This PR contains new or changed maps:

  • oasis.yml

Maps are being rendered. This comment will be updated if rendering them is done.
12/01/24 16:55

@slarticodefast
Copy link
Member

Could you also undo the whitespace changes in oasis.yml? I would like to avoid merge conflicts for mappers working on that map.

@Litraxx
Copy link
Contributor Author

Litraxx commented Dec 1, 2024

Could you also undo the whitespace changes in oasis.yml? I would like to avoid merge conflicts for mappers working on that map.

Should be done now, had to fight Rider a bit to get it reverted

@ScarKy0
Copy link
Contributor

ScarKy0 commented Dec 1, 2024

Could the CL be "The "Game Master" lawset is now legally distinct"? :godo:

slarticodefast
slarticodefast approved these changes Dec 1, 2024
View reviewed changes
Copy link
Member

@slarticodefast slarticodefast left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for the cleanup and your first contribution!
Can you add a changelog for this since it has an in-game impact?
For example: "Renamed the Dungeon Master lawset to Game Master lawset."

@slarticodefast slarticodefast added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Dec 1, 2024
@slarticodefast slarticodefast self-assigned this Dec 1, 2024
@ScarKy0 ScarKy0 added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: Cleanup Type: Code clean-up, without being a full refactor or feature D3: Low Difficulty: Some codebase knowledge required. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Dec 1, 2024
@chromiumboy
Copy link
Contributor

chromiumboy commented Dec 2, 2024 •
edited
Loading

As far as I'm aware, there's no need to rename the board prototypes. It's only the text thats visible to the public (i.e the label and description) that's a potential issue. I'd like to avoid migrations and breaking changes if possible

Also there's no need for a CL, the change is so minor

@Litraxx
Copy link
Contributor Author

Litraxx commented Dec 2, 2024 •
edited
Loading

As far as I'm aware, there's no need to rename the board prototypes. It's only the text thats visible to the public (i.e the label and description) that's a potential issue. I'd like to avoid migrations and breaking changes if possible

While that is true, I think it would be better to rename all associated prototypes, to avoid any confusion for future contributors. I also think that, in this case, the risk of any adverse is minimal

Also there's no need for a CL, the change is so minor

I agree with this, but I'm just following what the maintainer asked

@TheShuEd TheShuEd merged commit 46d288c into space-wizards:master Dec 16, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slarticodefast slarticodefast slarticodefast approved these changes

@DrSmugleaf DrSmugleaf Awaiting requested review from DrSmugleaf DrSmugleaf is a code owner

Assignees

@slarticodefast slarticodefast

Labels
A: General Interactions Area: General in-game interactions that don't relate to another area. Changes: Map Changes: Might require knowledge of mapping. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. D3: Low Difficulty: Some codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. size/L Denotes a PR that changes 1000-4999 lines. T: Cleanup Type: Code clean-up, without being a full refactor or feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Dungeon Master lawset name is copyrighted/trademarked and needs to be changed
5 participants
@Litraxx @slarticodefast @ScarKy0 @chromiumboy @TheShuEd