Skip to content

Nested weapon combat practice#69367

Merged
Maleclypse merged 3 commits intoCleverRaven:masterfrom
Termineitor244:Nested-weapon-combat-practice
Nov 14, 2023
Merged

Nested weapon combat practice#69367
Maleclypse merged 3 commits intoCleverRaven:masterfrom
Termineitor244:Nested-weapon-combat-practice

Conversation

@Termineitor244
Copy link
Contributor

@Termineitor244 Termineitor244 commented Nov 14, 2023

Summary

Content "Adds nested groups to the weapon combat practice recipes"

Purpose of change

Since #68734 and later #69156 I had the idea of adding nested groups to the new combat practice recipes, since they were clearly a lot, but felt that the PR was already too big and I had already asked too many things so I decided to just do it myself after it was merged... And here we are!

Describe the solution

Adds several nested groups for most of the new combat practice recipes when appropriate, some are just too weird to be categorized with other weapons (Looking at you hooking weapons and flails >_>) but most of them could be grouped with similar weaponry for ease of finding and for the sanity of the player.

Describe alternatives you've considered

Maybe a group that includes unarmed combat and claws? Since claws are a semi unarmed weapon, but it felt too forced...
Also, maybe different names for the mixed groups? But I decided against since I wanted the player to easily know what recipes were inside...

Testing

The game loads, the recipes appear in their respective groups.

Additional context

Before:
imagen
After:
imagen
imagen

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack labels Nov 14, 2023
@Termineitor244
Copy link
Contributor Author

Maybe I should remove "practice" from the nested groups names?

@github-actions github-actions bot added 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 Nov 14, 2023
@Maleclypse Maleclypse merged commit edb0334 into CleverRaven:master Nov 14, 2023
@Termineitor244 Termineitor244 deleted the Nested-weapon-combat-practice branch November 14, 2023 21:44
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Nov 16, 2023
* Nesred weapon combat practice

* Adjust difficulty

* Removed "practice" from names
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 Melee Melee weapons, tactics, techniques, reach attack

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants