From d2bc560ca8bfec6212bd088643480505d95275e2 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 14 Mar 2016 23:58:58 +0100 Subject: [PATCH] Changed: Minor changes (spaces replaced by tabs) --- .../gamedev/interfaces_v3/out_v2_appear.lua | 144 ++-- .../gamedev/interfaces_v3/out_v2_appear.xml | 705 +++++++++--------- 2 files changed, 427 insertions(+), 422 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua index e74c15469..c962a7492 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua +++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.lua @@ -20,90 +20,93 @@ end -- Fyros function outgame:getFyrosFirstName() - local nbFyrosFirstNames = 0; - for _ in pairs(fyrosFirstNames) do nbFyrosFirstNames = nbFyrosFirstNames + 1 end + local nbFyrosFirstNames = 0; + for _ in pairs(fyrosFirstNames) do nbFyrosFirstNames = nbFyrosFirstNames + 1 end - return fyrosFirstNames[math.random(nbFyrosFirstNames)] + return fyrosFirstNames[math.random(nbFyrosFirstNames)] end -function outgame:getFyrosLastName() - local nbFyrosLastNames = 0; - for _ in pairs(fyrosLastNames) do nbFyrosLastNames = nbFyrosLastNames + 1 end - return fyrosLastNames[math.random(nbFyrosLastNames)] +function outgame:getFyrosLastName() + local nbFyrosLastNames = 0; + for _ in pairs(fyrosLastNames) do nbFyrosLastNames = nbFyrosLastNames + 1 end + + return fyrosLastNames[math.random(nbFyrosLastNames)] end -- Matis function outgame:getMatisFirstName(sex) - local dbNameSex = getDbProp("UI:TEMP:NAME_SEX"); + -- 1 = male, 2 = female + local dbNameSex = getDbProp("UI:TEMP:NAME_SEX"); - if sex ~= nil then - dbNameSex = sex; - end + if sex ~= nil then + dbNameSex = sex; + end - local FirstName = "" - if tonumber( dbNameSex )== 1 then - local nbMatisMaleFirstNames = 0; - for _ in pairs(matisMaleFirstNames) do nbMatisMaleFirstNames = nbMatisMaleFirstNames + 1 end - FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]; - else - local nbMatisFemaleFirstNames = 0; - for _ in pairs(matisFemaleFirstNames) do nbMatisFemaleFirstNames = nbMatisFemaleFirstNames + 1 end - FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]; - end + local FirstName = "" + if tonumber(dbNameSex) == 1 then + local nbMatisMaleFirstNames = 0; + for _ in pairs(matisMaleFirstNames) do nbMatisMaleFirstNames = nbMatisMaleFirstNames + 1 end + FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]; + else + local nbMatisFemaleFirstNames = 0; + for _ in pairs(matisFemaleFirstNames) do nbMatisFemaleFirstNames = nbMatisFemaleFirstNames + 1 end + FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]; + end - return FirstName; + return FirstName; end function outgame:getMatisLastName() - local nbMatisLastNames = 0; - for _ in pairs(matisLastNames) do nbMatisLastNames = nbMatisLastNames + 1 end + local nbMatisLastNames = 0; + for _ in pairs(matisLastNames) do nbMatisLastNames = nbMatisLastNames + 1 end - return matisLastNames[math.random(nbMatisLastNames)] + return matisLastNames[math.random(nbMatisLastNames)] end -- Tryker function outgame:getTrykerFirstName() - local nbTrykerFirstNames = 0; - for _ in pairs(trykerFirstNames) do nbTrykerFirstNames = nbTrykerFirstNames + 1 end + local nbTrykerFirstNames = 0; + for _ in pairs(trykerFirstNames) do nbTrykerFirstNames = nbTrykerFirstNames + 1 end - return trykerFirstNames[math.random(nbTrykerFirstNames)] + return trykerFirstNames[math.random(nbTrykerFirstNames)] end -function outgame:getTrykerLastName() - local nbTrykerLastNames = 0; - for _ in pairs(trykerLastNames) do nbTrykerLastNames = nbTrykerLastNames + 1 end - return trykerLastNames[math.random(nbTrykerLastNames)] +function outgame:getTrykerLastName() + local nbTrykerLastNames = 0; + for _ in pairs(trykerLastNames) do nbTrykerLastNames = nbTrykerLastNames + 1 end + + return trykerLastNames[math.random(nbTrykerLastNames)] end -- Zoraļ function outgame:getZoraiFirstName() - local nbFirstNamesOne = 0; - for _ in pairs(zoraiFirstNamesOne) do nbFirstNamesOne = nbFirstNamesOne + 1 end - local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]; + local nbFirstNamesOne = 0; + for _ in pairs(zoraiFirstNamesOne) do nbFirstNamesOne = nbFirstNamesOne + 1 end + local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]; - local nbFirstNamesTwo = 0; - for _ in pairs(zoraiFirstNamesTwo) do nbFirstNamesTwo = nbFirstNamesTwo + 1 end - local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]; + local nbFirstNamesTwo = 0; + for _ in pairs(zoraiFirstNamesTwo) do nbFirstNamesTwo = nbFirstNamesTwo + 1 end + local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]; - return FirstNameOne .. "-" .. FirstNameTwo + return FirstNameOne .. "-" .. FirstNameTwo end function outgame:getZoraiLastName() - local nbLastNames = 0; - for _ in pairs(zoraiLastNames) do nbLastNames = nbLastNames + 1 end + local nbLastNames = 0; + for _ in pairs(zoraiLastNames) do nbLastNames = nbLastNames + 1 end - return zoraiLastNames[math.random(nbLastNames)] + return zoraiLastNames[math.random(nbLastNames)] end function outgame:procGenerateName() - local uiNameFull = getUI("ui:outgame:appear_name:name_full"); + local uiNameFull = getUI("ui:outgame:appear_name:name_full"); local uiGenText = getUI("ui:outgame:appear_name:eb"); local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); local dbNameSubRace = getDbProp("UI:TEMP:NAME_SUB_RACE"); local dbNameSubRace2 = getDbProp("UI:TEMP:NAME_SUB_RACE2"); - local nameResult = ""; - local fullnameResult = ""; + local nameResult = ""; + local fullnameResult = ""; -- Look at outgame:procUpdateNameRaceLabel() for the "race" list. -- fy ma try zo --> @@ -175,31 +178,35 @@ function outgame:procGenerateName() uiNameFull.hardtext = fullnameResult; - nameResult = string.gsub(nameResult, "'", ""); - nameResult = string.gsub(nameResult, " ", ""); - nameResult = string.gsub(nameResult, "-", ""); - nameResult = string.lower( nameResult ); - nameResult = nameResult:gsub("^%l", string.upper); - uiGenText.input_string = nameResult; + uiNameFull.hardtext = fullnameResult; + + nameResult = string.gsub(nameResult, "'", ""); + nameResult = string.gsub(nameResult, " ", ""); + nameResult = string.gsub(nameResult, "-", ""); + nameResult = string.lower( nameResult ); + nameResult = nameResult:gsub("^%l", string.upper); + uiGenText.input_string = nameResult; end + -- Name sex slider update. function outgame:procUpdateNameSexLabel() - local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" } + local nameSexType = { "uiCP_Sex_Male", "uiCP_Sex_Female" } local uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider:name_sex"); - local uiNameSex = getDbProp("UI:TEMP:NAME_SEX"); + local uiNameSex = getDbProp("UI:TEMP:NAME_SEX"); - tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)])); - tempstr = string.lower( tempstr ); - tempstr = (tempstr:gsub("^%l", string.upper)); + tempstr = tostring(i18n.get(nameSexType[tonumber(uiNameSex)])); + tempstr = string.lower(tempstr); + tempstr = (tempstr:gsub("^%l", string.upper)); - uiNameSexText.hardtext= tempstr; + uiNameSexText.hardtext = tempstr; end + -- Name race slider update. function outgame:procUpdateNameRaceLabel() - local nameRaceType = { "Fyros", "Matis", "Tryker", "Zoraļ", "uiCP_Maraudeur" } + local nameRaceType = { "Fyros", "Matis", "Tryker", "Zoraļ", "uiCP_Maraudeur" } local uiNameRaceText = getUI("ui:outgame:appear_name:name_race_slider:name_race"); - local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); + local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider"); @@ -207,15 +214,15 @@ function outgame:procUpdateNameRaceLabel() local uiNameSubRace2Slider = getUI("ui:outgame:appear_name:name_sub_race2_slider"); local uiNameGenerate = getUI("ui:outgame:appear_name:generate"); - -- Show/Hide sex slider + -- Show/Hide sex slider - uiNameGenerate.y = "-50" - if tonumber(dbNameRace) == 2 then - uiNameSexSlider.active = true; - uiNameGenerate.y = "-65" - else - uiNameSexSlider.active = false; - end + uiNameGenerate.y = "-50" + if tonumber(dbNameRace) == 2 then + uiNameSexSlider.active = true; + uiNameGenerate.y = "-65" + else + uiNameSexSlider.active = false; + end -- Show/Hide sub race slider if tonumber(dbNameRace) == 5 then @@ -227,8 +234,7 @@ function outgame:procUpdateNameRaceLabel() uiNameSubRace2Slider.active = false; end - - uiNameRaceText.hardtext= tostring(nameRaceType[tonumber(dbNameRace)]); + uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)]); end diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml index afe180d79..a6cafbf17 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml @@ -49,14 +49,14 @@ - + - + - + @@ -195,15 +195,15 @@ - + - + - + @@ -229,12 +229,12 @@ - + - - + + @@ -242,19 +242,19 @@ - + - + - - - + + + @@ -300,7 +300,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -329,13 +329,13 @@ - + - + @@ -351,9 +351,9 @@ - + - @@ -371,7 +371,7 @@ - @@ -383,13 +383,13 @@ - + - + @@ -409,14 +409,14 @@ - - + + - - + + @@ -612,8 +612,8 @@ - - + + @@ -635,7 +635,7 @@ - + @@ -668,14 +668,14 @@ - + - + - + @@ -722,7 +722,7 @@ - + @@ -730,10 +730,10 @@ - + - + @@ -745,13 +745,13 @@ - + - + @@ -761,19 +761,19 @@ - + - + - + - + - + @@ -804,48 +804,48 @@ - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -853,32 +853,32 @@ - + + value=switch(@0, 2, -151, -304, -457, -610)" /> - - + value=switch(@0, 0, -153, -306, -459, -612)" /> + + - + - + - + - + @@ -918,13 +918,13 @@ - - + + - + @@ -934,55 +934,55 @@ - + - + - + - + - - + + - + - + - + - + - + - - + + - + @@ -1054,16 +1054,16 @@ - - + + - + - + @@ -1074,8 +1074,8 @@ - - + + @@ -1097,18 +1097,18 @@ - + - + - + @@ -1120,7 +1120,7 @@ - + @@ -1188,10 +1188,10 @@ - + - + - + - - + @@ -1244,23 +1244,23 @@ - + - + - + - + - + @@ -1270,32 +1270,31 @@ - + - - - - - + + + + - @@ -1432,10 +1431,10 @@ - + - + @@ -1443,20 +1442,20 @@ - + - + - - + @@ -1478,23 +1477,23 @@ - + - + - + - + - + @@ -1503,15 +1502,15 @@ - - - + + - - + + @@ -1531,7 +1530,7 @@ - + @@ -1539,14 +1538,14 @@ - - + + - - - - - + + + + + @@ -1564,23 +1563,23 @@ - + - + - + - + - + @@ -1591,23 +1590,23 @@ - + - + - + - + - + @@ -1624,31 +1623,31 @@ - + - + - + - + - + - + - + - + - + @@ -1696,16 +1695,16 @@ - + - - + + - + @@ -1714,12 +1713,12 @@ - + - + @@ -1741,35 +1740,35 @@ - + - - + + - + - - - + - + @@ -1779,10 +1778,10 @@ - + @@ -1792,10 +1791,10 @@ - + @@ -1805,10 +1804,10 @@ - + @@ -1839,7 +1838,7 @@ --> - + @@ -1848,27 +1847,27 @@ - - + + - + - + - + - + - + @@ -1878,189 +1877,189 @@ roty_factor="0.005" roty_limit_min="-30" roty_limit_max="30" dist_factor="0.005" dist_limit_min="1.5" dist_limit_max="2.5" > - + - - - + + + - - - + + + - - + - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - + - - + - + - + - + - - + - + - + - + - + - + - + - + - + - + + onclick_l="proc" params_l="proc_CP_menu|4" + /> + + - - - + - + - + - + - + - + @@ -2078,48 +2077,48 @@ --> - - + + - + - + - + - + - - - - - - - + + + + + + + - + - + @@ -2127,15 +2126,15 @@ - + @@ -2143,7 +2142,7 @@ @@ -2152,16 +2151,16 @@ - + - - + + @@ -2178,22 +2177,22 @@ - - + + - + - + - + - + @@ -2203,8 +2202,8 @@ - - + + @@ -2213,8 +2212,8 @@ - - + + @@ -2239,40 +2238,40 @@ - + - + - + @@ -2295,45 +2294,45 @@ - + - - + + - + - + - + - + - + - - - + + + - + - - + + - + @@ -2343,7 +2342,7 @@ line_maxw="450" multi_line="true" multi_line_space="0"/> - + @@ -2369,8 +2368,8 @@ - - + + @@ -2392,22 +2391,22 @@ - + - + - + - + - - + + - + - + @@ -2415,16 +2414,16 @@ - + - + - + - + @@ -2435,7 +2434,7 @@ color="255 255 255 255" col_pushed="255 255 255 255" col_over="0 0 0 0" onover="play_sound" params_over="name=specie_but_over" onclick_l="proc" params_l="anim_perso"/> - + - --> - + --> + @@ -2460,18 +2459,18 @@ - + - + - + - - + + - + - - + + - + + color="255 255 255 255" global_color="false" /> - - - - + + + + color="0 0 0 255" sizeref="wh" scale="true" global_color="false" /> @@ -2649,7 +2648,7 @@ - + @@ -2706,7 +2705,7 @@ - + @@ -2714,7 +2713,7 @@ - +