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

[Magiclysm] Weapon Categories touchup #58418

Merged
merged 3 commits into from
Jun 15, 2022

Conversation

catdach
Copy link
Contributor

@catdach catdach commented Jun 14, 2022

Summary

Mods "Added the rest of the missing weapon categories for the magiclysm items, and removed the now obsolete martialarts.json file."

Purpose of change

The full completion of #55756. Some magiclysm items were still missing their weapon categories. Fixes #57111. Weapon categories also make the Magiclysm/martialarts.json file obsolete, as its only purpose was to extend the weapon lists of the vanilla martial arts.

Describe the solution

I manually dug through everything in Magiclysm/items and distributed weapon categories to the appropriate items. I wasn't super careful about it so I may have missed a few things.
Also some of the categories are a bit of a stretch, I'm pretty sure the magi staffs are supposed to be quarterstaffs but the semi-recent changes to the vanilla quarterstaffs make it hard to tell.

Deleted Magiclysm/martialarts.json.

Describe alternatives you've considered

  1. Making more use of inheritance. I feel like most of the stuff in magiclysm could make better use of things like "copy_from" and "extend" as there are alot of magic items that boil down to: "vanilla item + magic effect". However that is kinda its own project and is massively out of scope for this PR.
  2. Making a vanilla Falcata item for the gunblade to inherit from, instead of just giving it the medium_swords category. I really am tempted to, but I don't know enough about it to make an approximation of its dimensions and combat stats.

Testing

Started up the game and looked at some of the relevant MA weapon lists, everything looks fine.

Additional context

Magiclysm in general could use some more love. While I noticed quite a few things that need updating, for example most weapons are still using the old to-hit system. Again, alot of stuff might be solved with more liberal use of inheritance, but that's a project for another time.

Added the appropriate weapon categories to more of the magiclysm weapons.
@catdach catdach requested a review from KorGgenT as a code owner June 14, 2022 18:22
@github-actions github-actions bot added Mods Issues related to mods or modding [JSON] Changes (can be) made in JSON Martial Arts Arts, Techniques, weapons and anything touching martial arts. Mods: Magiclysm Anything to do with the Magiclysm mod astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jun 14, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 14, 2022
@KorGgenT KorGgenT merged commit aeaec40 into CleverRaven:master Jun 15, 2022
@catdach catdach deleted the magiclysm_weapon_categories branch August 25, 2022 20:23
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. Mods: Magiclysm Anything to do with the Magiclysm mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Magiclysm's Gunblade change suggestion to be used with mod martial arts
2 participants