Consistently show merch cost in conversation #55737
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
github-actions
bot
added
astyled
Maleclypse
added
[JSON]
github-actions
bot
added
the
BasicBuildPassed
71 tasks
Faalagorn
reviewed
Mar 4, 2022
| @@ -18,13 +18,13 @@ | |||
| { "text": "What is your job here?", "topic": "TALK_RANCH_BARBER_JOB" }, | |||
| { "text": "Do you need any help?", "topic": "TALK_RANCH_BARBER_HIRE" }, | |||
| { | |||
| "text": "[$5] I'll have a shave", | |||
| "text": "[3 merch] I'll have a shave", | |||
There was a problem hiding this comment.
Missing full stop at the end.
| "topic": "TALK_RANCH_BARBER_CUT", | ||
| "condition": { "u_has_items": { "item": "FMCNote", "count": 3 } }, | ||
| "effect": [ "buy_shave", { "u_sell_item": "FMCNote", "count": 3 }, "barber_beard" ] | ||
| }, | ||
| { | ||
| "text": "[$10] I'll get a haircut", | ||
| "text": "[6 merch] I'll get a haircut", |
There was a problem hiding this comment.
Missing full stop at the end.
|
I marked two comments that are missing the full stop at the end (these are on screenshot), these cause the strings to appear (and having to be translated) twice in Transifex, that's how I found them :) |
|
I can make those fixes in the Tacoma PR |
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
Bugfixes "Consistently show merch cost in conversation"
Purpose of change
Some purchases using merch weren't showing the price. The Tacoma ranch barber was in $ and the scavenger was [FMC750]. We should be consistent for all of them. Also fixed the grammar in Cody's blacksmith quests.
Describe the solution
Anywhere merch is used to purchase/trade for something, show
[# merch]before the sentence for consistency. Only exception now is Cody's fabrication services, which are shown as[# merch, # mm]Describe alternatives you've considered
u_sell_itemandu_consume_item, but I'm not sure we want to do this for all items.Testing
Compiled and loaded the game. Checked a couple dialogs.
To find these, I searched for
"u_consume_item": "FMCNote"and"u_sell_item": "FMCNote"Additional context