Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Wrong first and last names orders and some minor bugs

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-03-15 00:03:06 +01:00
parent efac9c97b1
commit bb67a604e6
1 changed files with 60 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua
View file

@ -110,73 +110,63 @@ function outgame:procGenerateName()
-- 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()
fullnameResult = lastName .. " " .. firstName lastName = self:getFyrosLastName()
nameResult = firstName
elseif tonumber(dbNameRace) == 2 then elseif tonumber(dbNameRace) == 2 then
-- Matis -- Matis
lastName = self:getMatisLastName()
firstName = self:getMatisFirstName() firstName = self:getMatisFirstName()
fullnameResult = lastName .. " " .. firstName lastName = self:getMatisLastName()
nameResult = firstName
elseif tonumber(dbNameRace) == 3 then elseif tonumber(dbNameRace) == 3 then
-- Tryker -- Tryker
lastName = self:getTrykerLastName()
firstName = self:getTrykerFirstName() firstName = self:getTrykerFirstName()
fullnameResult = firstName .. " " .. lastName lastName = self:getTrykerLastName()
nameResult = firstName
elseif tonumber(dbNameRace) == 4 then elseif tonumber(dbNameRace) == 4 then
-- Zorai -- Zorai
lastName = self:getZoraiLastName()
firstName = self:getZoraiFirstName() firstName = self:getZoraiFirstName()
fullnameResult = firstName .. " " .. lastName lastName = self:getZoraiLastName()
nameResult = firstName
elseif tonumber(dbNameRace) == 5 then elseif tonumber(dbNameRace) == 5 then
-- Maraudeurs -- 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
firstName = self:getMatisFirstName(2)
elseif tonumber(dbNameSubRaceFirstName) == 4 then
-- Tryker -- Tryker
firstName = self:getTrykerFirstName() firstName = self:getTrykerFirstName()
elseif tonumber( dbNameSubRace2 ) == 4 then elseif tonumber(dbNameSubRaceFirstName) == 5 then
-- Zorai -- Zorai
firstName = self:getZoraiFirstName() firstName = self:getZoraiFirstName()
end end
fullnameResult = lastName .. " " .. firstName -- lastName
nameResult = firstName if tonumber(dbNameSubRaceLastName) == 1 then
-- 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 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