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): Shocking flag #4561

Merged
merged 16 commits into from
Apr 30, 2024
Merged

Conversation

yay855
Copy link
Collaborator

@yay855 yay855 commented Apr 30, 2024

Added in the shocking json flag, changes to electrical weapons, electrified rapier, tonfa recipe adjustment.

Purpose of change

There was a FLAMING flag which made weapons deal bonus fire damage, but not a SHOCKING flag that made weapons deal bonus electrical damage.

Describe the solution

Added in the SHOCKING flag which is an electrical equivalent to the FLAMING flag. Adjusted electrical weapons to compensate, giving them transformations instead. Made tonfas autolearn, since they're not that amazing and they're basically just clubs with a prong coming out of them.

Describe alternatives you've considered

Testing

I've managed to get it down to only one error! If anyone can help me, please do.

Additional context

Checklist

Added in the shocking json flag, changes to electrical weapons, electrified rapier, tonfa recipe adjustment. WIP.
@yay855 yay855 marked this pull request as draft April 30, 2024 03:33
@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. labels Apr 30, 2024
Copy link
Contributor

autofix-ci bot commented Apr 30, 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.

@chaosvolt
Copy link
Member

Hmm. Question: did these need to be hardcoded in at all? I see nothing in this so far that can't be replicated using a mundane transform action?

Undid the hardcode for the use actions, instead just added them in the json since that's way simpler.
@yay855 yay855 marked this pull request as ready for review April 30, 2024 04:22
@yay855
Copy link
Collaborator Author

yay855 commented Apr 30, 2024

Hmm. Question: did these need to be hardcoded in at all? I see nothing in this so far that can't be replicated using a mundane transform action?

No, no it did not.

@yay855
Copy link
Collaborator Author

yay855 commented Apr 30, 2024

Thanks for catching that, Chaos.

yay855 and others added 4 commits April 30, 2024 13:09
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.

Mostly just one case of a turn-off action still retaining active toggle and other stuff copied from the turn-on action, but also having a separate revert message could be an optional improvement if desired, so it doesn't just claim you flick the switch off automatically when it runs out of charges and reverts.

data/json/items/melee/bludgeons.json Outdated Show resolved Hide resolved
data/json/items/melee/bludgeons.json Show resolved Hide resolved
data/json/items/melee/swords_and_blades.json Show resolved Hide resolved
data/json/items/melee/swords_and_blades.json Show resolved Hide resolved
data/json/items/melee/swords_and_blades.json Show resolved Hide resolved
data/json/items/melee/swords_and_blades.json Show resolved Hide resolved
@chaosvolt chaosvolt merged commit d875c37 into cataclysmbnteam:main Apr 30, 2024
13 checks passed
@yay855 yay855 deleted the electrical-flag branch May 1, 2024 00:27
@VissValdyr
Copy link
Contributor

How about a shocking pride flag now?

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. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants