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

Hobbies give weapon proficiencies + AFS & bat weapon categories #68990

Merged
merged 1 commit into from
Nov 11, 2023

Conversation

TheShadowFerret
Copy link
Contributor

@TheShadowFerret TheShadowFerret commented Oct 29, 2023

Summary

Content "Hobbies give weapon proficiency, Aftershock & baseball bats use weapon categories"

Purpose of change

  1. Hobbies should give weapon proficiencies, especially the combat ones.
  2. Aftershock's melee weapons don't have categories on them(other than one machine pistol 🤔)
  3. Baseball bats, despite being top-heavy bludgeons similar to a mace in length, have no martial art.

Describe the solution

  1. Give weapon proficiencies to the combat hobbies, as well as first level of knives to the cooking hobbies if they have Knife Skills(big think).
  2. Give AFS weapon categories
  3. Make vanilla + AFS titanium bats count as maces.

Describe alternatives you've considered

Cooking skills don't get knife familiarity.
Fabrication hobbies get baton familiarity(hammer & crowbar). Thought a hobby wasn't enough.

Testing

image

Additional context

Previous question on BBs as maces: #56995 (comment)

Melee Training catching all armed MAs is getting ridiculous now

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Mods: Aftershock Anything to do with the Aftershock mod astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Oct 29, 2023
@TheShadowFerret TheShadowFerret marked this pull request as ready for review October 29, 2023 17:36
@Termineitor244
Copy link
Contributor

Pretty good! Just this kind of thing I was thinking of doing, except that for professions rather than hobbies.

I don't think the food related hobbies should gain more than a familiar level of knife combat skills, and even that just because of their familiar usage with them and their form, which should be greatly different that when employing them as weapons.

@TheShadowFerret
Copy link
Contributor Author

I don't think the food related hobbies should gain more than a familiar level of knife combat skills,

@Maleclypse
Copy link
Member

Should be good for rebase now

data/mods/Aftershock/items/gun/10mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/10mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/5x50.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/7.50mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/7.50mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/laser.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/laser.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/laser.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 9, 2023
@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label Nov 11, 2023
@Maleclypse Maleclypse merged commit de99a4c into CleverRaven:master Nov 11, 2023
24 checks passed
@TheShadowFerret TheShadowFerret deleted the WeaponHobbies branch November 12, 2023 00:38
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 <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods Issues related to mods or modding Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants