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

fix: magic_light throwing wind_resist error #4688

Merged
merged 2 commits into from
May 23, 2024

Conversation

chrsrns
Copy link
Contributor

@chrsrns chrsrns commented May 23, 2024

Adds a new material contentrated_mana.
Adds a material field on magic_light entry containing concentrated_mana.

Purpose of change

Fixes #2518.

Describe the solution

Done by adding a new material concentrated_light which magic_light can use. The values were adapted from DDA's concentrated_mana material entry.

Describe alternatives you've considered

None.

Testing

  1. Cast spell `Magical Light.
  2. Move to see if the error pops up.

Additional context

Checklist

…ntrated_mana` material

Adds a new material `contentrated_mana`.
Adds a material field on `magic_light` entry containing `concentrated_mana`.
@github-actions github-actions bot added data PRs related to datas. Won't crash game (probably) mods PR changes related to mods. labels May 23, 2024
Copy link
Contributor

autofix-ci bot commented May 23, 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.

@Lamandus
Copy link
Contributor

you need to correct the title, it cut it in half.

@scarf005 scarf005 changed the title fix: magic_light throwing wind_resist error via adding new `conce… fix: magic_light throwing wind_resist error May 23, 2024
@scarf005 scarf005 requested a review from chaosvolt May 23, 2024 06:49
@scarf005
Copy link
Member

image
also please note that it's dangerous to directly commit on main branch; it's recommended to work on a separate branch.

@chrsrns
Copy link
Contributor Author

chrsrns commented May 23, 2024

image also please note that it's dangerous to directly commit on main branch; it's recommended to work on a separate branch.

Sorry I honestly didn't think to read the guidelines first. Would I need to open a new pull request?

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.

Note that it's usually just that not creating a separate branch for your PRs means you're stuck working on one thing at a time until the current PR is merged, but every so often it causes some weird obscure problem because github is weird. Assuming that doesn't happen it should be fine, just good to remember to create a branch next time just in case. :3

@chaosvolt chaosvolt merged commit 4df27ff into cataclysmbnteam:main May 23, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably) mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Magiclysm mod magic light error popup.
4 participants