mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-24 18:08:44 +00:00
Fixed: Wrong first and last names orders and some minor bugs
--HG-- branch : develop
This commit is contained in:
parent
efac9c97b1
commit
bb67a604e6
1 changed files with 60 additions and 70 deletions
|
@ -108,75 +108,65 @@ function outgame:procGenerateName()
|
||||||
local nameResult = "";
|
local nameResult = "";
|
||||||
local fullnameResult = "";
|
local fullnameResult = "";
|
||||||
|
|
||||||
-- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
|
-- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
|
||||||
-- fy ma try zo -->
|
-- fy ma try zo -->
|
||||||
local lastName = "test"
|
local firstName = "test2"
|
||||||
local firstName = "test2"
|
local lastName = "test"
|
||||||
if tonumber( dbNameRace ) == 1 then
|
if tonumber(dbNameRace) == 1 then
|
||||||
-- Fyros
|
-- Fyros
|
||||||
lastName = self:getFyrosLastName()
|
firstName = self:getFyrosFirstName()
|
||||||
firstName = self:getFyrosFirstName()
|
lastName = self:getFyrosLastName()
|
||||||
fullnameResult = lastName .. " " .. firstName
|
elseif tonumber(dbNameRace) == 2 then
|
||||||
nameResult = firstName
|
-- Matis
|
||||||
elseif tonumber( dbNameRace ) == 2 then
|
firstName = self:getMatisFirstName()
|
||||||
-- Matis
|
lastName = self:getMatisLastName()
|
||||||
lastName = self:getMatisLastName()
|
elseif tonumber(dbNameRace) == 3 then
|
||||||
firstName = self:getMatisFirstName()
|
-- Tryker
|
||||||
fullnameResult = lastName .. " " .. firstName
|
firstName = self:getTrykerFirstName()
|
||||||
nameResult = firstName
|
lastName = self:getTrykerLastName()
|
||||||
elseif tonumber( dbNameRace ) == 3 then
|
elseif tonumber(dbNameRace) == 4 then
|
||||||
-- Tryker
|
-- Zorai
|
||||||
lastName = self:getTrykerLastName()
|
firstName = self:getZoraiFirstName()
|
||||||
firstName = self:getTrykerFirstName()
|
lastName = self:getZoraiLastName()
|
||||||
fullnameResult = firstName .. " " .. lastName
|
elseif tonumber(dbNameRace) == 5 then
|
||||||
nameResult = firstName
|
-- Maraudeurs
|
||||||
elseif tonumber( dbNameRace ) == 4 then
|
|
||||||
-- Zorai
|
|
||||||
lastName = self:getZoraiLastName()
|
|
||||||
firstName = self:getZoraiFirstName()
|
|
||||||
fullnameResult = firstName .. " " .. lastName
|
|
||||||
nameResult = firstName
|
|
||||||
elseif tonumber( dbNameRace ) == 5 then
|
|
||||||
-- Maraudeurs
|
|
||||||
-- lastName
|
|
||||||
if tonumber(dbNameSubRace) == 1 then
|
|
||||||
-- Fyros
|
|
||||||
lastName = self:getFyrosLastName()
|
|
||||||
elseif tonumber( dbNameSubRace ) == 2 then
|
|
||||||
-- Matis F
|
|
||||||
lastName = self:getMatisLastName(2)
|
|
||||||
elseif tonumber( dbNameSubRace ) == 3 then
|
|
||||||
-- Matis M
|
|
||||||
lastName = self:getMatisLastName(1)
|
|
||||||
elseif tonumber( dbNameSubRace ) == 4 then
|
|
||||||
-- Tryker
|
|
||||||
lastName = self:getTrykerLastName()
|
|
||||||
elseif tonumber( dbNameSubRace ) == 5 then
|
|
||||||
-- Zorai
|
|
||||||
lastName = self:getZoraiLastName()
|
|
||||||
end
|
|
||||||
|
|
||||||
-- firstName
|
-- firstName
|
||||||
if tonumber(dbNameSubRace2) == 1 then
|
if tonumber(dbNameSubRaceFirstName) == 1 then
|
||||||
-- Fyros
|
-- Fyros
|
||||||
firstName = self:getFyrosFirstName()
|
firstName = self:getFyrosFirstName()
|
||||||
elseif tonumber( dbNameSubRace2 ) == 2 then
|
elseif tonumber(dbNameSubRaceFirstName) == 2 then
|
||||||
-- Matis
|
-- Matis M
|
||||||
firstName = self:getMatisFirstName()
|
firstName = self:getMatisFirstName(1)
|
||||||
firstName = self:getMatisFirstName()
|
elseif tonumber(dbNameSubRaceFirstName) == 3 then
|
||||||
elseif tonumber( dbNameSubRace2 ) == 3 then
|
-- Matis F
|
||||||
-- Tryker
|
firstName = self:getMatisFirstName(2)
|
||||||
firstName = self:getTrykerFirstName()
|
elseif tonumber(dbNameSubRaceFirstName) == 4 then
|
||||||
elseif tonumber( dbNameSubRace2 ) == 4 then
|
-- Tryker
|
||||||
-- Zorai
|
firstName = self:getTrykerFirstName()
|
||||||
firstName = self:getZoraiFirstName()
|
elseif tonumber(dbNameSubRaceFirstName) == 5 then
|
||||||
end
|
-- Zorai
|
||||||
|
firstName = self:getZoraiFirstName()
|
||||||
|
end
|
||||||
|
|
||||||
fullnameResult = lastName .. " " .. firstName
|
-- lastName
|
||||||
nameResult = firstName
|
if tonumber(dbNameSubRaceLastName) == 1 then
|
||||||
end
|
-- Fyros
|
||||||
|
lastName = self:getFyrosLastName()
|
||||||
|
elseif tonumber(dbNameSubRaceLastName) == 2 then
|
||||||
|
-- Matis
|
||||||
|
lastName = self:getMatisLastName()
|
||||||
|
elseif tonumber(dbNameSubRaceLastName) == 3 then
|
||||||
|
-- Tryker
|
||||||
|
lastName = self:getTrykerLastName()
|
||||||
|
elseif tonumber(dbNameSubRaceLastName) == 4 then
|
||||||
|
-- Zorai
|
||||||
|
lastName = self:getZoraiLastName()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
uiNameFull.hardtext = fullnameResult;
|
fullnameResult = firstName .. " " .. lastName
|
||||||
|
nameResult = firstName
|
||||||
|
|
||||||
uiNameFull.hardtext = fullnameResult;
|
uiNameFull.hardtext = fullnameResult;
|
||||||
|
|
||||||
|
@ -241,10 +231,10 @@ end
|
||||||
local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper);
|
local matisF = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Female")) )):gsub("^%l", string.upper);
|
||||||
local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper);
|
local matisM = "Matis " .. (string.lower(tostring(i18n.get("uiCP_Sex_Male")) )):gsub("^%l", string.upper);
|
||||||
|
|
||||||
function outgame:procUpdateNameSubRaceLabel()
|
function outgame:procUpdateNameSubRaceFirstNameLabel()
|
||||||
local nameSubRaceType = { "Fyros", matisF, matisM, "Tryker", "Zoraï" }
|
local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zoraï" }
|
||||||
local uiNameSubRaceText = getUI("ui:outgame:appear_name:name_sub_race_slider:name_race");
|
local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race");
|
||||||
local dbNameSubRace = getDbProp("UI:TEMP:NAME_SUB_RACE");
|
local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME");
|
||||||
|
|
||||||
uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)]);
|
uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)]);
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue