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

[MMA] Remove redundant "weapons" entries where covered by "weapons_category" #56082

Merged
merged 2 commits into from
Mar 16, 2022

Conversation

TheShadowFerret
Copy link
Contributor

@TheShadowFerret TheShadowFerret commented Mar 13, 2022

Summary

None

Purpose of change

MMA being created pre-weapon categories means it has double entries.

Describe the solution

Remove "weapons" entries that are also covered by weapon_category.

Describe alternatives you've considered

None.

Testing

Load game, see that no weapons were lost.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods: MMA Mythical Martial Arts mod astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Mar 13, 2022
@Maleclypse Maleclypse added Melee Melee weapons, tactics, techniques, reach attack Martial Arts Arts, Techniques, weapons and anything touching martial arts. labels Mar 13, 2022
@TheShadowFerret TheShadowFerret marked this pull request as draft March 13, 2022 17:57
@TheShadowFerret TheShadowFerret changed the title Remove redundant "weapons" entry from Stone Dragon [MMA] Remove redundant "weapons" entries where covered by "weapons_category" Mar 13, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 13, 2022
@TheShadowFerret TheShadowFerret marked this pull request as ready for review March 13, 2022 18:15
@catdach
Copy link
Contributor

catdach commented Mar 13, 2022

This looks mostly fine except for Shii-Cho, adding every sword category is going to add way more weapons than it had before. For now it should probably just use the Japanese_swords category instead.

@TheShadowFerret
Copy link
Contributor Author

This looks mostly fine except for Shii-Cho, adding every sword category is going to add way more weapons than it had before. For now it should probably just use the Japanese_swords category instead.

This PR doesn't change any style weapons, it's just line condensation 🤔
I'll put the seperate list back in for Shii-Cho's own PR.

@catdach
Copy link
Contributor

catdach commented Mar 14, 2022

This looks mostly fine except for Shii-Cho, adding every sword category is going to add way more weapons than it had before. For now it should probably just use the Japanese_swords category instead.

This PR doesn't change any style weapons, it's just line condensation 🤔 I'll put the seperate list back in for Shii-Cho's own PR.

Oh sorry, for some reason I confused this with a different PR that added the weapon categories to all these.

@ZhilkinSerg ZhilkinSerg merged commit 964c83e into CleverRaven:master Mar 16, 2022
@TheShadowFerret TheShadowFerret deleted the MMAStoneDragon branch March 17, 2022 01:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Martial Arts Arts, Techniques, weapons and anything touching martial arts. Melee Melee weapons, tactics, techniques, reach attack Mods: MMA Mythical Martial Arts mod
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants