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

Fixes of dialogues in the refugee center #75187

Merged
merged 4 commits into from
Jul 27, 2024
Merged

Conversation

Uwuewsky
Copy link
Contributor

@Uwuewsky Uwuewsky commented Jul 23, 2024

Summary

Bugfixes "Fix of bread sale from Dana Nunez"

Purpose of change

Commit №1: Nunez had a lot of small dialogue errors when trying to buy something from her.
Снимок экрана_2024-07-23_14-04-42

Commit №2: Smokes had the wrong dialogue replaced. He was trying to pay for work not yet done.
изображение

Commit №3: Lots of other lines had double quotes.
Снимок экрана_2024-07-23_20-04-36

Commit №4: fix #74504 Smokes did not give the hard drive quest if the player completed some quest in the Hub.

Describe the solution

Although her quest is still “in development” - the player is given the effect immediately after the conversation. But now all options give the correct items, take the correct number of items, have the correct checks, etc. The effect has been moved to the negotiation check, otherwise options without a discount will be displayed.

Oh, and increased the search radius for the quest building. Although when I try to pick up a quest item from there, it gives an error.

Details

изображение

изображение

изображение

Smokes' dialogue is now in place.
изображение

The double quotes are simply removed.

The quest to transfer the hard drive to the Hub can now always be taken. Works as expected.

Details

Снимок экрана_2024-07-24_09-55-36
Снимок экрана_2024-07-24_09-58-34
Снимок экрана_2024-07-24_09-59-34
Снимок экрана_2024-07-24_09-59-50

Describe alternatives you've considered

Testing

Looks ok, but I couldn't test some dialogs with complex prerequisites.
Test world in the refugee center: Big Pine-trimmed.tar.gz

Additional context

Снимок экрана_2024-07-22_16-12-53

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jul 23, 2024
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • *shows you on your map where to find it. "That should get you there. Good luck, I 'spect you'll need it."
  • . Why don't you fuckin' figure it out?
  • I reckon I've done my job here. Goan' be time to ride out into the sunset soon, if'n you catch m'drift." He tilts his hat melodramatically. "Folks're comin' around to this here new world we live in.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@PatrikLundell
Copy link
Contributor

It's probably out of your scope, but in case you'd want to take a look at it: #74504.
That report isn't about dialog, but rather incorrect conditions, and so might not be your kind of problem.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 24, 2024
@Uwuewsky
Copy link
Contributor Author

Yes, the quest was unavailable if you completed "Return to Sender". I don't see any real reason for this other than someone overlooked it.

Trivial change, I added it to this PR. I also replaced a similar section in the Great Library, just in case.

@Maleclypse Maleclypse merged commit 3faf4c8 into CleverRaven:master Jul 27, 2024
21 of 25 checks passed
@Uwuewsky Uwuewsky deleted the rc-fix branch September 9, 2024 07:12
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 <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Broken Hub01 refugee center quest line?
3 participants