aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 16:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-03-15 12:37:11 +01:00
commit b0d50dea69
7 changed files with 111 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/driver/opengl/CMakeLists.txt
View file

@ -40,8 +40,6 @@ NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB})
NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB}) NL_ADD_RUNTIME_FLAGS(${NLDRV_OGL_LIB})
IF(WIN32) IF(WIN32)
INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
ADD_DEFINITIONS(-DDRIVER_OPENGL_EXPORTS) ADD_DEFINITIONS(-DDRIVER_OPENGL_EXPORTS)
ENDIF() ENDIF()

2
code/nel/src/3d/driver/opengles/CMakeLists.txt
View file

@ -38,8 +38,6 @@ NL_ADD_LIB_SUFFIX(${NLDRV_OGLES_LIB})
NL_ADD_RUNTIME_FLAGS(${NLDRV_OGLES_LIB}) NL_ADD_RUNTIME_FLAGS(${NLDRV_OGLES_LIB})
IF(WIN32) IF(WIN32)
INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
ADD_DEFINITIONS(/DDRIVER_OPENGLES_EXPORTS) ADD_DEFINITIONS(/DDRIVER_OPENGLES_EXPORTS)
ENDIF() ENDIF()

6
code/nel/src/misc/CMakeLists.txt
View file

@ -201,12 +201,6 @@ ELSE(WITH_STATIC OR WIN32)
TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARY}) TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARY})
ENDIF(WITH_STATIC OR WIN32) ENDIF(WITH_STATIC OR WIN32)
# For DirectInput (di_event_emitter)
IF(WIN32)
INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(nelmisc ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY} winmm dbghelp)
ENDIF(WIN32)
IF(UNIX) IF(UNIX)
TARGET_LINK_LIBRARIES(nelmisc -lc -ldl) TARGET_LINK_LIBRARIES(nelmisc -lc -ldl)
IF(NOT APPLE) IF(NOT APPLE)

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

@ -4,7 +4,7 @@
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- create the game namespace without reseting if already created in an other file. -- create the game namespace without reseting if already created in an other file.
if (outgame == nil) then if (outgame == nil) then
outgame= {}; outgame = {}
end end
@ -20,14 +20,14 @@ end
-- Fyros -- Fyros
function outgame:getFyrosFirstName() function outgame:getFyrosFirstName()
local nbFyrosFirstNames = 0; local nbFyrosFirstNames = 0
for _ in pairs(fyrosFirstNames) do nbFyrosFirstNames = nbFyrosFirstNames + 1 end for _ in pairs(fyrosFirstNames) do nbFyrosFirstNames = nbFyrosFirstNames + 1 end
return fyrosFirstNames[math.random(nbFyrosFirstNames)] return fyrosFirstNames[math.random(nbFyrosFirstNames)]
end end
function outgame:getFyrosLastName() function outgame:getFyrosLastName()
local nbFyrosLastNames = 0; local nbFyrosLastNames = 0
for _ in pairs(fyrosLastNames) do nbFyrosLastNames = nbFyrosLastNames + 1 end for _ in pairs(fyrosLastNames) do nbFyrosLastNames = nbFyrosLastNames + 1 end
return fyrosLastNames[math.random(nbFyrosLastNames)] return fyrosLastNames[math.random(nbFyrosLastNames)]
@ -36,29 +36,29 @@ end
-- Matis -- Matis
function outgame:getMatisFirstName(sex) function outgame:getMatisFirstName(sex)
-- 1 = male, 2 = female -- 1 = male, 2 = female
local dbNameSex = getDbProp("UI:TEMP:NAME_SEX"); local dbNameSex = getDbProp("UI:TEMP:NAME_SEX")
if sex ~= nil then if sex ~= nil then
dbNameSex = sex; dbNameSex = sex
end end
local FirstName = "" local FirstName = ""
if tonumber(dbNameSex) == 1 then if tonumber(dbNameSex) == 1 then
local nbMatisMaleFirstNames = 0; local nbMatisMaleFirstNames = 0
for _ in pairs(matisMaleFirstNames) do nbMatisMaleFirstNames = nbMatisMaleFirstNames + 1 end for _ in pairs(matisMaleFirstNames) do nbMatisMaleFirstNames = nbMatisMaleFirstNames + 1 end
FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]; FirstName = matisMaleFirstNames[math.random(nbMatisMaleFirstNames)]
else else
local nbMatisFemaleFirstNames = 0; local nbMatisFemaleFirstNames = 0
for _ in pairs(matisFemaleFirstNames) do nbMatisFemaleFirstNames = nbMatisFemaleFirstNames + 1 end for _ in pairs(matisFemaleFirstNames) do nbMatisFemaleFirstNames = nbMatisFemaleFirstNames + 1 end
FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]; FirstName = matisFemaleFirstNames[math.random(nbMatisFemaleFirstNames)]
end end
return FirstName; return FirstName
end end
function outgame:getMatisLastName() function outgame:getMatisLastName()
local nbMatisLastNames = 0; local nbMatisLastNames = 0
for _ in pairs(matisLastNames) do nbMatisLastNames = nbMatisLastNames + 1 end for _ in pairs(matisLastNames) do nbMatisLastNames = nbMatisLastNames + 1 end
return matisLastNames[math.random(nbMatisLastNames)] return matisLastNames[math.random(nbMatisLastNames)]
@ -66,14 +66,14 @@ end
-- Tryker -- Tryker
function outgame:getTrykerFirstName() function outgame:getTrykerFirstName()
local nbTrykerFirstNames = 0; local nbTrykerFirstNames = 0
for _ in pairs(trykerFirstNames) do nbTrykerFirstNames = nbTrykerFirstNames + 1 end for _ in pairs(trykerFirstNames) do nbTrykerFirstNames = nbTrykerFirstNames + 1 end
return trykerFirstNames[math.random(nbTrykerFirstNames)] return trykerFirstNames[math.random(nbTrykerFirstNames)]
end end
function outgame:getTrykerLastName() function outgame:getTrykerLastName()
local nbTrykerLastNames = 0; local nbTrykerLastNames = 0
for _ in pairs(trykerLastNames) do nbTrykerLastNames = nbTrykerLastNames + 1 end for _ in pairs(trykerLastNames) do nbTrykerLastNames = nbTrykerLastNames + 1 end
return trykerLastNames[math.random(nbTrykerLastNames)] return trykerLastNames[math.random(nbTrykerLastNames)]
@ -81,53 +81,61 @@ end
-- Zoraï -- Zoraï
function outgame:getZoraiFirstName() function outgame:getZoraiFirstName()
local nbFirstNamesOne = 0; local nbFirstNamesOne = 0
for _ in pairs(zoraiFirstNamesOne) do nbFirstNamesOne = nbFirstNamesOne + 1 end for _ in pairs(zoraiFirstNamesOne) do nbFirstNamesOne = nbFirstNamesOne + 1 end
local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]; local FirstNameOne = zoraiFirstNamesOne[math.random(nbFirstNamesOne)]
local nbFirstNamesTwo = 0; local nbFirstNamesTwo = 0
for _ in pairs(zoraiFirstNamesTwo) do nbFirstNamesTwo = nbFirstNamesTwo + 1 end for _ in pairs(zoraiFirstNamesTwo) do nbFirstNamesTwo = nbFirstNamesTwo + 1 end
local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]; local FirstNameTwo = zoraiFirstNamesTwo[math.random(nbFirstNamesTwo)]
return FirstNameOne .. "-" .. FirstNameTwo return FirstNameOne .. "-" .. FirstNameTwo
end end
function outgame:getZoraiLastName() function outgame:getZoraiLastName()
local nbLastNames = 0; local nbLastNames = 0
for _ in pairs(zoraiLastNames) do nbLastNames = nbLastNames + 1 end for _ in pairs(zoraiLastNames) do nbLastNames = nbLastNames + 1 end
return zoraiLastNames[math.random(nbLastNames)] return zoraiLastNames[math.random(nbLastNames)]
end end
function outgame:procGenerateName() 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 uiGenText = getUI("ui:outgame:appear_name:eb")
local dbNameRace = getDbProp("UI:TEMP:NAME_RACE"); local dbNameRace = getDbProp("UI:TEMP:NAME_RACE")
local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME"); local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME"); local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
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 firstName = "test2" local firstName = "test2"
local lastName = "test" 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 if tonumber(dbNameRace) == 1 then
-- Fyros -- Fyros
firstName = self:getFyrosFirstName() firstName = self:getFyrosFirstName()
lastName = self:getFyrosLastName() lastName = self:getFyrosLastName()
fullnameResult = firstName .. " " .. lastName
elseif tonumber(dbNameRace) == 2 then elseif tonumber(dbNameRace) == 2 then
-- Matis -- Matis
firstName = self:getMatisFirstName() firstName = self:getMatisFirstName()
lastName = self:getMatisLastName() lastName = self:getMatisLastName()
fullnameResult = firstName .. " " .. lastName
elseif tonumber(dbNameRace) == 3 then elseif tonumber(dbNameRace) == 3 then
-- Tryker -- Tryker
firstName = self:getTrykerFirstName() firstName = self:getTrykerFirstName()
lastName = self:getTrykerLastName() lastName = self:getTrykerLastName()
fullnameResult = lastName .. " " .. firstName
elseif tonumber(dbNameRace) == 4 then elseif tonumber(dbNameRace) == 4 then
-- Zorai -- Zorai
firstName = self:getZoraiFirstName() firstName = self:getZoraiFirstName()
lastName = self:getZoraiLastName() lastName = self:getZoraiLastName()
fullnameResult = lastName .. " " .. firstName
elseif tonumber(dbNameRace) == 5 then elseif tonumber(dbNameRace) == 5 then
-- Maraudeurs -- Maraudeurs
@ -163,97 +171,99 @@ function outgame:procGenerateName()
-- Zorai -- Zorai
lastName = self:getZoraiLastName() lastName = self:getZoraiLastName()
end end
end
fullnameResult = firstName .. " " .. lastName fullnameResult = firstName .. " " .. lastName
end
-- always use first name for character name
nameResult = firstName nameResult = firstName
uiNameFull.hardtext = fullnameResult; uiNameFull.hardtext = fullnameResult
nameResult = string.gsub(nameResult, "'", ""); nameResult = string.gsub(nameResult, "'", "")
nameResult = string.gsub(nameResult, " ", ""); nameResult = string.gsub(nameResult, " ", "")
nameResult = string.gsub(nameResult, "-", ""); nameResult = string.gsub(nameResult, "-", "")
nameResult = string.lower( nameResult ); nameResult = string.lower(nameResult)
nameResult = nameResult:gsub("^%l", string.upper); nameResult = nameResult:gsub("^%l", string.upper)
uiGenText.input_string = nameResult; uiGenText.input_string = nameResult
end end
-- Name sex slider update. -- Name sex slider update.
function outgame:procUpdateNameSexLabel() 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 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 = tostring(i18n.get(nameSexType[tonumber(uiNameSex)]))
tempstr = string.lower(tempstr); tempstr = string.lower(tempstr)
tempstr = (tempstr:gsub("^%l", string.upper)); tempstr = (tempstr:gsub("^%l", string.upper))
uiNameSexText.hardtext = tempstr; uiNameSexText.hardtext = tempstr
end end
-- Name race slider update. -- Name race slider update.
function outgame:procUpdateNameRaceLabel() 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 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"); local uiNameSexSlider = getUI("ui:outgame:appear_name:name_sex_slider")
local uiNameSubRaceFirstNameSlider = getUI("ui:outgame:appear_name:name_sub_race_first_name_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 uiNameSubRaceLastNameSlider = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider")
local uiNameGenerate = getUI("ui:outgame:appear_name:generate"); local uiNameGenerate = getUI("ui:outgame:appear_name:generate")
-- Show/Hide sex slider -- Show/Hide sex slider
uiNameGenerate.y = "-50" uiNameGenerate.y = "-50"
if tonumber(dbNameRace) == 2 then if tonumber(dbNameRace) == 2 then
uiNameSexSlider.active = true; uiNameSexSlider.active = true
uiNameGenerate.y = "-65" uiNameGenerate.y = "-65"
else else
uiNameSexSlider.active = false; uiNameSexSlider.active = false
end end
-- Show/Hide sub race slider -- Show/Hide sub race slider
if tonumber(dbNameRace) == 5 then if tonumber(dbNameRace) == 5 then
uiNameSubRaceFirstNameSlider.active = true; uiNameSubRaceFirstNameSlider.active = true
uiNameSubRaceLastNameSlider.active = true; uiNameSubRaceLastNameSlider.active = true
uiNameGenerate.y = "-105" uiNameGenerate.y = "-105"
else else
uiNameSubRaceFirstNameSlider.active = false; uiNameSubRaceFirstNameSlider.active = false
uiNameSubRaceLastNameSlider.active = false; uiNameSubRaceLastNameSlider.active = false
end end
uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)]); uiNameRaceText.hardtext = tostring(nameRaceType[tonumber(dbNameRace)])
end 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:procUpdateNameSubRaceFirstNameLabel() function outgame:procUpdateNameSubRaceFirstNameLabel()
local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zoraï" } local nameSubRaceFirstNameType = { "Fyros", matisM, matisF, "Tryker", "Zoraï" }
local uiNameSubRaceFirstNameText = getUI("ui:outgame:appear_name:name_sub_race_first_name_slider:name_race"); 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"); local dbNameSubRaceFirstName = getDbProp("UI:TEMP:NAME_SUB_RACE_FIRST_NAME")
uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)]); uiNameSubRaceFirstNameText.hardtext= tostring(nameSubRaceFirstNameType[tonumber(dbNameSubRaceFirstName)])
end end
function outgame:procUpdateNameSubRaceLastNameLabel() function outgame:procUpdateNameSubRaceLastNameLabel()
local nameSubRaceLastNameType = { "Fyros", "Matis", "Tryker", "Zoraï" } local nameSubRaceLastNameType = { "Fyros", "Matis", "Tryker", "Zoraï" }
local uiNameSubRaceLastNameText = getUI("ui:outgame:appear_name:name_sub_race_last_name_slider:name_race"); 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"); local dbNameSubRaceLastName = getDbProp("UI:TEMP:NAME_SUB_RACE_LAST_NAME")
uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)]); uiNameSubRaceLastNameText.hardtext= tostring(nameSubRaceLastNameType[tonumber(dbNameSubRaceLastName)])
end end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- called to construct icons -- called to construct icons
function outgame:activePackElement(id, icon) function outgame:activePackElement(id, icon)
local uiDesc = getUI("ui:outgame:appear:job_options:options:desc"); local uiDesc = getUI("ui:outgame:appear:job_options:options:desc")
uiDesc['ico' .. tostring(id)].active= true; uiDesc['ico' .. tostring(id)].active = true
uiDesc['ico' .. tostring(id)].texture= icon; uiDesc['ico' .. tostring(id)].texture = icon
uiDesc['ico' .. tostring(id) .. 'txt'].active= true; uiDesc['ico' .. tostring(id) .. 'txt'].active = true
end end
@ -261,13 +271,13 @@ end
-- called to construct pack text -- called to construct pack text
function outgame:setPackJobText(id, spec) function outgame:setPackJobText(id, spec)
-- Set Pack content -- Set Pack content
local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id); local uiPackText = getUI("ui:outgame:appear:job_options:options:desc:pack_" .. id)
uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec); uiPackText.hardtext= "uiCP_Job_" .. id .. tostring(spec)
-- Set specialization text -- 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 if(spec==2) then
uiResText.hardtext= "uiCP_Res_" .. id; uiResText.hardtext= "uiCP_Res_" .. id
end end
end end
@ -275,63 +285,63 @@ end
-- called to construct pack -- called to construct pack
function outgame:buildActionPack() 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 if (uiDesc==nil) then
return; return
end end
-- Reset All -- Reset All
for i = 1,20 do for i = 1,20 do
uiDesc['ico' .. tostring(i)].active= false; uiDesc['ico' .. tostring(i)].active = false
uiDesc['ico' .. tostring(i) .. 'txt'].active= false; uiDesc['ico' .. tostring(i) .. 'txt'].active = false
end end
-- Build Default Combat -- Build Default Combat
self:activePackElement(1, 'f1.tga'); -- Dagger self:activePackElement(1, 'f1.tga') -- Dagger
self:activePackElement(2, 'f2.tga'); -- Accurate Attack self:activePackElement(2, 'f2.tga') -- Accurate Attack
-- Build Default Magic -- Build Default Magic
self:activePackElement(6, 'm2.tga'); -- Gloves self:activePackElement(6, 'm2.tga') -- Gloves
self:activePackElement(7, 'm1.tga'); -- Acid self:activePackElement(7, 'm1.tga') -- Acid
-- Build Default Forage -- Build Default Forage
self:activePackElement(11, 'g1.tga'); -- Forage Tool self:activePackElement(11, 'g1.tga') -- Forage Tool
self:activePackElement(12, 'g2.tga'); -- Basic Extract self:activePackElement(12, 'g2.tga') -- Basic Extract
-- Build Default Craft -- Build Default Craft
self:activePackElement(16, 'c2.tga'); -- Craft Tool self:activePackElement(16, 'c2.tga') -- Craft Tool
self:activePackElement(17, 'c1.tga'); -- 50 raw mat self:activePackElement(17, 'c1.tga') -- 50 raw mat
self:activePackElement(18, 'c3.tga'); -- Craft Root self:activePackElement(18, 'c3.tga') -- Craft Root
self:activePackElement(19, 'c4.tga'); -- Boots Plan self:activePackElement(19, 'c4.tga') -- Boots Plan
-- Build Option -- Build Option
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then 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 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 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 elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
self:activePackElement(20, 'c6.tga'); -- Gloves Plan self:activePackElement(20, 'c6.tga') -- Gloves Plan
self:activePackElement(17, 'c5.tga'); -- Replace 17, with 100x RawMat self:activePackElement(17, 'c5.tga') -- Replace 17, with 100x RawMat
end end
-- Reset Text -- Reset Text
self:setPackJobText('F', 1); self:setPackJobText('F', 1)
self:setPackJobText('M', 1); self:setPackJobText('M', 1)
self:setPackJobText('G', 1); self:setPackJobText('G', 1)
self:setPackJobText('C', 1); self:setPackJobText('C', 1)
-- Set correct text for specalized version -- Set correct text for specalized version
if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then if (getDbProp('UI:TEMP:JOB_FIGHT') == 2) then
self:setPackJobText('F', 2); self:setPackJobText('F', 2)
elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then elseif (getDbProp('UI:TEMP:JOB_MAGIC') == 2) then
self:setPackJobText('M', 2); self:setPackJobText('M', 2)
elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then elseif (getDbProp('UI:TEMP:JOB_FORAGE') == 2) then
self:setPackJobText('G', 2); self:setPackJobText('G', 2)
elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then elseif (getDbProp('UI:TEMP:JOB_CRAFT') == 2) then
self:setPackJobText('C', 2); self:setPackJobText('C', 2)
end end
end end

5
code/ryzom/tools/client/client_config_qt/general_settings_widget.ui
View file

@ -43,11 +43,6 @@
<string>German</string> <string>German</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Hungarian</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item> <item>

8
code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_es.ts
View file

@ -241,7 +241,7 @@
<message> <message>
<location filename="../display_settings_widget.ui" line="28"/> <location filename="../display_settings_widget.ui" line="28"/>
<source>Specify if Ryzom is to be run in OpenGL or Direct3D:</source> <source>Specify if Ryzom is to be run in OpenGL or Direct3D:</source>
<translation type="unfinished"></translation> <translation>Especificar si Ryzom debe ser ejecutado con OpenGL o Direct3D:</translation>
</message> </message>
<message> <message>
<location filename="../display_settings_widget.ui" line="35"/> <location filename="../display_settings_widget.ui" line="35"/>
@ -276,7 +276,7 @@
<message> <message>
<location filename="../display_settings_widget.ui" line="81"/> <location filename="../display_settings_widget.ui" line="81"/>
<source>Specify a video mode:</source> <source>Specify a video mode:</source>
<translation type="unfinished"></translation> <translation>Especificar un modo de video:</translation>
</message> </message>
<message> <message>
<source>Specify a video mode</source> <source>Specify a video mode</source>
@ -353,7 +353,7 @@
<message> <message>
<location filename="../general_settings_widget.ui" line="100"/> <location filename="../general_settings_widget.ui" line="100"/>
<source>Slow down the game (process low priority)</source> <source>Slow down the game (process low priority)</source>
<translation type="unfinished"></translation> <translation>Realentizar el juego (prioridad de procesamiento bajo)</translation>
</message> </message>
<message> <message>
<source>Slow down the game ( process low priority )</source> <source>Slow down the game ( process low priority )</source>
@ -385,7 +385,7 @@
<message> <message>
<location filename="../sound_settings_widget.ui" line="45"/> <location filename="../sound_settings_widget.ui" line="45"/>
<source>Software sound buffer (may increase FPS)</source> <source>Software sound buffer (may increase FPS)</source>
<translation type="unfinished"></translation> <translation>Buffer de sonido software (puede aumentar los FPS)</translation>
</message> </message>
<message> <message>
<source>Software sound buffer ( may increase FPS )</source> <source>Software sound buffer ( may increase FPS )</source>

2
code/web/public_php/ams/inc/login.php
View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* This function is beign used to load info that's needed for the login page. * This function is being used to load info that's needed for the login page.
* it will try to auto-login, this can only be used while ingame, the web browser sends additional cookie information that's also stored in the open_ring db. * it will try to auto-login, this can only be used while ingame, the web browser sends additional cookie information that's also stored in the open_ring db.
* We will compare the values and if they match, the user will be automatically logged in! * We will compare the values and if they match, the user will be automatically logged in!
* @author Daan Janssens, mentored by Matthew Lagoe * @author Daan Janssens, mentored by Matthew Lagoe