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(port,content): Day and Night, Dusk and Dawn for enchantment conditions #5871

Merged
merged 7 commits into from
Jan 4, 2025

Conversation

Zlorthishen
Copy link
Contributor

@Zlorthishen Zlorthishen commented Jan 4, 2025

Checklist

Required

  • I wrote the PR title in conventional commit format.
  • I ran the code formatter.
  • I linked any relevant issues using github keyword syntax so it can be closed automatically.
  • I have committed my changes to new branch that isn't main so it won't cause conflict when updating main branch later.
  • This PR ports commits from DDA or other cataclysm forks.
    • I have attributed original authors in the commit messages adding Co-Authored-By in the commit message.
    • I have linked the URL of original PR(s) in the description.
  • This is a C++ PR that modifies JSON loading or behavior.
    • I have documented the changes in the appropriate location in the doc/ folder.

Purpose of change

ports small elements of the following dda pr

Describe the solution

allows the use of DAWN, DUSK, DAY, and NIGHT for use as conditional elements of enchantments

Describe alternatives you've considered

Testing

image
image

Additional context

@github-actions github-actions bot added docs PRs releated to docs page src changes related to source code. JSON related to game datas in JSON format. mods PR changes related to mods. labels Jan 4, 2025
Copy link
Contributor

autofix-ci bot commented Jan 4, 2025

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@Zlorthishen Zlorthishen marked this pull request as ready for review January 4, 2025 02:17
@RobbieNeko
Copy link
Collaborator

Slight correction: It's conditions for enchantments, not spells haha

@Zlorthishen Zlorthishen changed the title feat(port,content): Day and Night, Dusk and Dawn for spell conditions feat(port,content): Day and Night, Dusk and Dawn for enchantment conditions Jan 4, 2025
Copy link
Contributor Author

@Zlorthishen Zlorthishen left a comment

Choose a reason for hiding this comment

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

co-authored with Maleclypse from dda pull request CleverRaven/Cataclysm-DDA#51630

Copy link
Collaborator

@RobbieNeko RobbieNeko left a comment

Choose a reason for hiding this comment

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

  • Builds on my machine
  • Loads into the game on my machine
  • All four time-related enchantments worked flawlessly
    image
    image
    image
    image

Only concern left would be whether the PR comment / mentioning the PR in the description is adequate attribution

@RobbieNeko RobbieNeko merged commit 27ef8b0 into cataclysmbnteam:main Jan 4, 2025
14 of 17 checks passed
@Zlorthishen Zlorthishen deleted the Day-and-Night-Spells branch January 4, 2025 03:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PRs releated to docs page JSON related to game datas in JSON format. mods PR changes related to mods. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants