Skip to content

Findperson - New scenarios and some tests to give variation to the strings #6251

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.

Sign up for GitHub

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

Open
zonkmachine wants to merge 1 commit into
base: master
Choose a base branch
from
+450 −26
Open

Findperson - New scenarios and some tests to give variation to the strings #6251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions data/culture/culture.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ end
-- one is randomly selected according to pre-set weights. Valid input
-- is the same as Culture:Surname.
--
-- > name1, name2 = Culture:Names(isfemale, rand, culture)
-- > first_name, surname, culture = Culture:Names(isfemale, rand, culture)
--
-- Parameters:
--
Expand All @@ -167,21 +167,23 @@ end
--
-- rand - the <Rand> object to use to generate the name
--
-- culture - optional string
-- culture - optional string. Equivalent to the language files parameter 'name'
--
-- Return:
--
-- name1 - a string containing the first name
-- first_name - a string containing the first name
--
-- name2 - a string containing the surname
-- surname - a string containing the surname
--
-- culture - a string containing the language/culture name
--
-- Return full name from the same culture/language

--
-- Return full name and language/culture name, from the same culture/language
-- as separate strings
function Culture:Names (isFemale, rand, culture)
-- if 'culture' given as a string, e.g. "Russian" use that
local c = self.lookup[culture] or utils.chooseNormalized(self.weights, rand).lang
return c:FirstName(isFemale), c:Surname(isFemale)
return c:FirstName(isFemale), c:Surname(isFemale), c.name
end

return Culture
Loading