Jsonize crafting skill penalty from mutations #36565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-Authored-By: Anton Burmistrov <[email protected]>
fengjixuchui
added a commit
to fengjixuchui/Cataclysm-DDA
that referenced
this pull request
Dec 31, 2019
Jsonize crafting skill penalty from mutations (CleverRaven#36565)
BevapDin
reviewed
Dec 31, 2019
| @@ -411,6 +411,15 @@ void mutation_branch::load( const JsonObject &jo, const std::string & ) | |||
| spells_learned.emplace( sp, ja.next_int() ); | |||
| } | |||
|
|
|||
| for( JsonArray ja : jo.get_array( "craft_skill_bonus" ) ) { | |||
| const skill_id skid( ja.next_string() ); | |||
| if( skid.is_valid() ) { | |||
There was a problem hiding this comment.
What if the skill definition is loaded after the mutation is loaded? This will report that skill id as invalid. Id checking should be done after everything has been loaded.
BevapDin
reviewed
Dec 31, 2019
| paws_rank_penalty += 1; | ||
| for( const std::pair< trait_id, trait_data > &mut : my_mutations ) { | ||
| for( const std::pair<skill_id, int> &skib : mut.first->craft_skill_bonus ) { | ||
| if( making.skill_used == skib.first ) { |
There was a problem hiding this comment.
craft_skill_bonus is a std::map. You can lookup keys in a map, there is a function for that. You do not need to iterate over all entries of the map.
|
Right, I can't work on it right now, but I'll fix it next tuesday if no one else has done it by then. |
This was referenced Jan 5, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Infrastructure "Jsonize crafting skill penalty from mutations"Purpose of change
Jsonize crafting skill penalty from mutations
Halve penalty from Paws, and Broad Paws to fix #36439
Describe the solution
Describe alternatives you've considered
Testing
Start game without error
Debug paw mutation
Get supply for level 1 tailor craft
Try crafting
Immedialty fail
Halve penalty
Try again
Mess up craft several times
Eventually succeed to craft the gloves and get 33% toward the next tailoring level
Additional context