Skip to content

Conversation

@Termineitor244
Copy link
Contributor

@Termineitor244 Termineitor244 commented Oct 30, 2023

Summary

Content "Adds weapon proficiencies to professions when adequate,"

Purpose of change

#68734 is adding new weapon proficiencies for most weapon categories in the game, the only problem is that professions and hobbies do not grant them yet!
#68990 is already making the hobbies, so why not help with the professions?

Closes #69215 (if the hobbies PR doesn't closes it first).

Describe the solution

Adds proficiencies when appropriate to the professions, the hunters receive basic knife familiarity because they are hunters, they now also have survival skills so they are hunters in more than just name... Food related professions also receive a basic familiarity with knifes, soldiers receive basic familiarity with knifes/rifles/pistols when appropriate, and more for the rest of professions.

Describe alternatives you've considered

None.

Testing

None yet, the PR in question has not been merged yet.

Additional context

Added the proficiencies to the modded professions! Any input on those is more than welcome since I'm not so confident in those.
Requires #68734

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions Mods Issues related to mods or modding Bionics CBM (Compact Bionic Modules) Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mods: MMA Mythical Martial Arts mod Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Xedra Evolved Anything to do with Xedra Evolved labels Oct 30, 2023
@Termineitor244 Termineitor244 marked this pull request as ready for review October 31, 2023 00:36
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @Hymore246 @GuardianDll @Light-Wave

@TheShadowFerret
Copy link
Contributor

TheShadowFerret commented Nov 8, 2023

@Maleclypse will probably want this rebased before merge like mine 👀

@Termineitor244
Copy link
Contributor Author

@Maleclypse will probably want this rebased before merge like mine 👀

Oh, it was merged at last! I will rebase this in a flash, give me a moment.

@Termineitor244 Termineitor244 force-pushed the Professions-weapons-familiar branch from 4725d95 to bf60bcf Compare November 9, 2023 05:14
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 9, 2023
@Maleclypse Maleclypse merged commit 5636fb4 into CleverRaven:master Nov 11, 2023
@Termineitor244 Termineitor244 deleted the Professions-weapons-familiar branch November 11, 2023 00:38
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Nov 16, 2023
* Weapon familiarities for professions

* Modded professions

* Apply suggestions from code review

Co-authored-by: TheShadowFerret <[email protected]>

* Apply suggestions from code review

Co-authored-by: TheShadowFerret <[email protected]>

* Shivs for criminals

* fix

---------

Co-authored-by: TheShadowFerret <[email protected]>
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 Bionics CBM (Compact Bionic Modules) [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: Innawood 🌲 Anything to do with Innawood mod Mods: Magiclysm Anything to do with the Magiclysm mod Mods: MMA Mythical Martial Arts mod Mods: Xedra Evolved Anything to do with Xedra Evolved 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.

Weapon Proficiencies, profession and background

3 participants