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(content, port): Port Directed push from DDA #5566

Merged
merged 4 commits into from
Oct 14, 2024

Conversation

RobbieNeko
Copy link
Contributor

Checklist

Required

Optional

  • 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.
    • If documentation for this feature does not exist, please write it or at least note its lack in PR description.

Purpose of change

More spell effects available is always good, and the previous pushing behavior did not seem very nice to use.

Describe the solution

Ports CleverRaven/Cataclysm-DDA#44682

Describe alternatives you've considered

  • Leave out the function re-organization

Seemed worth it, and like not doing it would just be a big headache

  • Wait for someone else to do it
  • Put this into a package with pull target

More atomic commits go brrr

Testing

Built once back when I had set it to be a cone area type, worked fine. I doubt that changing it to blast to better align with the DDA intentions (and to make more sense) is going to seriously break anything

Additional context

Apparently DDA jsonized both spell shape and simplified targeting fields at some point.

Debug spells provided for testing convenience. Documentation coming in just a minute or two :3

When the push is directed

Co-Authored-By: Curtis Merrill <[email protected]>
@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. mods PR changes related to mods. labels Oct 12, 2024
Copy link
Contributor

autofix-ci bot commented Oct 12, 2024

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.

@RobbieNeko
Copy link
Contributor Author

Wait fuck I accidentally removed debug dash. Let me just fix that...

@github-actions github-actions bot added the docs PRs releated to docs page label Oct 12, 2024
@RobbieNeko
Copy link
Contributor Author

There we go, documentation obtained and debug-dash reinstated

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.

looks ok, @chaosvolt could you playtest it?

@chaosvolt
Copy link
Member

Hecc, was distracted yesterday and being dragged out today, will try to test when I get home @.@

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.

And bit belatedly, looks good.

@chaosvolt chaosvolt merged commit d0d1c96 into cataclysmbnteam:main Oct 14, 2024
12 checks passed
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.

3 participants