Fix NPC equip fail message #37824
Merged
Fix NPC equip fail message #37824
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
ZhilkinSerg
added
<Bugfix>
BevapDin
reviewed
Feb 8, 2020
| return ret_val<bool>::make_failure( _( "Your %s mutation prevents you from wearing your %s." ), | ||
| return ret_val<bool>::make_failure( is_player() ? | ||
| _( "Your %s mutation prevents you from wearing your %s." ), branch.name(), it.type_name() : | ||
| _( "My %s mutation prevents me from wearing this %s." ), branch.name(), it.type_name(), |
There was a problem hiding this comment.
I think the second operand of the ternary will evaluate to just the type_name. That second operand consists of some invocations of the comma operator, so it evaluates to the right operand of them.
is_player ? "...", name(), type_name() : ...
// Is parsed as
is_player ? ( "...", name(), type_name() ) : ...
// Which is the same as
is_player ?( type_name() ) : ...I suggest writing it like this:
make_failure( is ? "text 1" : "text 2", additional, parameters, that, will, apply, to, both, strings )
This was referenced Feb 9, 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: Bugfixes "Fix NPC equip due to mutation fail message"
Purpose of change
Fixes #23409
NPC refusing to equip items due to mutation had incorrect message.
Describe the solution
#23409 was already mostly fixed, the NPC would correctly refuse to equip an incompatible item but the message was wrong so I fixed the message.
Describe alternatives you've considered
Testing
Additional context