diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
index 2d3271082..b9c358f96 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/bot_chat_v4.xml
@@ -1617,7 +1617,7 @@
+ -->
-
-
-
-
-
-
+ case_mode="%case_first_word_letter_up" />
@@ -199,7 +199,7 @@
x="-15"
y="10"
posref="BM BM"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="active_hardware_cursor"
hardtext="uiYes" />
@@ -208,7 +208,7 @@
y="0"
posparent="active_ok"
posref="BR BL"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="close_hardware_cursor"
hardtext="uiNo" />
@@ -316,7 +316,7 @@
x="0"
y="6"
posref="BM BM"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="universe_chanel_warning_close"
hardtext="uittOK" />
@@ -356,9 +356,9 @@
@@ -464,9 +463,9 @@
@@ -864,8 +863,10 @@
+
+ value="http://lirria.khaganat.net/ams/" />
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -2829,7 +2809,7 @@
global_color_normal="true"
global_color_over="true"
global_color_pushed="true"
- text_y="0"
+ text_y="-2"
fontsize="10"
shadow="true"
case_mode="%case_upper"
@@ -2888,21 +2868,21 @@
x="4"
y="0"
posref="TL TL"
- text_y="0"
+ text_y="-2"
onclick_l="proc"
params_l="proc_stat_report_yes"
hardtext="uiYes" />
-
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index 38dbf0ed2..7a0919bf1 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -1467,7 +1467,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
index 660cb4f9d..bff52b123 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
@@ -63,7 +63,7 @@
-
-
-
+
@@ -141,7 +138,7 @@
-
@@ -244,7 +241,7 @@
+ color="255 254 243 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@@ -279,7 +276,7 @@
+ color="255 254 243 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@@ -385,7 +382,7 @@
-
-
-
-
+
+
@@ -614,7 +611,7 @@
-
+
@@ -623,7 +620,7 @@
-
+
@@ -632,7 +629,7 @@
-
+
@@ -829,7 +826,7 @@
>
-
+
-
-
-
-
-
-
-
-
-
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
index 69b9f0bc8..bbc7ffade 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
@@ -403,12 +403,12 @@
onclick_l="new_macro_new_cmd" />
-
-
-
+
+
-
-
-
+
\ No newline at end of file
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 43727200a..2bd2767de 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
@@ -3,256 +3,69 @@
------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file.
-if (outgame == nil) then
- outgame = {}
+if (outgame==nil) then
+ outgame= {};
end
-
-
------------------------------------------------------------------------------------------------------------
-- Name generator.
---nb noms:
--- 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
-
--- Fyros
-function outgame:getFyrosFirstName()
- local nbFyrosFirstNames = #fyrosFirstNames
-
- return fyrosFirstNames[math.random(nbFyrosFirstNames)]
-end
-
-function outgame:getFyrosLastName()
- local nbFyrosLastNames = #fyrosLastNames
-
- return fyrosLastNames[math.random(nbFyrosLastNames)]
-end
-
--- Matis
-function outgame:getMatisFirstName(sex)
- -- 1 = male, 2 = female
- local dbNameSex = getDbProp("UI:TEMP:NAME_SEX")
-
- if sex ~= nil then
- dbNameSex = sex
- end
-
- local FirstName = ""
- if tonumber(dbNameSex) == 1 then
- local nbMatisMaleFirstNames = #matisMaleFirstNames
- FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]
- else
- local nbMatisFemaleFirstNames = #matisFemaleFirstNames
- FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]
- end
-
- return FirstName
-end
-
-function outgame:getMatisLastName()
- local nbMatisLastNames = #matisLastNames
-
- return matisLastNames[math.random(nbMatisLastNames)]
-end
-
--- Tryker
-function outgame:getTrykerFirstName()
- local nbTrykerFirstNames = #trykerFirstNames
-
- return trykerFirstNames[math.random(nbTrykerFirstNames)]
-end
-
-function outgame:getTrykerLastName()
- local nbTrykerLastNames = #trykerLastNames
-
- return trykerLastNames[math.random(nbTrykerLastNames)]
-end
-
--- Zoraï
-function outgame:getZoraiFirstName()
- local nbFirstNamesOne = #zoraiFirstNamesOne
- local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]
-
- local nbFirstNamesTwo = #zoraiFirstNamesTwo
- local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]
-
- return FirstNameOne .. "-" .. FirstNameTwo
-end
-
-function outgame:getZoraiLastName()
- local nbLastNames = #zoraiLastNames
-
- return zoraiLastNames[math.random(nbLastNames)]
-end
function outgame:procGenerateName()
- 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 dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
- local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
+ local uiNameFull = getUI("ui:outgame:appear_name:name_full");
+ local uiNameDef = getUI("ui:outgame:appear_name:name_def");
+ local uiGenText = getUI("ui:outgame:appear_name:eb");
+ local dbNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE");
+ local dbNameRace = getDbProp("UI:TEMP:NAME_RACE");
+ local dbNameSyllabeMax = getDbProp("UI:TEMP:NAME_SYLLABE_MAX");
- local nameResult = ""
- local fullnameResult = ""
-
- -- Look at outgame:procUpdateNameRaceLabel() for the "race" list.
- -- fy ma try zo -->
- local firstName = "test2"
- local lastName = "test"
-
- -- Fyros and Matis are using "first name, last name" order
- -- Trykers and Zoraïs are using "last name, first name" order
- if tonumber(dbNameRace) == 1 then
- -- Fyros
- firstName = self:getFyrosFirstName()
- lastName = self:getFyrosLastName()
- fullnameResult = firstName .. " " .. lastName
- elseif tonumber(dbNameRace) == 2 then
- -- Matis
- firstName = self:getMatisFirstName()
- lastName = self:getMatisLastName()
- fullnameResult = firstName .. " " .. lastName
- elseif tonumber(dbNameRace) == 3 then
- -- Tryker
- firstName = self:getTrykerFirstName()
- lastName = self:getTrykerLastName()
- fullnameResult = lastName .. " " .. firstName
- elseif tonumber(dbNameRace) == 4 then
- -- Zorai
- firstName = self:getZoraiFirstName()
- lastName = self:getZoraiLastName()
- fullnameResult = lastName .. " " .. firstName
- elseif tonumber(dbNameRace) == 5 then
- -- Maraudeurs
-
- -- firstName
- if tonumber(dbNameSubRaceFirstName) == 1 then
- -- Fyros
- firstName = self:getFyrosFirstName()
- elseif tonumber(dbNameSubRaceFirstName) == 2 then
- -- Matis M
- firstName = self:getMatisFirstName(1)
- elseif tonumber(dbNameSubRaceFirstName) == 3 then
- -- Matis F
- firstName = self:getMatisFirstName(2)
- elseif tonumber(dbNameSubRaceFirstName) == 4 then
- -- Tryker
- firstName = self:getTrykerFirstName()
- elseif tonumber(dbNameSubRaceFirstName) == 5 then
- -- Zorai
- firstName = self:getZoraiFirstName()
- end
-
- -- lastName
- 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
-
- fullnameResult = firstName .. " " .. lastName
- end
-
- -- always use first name for character name
- nameResult = firstName
-
- 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
+ local nameResult = "";
+ local fullnameResult = "";
+ local defResult = "";
+
+ local nbRafsi = 0;
+ for _ in pairs(rafsi) do nbRafsi = nbRafsi + 1 end
+
+
+ index = math.random(nbRafsi);
+ nameResult = rafsi[index];
+ fullnameResult = gismu[index];
+ defResult = def[index];
+
+ imax = tonumber(dbNameSyllabe);
+ for i=2,imax,1 do
+ index = math.random(nbRafsi);
+ nameResult = nameResult .. rafsi[index];
+ fullnameResult = fullnameResult .. " " .. gismu[index];
+ defResult = defResult .. " | " .. def[index];
+ end
+
+ uiNameFull.hardtext = fullnameResult;
+ uiNameDef.hardtext = defResult;
+
+ 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 uiNameSexText = getUI("ui:outgame:appear_name:name_sex_slider: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))
-
- uiNameSexText.hardtext = tempstr
-end
-
--- Name race slider update.
-function outgame:procUpdateNameRaceLabel()
- 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 uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider")
-
- local uiNameSubRaceFirstNameSlider = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider")
- local uiNameSubRaceLastNameSlider = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider")
-
- local uiNameGenerate = getUI("ui:outgame:appear_name:generate")
- -- Show/Hide sex slider
-
- 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
- uiNameSubRaceFirstNameSlider.active = true
- uiNameSubRaceLastNameSlider.active = true
- uiNameGenerate.y = "-105"
- else
- uiNameSubRaceFirstNameSlider.active = false
- uiNameSubRaceLastNameSlider.active = false
- end
-
- uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)])
-end
-
-
-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)
-
-function outgame:procUpdateNameSubRaceFirstNameLabel()
- local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zoraï" }
- local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race")
- local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
-
- uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)])
-end
-
-function outgame:procUpdateNameSubRaceLastNameLabel()
- local nameSubRaceLastNameType = { "Fyros", "Matis", "Tryker", "Zoraï" }
- local uiNameSubRaceLastNameText = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider:name_race")
- local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
-
- uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)])
+-- Name syllabe slider update.
+function outgame:procUpdateNameSyllabeLabel()
+ local uiNameSyllabeText_nb = getUI("ui:outgame:appear_name:name_syllabe_slider:name_syllabe_nb");
+ local uiNameSyllabe = getDbProp("UI:TEMP:NAME_SYLLABE");
+ uiNameSyllabeText_nb.hardtext = uiNameSyllabe;
+ -- uiNameSyllabeText.hardtext = uiNameSyllabe .. " " .. i18n.get("uiCP_Syllabe");
end
------------------------------------------------------------------------------------------------------------
-- called to construct icons
function outgame:activePackElement(id, icon)
- local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
- uiDesc['ico' .. tostring(id)].active = true
- uiDesc['ico' .. tostring(id)].texture = icon
- uiDesc['ico' .. tostring(id) .. 'txt'].active = true
+ local uiDesc = getUI("ui:outgame:appear:job_options:options:desc");
+ uiDesc['ico' .. tostring(id)].active= true;
+ uiDesc['ico' .. tostring(id)].texture= icon;
+ uiDesc['ico' .. tostring(id) .. 'txt'].active= true;
end
@@ -260,13 +73,13 @@ end
-- called to construct pack text
function outgame:setPackJobText(id, spec)
-- Set Pack content
- local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id)
- uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec)
+ local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id);
+ uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec);
-- Set specialization text
- local uiResText = getUI("ui:outgame:appear:job_options:options:result:res")
+ local uiResText = getUI("ui:outgame:appear:job_options:options:result:res");
if(spec==2) then
- uiResText.hardtext= "uiCP_Res_" .. id
+ uiResText.hardtext= "uiCP_Res_" .. id;
end
end
@@ -274,65 +87,65 @@ end
-- called to construct pack
function outgame:buildActionPack()
- local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
+ local uiDesc = getUI("ui:outgame:appear:job_options:options:desc");
if (uiDesc==nil) then
- return
+ return;
end
-- Reset All
for i = 1,20 do
- uiDesc['ico' .. tostring(i)].active = false
- uiDesc['ico' .. tostring(i) .. 'txt'].active = false
+ uiDesc['ico' .. tostring(i)].active= false;
+ uiDesc['ico' .. tostring(i) .. 'txt'].active= false;
end
-- Build Default Combat
- self:activePackElement(1, 'f1.tga') -- Dagger
- self:activePackElement(2, 'f2.tga') -- Accurate Attack
-
+ self:activePackElement(1, 'f1.tga'); -- Dagger
+ self:activePackElement(2, 'f2.tga'); -- Accurate Attack
+
-- Build Default Magic
- self:activePackElement(6, 'm2.tga') -- Gloves
- self:activePackElement(7, 'm1.tga') -- Acid
-
+ self:activePackElement(6, 'm2.tga'); -- Gloves
+ self:activePackElement(7, 'm1.tga'); -- Acid
+
-- Build Default Forage
- self:activePackElement(11, 'g1.tga') -- Forage Tool
- self:activePackElement(12, 'g2.tga') -- Basic Extract
-
+ self:activePackElement(11, 'g1.tga'); -- Forage Tool
+ self:activePackElement(12, 'g2.tga'); -- Basic Extract
+
-- Build Default Craft
- self:activePackElement(16, 'c2.tga') -- Craft Tool
- self:activePackElement(17, 'c1.tga') -- 50 raw mat
- self:activePackElement(18, 'c3.tga') -- Craft Root
- self:activePackElement(19, 'c4.tga') -- Boots Plan
+ self:activePackElement(16, 'c2.tga'); -- Craft Tool
+ self:activePackElement(17, 'c1.tga'); -- 50 raw mat
+ self:activePackElement(18, 'c3.tga'); -- Craft Root
+ self:activePackElement(19, 'c4.tga'); -- Boots Plan
-- Build Option
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
- self:activePackElement(3, 'f3.tga') -- Increase damage
+ self:activePackElement(3, 'f3.tga'); -- Increase damage
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
- self:activePackElement(8, 'm5.tga') -- Fear
+ self:activePackElement(8, 'm5.tga'); -- Fear
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
- self:activePackElement(13, 'g3.tga') -- Basic Prospection
+ self:activePackElement(13, 'g3.tga'); -- Basic Prospection
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
- self:activePackElement(20, 'c6.tga') -- Gloves Plan
- self:activePackElement(17, 'c5.tga') -- Replace 17, with 100x RawMat
+ self:activePackElement(20, 'c6.tga'); -- Gloves Plan
+ self:activePackElement(17, 'c5.tga'); -- Replace 17, with 100x RawMat
end
-- Reset Text
- self:setPackJobText('F', 1)
- self:setPackJobText('M', 1)
- self:setPackJobText('G', 1)
- self:setPackJobText('C', 1)
-
- -- Set correct text for specalized version
+ self:setPackJobText('F', 1);
+ self:setPackJobText('M', 1);
+ self:setPackJobText('G', 1);
+ self:setPackJobText('C', 1);
+
+ -- Set correct text for specalized version
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
- self:setPackJobText('F', 2)
+ self:setPackJobText('F', 2);
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
- self:setPackJobText('M', 2)
+ self:setPackJobText('M', 2);
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
- self:setPackJobText('G', 2)
+ self:setPackJobText('G', 2);
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
- self:setPackJobText('C', 2)
+ self:setPackJobText('C', 2);
end
-
+
end
@@ -373,8 +186,8 @@ end
--function outgame:setPatchProgress(progress)
-- --debugInfo("*** 3 ***")
-- local progressPercentText = string.format("%d%%", 100 * progress)
--- local progressPostfix = math.fmod(os.time(), 3)
--- --debugInfo("Patch in progress : " .. tostring(progress))
+-- local progressPostfix = math.fmod(os.time(), 3)
+-- --debugInfo("Patch in progress : " .. tostring(progress))
-- local progressDate = nltime.getLocalTime() / 500
-- local colValue = math.floor(230 + 24 * math.sin(progressDate))
-- local color = string.format("%d %d %d %d", colValue, colValue, colValue, 255)
@@ -390,7 +203,7 @@ end
--
--function outgame:setPatchError()
-- --debugInfo("*** 5 ***")
--- --debugInfo("Patch error")
+-- --debugInfo("Patch error")
-- self:setProgressText(i18n.get("uiBGD_PatchError"), "255 0 0 255", 0)
--end
--
@@ -406,9 +219,9 @@ end
function outgame:launchGame()
if not isPlayerSlotNewbieLand(getPlayerSelectedSlot()) then
if not isFullyPatched() then
- messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")
+ messageBoxWithHelp(i18n.get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame")
return
end
- end
+ end
runAH(getUICaller(), "proc", "proc_charsel_play")
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 c1e3d736b..ca5867acc 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
@@ -2,10 +2,7 @@
-
-
-
-
+
@@ -47,17 +44,13 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -109,7 +102,7 @@
@@ -136,11 +129,11 @@
-
+
-
+
@@ -195,15 +188,15 @@
-
+
-
+
-
+
@@ -223,41 +216,45 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
+
+
@@ -300,7 +297,7 @@
-
+
@@ -317,7 +314,7 @@
-
+
@@ -329,13 +326,13 @@
-
+
-
+
@@ -351,9 +348,9 @@
-
+
-
@@ -371,7 +368,7 @@
-
@@ -383,13 +380,13 @@
-
+
-
+
@@ -409,14 +406,14 @@
-
-
+
+
-
-
+
+
@@ -612,8 +609,8 @@
-
-
+
+
@@ -635,7 +632,7 @@
-
+
@@ -650,9 +647,10 @@
-
+
+
-
+
@@ -668,14 +666,14 @@
-
+
-
+
-
+
@@ -722,7 +720,7 @@
-
+
@@ -730,10 +728,10 @@
-
+
-
+
@@ -745,13 +743,13 @@
@@ -853,32 +851,39 @@
@@ -918,13 +923,13 @@
-
-
+
+
-
+
@@ -934,55 +939,55 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -1054,16 +1059,16 @@
-
-
+
+
-
+
-
+
@@ -1074,8 +1079,8 @@
-
-
+
+
@@ -1097,18 +1102,18 @@
-
+
-
+
-
+
@@ -1120,7 +1125,7 @@
-
+
@@ -1188,10 +1193,10 @@
-
+
-
+
-
+
-
-
+
@@ -1244,23 +1249,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1270,158 +1275,80 @@
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1432,10 +1359,10 @@
-
+
-
+
@@ -1443,20 +1370,20 @@
-
+
-
+
-
-
+
@@ -1478,23 +1405,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1503,15 +1430,15 @@
-
-
-
+
+
-
-
+
+
@@ -1530,24 +1457,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1564,23 +1474,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1591,23 +1501,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -1621,60 +1531,39 @@
-
-
+
-
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ -->
+
-
+
-
-
+
+
-
+
@@ -1714,12 +1603,12 @@
-
+
-
+
@@ -1740,36 +1629,36 @@
-
-
+
-
-
+
+
-
+
-
-
-
+
-
-
+
@@ -1778,11 +1667,11 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
-
-
+
@@ -1791,11 +1680,11 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
-
-
+
@@ -1804,11 +1693,11 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
-
-
+
@@ -1839,238 +1728,248 @@
-->
-
+
-
+
+
-
-
+
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
-
-
-
+
-
@@ -269,7 +269,7 @@
-
@@ -294,7 +294,7 @@
-
@@ -449,7 +449,7 @@
-
+
-
+
-
-
-
-
-
@@ -874,12 +874,12 @@
-
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/outgame_connect.xml b/code/ryzom/client/data/gamedev/interfaces_v3/outgame_connect.xml
index 3eaba6242..060f14335 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/outgame_connect.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/outgame_connect.xml
@@ -1,163 +1,163 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/outgame_crash.xml b/code/ryzom/client/data/gamedev/interfaces_v3/outgame_crash.xml
index 436573f92..c8c08a3a5 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/outgame_crash.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/outgame_crash.xml
@@ -1,118 +1,118 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
index 7aea01a67..dcb451af8 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
@@ -253,7 +253,7 @@
-
+
-
\ No newline at end of file
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 666504a78..9aa7b0208 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -1702,7 +1702,7 @@
color_grayed="255 255 255 64"
shadow_color_grayed="0 0 0 255"
highlight_over="255 255 255 150"
- case_mode="%case_normal">
+ case_mode="%case_first_word_letter_up">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-