Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Revert profile interface

Browse Source
ryzomclassic-develop
kaetemi 5 years ago
parent 2cb353438b
commit 739730127d
16 changed files with 1238 additions and 1088 deletions
Show Stats Download Patch File Download Diff File

2
code/nel/src/gui/widget_manager.cpp
Unescape Escape View File

@ -433,6 +433,8 @@ namespace NLGUI
if (pIEL != NULL) if (pIEL != NULL)
return pIEL; return pIEL;
} }
nlwarning("Could not find UI element from Id '%s'", sEltId.c_str());
return NULL; return NULL;
} }

92
code/ryzom/client/data/fonts/LICENSE_OFL.txt
Unescape Escape View File

@ -0,0 +1,92 @@
This Font Software is licensed under the SIL Open Font License,
Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font
creation efforts of academic and linguistic communities, and to
provide a free and open framework in which fonts may be shared and
improved in partnership with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply to
any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software
components as distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to,
deleting, or substituting -- in part or in whole -- any of the
components of the Original Version, by changing formats or by porting
the Font Software to a new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed,
modify, redistribute, and sell modified and unmodified copies of the
Font Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components, in
Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the
corresponding Copyright Holder. This restriction only applies to the
primary font name as presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created using
the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

BIN
code/ryzom/client/data/fonts/noto_mono.ttf
View File

Binary file not shown.

BIN
code/ryzom/client/data/fonts/noto_sans_display.ttf
View File

Binary file not shown.

5
code/ryzom/client/data/gamedev/interfaces_v3/config.xml
Unescape Escape View File

@ -919,9 +919,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
<param name="ctrl_sheet_greenify_color" value="140 255 140 150" /> <param name="ctrl_sheet_greenify_color" value="140 255 140 150" />
<param name="ctrl_text_greenify_color" value="140 255 140 150" /> <param name="ctrl_text_greenify_color" value="140 255 140 150" />
<param name="text_over_back_color" value="64 64 64 255" /> <param name="text_over_back_color" value="64 64 64 255" />
<!-- <param name="font" value="basic.ttf" /> --> <param name="font" value="noto_sans_display.ttf" />
<param name="font" value="ryzom.ttf" /> <param name="monospace_font" value="noto_mono.ttf" />
<param name="monospace_font" value="ryzom_monospace.ttf" />
<param name="add_coef_font" value="1" /> <param name="add_coef_font" value="1" />
<param name="mul_coef_anim" value="0.8" /> <param name="mul_coef_anim" value="0.8" />
<param name="bubbles_timeout" value="10" /> <param name="bubbles_timeout" value="10" />

206
code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
Unescape Escape View File

@ -283,14 +283,17 @@ function game:onDrawNpcWebPage()
local utf8Url = ucUrl:toUtf8() local utf8Url = ucUrl:toUtf8()
local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
if isRing then if isRing then
-- when in ring mode, add the parameters ourselves. 60 sec timeout because of zope...
-- browseNpcWebPage(uiStr, utf8Url .. game.RingAccessPointFilter:getURLParameters(), false, 60)
-- Use new window after revamp
--RingAccessPoint:getWindow().active = 1
--RingAccessPoint:getWindow():center()
--RingAccessPoint:getWindow():blink(1)
--RingAccessPoint:show()
getUI("ui:interface:npc_web_browser").active = false getUI("ui:interface:npc_web_browser").active = false
runAH(nil, "context_ring_sessions", "") runAH(nil, "context_ring_sessions", "")
return return
else else
local hideWindow = string.find(utf8Url, "_hideWindow=1") ~= nil
if hideWindow then
getUI("ui:interface:npc_web_browser").active = false
end
self.NpcWebPage.BrowseDone= true; self.NpcWebPage.BrowseDone= true;
browseNpcWebPage(uiStr, utf8Url, true, 10); -- 'true' is for 'add parameters' here. 10 is standard timeout browseNpcWebPage(uiStr, utf8Url, true, 10); -- 'true' is for 'add parameters' here. 10 is standard timeout
end end
@ -299,9 +302,9 @@ function game:onDrawNpcWebPage()
-- if this is a ring window, then only the refresh button to access to filter will be available -- if this is a ring window, then only the refresh button to access to filter will be available
local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
local browser = getUI("ui:interface:npc_web_browser") local browser = getUI("ui:interface:npc_web_browser")
browser:find("browse_redo").active = true browser:find("browse_redo").active = not isRing
browser:find("browse_undo").active = true browser:find("browse_undo").active = not isRing
browser:find("browse_refresh").active = true browser:find("browse_refresh").active = isRing
end end
end end
end end
@ -1010,27 +1013,6 @@ function RingPlayerInfo:getLevelRatingAndImprovementRate(val)
return level, progress return level, progress
end end
--------------------------------------------------------------------------------------------------------------
--
function game:updateOrganization(path, uiOrgText, uiStatusText, uiPointsText)
local org = getDbProp(path.."1:VALUE")
getUICaller()[uiOrgText].uc_hardtext = i18n.get('uiOrganization_' .. org)
local status = getDbProp(path.."2:VALUE")
getUICaller()[uiStatusText].uc_hardtext= status
local points = getDbProp(path.."3:VALUE")
getUICaller()[uiPointsText].uc_hardtext= points
end
------------------------------------------------------------------------------------------------------------
function game:organizationTooltip()
-- set the tooltip in InterfaceManager
setContextHelpText( i18n.get('uittOrganization') );
end
-------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------
function game:popMissionList() function game:popMissionList()
@ -1435,13 +1417,6 @@ function game:onInGameDbInitialized()
runAH(nil, "sort_tribefame", "") runAH(nil, "sort_tribefame", "")
end end
function game:onWebIgReady()
-- Call init webig
getUI("ui:interface:web_transactions:content:html"):browse("home")
getUI("ui:interface:webig:content:html"):browse("home")
end
-------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------
-- handler called by C++ at the start of a far TP (log to char selection or far tp) -- handler called by C++ at the start of a far TP (log to char selection or far tp)
function game:onFarTpStart() function game:onFarTpStart()
@ -1602,164 +1577,3 @@ end
function game:onNewMissionAdded(missionIndex) function game:onNewMissionAdded(missionIndex)
debugInfo("Mission " .. missionIndex .. " has been added") debugInfo("Mission " .. missionIndex .. " has been added")
end end
--------------------------------------------------------------------------------------------------------------
-- RPJOBS
function game:addRpJob(jobtype, id, value, rpjobs)
local base_path = "ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id..":rpjob_"..jobtype.."_infos_"..id
local group = getUI("ui:interface:info_player_skills:content:rpjobs:rpjob_"..jobtype.."_"..id)
if (value == nil) then
group.active = false
else
local name = "rpjob_" .. string.format("%03d", value)
local sitem = name..".sitem"
if (rpjobs[sitem] == nil) then
group.active = false
else
group.active = true
local echelon_value = rpjobs[sitem][1]
local quantity = rpjobs[sitem][2]
local maxlevel = (echelon_value*6)-30
if (quantity > maxlevel) then
quantity = maxlevel
end
local base = getUI(base_path..":t")
base.hardtext = i18n.get(name):toUtf8()
local ui = getUI(base_path..":icon")
ui.texture = name..".tga"
local echelon = getUI(base_path..":echelon_value")
echelon.hardtext = tostring(echelon_value/10)
local bar = getUI(base_path..":bar3d:level")
local t = getUI(base_path..":bar3d:t")
if (echelon_value >= 60) then
bar.color = "255 0 0 255"
bar.w = "368"
t.hardtext = i18n.get("uiRpjobMaxLevel"):toUtf8()
t.color = "255 255 0 255"
else
bar.color = tostring(math.floor((105*quantity)/maxlevel)).." "..tostring(100+math.floor((155*quantity)/maxlevel)).." "..tostring(math.floor((105*quantity)/maxlevel)).." 255"
bar.w = tostring((368*quantity)/maxlevel)
t.hardtext = tostring(quantity).." / "..tostring(maxlevel)
t.color = tostring(255*math.floor(3*(maxlevel-quantity)/maxlevel)).." "..tostring(255*math.floor(3*(maxlevel-quantity)/maxlevel)).." "..tostring(255*math.floor(3*(maxlevel-quantity)/maxlevel)).." 255"
end
end
end
end
function game:getRPJobs()
rpjobs_advanced = {}
rpjobs_elementary = {}
rpjobs_roleplay = {}
rpjobs = {}
for i = 0, 499, 1 do
local sheet = getDbProp("SERVER:INVENTORY:BAG:"..tostring(i)..":SHEET")
if (sheet ~= 0) then
local name = getSheetName(sheet)
if (string.sub(name, 0, 6) == "rpjob_") then
local quality = getDbProp("SERVER:INVENTORY:BAG:"..tostring(i)..":QUALITY")
local quantity = getDbProp("SERVER:INVENTORY:BAG:"..tostring(i)..":QUANTITY")
if (name == "rpjob_advanced.sitem") then
table.insert(rpjobs_advanced, quality)
else
if (name == "rpjob_elementary.sitem") then
table.insert(rpjobs_elementary, quality)
else
if (name == "rpjob_roleplay.sitem") then
table.insert(rpjobs_roleplay, quality)
else
if rpjobs[name] == nil then
rpjobs[name] = {quality, quantity}
else
if rpjobs[name][1] < quality then
rpjobs[name] = {quality, quantity}
end
end
end
end
end
end
end
end
for id=1,2,1 do
game:addRpJob("advanced", id, rpjobs_advanced[id], rpjobs)
end
for id=1,3,1 do
game:addRpJob("elementary", id, rpjobs_elementary[id], rpjobs)
end
end
--------------------------------------------------------------------------------------------------------------
function game:setInfoPlayerCharacterRace()
getUI("ui:interface:info_player_skills:content:basics_skills:character_race_name").uc_hardtext = i18n.get("io"..getUserRace())
end
-- --------------------------------------------------------------------------------------------------------------
-- game.preInitTimer = 0
-- function game:preInitWebIgAppsLoop()
-- if game.preInitTimer == nil then game.preInitTimer = 0 end
-- game.preInitTimer = game.preInitTimer - 1
-- if (not game.preWebIgAppsInitialized) and game.preInitTimer < 0 then
-- debugInfo("initWebIgAppsLoop(): calling app_ig_preinit.php")
-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_preinit.php")
-- game.preInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
-- end
-- if game.preWebIgAppsInitialized then
-- debugInfo("preInitWebIgAppsLoop(): Calling removeOnDbChange()")
-- removeOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
-- end
-- end
-- --------------------------------------------------------------------------------------------------------------
-- function game:preInitWebIgApps()
-- debugInfo("game:preInitWebIgApps()")
-- addOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:preInitWebIgAppsLoop()")
-- end
-- --------------------------------------------------------------------------------------------------------------
-- game.postInitTimer = 0
-- function game:postInitWebIgAppsLoop()
-- if game.postInitTimer == nil then game.postInitTimer = 0 end
-- game.postInitTimer = game.postInitTimer - 1
-- if game.postInitTimer < 0 then
-- debugInfo("initWebIgAppsLoop(): calling app_ig_postinit.php")
-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_postinit.php")
-- game.postInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
-- end
-- if game.postWebIgAppsInitialized then
-- debugInfo("postInitWebIgAppsLoop(): Calling removeOnDbChange()")
-- removeOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
-- end
-- end
-- --------------------------------------------------------------------------------------------------------------
-- function game:postInitWebIgApps()
-- debugInfo("game:postInitWebIgApps()")
-- addOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:postInitWebIgAppsLoop()")
-- end
-- --------------------------------------------------------------------------------------------------------------
-- function game:deinitWebIgApps()
-- debugInfo("game:deinitWebIgApps()")
-- game.preWebIgAppsInitialized = nil
-- game.postWebIgAppsInitialized = nil
-- titleSetted = nil
-- end

1276
code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
View File

File diff suppressed because it is too large Load Diff

5
code/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
Unescape Escape View File

@ -428,9 +428,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
<param name="ctrl_sheet_gray_color" value="255 255 255 100" /> <param name="ctrl_sheet_gray_color" value="255 255 255 100" />
<param name="ctrl_sheet_redify_color" value="255 100 100 100" /> <param name="ctrl_sheet_redify_color" value="255 100 100 100" />
<param name="ctrl_text_redify_color" value="255 32 32 160" /> <param name="ctrl_text_redify_color" value="255 32 32 160" />
<!-- <param name="font" value="basic.ttf" /> --> <param name="font" value="noto_sans_display.ttf" />
<param name="font" value="ryzom.ttf" /> <param name="monospace_font" value="noto_mono.ttf" />
<param name="monospace_font" value="ryzom_monospace.ttf" />
<param name="add_coef_font" value="3" /> <param name="add_coef_font" value="3" />
<param name="mul_coef_anim" value="0.8" /> <param name="mul_coef_anim" value="0.8" />
<param name="bubbles_timeout" value="10" /> <param name="bubbles_timeout" value="10" />

337
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
Unescape Escape View File

@ -1,259 +1,144 @@
<interface_config> <interface_config>
<root id="outgame"
x="0" <root id="outgame" x="0" y="0" w="800" h="600" active="true" />
y="0"
w="800"
h="600"
active="true" />
<!-- **************************************** --> <!-- **************************************** -->
<!-- * CONFIGURATION FOR OUTGAME INTERFACES * --> <!-- * CONFIGURATION FOR OUTGAME INTERFACES * -->
<!-- **************************************** --> <!-- **************************************** -->
<options name="text_selection"> <options name="text_selection">
<param name="back_select_color" <param name="back_select_color" value="255 255 255 255" />
value="255 255 255 255" /> <param name="text_select_color" value="0 0 0 255" />
<param name="text_select_color"
value="0 0 0 255" />
</options> </options>
<options name="system"> <options name="system">
<param name="ctrl_sheet_gray_color" <param name="ctrl_sheet_gray_color" value="255 255 255 128" />
value="255 255 255 128" /> <param name="ctrl_sheet_redify_color" value="255 100 100 128" />
<param name="ctrl_sheet_redify_color" <param name="ctrl_text_redify_color" value="255 32 32 160" />
value="255 100 100 128" /> <param name="font" value="noto_sans_display.ttf" />
<param name="ctrl_text_redify_color" <param name="monospace_font" value="noto_mono.ttf" />
value="255 32 32 160" /> <param name="add_coef_font" value="0" />
<!-- <param name="font" <param name="mul_coef_anim" value="1.0" />
value="basic.ttf" /> --> <param name="bubbles_timeout" value="10" />
<param name="font" <param name="messages_timeout" value="10" />
value="ryzom.ttf" /> <param name="context_timeout" value="5" />
<param name="monospace_font" <param name="context_html_timeout" value="15" />
value="ryzom_monospace.ttf" />
<param name="add_coef_font"
value="0" />
<param name="mul_coef_anim"
value="1.0" />
<param name="bubbles_timeout"
value="10" />
<param name="messages_timeout"
value="10" />
<param name="context_timeout"
value="5" />
<param name="context_html_timeout"
value="15" />
</options> </options>
<!-- anim 0 is the default animation --> <!-- anim 0 is the default animation -->
<options type="animation_set" <options type="animation_set" name="character_animations">
name="character_animations"> <param name="m0" value="FY_HOM_idle" />
<param name="m0" <param name="m1" value="CP_HOM_pose" />
value="FY_HOM_idle" /> <param name="m2" value="CP_HOM_body" />
<param name="m1" <param name="m3" value="CP_HOM_visage" />
value="CP_HOM_pose" /> <param name="m4" value="CP_HOM_course" />
<param name="m2" <param name="m5" value="CP_HOM_view" />
value="CP_HOM_body" /> <param name="m6" value="CP_FY_HOM_species" />
<param name="m3" <param name="m7" value="CP_MA_HOM_species" />
value="CP_HOM_visage" /> <param name="m8" value="CP_TR_HOM_species" />
<param name="m4" <param name="m9" value="CP_ZO_HOM_species" />
value="CP_HOM_course" /> <param name="m10" value="CP_HOM_select" />
<param name="m5"
value="CP_HOM_view" />
<param name="m6"
value="CP_FY_HOM_species" />
<param name="m7"
value="CP_MA_HOM_species" />
<param name="m8"
value="CP_TR_HOM_species" />
<param name="m9"
value="CP_ZO_HOM_species" />
<param name="m10"
value="CP_HOM_select" />
<!-- New anims CP --> <!-- New anims CP -->
<param name="m11" <param name="m11" value="CP_FY_HOM_view" />
value="CP_FY_HOM_view" /> <param name="m12" value="CP_MA_HOM_view" />
<param name="m12" <param name="m13" value="CP_TR_HOM_view" />
value="CP_MA_HOM_view" /> <param name="m14" value="CP_ZO_HOM_view" />
<param name="m13"
value="CP_TR_HOM_view" />
<param name="m14"
value="CP_ZO_HOM_view" /> <param name="f0" value="FY_HOF_A_idle" />
<param name="f0" <param name="f1" value="CP_HOF_pose" />
value="FY_HOF_A_idle" /> <param name="f2" value="CP_HOF_body" />
<param name="f1" <param name="f3" value="CP_HOF_visage" />
value="CP_HOF_pose" /> <param name="f4" value="CP_HOF_course" />
<param name="f2" <param name="f5" value="CP_HOF_view" />
value="CP_HOF_body" /> <param name="f6" value="CP_FY_HOF_species" />
<param name="f3" <param name="f7" value="CP_MA_HOF_species" />
value="CP_HOF_visage" /> <param name="f8" value="CP_TR_HOF_species" />
<param name="f4" <param name="f9" value="CP_ZO_HOF_species" />
value="CP_HOF_course" /> <param name="f10" value="CP_HOF_select" />
<param name="f5"
value="CP_HOF_view" />
<param name="f6"
value="CP_FY_HOF_species" />
<param name="f7"
value="CP_MA_HOF_species" />
<param name="f8"
value="CP_TR_HOF_species" />
<param name="f9"
value="CP_ZO_HOF_species" />
<param name="f10"
value="CP_HOF_select" />
<!-- New anims CP --> <!-- New anims CP -->
<param name="f11" <param name="f11" value="CP_FY_HOF_view" />
value="CP_FY_HOF_view" /> <param name="f12" value="CP_MA_HOF_view" />
<param name="f12" <param name="f13" value="CP_TR_HOF_view" />
value="CP_MA_HOF_view" /> <param name="f14" value="CP_ZO_HOF_view" />
<param name="f13"
value="CP_TR_HOF_view" />
<param name="f14"
value="CP_ZO_HOF_view" />
</options> </options>
<!-- *********** --> <!-- *********** -->
<!-- * MOUSE * --> <!-- * MOUSE * -->
<!-- * POINTER * --> <!-- * POINTER * -->
<!-- *********** --> <!-- *********** -->
<view type="pointer"
id="cursor" <view type="pointer" id="cursor" x="8" y="-4" w="56" h="56" tx_default="curs_default.tga"
x="8" tx_move_window="curs_move_window.tga" tx_resize_BR_TL="curs_resize_BR_TL.tga"
y="-4" tx_resize_BL_TR="curs_resize_BL_TR.tga" tx_resize_TB="curs_resize_TB.tga"
w="56" tx_resize_LR="curs_resize_LR.tga" tx_rotate="curs_rotate.tga" tx_scale="curs_scale.tga"
h="56"
tx_default="curs_default.tga"
tx_move_window="curs_move_window.tga"
tx_resize_BR_TL="curs_resize_BR_TL.tga"
tx_resize_BL_TR="curs_resize_BL_TR.tga"
tx_resize_TB="curs_resize_TB.tga"
tx_resize_LR="curs_resize_LR.tga"
tx_rotate="curs_rotate.tga"
tx_scale="curs_scale.tga"
posref="BL MM" /> posref="BL MM" />
<!-- ************* --> <!-- ************* -->
<!-- * CONSTANTES * --> <!-- * CONSTANTES * -->
<!-- ************* --> <!-- ************* -->
<variable entry="UI:CONST:127" <variable entry="UI:CONST:127" type="sint32" value="127" />
type="sint32"
value="127" />
<!-- ************* --> <!-- ************* -->
<!-- * DEFINES * --> <!-- * DEFINES * -->
<!-- ************* --> <!-- ************* -->
<define id="screen_connecting" <define id="screen_connecting" value="0" />
value="0" /> <define id="screen_intro" value="1" />
<define id="screen_intro" <define id="screen_select" value="2" />
value="1" /> <define id="screen_specie" value="3" />
<define id="screen_select" <define id="screen_career" value="4" />
value="2" /> <define id="screen_career" value="5" />
<define id="screen_specie" <define id="screen_appear" value="6" />
value="3" /> <define id="screen_summary" value="7" />
<define id="screen_career" <define id="screen_crashing" value="8" />
value="4" /> <define id="screen_location" value="9" />
<define id="screen_career"
value="5" /> <variable entry="UI:TEMP:SKIP_INTRO" type="bool" value="0" />
<define id="screen_appear" <variable entry="UI:SERVER_RECEIVED_CHARS" type="sint64" value="0" />
value="6" /> <variable entry="UI:SERVER_RECEIVED_VALID" type="sint64" value="0" />
<define id="screen_summary" <variable entry="UI:CURRENT_SCREEN" type="sint64" value="%screen_connecting" />
value="7" /> <variable entry="UI:NEXT_SCREEN" type="sint64" value="-1" />
<define id="screen_crashing" <variable entry="UI:SELECTED_SLOT" type="sint64" value="-1"/>
value="8" /> <variable entry="UI:NEW_SELECTED_SLOT" type="sint64" value="-1"/>
<define id="screen_location"
value="9" /> <variable entry="UI:TEMP:CARACS:STR" type="sint64" value="0"/>
<variable entry="UI:TEMP:SKIP_INTRO" <variable entry="UI:TEMP:CARACS:CON" type="sint64" value="0"/>
type="bool" <variable entry="UI:TEMP:CARACS:AGI" type="sint64" value="0"/>
value="0" /> <variable entry="UI:TEMP:CARACS:WIL" type="sint64" value="0"/>
<variable entry="UI:SERVER_RECEIVED_CHARS" <variable entry="UI:TEMP:CARACS:WEL" type="sint64" value="0"/>
type="sint64" <variable entry="UI:TEMP:CARACS:INT" type="sint64" value="0"/>
value="0" /> <variable entry="UI:TEMP:CARACS:CHA" type="sint64" value="0"/>
<variable entry="UI:SERVER_RECEIVED_VALID" <variable entry="UI:TEMP:CARACS:EMP" type="sint64" value="0"/>
type="sint64" <variable entry="UI:TEMP:CARACS:PER" type="sint64" value="0"/>
value="0" />
<variable entry="UI:CURRENT_SCREEN"
type="sint64"
value="%screen_connecting" />
<variable entry="UI:NEXT_SCREEN"
type="sint64"
value="-1" />
<variable entry="UI:SELECTED_SLOT"
type="sint64"
value="-1" />
<variable entry="UI:NEW_SELECTED_SLOT"
type="sint64"
value="-1" />
<variable entry="UI:TEMP:CARACS:STR"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:CON"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:AGI"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:WIL"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:WEL"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:INT"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:CHA"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:EMP"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:PER"
type="sint64"
value="0" />
<!-- ****************************** --> <!-- ****************************** -->
<!-- * MISC * --> <!-- * MISC * -->
<!-- ****************************** --> <!-- ****************************** -->
<variable entry="UI:VARIABLES:CURRENT_TIME" <variable entry="UI:VARIABLES:CURRENT_TIME" type="sint64" value="0" />
type="sint64" <variable entry="UI:VARIABLES:CURRENT_SERVER_TICK" type="sint64" value="0" />
value="0" /> <variable entry="UI:VARIABLES:CURRENT_SMOOTH_SERVER_TICK" type="sint64" value="0" />
<variable entry="UI:VARIABLES:CURRENT_SERVER_TICK"
type="sint64" <variable entry="UI:SAVE:COLOR:R" type="sint32" value="255" />
value="0" /> <variable entry="UI:SAVE:COLOR:G" type="sint32" value="255" />
<variable entry="UI:VARIABLES:CURRENT_SMOOTH_SERVER_TICK" <variable entry="UI:SAVE:COLOR:B" type="sint32" value="255" />
type="sint64" <variable entry="UI:SAVE:COLOR:A" type="sint32" value="255" />
value="0" />
<variable entry="UI:SAVE:COLOR:R"
type="sint32"
value="255" />
<variable entry="UI:SAVE:COLOR:G"
type="sint32"
value="255" />
<variable entry="UI:SAVE:COLOR:B"
type="sint32"
value="255" />
<variable entry="UI:SAVE:COLOR:A"
type="sint32"
value="255" />
<!-- ***************************** --> <!-- ***************************** -->
<!-- * COMMON DEFINE COLORS * --> <!-- * COMMON DEFINE COLORS * -->
<!-- ***************************** --> <!-- ***************************** -->
<define id="hp_color"
value="255 64 0 255" /> <define id="hp_color" value="255 64 0 255" />
<define id="hp_color_neg" <define id="hp_color_neg" value="127 32 0 255" />
value="127 32 0 255" /> <define id="sta_color" value="255 0 255 255" />
<define id="sta_color" <define id="sap_color" value="72 255 0 255" />
value="255 0 255 255" /> <define id="focus_color" value="0 128 255 255" />
<define id="sap_color" <define id="bulk_color" value="215 185 75 255" />
value="72 255 0 255" />
<define id="focus_color"
value="0 128 255 255" />
<define id="bulk_color"
value="215 185 75 255" />
<!-- ***************************** --> <!-- ***************************** -->
<!-- * STRING CASE OPTION * --> <!-- * STRING CASE OPTION * -->
<!-- ***************************** --> <!-- ***************************** -->
<define id="case_normal" <define id="case_normal" value="0" />
value="0" /> <define id="case_lower" value="1" />
<define id="case_lower" <define id="case_upper" value="2" />
value="1" /> <define id="case_first_string_letter_up" value="3" />
<define id="case_upper" <define id="case_first_sentence_letter_up" value="4" />
value="2" /> <define id="case_first_word_letter_up" value="5" />
<define id="case_first_string_letter_up"
value="3" />
<define id="case_first_sentence_letter_up"
value="4" />
<define id="case_first_word_letter_up"
value="5" />
</interface_config> </interface_config>

2
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_connect.xml
Unescape Escape View File

@ -37,7 +37,7 @@
<!-- JENA BACK --> <!-- JENA BACK -->
<view type="bitmap" id="jena" render_layer="-1" <view type="bitmap" id="jena" render_layer="-1"
global_color="false" color="255 255 255 255" posref="TL TL" x="0" y="0" texture="new_launcher_bg.tga" /> global_color="false" color="255 255 255 255" posref="TL TL" x="0" y="0" texture="launcher_bg.tga" />
<!-- Quit Button --> <!-- Quit Button -->

2
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_crash.xml
Unescape Escape View File

@ -10,7 +10,7 @@
<!-- JENA BACK --> <!-- JENA BACK -->
<view type="bitmap" id="jena" render_layer="-1" <view type="bitmap" id="jena" render_layer="-1"
global_color="false" color="255 255 255 255" posref="TL TL" x="0" y="0" texture="new_launcher_bg.tga" /> global_color="false" color="255 255 255 255" posref="TL TL" x="0" y="0" texture="launcher_bg.tga" />
<!-- Quit Button --> <!-- Quit Button -->

22
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
Unescape Escape View File

@ -580,9 +580,12 @@
onclick_l="proc" params_l="proc_charsel_play"/> onclick_l="proc" params_l="proc_charsel_play"/>
--> -->
<ctrl style="valid_txt_button" id="play_but" posref="BR BM" x="-112" y="56" hardtext="uiCharSel_Play" <ctrl style="valid_txt_button" id="play_but" posref="BR BM" x="-112" y="76" hardtext="uiCharSel_Play"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
onclick_l="lua" params_l="outgame:launchGame()"/> onclick_l="lua" params_l="outgame:launchGame()"/>
<ctrl style="valid_txt_button" id="edit_session_but" posref="BR BM" x="-112" y="36" hardtext="uiLaunchEditor"
onover="play_sound" params_over="name=specie_but_over"
onclick_l="proc" params_l="proc_charsel_edit_menu"/>
<ctrl style="valid_txt_button" id="del_but" posref="BR BL" x="-794" y="56" hardtext="uiCharSel_Del" <ctrl style="valid_txt_button" id="del_but" posref="BR BL" x="-794" y="56" hardtext="uiCharSel_Del"
onover="play_sound" params_over="name=specie_but_over" onover="play_sound" params_over="name=specie_but_over"
@ -628,7 +631,7 @@
<!-- TITLE --> <!-- TITLE -->
<group id="title" w="292" h="46" y="-6" x="-272" posref="TR TR"> <group id="title" w="292" h="46" y="-6" x="-272" posref="TR TR">
<view type="text" id="title1" posref="TM TM" global_color="false" render_layer="2" fontsize="20" shadow="true" y="0" hardtext="uiCP_title1"/> <view type="text" id="title1" posref="TM TM" global_color="false" render_layer="2" fontsize="20" shadow="true" y="-4" hardtext="uiCP_title1"/>
<view type="text" id="title2" posref="BM BM" global_color="false" render_layer="2" fontsize="20" shadow="true" y="0" hardtext="uiCP_selection"/> <view type="text" id="title2" posref="BM BM" global_color="false" render_layer="2" fontsize="20" shadow="true" y="0" hardtext="uiCP_selection"/>
</group> </group>
@ -682,9 +685,15 @@
onclick_l="leave_modal" /> onclick_l="leave_modal" />
</group> </group>
<group id="webstart" posref="BR BR" w="100" h="60" active="true" >
<group id="content" x="0" y="0" w="100" h="60" posref="MM MM" >
<group id="webstart_html" type="html" posref="MM MM"
<!-- Web box
<group id="webstart" posref="BR BR" w="200" h="200" active="true" >
<group id="content" x="0" y="0" w="200" h="200" posref="TL TL" >
<group type="html" id="webstart_html" posref="TL TL"
url="" url=""
title_prefix="uiQuickhelpTitle" title_prefix="uiQuickhelpTitle"
sizeref="wh" x="0" y="0" w="-40" h="-40" sizeref="wh" x="0" y="0" w="-40" h="-40"
@ -728,6 +737,7 @@
</group> </group>
</group> </group>
</group> </group>
-->
</group> </group>
@ -778,7 +788,7 @@
<group type="menu" id="r2ed_editor_menu" <group type="menu" id="r2ed_editor_menu"
options="menu_back" options="menu_back"
text_y="0" text_y="-2"
color="255 255 255 255" color="255 255 255 255"
fontsize="16" fontsize="16"
shadow="true" shadow="true"

2
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_widgets.xml
Unescape Escape View File

@ -83,7 +83,7 @@
tx_normal="qh_off" tx_pushed="qh_on" tx_over="qh_off" wmin="80" wmargin="40" tx_normal="qh_off" tx_pushed="qh_on" tx_over="qh_off" wmin="80" wmargin="40"
global_color_normal="false" global_color_over="false" global_color_pushed="false" global_color_normal="false" global_color_over="false" global_color_pushed="false"
color="255 255 255 255" col_over="255 255 255 0" col_pushed="255 255 255 255" color="255 255 255 255" col_over="255 255 255 0" col_pushed="255 255 255 255"
text_y="1" fontsize="13" shadow="true" text_y="-1" fontsize="13" shadow="true"
text_color_normal="222 201 182 255" text_color_normal="222 201 182 255"
text_color_pushed="222 201 182 255" text_color_pushed="222 201 182 255"
text_color_over="255 255 255 255" text_color_over="255 255 255 255"

310
code/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
Unescape Escape View File

@ -1,238 +1,128 @@
<interface_config> <interface_config>
<root id="outgame"
x="0" <root id="outgame" x="0" y="0" w="800" h="600" active="true" />
y="0"
w="800"
h="600"
active="true" />
<!-- **************************************** --> <!-- **************************************** -->
<!-- * CONFIGURATION FOR OUTGAME INTERFACES * --> <!-- * CONFIGURATION FOR OUTGAME INTERFACES * -->
<!-- **************************************** --> <!-- **************************************** -->
<options name="text_selection"> <options name="text_selection">
<param name="back_select_color" <param name="back_select_color" value="255 255 255 255" />
value="255 255 255 255" /> <param name="text_select_color" value="0 0 0 255" />
<param name="text_select_color"
value="0 0 0 255" />
</options> </options>
<options name="system"> <options name="system">
<param name="ctrl_sheet_gray_color" <param name="ctrl_sheet_gray_color" value="255 255 255 128" />
value="255 255 255 128" /> <param name="ctrl_sheet_redify_color" value="255 100 100 128" />
<param name="ctrl_sheet_redify_color" <param name="ctrl_text_redify_color" value="255 32 32 160" />
value="255 100 100 128" /> <param name="font" value="noto_sans_display.ttf" />
<param name="ctrl_text_redify_color" <param name="monospace_font" value="noto_mono.ttf" />
value="255 32 32 160" /> <param name="add_coef_font" value="3" />
<!-- <param name="font" <param name="mul_coef_anim" value="0.8" />
value="outgame.ttf" /> --> <param name="bubbles_timeout" value="10" />
<param name="font" <param name="messages_timeout" value="10" />
value="ryzom.ttf" /> <param name="context_timeout" value="5" />
<param name="monospace_font" <param name="context_html_timeout" value="15" />
value="ryzom_monospace.ttf" />
<param name="add_coef_font"
value="3" />
<param name="mul_coef_anim"
value="0.8" />
<param name="bubbles_timeout"
value="10" />
<param name="messages_timeout"
value="10" />
<param name="context_timeout"
value="5" />
<param name="context_html_timeout"
value="15" />
</options> </options>
<!-- anim 0 is the default animation --> <!-- anim 0 is the default animation -->
<options type="animation_set" <options type="animation_set" name="character_animations">
name="character_animations"> <param name="m0" value="FY_HOM_idle" />
<param name="m0" <param name="m1" value="FY_HOM_Co_AB_engarde" />
value="FY_HOM_idle" /> <param name="m2" value="FY_HOM_Co_fu_engarde" />
<param name="m1" <param name="m3" value="FY_HOM_Co_A1m_engarde" />
value="FY_HOM_Co_AB_engarde" /> <param name="m4" value="FY_HOM_Co_A1mD_engarde" />
<param name="m2" <param name="m5" value="FY_HOM_Pioche_loop" />
value="FY_HOM_Co_fu_engarde" /> <param name="m6" value="FY_HOM_AD_idle" />
<param name="m3" <param name="m7" value="FY_HOM_Co_L2m_engarde" />
value="FY_HOM_Co_A1m_engarde" /> <param name="m8" value="FY_HOM_Co_p_engarde" />
<param name="m4" <param name="m9" value="FY_HOM_Host_Loop" />
value="FY_HOM_Co_A1mD_engarde" /> <param name="m10" value="FY_HOM_Bienveillant_Loop" />
<param name="m5" <param name="m11" value="FY_HOM_Neutre_loop" />
value="FY_HOM_Pioche_loop" /> <param name="m12" value="FY_HOM_Co_A2m_engarde" />
<param name="m6" <param name="m13" value="FY_HOM_Co_A2m_engarde" />
value="FY_HOM_AD_idle" />
<param name="m7" <param name="f0" value="FY_HOF_A_idle" />
value="FY_HOM_Co_L2m_engarde" /> <param name="f1" value="FY_HOF_Co_AB_engarde" />
<param name="m8" <param name="f2" value="FY_HOF_Co_fu_engarde" />
value="FY_HOM_Co_p_engarde" /> <param name="f3" value="FY_HOF_Co_A1m_engarde" />
<param name="m9" <param name="f4" value="FY_HOF_Co_A1mD_engarde" />
value="FY_HOM_Host_Loop" /> <param name="f5" value="FY_HOF_Pioche_loop" />
<param name="m10" <param name="f6" value="FY_HOF_AD_idle" />
value="FY_HOM_Bienveillant_Loop" /> <param name="f7" value="FY_HOF_Co_L2m_engarde" />
<param name="m11" <param name="f8" value="FY_HOF_Co_p_engarde" />
value="FY_HOM_Neutre_loop" /> <param name="f9" value="FY_HOF_Host_Loop" />
<param name="m12" <param name="f10" value="FY_HOF_Bienveillant_Loop" />
value="FY_HOM_Co_A2m_engarde" /> <param name="f11" value="FY_HOF_Neutre_loop" />
<param name="m13" <param name="f12" value="FY_HOF_Co_A2m_coup1" />
value="FY_HOM_Co_A2m_engarde" /> <param name="f13" value="FY_HOF_Co_A2m_engarde" />
<param name="f0"
value="FY_HOF_A_idle" />
<param name="f1"
value="FY_HOF_Co_AB_engarde" />
<param name="f2"
value="FY_HOF_Co_fu_engarde" />
<param name="f3"
value="FY_HOF_Co_A1m_engarde" />
<param name="f4"
value="FY_HOF_Co_A1mD_engarde" />
<param name="f5"
value="FY_HOF_Pioche_loop" />
<param name="f6"
value="FY_HOF_AD_idle" />
<param name="f7"
value="FY_HOF_Co_L2m_engarde" />
<param name="f8"
value="FY_HOF_Co_p_engarde" />
<param name="f9"
value="FY_HOF_Host_Loop" />
<param name="f10"
value="FY_HOF_Bienveillant_Loop" />
<param name="f11"
value="FY_HOF_Neutre_loop" />
<param name="f12"
value="FY_HOF_Co_A2m_coup1" />
<param name="f13"
value="FY_HOF_Co_A2m_engarde" />
</options> </options>
<!-- *********** --> <!-- *********** -->
<!-- * MOUSE * --> <!-- * MOUSE * -->
<!-- * POINTER * --> <!-- * POINTER * -->
<!-- *********** --> <!-- *********** -->
<view type="pointer"
id="cursor" <view type="pointer" id="cursor" x="8" y="-4" w="56" h="56" tx_default="curs_default.tga"
x="8" tx_move_window="curs_move_window.tga" tx_resize_BR_TL="curs_resize_BR_TL.tga"
y="-4" tx_resize_BL_TR="curs_resize_BL_TR.tga" tx_resize_TB="curs_resize_TB.tga"
w="56" tx_resize_LR="curs_resize_LR.tga" tx_rotate="curs_rotate.tga" tx_scale="curs_scale.tga"
h="56"
tx_default="curs_default.tga"
tx_move_window="curs_move_window.tga"
tx_resize_BR_TL="curs_resize_BR_TL.tga"
tx_resize_BL_TR="curs_resize_BL_TR.tga"
tx_resize_TB="curs_resize_TB.tga"
tx_resize_LR="curs_resize_LR.tga"
tx_rotate="curs_rotate.tga"
tx_scale="curs_scale.tga"
posref="BL MM" /> posref="BL MM" />
<!-- ************* --> <!-- ************* -->
<!-- * CONSTANTES * --> <!-- * CONSTANTES * -->
<!-- ************* --> <!-- ************* -->
<variable entry="UI:CONST:127" <variable entry="UI:CONST:127" type="sint32" value="127" />
type="sint32"
value="127" />
<!-- ************* --> <!-- ************* -->
<!-- * DEFINES * --> <!-- * DEFINES * -->
<!-- ************* --> <!-- ************* -->
<define id="screen_connecting" <define id="screen_connecting" value="0" />
value="0" /> <define id="screen_intro" value="1" />
<define id="screen_intro" <define id="screen_select" value="2" />
value="1" /> <define id="screen_specie" value="3" />
<define id="screen_select" <define id="screen_career" value="4" />
value="2" /> <define id="screen_career" value="5" />
<define id="screen_specie" <define id="screen_appear" value="6" />
value="3" /> <define id="screen_summary" value="7" />
<define id="screen_career" <define id="screen_crashing" value="8" />
value="4" /> <define id="screen_location" value="9" />
<define id="screen_career"
value="5" /> <variable entry="UI:TEMP:SKIP_INTRO" type="bool" value="0" />
<define id="screen_appear" <variable entry="UI:SERVER_RECEIVED_CHARS" type="sint64" value="0" />
value="6" /> <variable entry="UI:SERVER_RECEIVED_VALID" type="sint64" value="0" />
<define id="screen_summary" <variable entry="UI:CURRENT_SCREEN" type="sint64" value="%screen_connecting" />
value="7" /> <variable entry="UI:NEXT_SCREEN" type="sint64" value="-1" />
<define id="screen_crashing" <variable entry="UI:SELECTED_SLOT" type="sint64" value="-1"/>
value="8" /> <variable entry="UI:NEW_SELECTED_SLOT" type="sint64" value="-1"/>
<define id="screen_location"
value="9" /> <variable entry="UI:TEMP:CARACS:STR" type="sint64" value="0"/>
<variable entry="UI:TEMP:SKIP_INTRO" <variable entry="UI:TEMP:CARACS:CON" type="sint64" value="0"/>
type="bool" <variable entry="UI:TEMP:CARACS:AGI" type="sint64" value="0"/>
value="0" /> <variable entry="UI:TEMP:CARACS:WIL" type="sint64" value="0"/>
<variable entry="UI:SERVER_RECEIVED_CHARS" <variable entry="UI:TEMP:CARACS:WEL" type="sint64" value="0"/>
type="sint64" <variable entry="UI:TEMP:CARACS:INT" type="sint64" value="0"/>
value="0" /> <variable entry="UI:TEMP:CARACS:CHA" type="sint64" value="0"/>
<variable entry="UI:SERVER_RECEIVED_VALID" <variable entry="UI:TEMP:CARACS:EMP" type="sint64" value="0"/>
type="sint64" <variable entry="UI:TEMP:CARACS:PER" type="sint64" value="0"/>
value="0" />
<variable entry="UI:CURRENT_SCREEN"
type="sint64"
value="%screen_connecting" />
<variable entry="UI:NEXT_SCREEN"
type="sint64"
value="-1" />
<variable entry="UI:SELECTED_SLOT"
type="sint64"
value="-1" />
<variable entry="UI:NEW_SELECTED_SLOT"
type="sint64"
value="-1" />
<variable entry="UI:TEMP:CARACS:STR"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:CON"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:AGI"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:WIL"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:WEL"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:INT"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:CHA"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:EMP"
type="sint64"
value="0" />
<variable entry="UI:TEMP:CARACS:PER"
type="sint64"
value="0" />
<!-- ****************************** --> <!-- ****************************** -->
<!-- * MISC * --> <!-- * MISC * -->
<!-- ****************************** --> <!-- ****************************** -->
<variable entry="UI:VARIABLES:CURRENT_TIME" <variable entry="UI:VARIABLES:CURRENT_TIME" type="sint64" value="0" />
type="sint64" <variable entry="UI:VARIABLES:CURRENT_SERVER_TICK" type="sint64" value="0" />
value="0" /> <variable entry="UI:VARIABLES:CURRENT_SMOOTH_SERVER_TICK" type="sint64" value="0" />
<variable entry="UI:VARIABLES:CURRENT_SERVER_TICK"
type="sint64" <variable entry="UI:SAVE:COLOR:R" type="sint32" value="255" />
value="0" /> <variable entry="UI:SAVE:COLOR:G" type="sint32" value="255" />
<variable entry="UI:VARIABLES:CURRENT_SMOOTH_SERVER_TICK" <variable entry="UI:SAVE:COLOR:B" type="sint32" value="255" />
type="sint64" <variable entry="UI:SAVE:COLOR:A" type="sint32" value="255" />
value="0" />
<variable entry="UI:SAVE:COLOR:R"
type="sint32"
value="255" />
<variable entry="UI:SAVE:COLOR:G"
type="sint32"
value="255" />
<variable entry="UI:SAVE:COLOR:B"
type="sint32"
value="255" />
<variable entry="UI:SAVE:COLOR:A"
type="sint32"
value="255" />
<!-- ***************************** --> <!-- ***************************** -->
<!-- * COMMON DEFINE COLORS * --> <!-- * COMMON DEFINE COLORS * -->
<!-- ***************************** --> <!-- ***************************** -->
<define id="hp_color"
value="255 64 0 255" /> <define id="hp_color" value="255 64 0 255" />
<define id="hp_color_neg" <define id="hp_color_neg" value="127 32 0 255" />
value="127 32 0 255" /> <define id="sta_color" value="255 0 255 255" />
<define id="sta_color" <define id="sap_color" value="72 255 0 255" />
value="255 0 255 255" /> <define id="focus_color" value="0 128 255 255" />
<define id="sap_color" <define id="bulk_color" value="215 185 75 255" />
value="72 255 0 255" />
<define id="focus_color"
value="0 128 255 255" />
<define id="bulk_color"
value="215 185 75 255" />
</interface_config> </interface_config>

53
code/ryzom/client/src/entity_cl.cpp
Unescape Escape View File

@ -2432,34 +2432,35 @@ public:
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
{ {
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
NLGUI::CDBManager *pCDBM = NLGUI::CDBManager::getInstance();
CEntityCL::_EntitiesColor[CEntityCL::User] = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:USER")->getValueRGBA();
CEntityCL::_EntitiesColor[CEntityCL::Player] = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:PLAYER")->getValueRGBA(); CEntityCL::_EntitiesColor[CEntityCL::User] = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:USER")->getValueRGBA();
CEntityCL::_EntitiesColor[CEntityCL::NPC] = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:NPC")->getValueRGBA(); CEntityCL::_EntitiesColor[CEntityCL::Player] = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:PLAYER")->getValueRGBA();
CEntityCL::_EntitiesColor[CEntityCL::Fauna] = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:FAUNA")->getValueRGBA(); CEntityCL::_EntitiesColor[CEntityCL::NPC] = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:NPC")->getValueRGBA();
CEntityCL::_EntitiesColor[CEntityCL::ForageSource] = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:SOURCE")->getValueRGBA(); CEntityCL::_EntitiesColor[CEntityCL::Fauna] = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:FAUNA")->getValueRGBA();
CEntityCL::_DeadColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:DEAD")->getValueRGBA(); CEntityCL::_EntitiesColor[CEntityCL::ForageSource] = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:SOURCE")->getValueRGBA();
CEntityCL::_TargetColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:TARGET")->getValueRGBA(); CEntityCL::_DeadColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:DEAD")->getValueRGBA();
CEntityCL::_GroupColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:GROUP")->getValueRGBA(); CEntityCL::_TargetColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:TARGET")->getValueRGBA();
CEntityCL::_GuildColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:GUILD")->getValueRGBA(); CEntityCL::_GroupColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:GROUP")->getValueRGBA();
CEntityCL::_UserMountColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:MOUNT")->getValueRGBA(); CEntityCL::_GuildColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:GUILD")->getValueRGBA();
CEntityCL::_UserPackAnimalColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:BEAST")->getValueRGBA(); CEntityCL::_UserMountColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:MOUNT")->getValueRGBA();
CEntityCL::_PvpEnemyColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:PVPENEMY")->getValueRGBA(); CEntityCL::_UserPackAnimalColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:BEAST")->getValueRGBA();
CEntityCL::_PvpAllyColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLY")->getValueRGBA(); CEntityCL::_PvpEnemyColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPENEMY")->getValueRGBA();
CEntityCL::_PvpAllyInTeamColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLYINTEAM")->getValueRGBA(); CEntityCL::_PvpAllyColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLY")->getValueRGBA();
CEntityCL::_PvpNeutralColor = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:ENTITY:COLORS:PVPNEUTRAL")->getValueRGBA(); CEntityCL::_PvpAllyInTeamColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLYINTEAM")->getValueRGBA();
CEntityCL::_PvpNeutralColor = pCDBM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPNEUTRAL")->getValueRGBA();
// don't save these colors in .icfg because players can't change them // don't save these colors in .icfg because players can't change them
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::SGM - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:SGM")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::SGM - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:SGM")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::GM - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:GM")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::GM - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:GM")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::VG - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:VG")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::VG - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:VG")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::SG - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:SG")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::SG - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:SG")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::G - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:G")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::G - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:G")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::CM - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:CM")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::CM - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:CM")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::EM - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:EM")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::EM - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:EM")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::EG - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:EG")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::EG - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:EG")->getValueRGBA();
CEntityCL::_GMTitleColor[ CHARACTER_TITLE::OBSERVER - CHARACTER_TITLE::BeginGmTitle ] = NLGUI::CDBManager::getInstance()->getDbProp("UI:INTERFACE:ENTITY:COLORS:OBSERVER")->getValueRGBA(); CEntityCL::_GMTitleColor[ CHARACTER_TITLE::OBSERVER - CHARACTER_TITLE::BeginGmTitle ] = pCDBM->getDbProp("UI:INTERFACE:ENTITY:COLORS:OBSERVER")->getValueRGBA();
} }
}; };
REGISTER_ACTION_HANDLER (CUpdateEntitiesColor, "update_entities_color"); REGISTER_ACTION_HANDLER (CUpdateEntitiesColor, "update_entities_color");

12
code/ryzom/client/src/interface_v3/skill_manager.cpp
Unescape Escape View File

@ -144,21 +144,21 @@ void CSkillManager::initInGame()
// **** Player State management // **** Player State management
CInterfaceManager *pIM= CInterfaceManager::getInstance(); NLGUI::CDBManager *pCDBM = NLGUI::CDBManager::getInstance();
// get now the nodes on Skill values // get now the nodes on Skill values
for(i=0;i<SKILLS::NUM_SKILLS;i++) for(i=0;i<SKILLS::NUM_SKILLS;i++)
{ {
_SkillValues[i]= NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:CHARACTER_INFO:SKILLS:%d:SKILL", i), false); _SkillValues[i] = pCDBM->getDbProp(toString("SERVER:CHARACTER_INFO:SKILLS:%d:SKILL", i), false);
_SkillBaseValues[i]= NLGUI::CDBManager::getInstance()->getDbProp(toString("SERVER:CHARACTER_INFO:SKILLS:%d:BaseSKILL", i), false); _SkillBaseValues[i] = pCDBM->getDbProp(toString("SERVER:CHARACTER_INFO:SKILLS:%d:BaseSKILL", i), false);
} }
// compute max child values // compute max child values
computeMaxChildValues(); // must be called after setting all _SkillBaseValues computeMaxChildValues(); // must be called after setting all _SkillBaseValues
// Get a node used to inform interface that a skill has changed // Get a node used to inform interface that a skill has changed
_TrackSkillChange= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true); _TrackSkillChange = pCDBM->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true);
// Add a branch observer on skill value change // Add a branch observer on skill value change
NLGUI::CDBManager::getInstance()->addBranchObserver( "SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs ); pCDBM->addBranchObserver("SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs);
} }
// *************************************************************************** // ***************************************************************************
@ -1040,7 +1040,7 @@ void CSkillManager::setPlayerTitle(const std::string &name)
// *************************************************************************** // ***************************************************************************
// *************************************************************************** // ***************************************************************************
#define GROUP_TITLE_COMBO "ui:interface:info_player_skills:content:webinfos:title:player_title" #define GROUP_TITLE_COMBO "ui:interface:info_player_skills:content:basics_skills:title:player_title"
// *************************************************************************** // ***************************************************************************
class CHandlerTitleInit: public IActionHandler class CHandlerTitleInit: public IActionHandler

Write Preview
Loading…
Cancel
Save