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

Make weapons recognized as weapons #65136

Merged
merged 2 commits into from
Apr 21, 2023

Conversation

Termineitor244
Copy link
Contributor

Summary

None

Purpose of change

Some objects are generally used as weapons but not classified as such by the game, the most obvious example being the cudgel which is classified as a tool but is always used as a weapon... This is problematic when you want to sort your items by category and expect to find your weapons with the, well, weapons pile.

Describe the solution

Makes the relevant items recognized as weapons.

Describe alternatives you've considered

Testing

Tested searching for the changed items in game, it works!

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 17, 2023
@Karol1223
Copy link
Contributor

I'm not sure about the axes being reclassified as weapons. They have good use as tools and they are, in concept, tools not weapons.

@Termineitor244
Copy link
Contributor Author

I'm not sure about the axes being reclassified as weapons. They have good use as tools and they are, in concept, tools not weapons.

They are crafted from the weapons division on the crafting interface, and I mainly use them as weapons when playing the game, those 2 are the main reasons of the change, but if most other players use them more often as tools (I do not) I can move their crafting recipes instead so they are not crafted as weapons but classified as tools when actually made...

@Karol1223
Copy link
Contributor

They are crafted from the weapons division on the crafting interface, and I mainly use them as weapons when playing the game, those 2 are the main reasons of the change, but if most other players use them more often as tools (I do not) I can move their crafting recipes instead so they are not crafted as weapons but classified as tools when actually made...

In my eyes, the category should be what the item actually is meant to be rather than what players use it as. This is also why I've started moving around some specific container 'clothing' to containers instead. So yes, I would move their crafting category. They're not really supposed to be weapons, they just happen to be good at that job similarly to stuff like wood axes or crowbars.

@Termineitor244
Copy link
Contributor Author

In my eyes, the category should be what the item actually is meant to be rather than what players use it as. This is also why I've started moving around some specific container 'clothing' to containers instead. So yes, I would move their crafting category. They're not really supposed to be weapons, they just happen to be good at that job similarly to stuff like wood axes or crowbars.

I can follow that logic, so I will do that then when I come back from work.

@bombasticSlacks
Copy link
Contributor

I can follow that logic, so I will do that then when I come back from work.

Am I still waiting on this next commit? No rush just ping me when it's done :)

@Termineitor244
Copy link
Contributor Author

I can follow that logic, so I will do that then when I come back from work.

Am I still waiting on this next commit? No rush just ping me when it's done :)

Yeah, sorry, I got sick yesterday and was unable to make the changes, I will ping you when they are done!

@Termineitor244
Copy link
Contributor Author

@bombasticSlacks done!!

@bombasticSlacks bombasticSlacks merged commit c7e7c3f into CleverRaven:master Apr 21, 2023
@Termineitor244 Termineitor244 deleted the Weapons-as-weapons branch April 21, 2023 19:22
katemonster33 pushed a commit to katemonster33/Cataclysm-DDA that referenced this pull request May 17, 2023
* Make weapons recognized as weapons

* Axes as tools
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants