Merge with develop
This commit is contained in:
commit
e280f89ea1
7 changed files with 150 additions and 138 deletions
|
@ -10,53 +10,61 @@ MACRO(FIND_CORRECT_LUA_VERSION)
|
|||
INCLUDE(CheckDepends)
|
||||
|
||||
# check for Lua 5.3
|
||||
SET(LUA53_LIBRARY "liblua5.3")
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
|
||||
SET(LUA53_LIBRARIES liblua5.3 liblua-5.3 liblua.so.5.3)
|
||||
|
||||
FOREACH(_LIB ${LUA53_LIBRARIES})
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.3")
|
||||
FIND_PACKAGE(Lua53 REQUIRED)
|
||||
BREAK()
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
|
||||
IF(NOT LUALIB_FOUND)
|
||||
# fedora (v22+)
|
||||
SET(LUA53_LIBRARY "liblua-5.3")
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
|
||||
# check for Lua 5.2
|
||||
SET(LUA52_LIBRARIES liblua5.2 liblua-5.2 liblua.so.5.2)
|
||||
|
||||
FOREACH(_LIB ${LUA52_LIBRARIES})
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.2")
|
||||
FIND_PACKAGE(Lua52 REQUIRED)
|
||||
BREAK()
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
ENDIF()
|
||||
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.3")
|
||||
FIND_PACKAGE(Lua53 REQUIRED)
|
||||
ELSE()
|
||||
# check for Lua 5.2
|
||||
SET(LUA52_LIBRARY "liblua5.2")
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
|
||||
IF(NOT LUALIB_FOUND)
|
||||
# check for Lua 5.1
|
||||
SET(LUA51_LIBRARIES liblua5.1 liblua-5.1 liblua.so.5.1)
|
||||
|
||||
IF(NOT LUALIB_FOUND)
|
||||
# fedora (v20)
|
||||
SET(LUA52_LIBRARY "liblua-5.2")
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
|
||||
ENDIF()
|
||||
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.2")
|
||||
FIND_PACKAGE(Lua52 REQUIRED)
|
||||
ELSE()
|
||||
# check for Lua 5.1
|
||||
SET(LUA51_LIBRARY "liblua5.1")
|
||||
FOREACH(_LIB ${LUA51_LIBRARIES})
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA51_LIBRARY LUALIB_FOUND)
|
||||
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.1")
|
||||
FIND_PACKAGE(Lua51 REQUIRED)
|
||||
ELSE()
|
||||
# check for Lua 5.0
|
||||
SET(LUA50_LIBRARY "liblua5.0")
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA50_LIBRARY LUALIB_FOUND)
|
||||
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.0")
|
||||
FIND_PACKAGE(Lua50 REQUIRED)
|
||||
ELSE()
|
||||
MESSAGE(FATAL_ERROR "Can't determine Lua version used by Luabind")
|
||||
ENDIF()
|
||||
BREAK()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
ENDIF()
|
||||
|
||||
IF(NOT LUALIB_FOUND)
|
||||
# check for Lua 5.0
|
||||
SET(LUA50_LIBRARIES liblua5.0 liblua-5.0 liblua.so.5.0)
|
||||
|
||||
FOREACH(_LIB ${LUA50_LIBRARIES})
|
||||
CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA50_LIBRARY LUALIB_FOUND)
|
||||
IF(LUALIB_FOUND)
|
||||
MESSAGE(STATUS "Luabind is using Lua 5.0")
|
||||
FIND_PACKAGE(Lua50 REQUIRED)
|
||||
BREAK()
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
ENDIF()
|
||||
|
||||
IF(NOT LUALIB_FOUND)
|
||||
MESSAGE(FATAL_ERROR "Can't determine Lua version used by Luabind")
|
||||
ENDIF()
|
||||
ELSE()
|
||||
# TODO: find a way to detect Lua version
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
fyrosGivenNames = {"Abyan", "Abybus", "Abycaan", "Abycabus", "Abycacaon", "Abycacus", "Abycadix", "Abycadon", "Abycados", "Abycaion"
|
||||
fyrosLastNames = {"Abyan", "Abybus", "Abycaan", "Abycabus", "Abycacaon", "Abycacus", "Abycadix", "Abycadon", "Abycados", "Abycaion"
|
||||
, "Abycakos", "Abycala", "Abycalaus", "Abycalion", "Abycallo", "Abycalus", "Abycamus", "Abycan", "Abycanix", "Abycaon", "Abycaps"
|
||||
, "Abycarius", "Abycaron", "Abycaros", "Abycarus", "Abycaseus", "Abycasse", "Abycatheus", "Abycathus", "Abycatis", "Abycaton", "Abycaxius"
|
||||
, "Abycus", "Abydix", "Abydon", "Abydos", "Abygrian", "Abygribus", "Abygricaon", "Abygricus", "Abygridix", "Abygridon", "Abygridos"
|
||||
|
@ -286,7 +286,7 @@ fyrosGivenNames = {"Abyan", "Abybus", "Abycaan", "Abycabus", "Abycacaon", "Abyca
|
|||
, "Zenathus", "Zenatis", "Zenaton", "Zenaxius", "Zenbus", "Zencaon", "Zencus", "Zendix", "Zendon", "Zendos", "Zenion", "Zenix", "Zenkos", "Zenla", "Zenlaus", "Zenlion", "Zenllo", "Zenlus", "Zenmus", "Zenn", "Zennix", "Zenps", "Zenrius", "Zenron", "Zenros", "Zenrus", "Zenseus", "Zensse", "Zentheus"
|
||||
, "Zenthus", "Zentis", "Zenton", "Zenxius", "Zeperian", "Zeperibus", "Zepericaon", "Zepericus", "Zeperidix", "Zeperidon", "Zeperidos", "Zeperiion", "Zeperikos", "Zeperila", "Zeperilaus", "Zeperilion", "Zeperillo", "Zeperilus", "Zeperimus", "Zeperin", "Zeperinix", "Zeperips", "Zeperirius", "Zeperiron", "Zeperiros", "Zeperirus", "Zeperiseus", "Zeperisse", "Zeperitheus", "Zeperithus", "Zeperitis", "Zeperiton", "Zeperixius", "Zephaan", "Zephabus", "Zephacaon", "Zephacus", "Zephadix", "Zephadon", "Zephados", "Zephaion", "Zephakos", "Zephala", "Zephalaus", "Zephalion", "Zephallo", "Zephalus", "Zephamus", "Zephan", "Zephanix", "Zephaps", "Zepharius", "Zepharon", "Zepharos", "Zepharus", "Zephaseus", "Zephasse", "Zephatheus", "Zephathus", "Zephatis", "Zephaton", "Zephaxius", "Zephoan", "Zephobus", "Zephocaon", "Zephocus", "Zephodix", "Zephodon", "Zephodos", "Zephoion", "Zephokos", "Zephola", "Zepholaus", "Zepholion", "Zephollo", "Zepholus", "Zephomus", "Zephon", "Zephonix", "Zephops", "Zephorius", "Zephoron", "Zephoros", "Zephorus", "Zephoseus", "Zephosse", "Zephotheus", "Zephothus", "Zephotis", "Zephoton", "Zephoxius", "Zephyan", "Zephybus", "Zephycaon", "Zephycus", "Zephydix", "Zephydon", "Zephydos", "Zephyion", "Zephykos", "Zephyla", "Zephylaus", "Zephylion", "Zephyllo", "Zephylus", "Zephymus", "Zephyn", "Zephynix", "Zephyps", "Zephyrius", "Zephyron", "Zephyros", "Zephyrus", "Zephyseus", "Zephysse", "Zephytheus", "Zephythus", "Zephytis", "Zephyton", "Zephyxius", "Zeps", "Zeraan", "Zerabus", "Zeracaon", "Zeracus", "Zeradix", "Zeradon", "Zerados", "Zeraion", "Zerakos", "Zerala", "Zeralaus", "Zeralion", "Zerallo", "Zeralus", "Zeramus", "Zeran", "Zeranix", "Zeraps", "Zerarius", "Zeraron", "Zeraros", "Zerarus", "Zeraseus", "Zerasse", "Zeratheus", "Zerathus", "Zeratis", "Zeraton", "Zeraxius", "Zerian", "Zeribus", "Zericaon", "Zericus", "Zeridix", "Zeridon", "Zeridos", "Zeriion", "Zerikos", "Zerila", "Zerilaus", "Zerilion", "Zerillo", "Zerilus", "Zerimus", "Zerin", "Zerinix", "Zerips", "Zeririus", "Zeriron", "Zeriros", "Zerirus", "Zeriseus", "Zerisse", "Zeritheus", "Zerithus", "Zeritis", "Zeriton", "Zerius", "Zerixius", "Zeron", "Zeros", "Zerus", "Zeryaan", "Zeryabus", "Zeryacaon", "Zeryacus", "Zeryadix", "Zeryadon", "Zeryados", "Zeryaion", "Zeryakos", "Zeryala", "Zeryalaus", "Zeryalion", "Zeryallo", "Zeryalus", "Zeryamus", "Zeryan", "Zeryanix", "Zeryaps", "Zeryarius", "Zeryaron", "Zeryaros", "Zeryarus", "Zeryaseus", "Zeryasse", "Zeryatheus", "Zeryathus", "Zeryatis", "Zeryaton", "Zeryaxius", "Zeseus", "Zesse", "Zessean", "Zessebus", "Zessecaon", "Zessecus", "Zessedix", "Zessedon", "Zessedos", "Zesseion", "Zessekos", "Zessela", "Zesselaus", "Zesselion", "Zessello", "Zesselus", "Zessemus", "Zessen", "Zessenix", "Zesseps", "Zesserius", "Zesseron", "Zesseros", "Zesserus", "Zesseseus", "Zessesse", "Zessetheus", "Zessethus", "Zessetis", "Zesseton", "Zessexius", "Zetheus", "Zethus", "Zetis", "Zeton", "Zexius"}
|
||||
|
||||
fyrosSurnames = {"Abyan", "Abybus", "Abycaon", "Abycus", "Abydix", "Abydon", "Abydos", "Abyion", "Abykos", "Abyla", "Abylaus", "Abylion"
|
||||
fyrosFirstNames = {"Abyan", "Abybus", "Abycaon", "Abycus", "Abydix", "Abydon", "Abydos", "Abyion", "Abykos", "Abyla", "Abylaus", "Abylion"
|
||||
, "Abyllo", "Abylus", "Abymus", "Abyn", "Abynix", "Abyps", "Abyrius", "Abyron", "Abyros", "Abyrus", "Abyseus", "Abysse", "Abytheus", "Abythus"
|
||||
, "Abytis", "Abyton", "Abyxius", "Aean", "Aebus", "Aecaon", "Aecus", "Aedix", "Aedon", "Aedos", "Aeion", "Aekos", "Aela", "Aelaus", "Aelion"
|
||||
, "Aello", "Aelus", "Aemus", "Aen", "Aenix", "Aeps", "Aerius", "Aeron", "Aeros", "Aerus", "Aeseus", "Aesse", "Aetheus", "Aethus", "Aetis"
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -13,94 +13,86 @@ end
|
|||
-- Name generator.
|
||||
|
||||
--nb noms:
|
||||
-- matis: male 621 - female 621 - surname 621
|
||||
-- fyros: given name 14269, surname 841
|
||||
-- zorai: given name one 318, given name two 644, surname 1287
|
||||
-- tryker: given name 4500, surname 4335
|
||||
-- matis: male 621 - female 621 - FirstName 621
|
||||
-- fyros: given name 14269, FirstName 841
|
||||
-- zorai: given name one 318, given name two 644, FirstName 1287
|
||||
-- tryker: given name 4500, FirstName 4335
|
||||
|
||||
function outgame:getFyrosName()
|
||||
local nameResult = "";
|
||||
local fullnameResult = "";
|
||||
-- Fyros
|
||||
function outgame:getFyrosLastName()
|
||||
local nbFyrosLastNames = 0;
|
||||
for _ in pairs(fyrosLastNames) do nbFyrosLastNames = nbFyrosLastNames + 1 end
|
||||
|
||||
local nbFyrosGivenNames = 0;
|
||||
for _ in pairs(fyrosGivenNames) do nbFyrosGivenNames = nbFyrosGivenNames + 1 end
|
||||
local givenName = fyrosGivenNames[math.random(nbFyrosGivenNames)];
|
||||
return fyrosLastNames[math.random(nbFyrosLastNames)]
|
||||
end
|
||||
function outgame:getFyrosFirstName()
|
||||
local nbFyrosFirstNames = 0;
|
||||
for _ in pairs(fyrosFirstNames) do nbFyrosFirstNames = nbFyrosFirstNames + 1 end
|
||||
|
||||
local nbFyrosSurnames = 0;
|
||||
for _ in pairs(fyrosSurnames) do nbFyrosSurnames = nbFyrosSurnames + 1 end
|
||||
local surname = fyrosSurnames[math.random(nbFyrosSurnames)];
|
||||
fullnameResult = givenName .. " " .. surname;
|
||||
nameResult = surname;
|
||||
return fullnameResult, nameResult
|
||||
return fyrosFirstNames[math.random(nbFyrosFirstNames)]
|
||||
end
|
||||
|
||||
function outgame:getMatisName(sex)
|
||||
local nameResult = "";
|
||||
local fullnameResult = "";
|
||||
-- Matis
|
||||
function outgame:getMatisLastName(sex)
|
||||
local dbNameSex = getDbProp("UI:TEMP:NAME_SEX");
|
||||
|
||||
if sex ~= nil then
|
||||
dbNameSex = sex
|
||||
dbNameSex = sex;
|
||||
end
|
||||
|
||||
local LastName = ""
|
||||
if tonumber( dbNameSex )== 1 then
|
||||
local nbMatisMaleNames = 0;
|
||||
for _ in pairs(matisMaleNames) do nbMatisMaleNames = nbMatisMaleNames + 1 end
|
||||
givenName = matisMaleNames[math.random(nbMatisMaleNames)];
|
||||
local nbMatisMaleLastNames = 0;
|
||||
for _ in pairs(matisMaleLastNames) do nbMatisMaleLastNames = nbMatisMaleLastNames + 1 end
|
||||
LastName = matisMaleLastNames[math.random(nbMatisMaleLastNames)];
|
||||
else
|
||||
local nbMatisFemaleNames = 0;
|
||||
for _ in pairs(matisFemaleNames) do nbMatisFemaleNames = nbMatisFemaleNames + 1 end
|
||||
givenName = matisFemaleNames[math.random(nbMatisFemaleNames)];
|
||||
local nbMatisFemaleLastNames = 0;
|
||||
for _ in pairs(matisFemaleLastNames) do nbMatisFemaleLastNames = nbMatisFemaleLastNames + 1 end
|
||||
LastName = matisFemaleLastNames[math.random(nbMatisFemaleLastNames)];
|
||||
end
|
||||
|
||||
local nbMatisSurnames = 0;
|
||||
for _ in pairs(matisSurnames) do nbMatisSurnames = nbMatisSurnames + 1 end
|
||||
local surname = matisSurnames[math.random(nbMatisSurnames)];
|
||||
fullnameResult = givenName .. " " .. surname;
|
||||
nameResult = givenName;
|
||||
|
||||
return fullnameResult, nameResult
|
||||
return LastName;
|
||||
end
|
||||
|
||||
function outgame:getTrykerName()
|
||||
local nameResult = "";
|
||||
local fullnameResult = "";
|
||||
function outgame:getMatisFirstName()
|
||||
|
||||
local nbTrykerGivenNames = 0;
|
||||
for _ in pairs(trykerGivenNames) do nbTrykerGivenNames = nbTrykerGivenNames + 1 end
|
||||
local givenName = trykerGivenNames[math.random(nbTrykerGivenNames)];
|
||||
local nbMatisFirstNames = 0;
|
||||
for _ in pairs(matisFirstNames) do nbMatisFirstNames = nbMatisFirstNames + 1 end
|
||||
|
||||
local nbTrykerSurnames = 0;
|
||||
for _ in pairs(trykerSurnames) do nbTrykerSurnames = nbTrykerSurnames + 1 end
|
||||
local surname = trykerSurnames[math.random(nbTrykerSurnames)];
|
||||
|
||||
fullnameResult = surname .. " " .. givenName;
|
||||
nameResult = givenName;
|
||||
|
||||
return fullnameResult, nameResult
|
||||
return matisFirstNames[math.random(nbMatisFirstNames)]
|
||||
end
|
||||
|
||||
-- Tryker
|
||||
function outgame:getTrykerLastName()
|
||||
local nbTrykerLastNames = 0;
|
||||
for _ in pairs(trykerLastNames) do nbTrykerLastNames = nbTrykerLastNames + 1 end
|
||||
|
||||
function outgame:getZoraiName()
|
||||
local nameResult = "";
|
||||
local fullnameResult = "";
|
||||
return trykerLastNames[math.random(nbTrykerLastNames)]
|
||||
end
|
||||
function outgame:getTrykerFirstName()
|
||||
local nbTrykerFirstNames = 0;
|
||||
for _ in pairs(trykerFirstNames) do nbTrykerFirstNames = nbTrykerFirstNames + 1 end
|
||||
|
||||
local nbGivenNameOne = 0;
|
||||
for _ in pairs(zoraiGivenNameOne) do nbGivenNameOne = nbGivenNameOne + 1 end
|
||||
local givenNameOne = zoraiGivenNameOne[math.random(nbGivenNameOne)];
|
||||
return trykerFirstNames[math.random(nbTrykerFirstNames)]
|
||||
end
|
||||
|
||||
local nbGivenNameTwo = 0;
|
||||
for _ in pairs(zoraiGivenNameTwo) do nbGivenNameTwo = nbGivenNameTwo + 1 end
|
||||
local givenNameTwo = zoraiGivenNameTwo[math.random(nbGivenNameTwo)];
|
||||
-- Zoraï
|
||||
function outgame:getZoraiLastName()
|
||||
local nbLastNamesOne = 0;
|
||||
for _ in pairs(zoraiLastNamesOne) do nbLastNamesOne = nbLastNamesOne + 1 end
|
||||
local lastNameOne = zoraiLastNamesOne[math.random(nbLastNamesOne)];
|
||||
|
||||
local nbSurnames = 0;
|
||||
for _ in pairs(zoraiSurnames) do nbSurnames = nbSurnames + 1 end
|
||||
local surname = zoraiSurnames[math.random(nbSurnames)];
|
||||
local nbLastNamesTwo = 0;
|
||||
for _ in pairs(zoraiLastNamesTwo) do nbLastNamesTwo = nbLastNamesTwo + 1 end
|
||||
local lastNameTwo = zoraiLastNamesTwo[math.random(nbLastNamesTwo)];
|
||||
|
||||
fullnameResult = surname .. " " .. givenNameOne .. "-" .. givenNameTwo;
|
||||
nameResult = givenNameOne .. givenNameTwo;
|
||||
return lastNameOne .. "-" .. lastNameTwo
|
||||
end
|
||||
function outgame:getZoraiFirstName()
|
||||
local nbFirstNames = 0;
|
||||
for _ in pairs(zoraiFirstNames) do nbFirstNames = nbFirstNames + 1 end
|
||||
|
||||
return fullnameResult, nameResult
|
||||
return zoraiFirstNames[math.random(nbFirstNames)]
|
||||
end
|
||||
|
||||
function outgame:procGenerateName()
|
||||
|
@ -115,59 +107,70 @@ function outgame:procGenerateName()
|
|||
|
||||
-- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
|
||||
-- fy ma try zo -->
|
||||
local givenName = "";
|
||||
local lastName = "test"
|
||||
local firstName = "test2"
|
||||
if tonumber( dbNameRace ) == 1 then
|
||||
-- Fyros
|
||||
fullnameResult, nameResult = self:getFyrosName()
|
||||
lastName = self:getFyrosLastName()
|
||||
firstName = self:getFyrosFirstName()
|
||||
fullnameResult = lastName .. " " .. firstName
|
||||
nameResult = lastName
|
||||
elseif tonumber( dbNameRace ) == 2 then
|
||||
-- Matis
|
||||
fullnameResult, nameResult = self:getMatisName()
|
||||
lastName = self:getMatisLastName()
|
||||
firstName = self:getMatisFirstName()
|
||||
fullnameResult = lastName .. " " .. firstName
|
||||
nameResult = lastName
|
||||
elseif tonumber( dbNameRace ) == 3 then
|
||||
-- Tryker
|
||||
fullnameResult, nameResult = self:getTrykerName()
|
||||
lastName = self:getTrykerLastName()
|
||||
firstName = self:getTrykerFirstName()
|
||||
fullnameResult = firstName .. " " .. lastName
|
||||
nameResult = lastName
|
||||
elseif tonumber( dbNameRace ) == 4 then
|
||||
-- Zorai
|
||||
fullnameResult, nameResult = self:getZoraiName()
|
||||
lastName = self:getZoraiLastName()
|
||||
firstName = self:getZoraiFirstName()
|
||||
fullnameResult = firstName .. " " .. lastName
|
||||
nameResult = lastName
|
||||
elseif tonumber( dbNameRace ) == 5 then
|
||||
-- Maraudeurs
|
||||
tempResult_1 = "";
|
||||
tempResult_2 = "";
|
||||
-- lastName
|
||||
if tonumber(dbNameSubRace) == 1 then
|
||||
-- Fyros
|
||||
fullnameResult, tempResult_1 = self:getFyrosName()
|
||||
lastName = self:getFyrosLastName()
|
||||
elseif tonumber( dbNameSubRace ) == 2 then
|
||||
-- Matis F
|
||||
fullnameResult, tempResult_1 = self:getMatisName(2)
|
||||
lastName = self:getMatisLastName(2)
|
||||
elseif tonumber( dbNameSubRace ) == 3 then
|
||||
-- Matis M
|
||||
fullnameResult, tempResult_1 = self:getMatisName(1)
|
||||
lastName = self:getMatisLastName(1)
|
||||
elseif tonumber( dbNameSubRace ) == 4 then
|
||||
-- Tryker
|
||||
fullnameResult, tempResult_1 = self:getTrykerName()
|
||||
lastName = self:getTrykerLastName()
|
||||
elseif tonumber( dbNameSubRace ) == 5 then
|
||||
-- Zorai
|
||||
fullnameResult, tempResult_1 = self:getZoraiName()
|
||||
lastName = self:getZoraiLastName()
|
||||
end
|
||||
|
||||
-- firstName
|
||||
if tonumber(dbNameSubRace2) == 1 then
|
||||
-- Fyros
|
||||
fullnameResult, tempResult_2 = self:getFyrosName()
|
||||
firstName = self:getFyrosFirstName()
|
||||
elseif tonumber( dbNameSubRace2 ) == 2 then
|
||||
-- Matis F
|
||||
fullnameResult, tempResult_2 = self:getMatisName(2)
|
||||
-- Matis
|
||||
firstName = self:getMatisFirstName()
|
||||
firstName = self:getMatisFirstName()
|
||||
elseif tonumber( dbNameSubRace2 ) == 3 then
|
||||
-- Matis M
|
||||
fullnameResult, tempResult_2 = self:getMatisName(1)
|
||||
elseif tonumber( dbNameSubRace2 ) == 4 then
|
||||
-- Tryker
|
||||
fullnameResult, tempResult_2 = self:getTrykerName()
|
||||
elseif tonumber( dbNameSubRace2 ) == 5 then
|
||||
firstName = self:getTrykerFirstName()
|
||||
elseif tonumber( dbNameSubRace2 ) == 4 then
|
||||
-- Zorai
|
||||
fullnameResult, tempResult_2 = self:getZoraiName()
|
||||
firstName = self:getZoraiFirstName()
|
||||
end
|
||||
|
||||
fullnameResult = tempResult_1 .. " " .. tempResult_2
|
||||
nameResult = tempResult_2
|
||||
fullnameResult = lastName .. " " .. firstName
|
||||
nameResult = lastName
|
||||
end
|
||||
|
||||
uiNameFull.hardtext = fullnameResult;
|
||||
|
@ -241,7 +244,7 @@ function outgame:procUpdateNameSubRaceLabel()
|
|||
uiNameSubRaceText.hardtext= tostring(nameSubRaceType[tonumber(dbNameSubRace)]);
|
||||
end
|
||||
function outgame:procUpdateNameSubRace2Label()
|
||||
local nameSubRace2Type = { "Fyros", matisF, matisM, "Tryker", "Zoraï" }
|
||||
local nameSubRace2Type = { "Fyros", "Matis", "Tryker", "Zoraï" }
|
||||
local uiNameSubRace2Text = getUI("ui:outgame:appear_name:name_sub_race2_slider:name_race");
|
||||
local dbNameSubRace2 = getDbProp("UI:TEMP:NAME_SUB_RACE2");
|
||||
|
||||
|
|
|
@ -1361,7 +1361,7 @@
|
|||
id="but_next" posref="TR TR" x="0" y="-6"
|
||||
onclick_l="proc" params_l="proc_appear_name_sub_race_add_one" />
|
||||
|
||||
<view type="text" id="surname" case="%case_first_string_letter_up" posparent="name_sub_race_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_FirstName" color="255 255 255 255" fontsize="11"/>
|
||||
<view type="text" id="lastName" case="%case_first_string_letter_up" posparent="name_sub_race_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_LastName" color="255 255 255 255" fontsize="11"/>
|
||||
<view type="text" id="name_race" case="%case_first_string_letter_up" posparent="name_sub_race_slider" posref="TR TL" x="-100" y="0" hardtext="Fyros" color="255 255 255 255" fontsize="11"/>
|
||||
<ctrl type="scroll" id="name_race_scroll" posparent="name_sub_race_slider" posref="MM MM" x="0" y="0" w="160" h="32"
|
||||
vertical="false" align="L" min="1" max="5" value="UI:TEMP:NAME_SUB_RACE" tracksize="40"
|
||||
|
@ -1385,10 +1385,10 @@
|
|||
id="but_next" posref="TR TR" x="0" y="-6"
|
||||
onclick_l="proc" params_l="proc_appear_name_sub_race2_add_one" />
|
||||
|
||||
<view type="text" id="name" case="%case_first_string_letter_up" posparent="name_sub_race2_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_LastName" color="255 255 255 255" fontsize="11"/>
|
||||
<view type="text" id="firstName" case="%case_first_string_letter_up" posparent="name_sub_race2_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_FirstName" color="255 255 255 255" fontsize="11"/>
|
||||
<view type="text" id="name_race" case="%case_first_string_letter_up" posparent="name_sub_race2_slider" posref="TR TL" x="-100" y="0" hardtext="Fyros" color="255 255 255 255" fontsize="11"/>
|
||||
<ctrl type="scroll" id="name_race_scroll" posparent="name_sub_race2_slider" posref="MM MM" x="0" y="0" w="160" h="32"
|
||||
vertical="false" align="L" min="1" max="5" value="UI:TEMP:NAME_SUB_RACE2" tracksize="40"
|
||||
vertical="false" align="L" min="1" max="4" value="UI:TEMP:NAME_SUB_RACE2" tracksize="40"
|
||||
tx_topright="" tx_middle="slider_m.tga" tx_bottomleft=""
|
||||
onscroll="proc" params="proc_appear_name_sub_race2_label_change" />
|
||||
</group>
|
||||
|
@ -1412,7 +1412,8 @@
|
|||
<view type="text" id="name_sex" posparent="name_race_slider" posref="TL TL" x="0" y="0" hardtext="uiCP_Sex_Male" case="%case_first_string_letter_up" color="255 255 255 255" fontsize="11"/>
|
||||
<ctrl type="scroll" id="name_sex_scroll" posparent="name_sex_slider" posref="MM MM" x="0" y="0" w="160" h="32"
|
||||
vertical="false" align="L" min="1" max="2" value="UI:TEMP:NAME_SEX" tracksize="40"
|
||||
tx_topright="" tx_middle="slider_m.tga" tx_bottomleft="" />
|
||||
tx_topright="" tx_middle="slider_m.tga" tx_bottomleft=""
|
||||
onscroll="proc" params="proc_appear_name_sex_label_change" />
|
||||
|
||||
</group>
|
||||
|
||||
|
@ -1666,7 +1667,7 @@
|
|||
<action handler="lua:outgame:procUpdateNameSubRace2Label()" />
|
||||
</proc>
|
||||
<proc id="proc_appear_name_sub_race2_add_one">
|
||||
<action handler="set" params="dblink=UI:TEMP:NAME_SUB_RACE2|value=min(add(@UI:TEMP:NAME_SUB_RACE2,1),5)" />
|
||||
<action handler="set" params="dblink=UI:TEMP:NAME_SUB_RACE2|value=min(add(@UI:TEMP:NAME_SUB_RACE2,1),4)" />
|
||||
<action handler="lua:outgame:procUpdateNameSubRace2Label()" />
|
||||
</proc>
|
||||
<proc id="proc_appear_name_sub_race2_sub_one">
|
||||
|
|
Loading…
Reference in a new issue