Migrate names to snippets & add weighted snippets #70279
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
NPC / Factions
|
Thank you for doing this. I was very surprised that <given_name> (etc) didn't work in dialogue. The names in that file in MoM were the top 500 most common given and family names in Massachusetts in (I think) 1990, so they would fit DDA's setting if you wanted to migrate them. |
|
Anything that stops us from merging this PR?
i think it's fine to have donors names in |
I haven't got the time to test this PR yet. I'll probably do it in a few days. |
Merged
github-actions
bot
added
astyled
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Auto-requesting reviews from non-collaborators: @Standing-Storm
github-actions
bot
added
the
BasicBuildPassed
github-actions
bot
added
astyled
github-actions
bot
added
the
BasicBuildPassed
|
The tests keep failing for unrelated reasons 🤷. |
Qrox
added a commit
to Qrox/Cataclysm-DDA
that referenced
this pull request
Apr 17, 2024
Append names from the removed files into corresponding lists in names/en.json, sort the lists, and remove duplicate entries. The given names from MoM are not added, because they lack gender info required by the lists.
Qrox
added a commit
to Qrox/Cataclysm-DDA
that referenced
this pull request
Apr 17, 2024
…0279 Family and given names from names/en.json are converted to translated names from the Japanese mo file before CleverRaven#70279 using a script. The translated names are then appended to lists in names/ja.json, sorted, and made unique. Translations that are not names are then removed. (They are easy to locate after sorting, because the Japanese translators translated names using half-width katakana exclusively.)
Qrox
added a commit
to Qrox/Cataclysm-DDA
that referenced
this pull request
Apr 17, 2024
…verRaven#70279 Family and given names from names/en.json are converted to translated names from the Simplified Chinese mo file before CleverRaven#70279 using a script. The translated names are then appended to lists in names/zh_CN.json, sorted, and made unique. Translations that are not names are then removed manually.
Qrox
added a commit
to Qrox/Cataclysm-DDA
that referenced
this pull request
Apr 17, 2024
…en#70279 Family and given names from names/en.json are converted to translated names from the Russian mo file before CleverRaven#70279 using a script. The translated names are then appended to lists in names/ru.json, sorted, and made unique.
Qrox
added a commit
to Qrox/Cataclysm-DDA
that referenced
this pull request
Apr 21, 2024
Family and given names from names/en.json are converted to translated names from the Russian mo file before CleverRaven#70279 and added to names/ru.json using a script.
Maleclypse
pushed a commit
that referenced
this pull request
Aug 29, 2024
(Help wanted with reviewing) (#73083) * Add Russian names from translated name snippets before #70279 Family and given names from names/en.json are converted to translated names from the Russian mo file before #70279 and added to names/ru.json using a script. * Fix some incorrectly translated Russian names, thanks Hyperseeker, Zireael07, and Vane79! Co-authored-by: Steve Brand <[email protected]> * Fix more incorrectly translated Russian names * Fix more incorrectly translated Russian names, thanks Hyperseeker and Vane79! Co-authored-by: Steve Brand <[email protected]> * Update ru.json * Fix more incorrectly translated Russian names Co-authored-by: Steve Brand <[email protected]> --------- Co-authored-by: Steve Brand <[email protected]> Co-authored-by: Uwuewsky <[email protected]>
Knut-Aage-Hofseth
pushed a commit
to Knut-Aage-Hofseth/Cataclysm-DDA
that referenced
this pull request
Aug 29, 2024
…verRaven#70279 (Help wanted with reviewing) (CleverRaven#73083) * Add Russian names from translated name snippets before CleverRaven#70279 Family and given names from names/en.json are converted to translated names from the Russian mo file before CleverRaven#70279 and added to names/ru.json using a script. * Fix some incorrectly translated Russian names, thanks Hyperseeker, Zireael07, and Vane79! Co-authored-by: Steve Brand <[email protected]> * Fix more incorrectly translated Russian names * Fix more incorrectly translated Russian names, thanks Hyperseeker and Vane79! Co-authored-by: Steve Brand <[email protected]> * Update ru.json * Fix more incorrectly translated Russian names Co-authored-by: Steve Brand <[email protected]> --------- Co-authored-by: Steve Brand <[email protected]> Co-authored-by: Uwuewsky <[email protected]>
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
Infrastructure "Migrate names to snippets & add weighted snippets"
Purpose of change
Unify the name snippets to use the strings in
names/*.jsoneverywhere. This should also relieve translators of the burden of having to translate gazillions of names, and fixes #70023:(Over 10k strings untranslated, of which several thousand are names...)
This also implements weighted snippets so that snippets can now have different probabilities to be chosen, which is used to generate full names with snippets.
Describe the solution
Migrate code from
name.h/cpptotext_snippets.h/cpp, and update related cpp/json code to use the snippet library and unified name tags.The second commit adds weighted snippets, which accepts a
"weight"value along with the snippet"text", and the weight value is used when selecting random snippets from a category by considering all weight values in the same category.Describe alternatives you've considered
Further migrate the name snippets to the normal snippet format, but the current format has the advantage of not requiring translations to have the same number of entries in the name list, which is not supported by the snippet format.
The removed names in dda and Mind Over Matter could be added to
names/*.jsonmaybe? @MNG-cataclysm @Standing-Storm what are your thoughts?Testing
Tested creating worlds and characters, spawning NPCs and cities, and other related changes, and the names were generated correctly.
Additional context
I notice that the current snippets use
<full_name>in multiple places, but<full_name>was actually expanded into the names of the crowdfunding donors, so I'd like some input on whether those are supposed to be any full name or only donor names.The ~10000 deletion is mostly due to the removal of the snippet name lists.