[Chore] Fix duplicate modifier id and minor weaponskill cleanup

[Xaver-DaRed]

I affirm:

• I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
• I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
• I have read and understood the Contributing Guide and the Code of Conduct.
• I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

• Fixed case where 2 modifiers shared 1 id (141)
• Retired old weaponskill function with newer and better one.

Steps to test these changes

None.