mise a jour des data clients v3

This commit is contained in:
deed 2016-10-14 18:29:29 +02:00
parent 6d66f629ec
commit 921a88062e
11 changed files with 369 additions and 106 deletions

View file

@ -1916,6 +1916,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
value="basic.ttf" /> --> value="basic.ttf" /> -->
<param name="font" <param name="font"
value="ryzom.ttf" /> value="ryzom.ttf" />
<param name="monospace_font"
value="ryzom_monospace.ttf" />
<param name="add_coef_font" <param name="add_coef_font"
value="1" /> value="1" />
<param name="mul_coef_anim" <param name="mul_coef_anim"

View file

@ -183,7 +183,7 @@
posref="BL BL" posref="BL BL"
scale="true" scale="true"
y="4" y="4"
w="110" w="130"
h="2" h="2"
texture="W_line_hor2.tga" /> texture="W_line_hor2.tga" />
<view type="text" <view type="text"
@ -202,7 +202,7 @@
posref="MM MM" posref="MM MM"
x="0" x="0"
y="-1" y="-1"
w="110" w="130"
h="8" h="8"
vertical="false" vertical="false"
align="L" align="L"
@ -246,7 +246,7 @@
posref="BL BL" posref="BL BL"
scale="true" scale="true"
y="4" y="4"
w="110" w="130"
h="2" h="2"
texture="W_line_hor2.tga" /> texture="W_line_hor2.tga" />
<view type="text" <view type="text"
@ -265,7 +265,7 @@
posref="MM MM" posref="MM MM"
x="0" x="0"
y="-1" y="-1"
w="110" w="130"
h="8" h="8"
vertical="false" vertical="false"
align="L" align="L"

View file

@ -87,7 +87,7 @@
y="0" y="0"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
case_mode="%case_first_word_letter_up" /> case_mode="%case_normal" />
<view type="text" <view type="text"
id="grade" id="grade"
x="158" x="158"

View file

@ -138,7 +138,7 @@
x="0" x="0"
y="6" y="6"
posref="BM BM" posref="BM BM"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="welcome_close" params_l="welcome_close"
hardtext="uittOK" /> hardtext="uittOK" />
@ -199,7 +199,7 @@
x="-15" x="-15"
y="10" y="10"
posref="BM BM" posref="BM BM"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="active_hardware_cursor" params_l="active_hardware_cursor"
hardtext="uiYes" /> hardtext="uiYes" />
@ -208,7 +208,7 @@
y="0" y="0"
posparent="active_ok" posparent="active_ok"
posref="BR BL" posref="BR BL"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="close_hardware_cursor" params_l="close_hardware_cursor"
hardtext="uiNo" /> hardtext="uiNo" />
@ -316,7 +316,7 @@
x="0" x="0"
y="6" y="6"
posref="BM BM" posref="BM BM"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="universe_chanel_warning_close" params_l="universe_chanel_warning_close"
hardtext="uittOK" /> hardtext="uittOK" />
@ -356,9 +356,9 @@
</proc> </proc>
<group type="container" <group type="container"
id="death_warning" id="death_warning"
w="400" w="500"
pop_min_w="400" pop_min_w="500"
pop_max_w="400" pop_max_w="500"
h="250" h="250"
pop_min_h="250" pop_min_h="250"
pop_max_h="250" pop_max_h="250"
@ -401,7 +401,7 @@
id="death_warning_text" id="death_warning_text"
posref="TM TM" posref="TM TM"
x="0" x="0"
y="-20" y="-10"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -416,6 +416,7 @@
y="30" y="30"
w="0" w="0"
h="16" h="16"
y_text="-5"
fontsize="10" fontsize="10"
hardtext="uiDeathWarningAvoid" hardtext="uiDeathWarningAvoid"
dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID" dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID"
@ -424,7 +425,7 @@
x="0" x="0"
y="6" y="6"
posref="BM BM" posref="BM BM"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="death_warning_close" params_l="death_warning_close"
hardtext="uittOK" /> hardtext="uittOK" />
@ -463,9 +464,9 @@
</proc> </proc>
<group type="container" <group type="container"
id="night_warning" id="night_warning"
w="400" w="500"
pop_min_w="400" pop_min_w="500"
pop_max_w="400" pop_max_w="500"
h="250" h="250"
pop_min_h="250" pop_min_h="250"
pop_max_h="250" pop_max_h="250"
@ -508,7 +509,7 @@
id="night_warning_text" id="night_warning_text"
posref="TM TM" posref="TM TM"
x="0" x="0"
y="-20" y="-10"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -531,7 +532,7 @@
x="0" x="0"
y="6" y="6"
posref="BM BM" posref="BM BM"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="night_warning_close" params_l="night_warning_close"
hardtext="uittOK" /> hardtext="uittOK" />
@ -863,10 +864,8 @@
</group> </group>
</group> </group>
</group> </group>
<!--<define id="cs_url"
value="http://app.ryzom.com/ticket_system/index.php?mode=load" />-->
<define id="cs_url" <define id="cs_url"
value="http://lirria.khaganat.net/ams/" /> value="https://app.khaganat.net/ams/" />
<group type="container" <group type="container"
id="cs_browser" id="cs_browser"
w="410" w="410"
@ -907,22 +906,7 @@
group_params_r="menu=ui:interface:base_menu_with_color" group_params_r="menu=ui:interface:base_menu_with_color"
on_active="lua" on_active="lua"
on_active_params="help:openCSBrowserHeader('cs_browser')"> on_active_params="help:openCSBrowserHeader('cs_browser')">
<!--Quitta start-->
<ctrl style="text_button_header"
button_type="push_button"
id="browse_home"
posref="MR MR"
x="-16"
y="0"
hardtext="AMS-HOME"
tooltip="uittBrowseHome"
onclick_l="browse_home"
params_l="name=ui:interface:cs_browser:content:html"
frozen="false" />
<!--Quitta end-->
</group> </group>
<group id="content" <group id="content"
x="0" x="0"
@ -937,9 +921,9 @@
url="home" url="home"
title_prefix="uiHelpTitle" title_prefix="uiHelpTitle"
sizeref="wh" sizeref="wh"
x="2" x="184"
y="0" y="0"
w="-4" w="-190"
h="0" h="0"
background_color="0 0 0 255" background_color="0 0 0 255"
error_color="255 240 48 255" error_color="255 240 48 255"
@ -960,7 +944,7 @@
h6_font_size="12" h6_font_size="12"
paragraph_begin_space="12" paragraph_begin_space="12"
multi_line_space_factor="0.25" multi_line_space_factor="0.25"
td_begin_space="10" td_begin_space="0"
li_begin_space="4" li_begin_space="4"
ul_begin_space="12" ul_begin_space="12"
li_indent="-10" li_indent="-10"
@ -1007,6 +991,43 @@
<ctrl style="skin_scroll" <ctrl style="skin_scroll"
id="scroll_bar" /> id="scroll_bar" />
</group> </group>
<group id="sbtree"
posref="TL TL"
x="0"
y="-12"
sizeref="h"
w="180"
h="-12">
<group id="black"
posref="BR BR"
sizeref="hw"
w="-12"
h="0"
inherit_gc_alpha="true" />
<instance template="inner_thin_border"
posparent="black"
inherit_gc_alpha="true" />
<group id="tree_list"
type="tree"
posref="TL TL"
x="16"
y="-4"
col_over="255 255 255 48"
col_select="255 255 255 80"
fontsize="10"
max_sizeparent="parent"
max_sizeref="wh"
max_w="-20"
max_h="-10">
<node name="uiCSBase"
handler="launch_help"
params="help_container=ui:interface:cs_browser|url=%cs_url" />
</group>
<ctrl style="skin_scroll"
id="scroll_bar"
align="T"
target="tree_list" />
</group>
</group> </group>
</group> </group>
<!--******************--> <!--******************-->
@ -2809,7 +2830,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-2" text_y="-0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -2868,21 +2889,21 @@
x="4" x="4"
y="0" y="0"
posref="TL TL" posref="TL TL"
text_y="-2" text_y="-0"
onclick_l="proc" onclick_l="proc"
params_l="proc_stat_report_yes" params_l="proc_stat_report_yes"
hardtext="uiYes" /> hardtext="uiYes" />
<ctrl style="button_cancel" <ctrl style="button_cancel"
x="4" x="4"
posparent="ok" posparent="ok"
text_y="-2" text_y="-0"
posref="TR TL" posref="TR TL"
onclick_l="leave_modal" onclick_l="leave_modal"
hardtext="uiNo" /> hardtext="uiNo" />
<ctrl style="button_always" <ctrl style="button_always"
x="4" x="4"
posparent="cancel" posparent="cancel"
text_y="-2" text_y="-0"
posref="TR TL" posref="TR TL"
onclick_l="proc" onclick_l="proc"
params_l="proc_stat_report_always" params_l="proc_stat_report_always"

View file

@ -161,7 +161,7 @@ end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- Compute the current Max Resist -- Compute the current Max Resist
function game:getMagicResistMaxLevel() function game:getMagicResistMaxLevel()
local mlvl= self:getMagicResistBaseLevel() + getDbProp(formatUI('%player_resist_maxratio')); local mlvl= 25 + self:getMagicResistBaseLevel() + getDbProp(formatUI('%player_resist_maxratio'));
return math.max(0,mlvl); return math.max(0,mlvl);
end end

View file

@ -403,12 +403,12 @@
onclick_l="new_macro_new_cmd" /> onclick_l="new_macro_new_cmd" />
<group id="cmds" type="list" posref="BR TR" posparent="sep" x="0" y="-22" over="true" > <group id="cmds" x="0" y="-22" over="true" sizeref="w" posref="TL TL" posparent="sep" child_resize_h="true" child_resize_hmargin="4">
<!-- <group id="macros" x="10" y="-4" sizeref="w" posref="TL TL" child_resize_h="true" max_h="300" >
<instance template="macro_command" id="cmd1" posref="TL TL" /> <group id="list" type="list" x="0" y="0" posref="TL TL" />
<instance template="macro_command" id="cmd2" posparent="cmd1" posref="BL TL" />
-->
</group> </group>
<ctrl style="skin_scroll" id="sv" posref="TL TL" y="-4" target="macros" />
</group>
<instance template="button_ok_cancel" posparent="cmds" posref="BR TR" x="0" y="-4" <instance template="button_ok_cancel" posparent="cmds" posref="BR TR" x="0" y="-4"
onclick_ok="new_macro_ok" onclick_ok="new_macro_ok"
@ -659,4 +659,4 @@
<tree node="keys_r2ed"/> <tree node="keys_r2ed"/>
</tree> </tree>
</interface_config> </interface_config>

View file

@ -218,7 +218,7 @@
<!-- ************** --> <!-- ************** -->
<!-- CURRENT ACTION --> <!-- CURRENT ACTION -->
<!-- ************** --> <!-- ************** -->
<!-- Must pass through an other DB, to allow multiple isntances of the action bar template --> <!-- Must pass through an other DB, to allow multiple instances of the action bar template -->
<variable entry="UI:PHRASE:ACT_BAR_LEN" <variable entry="UI:PHRASE:ACT_BAR_LEN"
type="sint32" type="sint32"
value="0" /> value="0" />

View file

@ -91,7 +91,11 @@
<action handler="set" params="target='ui:interface:gestion_windows:x'|value=div(sub(getprop('ui:interface:w'),getprop('ui:interface:gestion_windows:w')),2)" /> <action handler="set" params="target='ui:interface:gestion_windows:x'|value=div(sub(getprop('ui:interface:w'),getprop('ui:interface:gestion_windows:w')),2)" />
<action handler="set" params="target='ui:interface:gestion_windows:y'|value=add(getprop('ui:interface:gestion_windows:h'),div(sub(getprop('ui:interface:h'),getprop('ui:interface:gestion_windows:h')),2))" /> <action handler="set" params="target='ui:interface:gestion_windows:y'|value=add(getprop('ui:interface:gestion_windows:h'),div(sub(getprop('ui:interface:h'),getprop('ui:interface:gestion_windows:h')),2))" />
<action handler="set" params="target='ui:interface:gestion_windows:active'|value=@UI:TEMP:ACTIVE" /> <action handler="set" params="target='ui:interface:gestion_windows:active'|value=@UI:TEMP:ACTIVE" />
<!-- AppZone -->
<action handler="set" params="target='ui:interface:appzone:active'|value=1" />
<action handler="set" params="target='ui:interface:appzone:x'|value=div(sub(getprop('ui:interface:w'),getprop('ui:interface:appzone:w')),2)" />
<action handler="set" params="target='ui:interface:appzone:y'|value=add(getprop('ui:interface:appzone:h'),2)" />
</proc> </proc>
<proc id="proc_reset_interface"> <proc id="proc_reset_interface">
@ -321,14 +325,12 @@
<action handler="set" params="dblink=UI:SAVE:ISDETACHED:USER_CHAT|value=0" /> <action handler="set" params="dblink=UI:SAVE:ISDETACHED:USER_CHAT|value=0" />
<action handler="set" params="dblink=UI:SAVE:ISDETACHED:UNIVERSE_CHAT|value=0" /> <action handler="set" params="dblink=UI:SAVE:ISDETACHED:UNIVERSE_CHAT|value=0" />
<action handler="set" params="dblink=UI:SAVE:ISDETACHED:REGION_CHAT|value=0" /> <action handler="set" params="dblink=UI:SAVE:ISDETACHED:REGION_CHAT|value=0" />
<action handler="set" params="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=0" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:AROUND_ME|value=1" /> <action handler="set" params="dblink=UI:SAVE:ISENABLED:AROUND_ME|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:REGION_CHAT|value=1" /> <action handler="set" params="dblink=UI:SAVE:ISENABLED:REGION_CHAT|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:TEAM_CHAT|value=1" /> <action handler="set" params="dblink=UI:SAVE:ISENABLED:TEAM_CHAT|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:GUILD_CHAT|value=1" /> <action handler="set" params="dblink=UI:SAVE:ISENABLED:GUILD_CHAT|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:UNIVERSE_CHAT|value=1" /> <action handler="set" params="dblink=UI:SAVE:ISENABLED:UNIVERSE_CHAT|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:SYSTEM_INFO|value=1" /> <action handler="set" params="dblink=UI:SAVE:ISENABLED:SYSTEM_INFO|value=1" />
<action handler="set" params="dblink=UI:SAVE:ISENABLED:YUBO_CHAT|value=1" />
<action handler="reset_virtual_desktop" params="vdesk=0" /> <action handler="reset_virtual_desktop" params="vdesk=0" />
<action handler="reset_virtual_desktop" params="vdesk=1" /> <action handler="reset_virtual_desktop" params="vdesk=1" />

View file

@ -1702,7 +1702,7 @@
color_grayed="255 255 255 64" color_grayed="255 255 255 64"
shadow_color_grayed="0 0 0 255" shadow_color_grayed="0 0 0 255"
highlight_over="255 255 255 150" highlight_over="255 255 255 150"
case_mode="%case_first_word_letter_up"></group> case_mode="%case_normal"></group>
<group type="menu" <group type="menu"
id="base_menu_with_color" id="base_menu_with_color"
extends="base_menu"> extends="base_menu">
@ -1767,7 +1767,7 @@
name="uiOpen" name="uiOpen"
handler="item_text_display" handler="item_text_display"
params="ui:interface:edit_custom" /> params="ui:interface:edit_custom" />
<separator /> <separator />
<!-- Move to an Animal --> <!-- Move to an Animal -->
<action id="move" <action id="move"
name="uimMoveTo"> name="uimMoveTo">
@ -1991,7 +1991,7 @@
posparent="box1" posparent="box1"
posref="MR MR" posref="MR MR"
x="-3" x="-3"
y="-2" y="0"
color="135 243 28 255" color="135 243 28 255"
shadow="true" shadow="true"
fontsize="10" fontsize="10"
@ -2004,7 +2004,7 @@
posparent="box1" posparent="box1"
posref="MR MR" posref="MR MR"
x="-3" x="-3"
y="-3" y="0"
color="192 192 192 255" color="192 192 192 255"
shadow="true" shadow="true"
fontsize="10" fontsize="10"
@ -2619,7 +2619,7 @@
<template name="edit_box_widget" <template name="edit_box_widget"
posref="TL TL" posref="TL TL"
text_x="0" text_x="0"
text_y="-1" text_y="0"
text_ref="BL BL" text_ref="BL BL"
child_resize_h="true" child_resize_h="true"
child_resize_hmargin="0" child_resize_hmargin="0"
@ -2789,7 +2789,7 @@
<template name="edit_box_widget_multiline" <template name="edit_box_widget_multiline"
posref="TL TL" posref="TL TL"
text_x="0" text_x="0"
text_y="-1" text_y="0"
text_ref="BL BL" text_ref="BL BL"
child_resize_h="true" child_resize_h="true"
multi_line="true" multi_line="true"
@ -2872,6 +2872,7 @@
posref="#text_ref" posref="#text_ref"
multi_line="#multi_line" multi_line="#multi_line"
multi_line_space="0" multi_line_space="0"
multi_min_line="#multi_min_line"
fontsize="#fontsize" fontsize="#fontsize"
color="#color" color="#color"
shadow="true" shadow="true"
@ -3034,7 +3035,7 @@
id="edit" id="edit"
entry_type="positive_integer" entry_type="positive_integer"
text_ref="TR TR" text_ref="TR TR"
text_y="-1" text_y="0"
fontsize="12" fontsize="12"
posparent="sheet" posparent="sheet"
posref="MR ML" posref="MR ML"
@ -4321,7 +4322,7 @@
id="text" id="text"
posref="BL BL" posref="BL BL"
x="2" x="2"
y="1" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
@ -4848,7 +4849,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -4866,7 +4867,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -4900,7 +4901,7 @@
x="0" x="0"
y="0" y="0"
posref="TL TL" posref="TL TL"
text_y="-2" text_y="0"
onclick_l="#onclick_ok" onclick_l="#onclick_ok"
params_l="#onclick_ok_param" params_l="#onclick_ok_param"
hardtext="#ok_text" hardtext="#ok_text"
@ -4908,7 +4909,7 @@
<ctrl style="button_cancel" <ctrl style="button_cancel"
x="4" x="4"
posparent="ok" posparent="ok"
text_y="-2" text_y="0"
posref="TR TL" posref="TR TL"
onclick_l="#onclick_cancel" onclick_l="#onclick_cancel"
params_l="#onclick_cancel_param" params_l="#onclick_cancel_param"
@ -4944,7 +4945,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -4958,7 +4959,7 @@
tx_normal="w_text_button_normal" tx_normal="w_text_button_normal"
tx_pushed="w_text_button_pushed" tx_pushed="w_text_button_pushed"
tx_over="w_text_button_over" tx_over="w_text_button_over"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -4982,7 +4983,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -5000,7 +5001,7 @@
tx_normal="w_text_button_normal" tx_normal="w_text_button_normal"
tx_pushed="w_text_button_pushed" tx_pushed="w_text_button_pushed"
tx_over="w_text_button_over" tx_over="w_text_button_over"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -5028,7 +5029,7 @@
color="255 255 255 128" color="255 255 255 128"
col_over="255 255 255 0" col_over="255 255 255 0"
col_pushed="255 128 0 192" col_pushed="255 128 0 192"
text_y="-2" text_y="0"
fontsize="12" fontsize="12"
shadow="true" shadow="true"
text_color_normal="255 255 255 255" text_color_normal="255 255 255 255"
@ -5119,7 +5120,7 @@
global_color_normal="true" global_color_normal="true"
global_color_over="true" global_color_over="true"
global_color_pushed="true" global_color_pushed="true"
text_y="-2" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -5141,7 +5142,7 @@
color="255 255 255 255" color="255 255 255 255"
col_over="255 255 255 255" col_over="255 255 255 255"
col_pushed="255 255 255 255" col_pushed="255 255 255 255"
text_y="-4" text_y="0"
fontsize="10" fontsize="10"
shadow="true" shadow="true"
case_mode="%case_upper" case_mode="%case_upper"
@ -6650,7 +6651,7 @@
posparent="button" posparent="button"
posref="MR ML" posref="MR ML"
x="4" x="4"
y="-3" y="0"
color="255 255 255 255" color="255 255 255 255"
fontsize="#fontsize" fontsize="#fontsize"
shadow="true" shadow="true"
@ -6927,4 +6928,241 @@
</group> </group>
</group> </group>
</template> </template>
<!-- html browsing context -->
<template name="webig_html"
keep="true"
home=""
browse_redo=""
browse_undo=""
browse_refresh="">
<group id="html"
type="webig_html"
posref="TL TL"
home="#home"
title_prefix=""
sizeref="wh"
x="0"
y="0"
w="0"
h="0"
background_color="0 0 0 255"
error_color="255 240 48 255"
link_color="240 155 100 255"
text_color="210 210 210 255"
h1_color="255 255 255 255"
h2_color="255 255 255 255"
h3_color="255 255 255 255"
h4_color="255 255 255 255"
h5_color="255 255 255 255"
h6_color="255 255 255 255"
text_font_size="10"
h1_font_size="20"
h2_font_size="18"
h3_font_size="16"
h4_font_size="14"
h5_font_size="12"
h6_font_size="12"
paragraph_begin_space="12"
multi_line_space_factor="0.25"
td_begin_space="0"
li_begin_space="4"
ul_begin_space="12"
li_indent="-10"
ul_indent="30"
checkbox_bitmap_normal="w_slot_on.tga"
checkbox_bitmap_pushed="w_opacity_on.tga"
checkbox_bitmap_over=""
background_bitmap_view="background_bitmap"
browse_next_time="false"
form_text_area_group="edit_box_widget_multiline"
browse_refresh="#browse_refresh"
browse_undo="#browse_undo"
browse_redo="#browse_redo">
<group id="black"
posref="BR BR"
sizeref="hw"
w="-10"
h="-12"
inherit_gc_alpha="true" />
<instance template="inner_thin_border"
posparent="black"
inherit_gc_alpha="true " />
<view id="background_bitmap"
type="bitmap"
posparent="black"
posref="MM MM"
sizeref="wh"
w="-2"
h="-2"
inherit_gc_alpha="true"
scale="true"
texture="blank.tga"
global_color="false" />
<group id="text_list"
type="list"
fontsize="9"
posref="TL TL"
posparent="black"
x="2"
y="-2"
space="0"
sizeref="hw"
w="-4"
h="-4"
maxelements="2000" />
<ctrl id="scroll_bar"
style="skin_scroll" />
</group>
</template>
<!-- html browser window -->
<template name="webig_browser"
keep="true"
home=""
w="480"
h="400"
browse_redo=""
browse_undo=""
browse_refresh="">
<group id="browser"
type="container"
w="#w"
h="#h"
x="0"
y="0"
pop_max_w="2000"
pop_max_h="2000"
pop_min_w="64"
pop_min_h="32"
header_color="UI:SAVE:WIN:COLORS:COM"
posref="TL TL"
title=""
global_color="true"
global_color_over="true"
right_button="true"
movable="true"
lockable="true"
active="true"
openable="true"
opened="true"
resizer="true"
on_active="lua"
on_active_params="WebBrowser:onActive()">
<group id="header_closed"
w="64"
h="16"
posref="TL TL"
on_active="lua"
on_active_params="WebBrowser:onClickHeaderClose()" />
<group id="header_opened"
h="16"
w="480"
posref="TL TL"
on_active="lua"
on_active_params="WebBrowser:onClickHeaderOpen()">
<ctrl style="text_button_header"
id="browse_redo"
button_type="push_button"
posref="MR MR"
x="-16"
y="0"
hardtext="uiBrowseRedoButton"
tooltip="uittBrowseRedo"
onclick_l="lua"
params_l="WebBrowser:onClickRedo()"
frozen="true" />
<ctrl style="text_button_header"
id="browse_undo"
button_type="push_button"
posparent="browse_redo"
posref="ML MR"
x="-4"
y="0"
hardtext="uiBrowseUndoButton"
tooltip="uittBrowseUndo"
onclick_l="lua"
params_l="WebBrowser:onClickUndo()"
frozen="true" />
<ctrl style="text_button_header"
id="browse_refresh"
button_type="push_button"
posparent="browse_undo"
posref="ML MR"
x="-4"
y="0"
hardtext="uiBrowseRefresh"
tooltip="uittBrowseRefresh"
onclick_l="lua"
params_l="WebBrowser:onClickRefresh()"
frozen="true" />
<ctrl style="text_button_header"
id="browse_home"
button_type="push_button"
posparent="browse_refresh"
posref="ML MR"
x="-4"
y="0"
hardtext="uiBrowseHome"
tooltip="uittBrowseHome"
onclick_l="lua"
params_l="WebBrowser:onClickHome()" />
</group>
<group id="content"
x="0"
y="0"
w="0"
h="0"
posref="TL TL">
<instance template="webig_html"
home="#home"
browse_redo="#browse_redo"
browse_undo="#browse_undo"
browse_refresh="#browse_refresh" />
</group>
</group>
</template>
<!-- html <hr> element -->
<template name="html_hr"
keep="true">
<group id="sep_gr"
posref="ML ML"
sizeref="w"
w="0"
h="0"
child_resize_h="true"
child_resize_hmargin="12">
<view type="bitmap"
id="hr"
posref="MM MM"
sizeref="w"
w="-2"
h="2"
inherit_gc_alpha="true"
scale="true"
texture="blank.tga"
global_color="false" />
</group>
</template>
<template name="html_form_select_box_menu_widget"
keep="true"
id="sb">
<group type="menu"
id="#id"
posref="BL TL"
x="0"
y="0"
mouse_pos="false"
space="2"
shadow="false"
color="255 255 255 128"
color_over="255 255 255 255"
color_grayed="0 0 0 255"
fontsize="12"
highlight_over="255 255 255 128"
force_inside_screen="false"></group>
</template>
</interface_config> </interface_config>

View file

@ -32,7 +32,7 @@ end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
function bgdownloader:setIcon(icon) function bgdownloader:setIcon(icon)
local bm = self:getProgressGroup():find("bm"); local bm = self:getProgressGroup():find("bm")
if icon == "" then if icon == "" then
bm.active = false bm.active = false
else else

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 (game==nil) then if (game==nil) then
game= {}; game = {}
end end
@ -12,14 +12,14 @@ end
-- called to construct guild flags background in the modal window -- called to construct guild flags background in the modal window
function game:bcCreateGuildInitFlags() function game:bcCreateGuildInitFlags()
local ui = getUICaller(); local ui = getUICaller()
for i = 0,14 do for i = 0,14 do
local uiBack = getUI(getUIId(ui) .. ':back' .. i); local uiBack = getUI(getUIId(ui) .. ':back' .. i)
uiBack.image1.back = i+1; uiBack.image1.back = i+1
uiBack.image1.symbol = 0; uiBack.image1.symbol = 0
uiBack.image1.color1 = runExpr('makeRGB(255,255,255)'); uiBack.image1.color1 = runExpr('makeRGB(255,255,255)')
uiBack.image1.color2 = runExpr('makeRGB(0,0,0)'); uiBack.image1.color2 = runExpr('makeRGB(0,0,0)')
end end
end end
@ -28,37 +28,37 @@ end
-- trap some parts should be deprecated ... try to clean it up -- trap some parts should be deprecated ... try to clean it up
function game:bcMissionsUpdate() function game:bcMissionsUpdate()
local mt = getDbProp('UI:TEMP:MISSION:MISSION_TYPE'); local mt = getDbProp('UI:TEMP:MISSION:MISSION_TYPE')
-- init bot_chat_missions title -- init bot_chat_missions title
local title = 'uiBotChatMissions'; local title = 'uiBotChatMissions'
if (mt == 3) then title = 'uiBotChatZCCharges'; if (mt == 3) then title = 'uiBotChatZCCharges'
elseif (mt == 4) then title = 'uiBotChatBuilding'; elseif (mt == 4) then title = 'uiBotChatBuilding'
elseif (mt == 5) then title = 'uiBotChatRMBuy'; elseif (mt == 5) then title = 'uiBotChatRMBuy'
elseif (mt == 6) then title = 'uiBotChatRMUpgrade'; elseif (mt == 6) then title = 'uiBotChatRMUpgrade'
end end
local ui = getUI('ui:interface:bot_chat_missions'); local ui = getUI('ui:interface:bot_chat_missions')
ui.title = title; ui.title = title
-- init desc -- init desc
title = 'uiSelectMission'; title = 'uiSelectMission'
if (mt == 3) then title = 'uiSelectZCCharge'; if (mt == 3) then title = 'uiSelectZCCharge'
elseif (mt == 4) then title = 'uiSelectBuilding'; elseif (mt == 4) then title = 'uiSelectBuilding'
elseif (mt == 5) then title = 'uiSelectRMBuy'; elseif (mt == 5) then title = 'uiSelectRMBuy'
elseif (mt == 6) then title = 'uiSelectRMUpgrade'; elseif (mt == 6) then title = 'uiSelectRMUpgrade'
end end
ui.header_opened.mission_title.hardtext = title; ui.header_opened.mission_title.hardtext = title
ui.header_opened.zc_duty.active = (mt == 3); ui.header_opened.zc_duty.active = (mt == 3)
ui.header_opened.xp_guild.active = ((mt == 5) or (mt == 6)); ui.header_opened.xp_guild.active = ((mt == 5) or (mt == 6))
-- init bot_chat_accept_mission title -- init bot_chat_accept_mission title
title = 'uiAcceptMission'; title = 'uiAcceptMission'
if (mt == 3) then title = 'uiAcceptZCCharge'; if (mt == 3) then title = 'uiAcceptZCCharge'
elseif (mt == 4) then title = 'uiAcceptBuilding'; elseif (mt == 4) then title = 'uiAcceptBuilding'
elseif (mt == 5) then title = 'uiAcceptRMBuy'; elseif (mt == 5) then title = 'uiAcceptRMBuy'
elseif (mt == 6) then title = 'uiAcceptRMUpgrade'; elseif (mt == 6) then title = 'uiAcceptRMUpgrade'
end end
ui = getUI('ui:interface:bot_chat_accept_mission'); ui = getUI('ui:interface:bot_chat_accept_mission')
ui.title = title; ui.title = title;
end end