Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

correction du merge

Browse source
This commit is contained in:
deed 2017-03-24 15:10:35 +01:00
parent 6423fa1071
commit d63d55c60d
9 changed files with 1759 additions and 1929 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
View file

@ -1961,11 +1961,6 @@
name="6" name="6"
usergroup_l="chat_menu_button" usergroup_l="chat_menu_button"
usergroup_params_l="chat_db=DYNAMIC_CHAT6" /> usergroup_params_l="chat_db=DYNAMIC_CHAT6" />
<action id="dyn7"
name="7"
usergroup_l="chat_menu_button"
usergroup_params_l="chat_db=DYNAMIC_CHAT7" />
usergroup_params_l="chat_db=DYNAMIC_CHAT6" />
<action id="dyn7" <action id="dyn7"
name="7" name="7"
usergroup_l="chat_menu_button" usergroup_l="chat_menu_button"

1826
code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml
View file

File diff suppressed because it is too large Load diff

73
code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml
View file

@ -63,7 +63,7 @@
</template> </template>
<template name="edit_box_log" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" multi_line="false" x="0" y="0" w="0" h="0" <template name="edit_box_log" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" multi_line="false" x="0" y="0" w="0" h="0"
id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" on_focus="" on_focus_params="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" on_focus="" on_focus_params=""
enter_loose_focus="true" prompt="&gt;" enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true" enter_recover_focus="true"
@ -100,7 +100,7 @@
</template> </template>
<template name="edit_box_widget_multiline" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0" <template name="edit_box_widget_multiline" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;" enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true" enter_recover_focus="true"
@ -111,20 +111,17 @@
entry_type="text" entry_type="text"
keep="true" keep="true"
max_historic="40" max_historic="40"
fontsize="10" fontsize="10"
fontweight=""
fontstyle=""
backup_father_container_pos="false" backup_father_container_pos="false"
want_return="false" want_return="false"
color="255 255 255 255" color="255 255 255 255"
sizeref_eb="w" sizeref_eb="w"
render_layer="0" render_layer="0"
multi_min_line="0"
> >
<group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="#child_resize_h" sizeref="#sizeref" w="#w" h="#h" render_layer="#render_layer"> <group id="#id" posref="#posref" x="#x" y="#y" posparent="#posparent" child_resize_h="#child_resize_h" sizeref="#sizeref" w="#w" h="#h" render_layer="#render_layer">
<group type="edit_box" sizeref="#sizeref_eb" w="-16" id="eb" posref="TL TL" x="8" y="-8" child_resize_h="#child_resize_h" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" enter_recover_focus="#enter_recover_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic" want_return="#want_return" backup_father_container_pos="#backup_father_container_pos" render_layer="#render_layer"> <group type="edit_box" sizeref="#sizeref_eb" w="-16" id="eb" posref="TL TL" x="8" y="-8" child_resize_h="#child_resize_h" onenter="#onenter" params="#params" onchange="#onchange" onchange_params="#onchange_params" max_num_chars="#max_num_chars" prompt="#prompt" enter_loose_focus="#enter_loose_focus" enter_recover_focus="#enter_recover_focus" entry_type="#entry_type" reset_focus_on_hide="#reset_focus_on_hide" menu_r="#menu_r" max_historic="#max_historic" want_return="#want_return" backup_father_container_pos="#backup_father_container_pos" render_layer="#render_layer">
<view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="log_eb_m.tga" inherit_gc_alpha="false" render_layer="#render_layer"/> <view type="bitmap" id="bg" scale="true" sizeref="hw" h="0" w="0" texture="log_eb_m.tga" inherit_gc_alpha="false" render_layer="#render_layer"/>
<view id="edit_text" type="text" x="#text_x" y="#text_y" posref="#text_ref" multi_line="#multi_line" multi_line_space="0" multi_min_line="#multi_min_line" fontsize="#fontsize" color="#color" fontweight="#fontweight" fontstyle="#fontstyle" shadow="true" hardtext="" global_color="false" render_layer="#render_layer"/> <view id="edit_text" type="text" x="#text_x" y="#text_y" posref="#text_ref" multi_line="#multi_line" multi_line_space="0" fontsize="#fontsize" color="#color" shadow="true" hardtext="" global_color="false" render_layer="#render_layer"/>
</group> </group>
<!-- border around the list --> <!-- border around the list -->
@ -141,7 +138,7 @@
<!-- Alternate look for multi line input --> <!-- Alternate look for multi line input -->
<template name="edit_box_widget_multiline_2" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0" <template name="edit_box_widget_multiline_2" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="true" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;" enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true" enter_recover_focus="true"
@ -182,7 +179,7 @@
<style style="log_button" type="text_button" button_type="push_button" <style style="log_button" type="text_button" button_type="push_button"
tx_normal="log_but" tx_pushed="log_but_over" tx_over="log_but_over" wmargin="48" tx_normal="log_but" tx_pushed="log_but_over" tx_over="log_but_over" wmargin="48"
color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255"
text_y="0" fontsize="10" shadow="true" text_y="-3" fontsize="10" shadow="true"
text_color_normal="255 255 255 160" text_color_normal="255 255 255 160"
text_color_pushed="255 255 255 255" text_color_pushed="255 255 255 255"
text_color_over="255 255 255 255" text_color_over="255 255 255 255"
@ -195,7 +192,7 @@
<style style="log_std_but" type="text_button" button_type="push_button" <style style="log_std_but" type="text_button" button_type="push_button"
tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16" tx_normal="but" tx_pushed="but" tx_over="but_over" wmargin="16"
color="255 255 255 160" col_over="255 255 255 255" col_pushed="255 255 255 255" color="255 255 255 160" col_over="255 255 255 255" col_pushed="255 255 255 255"
text_y="-1" fontsize="10" shadow="true" text_y="-3" fontsize="10" shadow="true"
text_color_normal="255 254 243 160" text_color_normal="255 254 243 160"
text_color_pushed="255 254 243 255" text_color_pushed="255 254 243 255"
text_color_over="255 254 243 255" text_color_over="255 254 243 255"
@ -232,7 +229,7 @@
<style style="text_button_16" type="text_button" button_type="push_button" <style style="text_button_16" type="text_button" button_type="push_button"
tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over" tx_normal="w_text_button_normal" tx_pushed="w_text_button_pushed" tx_over="w_text_button_over"
global_color_normal="true" global_color_over="true" global_color_pushed="true" global_color_normal="true" global_color_over="true" global_color_pushed="true"
text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8" text_y="-2" fontsize="10" shadow="true" case_mode="%case_upper" wmargin="8"
text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" /> text_color_normal="255 255 255 128" text_color_pushed="255 255 255 255" text_color_over="255 255 255 255" />
@ -385,7 +382,7 @@
<!-- * EDIT BOX WIDGET * --> <!-- * EDIT BOX WIDGET * -->
<!-- ********************* --> <!-- ********************* -->
<template name="edit_box_widget" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0" <template name="edit_box_widget" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;" enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true" enter_recover_focus="true"
@ -423,7 +420,7 @@
</template> </template>
<!-- alternate look for edit box --> <!-- alternate look for edit box -->
<template name="edit_box_widget_2" posref="TL TL" text_x="0" text_y="0" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0" <template name="edit_box_widget_2" posref="TL TL" text_x="0" text_y="-1" text_ref="BL BL" child_resize_h="true" multi_line="false" x="0" y="0" w="0" h="0"
sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true" sizeref="" id="eb" posparent="parent" onenter="chat_box_entry" params="" reset_focus_on_hide="true"
enter_loose_focus="true" prompt="&gt;" enter_loose_focus="true" prompt="&gt;"
enter_recover_focus="true" enter_recover_focus="true"
@ -598,8 +595,8 @@
<template name="button_ok_cancel" id="ok_cancel" ok_text="uittOK" cancel_text="uittCancel" posparent="parent" posref="BM TM" <template name="button_ok_cancel" id="ok_cancel" ok_text="uittOK" cancel_text="uittCancel" posparent="parent" posref="BM TM"
onclick_ok="" onclick_ok_param="" onclick_cancel="" onclick_cancel_param="" x="0" y="0" keep="true" > onclick_ok="" onclick_ok_param="" onclick_cancel="" onclick_cancel_param="" x="0" y="0" keep="true" >
<group id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y"> <group id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y">
<ctrl style="button_ok" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick_ok" params_l="#onclick_ok_param" hardtext="#ok_text" /> <ctrl style="button_ok" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick_ok" params_l="#onclick_ok_param" hardtext="#ok_text" />
<ctrl style="button_cancel" x="4" posparent="ok" text_y="0" posref ="TR TL" onclick_l="#onclick_cancel" params_l="#onclick_cancel_param" hardtext="#cancel_text" /> <ctrl style="button_cancel" x="4" posparent="ok" text_y="-2" posref ="TR TL" onclick_l="#onclick_cancel" params_l="#onclick_cancel_param" hardtext="#cancel_text" />
</group> </group>
</template> </template>
@ -614,7 +611,7 @@
<template name="html_text_button" id="" text="" posparent="parent" posref="TL TL" <template name="html_text_button" id="" text="" posparent="parent" posref="TL TL"
onclick="" onclick_param="" x="0" y="0" keep="true" active="true" wmin="0"> onclick="" onclick_param="" x="0" y="0" keep="true" active="true" wmin="0">
<group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y" active="#active"> <group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y" active="#active">
<ctrl style="log_spe_but" id="button" wmin="#wmin" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/> <ctrl style="log_spe_but" id="button" wmin="#wmin" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group> </group>
</template> </template>
@ -623,7 +620,7 @@
<template name="html_text_button_look2" id="" text="" posparent="parent" posref="TL TL" <template name="html_text_button_look2" id="" text="" posparent="parent" posref="TL TL"
onclick="" onclick_param="" x="0" y="0" keep="true" > onclick="" onclick_param="" x="0" y="0" keep="true" >
<group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y"> <group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y">
<ctrl style="log_button" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/> <ctrl style="log_button" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group> </group>
</template> </template>
@ -632,7 +629,7 @@
<template name="html_text_button_look3" id="" text="" posparent="parent" posref="TL TL" <template name="html_text_button_look3" id="" text="" posparent="parent" posref="TL TL"
onclick="" onclick_param="" x="0" y="0" keep="true" > onclick="" onclick_param="" x="0" y="0" keep="true" >
<group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y"> <group type="html_input_offset" y_offset="-8" id="#id" posparent="#posparent" posref="#posref" child_resize_w="true" child_resize_h="true" x="#x" y="#y">
<ctrl style="server_note" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="0" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/> <ctrl style="server_note" id="button" wmin="0" x="0" y="0" posref="TL TL" text_y="-2" onclick_l="#onclick" params_l="#onclick_param" hardtext="#text" color="255 255 255 200"/>
</group> </group>
</template> </template>
@ -958,46 +955,6 @@
highlight_over="255 255 255 128" highlight_over="255 255 255 128"
force_inside_screen="true" force_inside_screen="true"
/> />
<!-- 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>

985
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
View file

File diff suppressed because it is too large Load diff

168
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_connect.xml
View file

@ -1,84 +1,84 @@
<interface_config> <interface_config>
<root id="outgame" x="0" y="0" w="1024" h="768" active="false" /> <root id="outgame" x="0" y="0" w="1024" h="768" active="false" />
<proc id="proc_con_test"> <proc id="proc_con_test">
<action handler="anim_start" params="anim=anim_connection_outro" <action handler="anim_start" params="anim=anim_connection_outro"
cond="and(eq(@UI:CURRENT_SCREEN, %screen_connecting),eq(@UI:SERVER_RECEIVED_CHARS,1))" /> cond="and(eq(@UI:CURRENT_SCREEN, %screen_connecting),eq(@UI:SERVER_RECEIVED_CHARS,1))" />
</proc> </proc>
<proc id="proc_con_test2"> <proc id="proc_con_test2">
<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_select" /> <action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_select" />
</proc> </proc>
<proc id="proc_con_quit" > <proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" /> <action handler="play_sound" params="name=charsel_quit_click" />
<action handler="quit_ryzom" /> <action handler="quit_ryzom" />
</proc> </proc>
<proc id="proc_startall_connect" > <proc id="proc_startall_connect" >
<action handler="anim_start" params="anim=anim_connection_intro" /> <action handler="anim_start" params="anim=anim_connection_intro" />
</proc> </proc>
<proc id="proc_restart_connect" > <proc id="proc_restart_connect" >
</proc> </proc>
<proc id="proc_restart_viseur" > <proc id="proc_restart_viseur" >
</proc> </proc>
<group id="connecting" w="1024" h="768" posref="MM MM" on_active="proc" on_active_params="proc_startall_connect" > <group id="connecting" w="1024" h="768" posref="MM MM" on_active="proc" on_active_params="proc_startall_connect" >
<!-- 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 -->
<ctrl style="valid_txt_button" id="finish_but" posref="BR BR" x="-40" y="130" hardtext="uiQuit" <ctrl style="valid_txt_button" id="finish_but" posref="BR BR" x="-40" y="130" hardtext="uiQuit"
onover="play_sound" params_over="name=charsel_quit_over" onover="play_sound" params_over="name=charsel_quit_over"
onclick_l="proc" params_l="proc_con_quit"/> onclick_l="proc" params_l="proc_con_quit"/>
<view type="text" id="title" posref="MM MM" y="24" hardtext="uiConnecting" fontsize="20"/> <view type="text" id="title" posref="MM MM" y="24" hardtext="uiConnecting" fontsize="20"/>
<!-- BLACK SCREEN FADE --> <!-- BLACK SCREEN FADE -->
<view type="bitmap" id="black_screen" posref="TL TL" x="0" y="0" render_layer="4" texture="blank.tga" <view type="bitmap" id="black_screen" posref="TL TL" x="0" y="0" render_layer="4" texture="blank.tga"
color="0 0 0 255" sizeref="wh" scale="true" global_color="false" /> color="0 0 0 255" sizeref="wh" scale="true" global_color="false" />
</group> </group>
<!-- This link is used to display the right screen among the outgame screens --> <!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_connecting)" target="connecting:active" /> <link expr="eq(@UI:CURRENT_SCREEN, %screen_connecting)" target="connecting:active" />
<!-- When we got the answer from server go to screen_intro --> <!-- When we got the answer from server go to screen_intro -->
<link expr="depends(@UI:CURRENT_SCREEN,@UI:SERVER_RECEIVED_CHARS)" action="proc" params="proc_con_test" /> <link expr="depends(@UI:CURRENT_SCREEN,@UI:SERVER_RECEIVED_CHARS)" action="proc" params="proc_con_test" />
<!-- ANIMATIONS --> <!-- ANIMATIONS -->
<anim id="anim_connection_intro" duration="1.0" disable_buttons="true" on_finish="" on_finish_params="" > <anim id="anim_connection_intro" duration="1.0" disable_buttons="true" on_finish="" on_finish_params="" >
<track type="linear" target="connecting:black_screen:alpha" > <track type="linear" target="connecting:black_screen:alpha" >
<key time="0.0" value="255" /> <key time="0.0" value="255" />
<key time="1.0" value="0" /> <key time="1.0" value="0" />
</track> </track>
</anim> </anim>
<anim id="anim_connection_outro" duration="1.0" disable_buttons="true" on_finish="proc" on_finish_params="proc_con_test2" > <anim id="anim_connection_outro" duration="1.0" disable_buttons="true" on_finish="proc" on_finish_params="proc_con_test2" >
<track type="linear" target="connecting:black_screen:alpha" > <track type="linear" target="connecting:black_screen:alpha" >
<key time="0.0" value="0" /> <key time="0.0" value="0" />
<key time="1.0" value="255" /> <key time="1.0" value="255" />
</track> </track>
</anim> </anim>
</interface_config> </interface_config>

64
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_crash.xml
View file

@ -1,32 +1,32 @@
<interface_config> <interface_config>
<root id="outgame" x="0" y="0" w="1024" h="768" active="false" /> <root id="outgame" x="0" y="0" w="1024" h="768" active="false" />
<proc id="proc_startall_crash" > <proc id="proc_startall_crash" >
</proc> </proc>
<group id="crashing" w="1024" h="768" posref="MM MM" on_active="" on_active_params="" > <group id="crashing" w="1024" h="768" posref="MM MM" on_active="" on_active_params="" >
<!-- 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 -->
<ctrl style="valid_txt_button" id="quit" posref="BR BR" x="-40" y="130" hardtext="uiQuit" <ctrl style="valid_txt_button" id="quit" posref="BR BR" x="-40" y="130" hardtext="uiQuit"
onover="play_sound" params_over="name=charsel_quit_over" onover="play_sound" params_over="name=charsel_quit_over"
onclick_l="proc" params_l="proc_con_quit"/> onclick_l="proc" params_l="proc_con_quit"/>
<view type="text" id="title1" posref="MM MM" y="48" hardtext="uiCrashing1" fontsize="20"/> <view type="text" id="title1" posref="MM MM" y="48" hardtext="uiCrashing1" fontsize="20"/>
<view type="text" id="title2" posref="MM MM" y="24" hardtext="uiCrashing2" fontsize="20"/> <view type="text" id="title2" posref="MM MM" y="24" hardtext="uiCrashing2" fontsize="20"/>
<view type="text" id="title3" posref="MM MM" y="0" hardtext="uiCrashing3" fontsize="20"/> <view type="text" id="title3" posref="MM MM" y="0" hardtext="uiCrashing3" fontsize="20"/>
</group> </group>
<!-- This link is used to display the right screen among the outgame screens --> <!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" /> <link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" />
<!-- ANIMATIONS --> <!-- ANIMATIONS -->
</interface_config> </interface_config>

326
code/ryzom/client/data/gamedev/interfaces_v3/outgame_connect.xml
View file

@ -1,163 +1,163 @@
<interface_config> <interface_config>
<root id="outgame" x="0" y="0" w="800" h="600" active="false" /> <root id="outgame" x="0" y="0" w="800" h="600" active="false" />
<proc id="proc_con_quit" > <proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" /> <action handler="play_sound" params="name=charsel_quit_click" />
<action handler="stop_music" params="name=music_intro" /> <action handler="stop_music" params="name=music_intro" />
<action handler="quit_ryzom" /> <action handler="quit_ryzom" />
</proc> </proc>
<proc id="proc_startall_connect" > <proc id="proc_startall_connect" >
<action handler="set" params="target_property=ui:outgame:connecting:back3d:fx1:started|value=1" /> <action handler="set" params="target_property=ui:outgame:connecting:back3d:fx1:started|value=1" />
<action handler="anim_start" params="anim=anim_connect" /> <action handler="anim_start" params="anim=anim_connect" />
<action handler="anim_start" params="anim=anim_viseur" /> <action handler="anim_start" params="anim=anim_viseur" />
</proc> </proc>
<proc id="proc_restart_connect" > <proc id="proc_restart_connect" >
<action handler="anim_start" cond="eq(@UI:CURRENT_SCREEN, %screen_connecting)" params="anim=anim_connect" /> <action handler="anim_start" cond="eq(@UI:CURRENT_SCREEN, %screen_connecting)" params="anim=anim_connect" />
</proc> </proc>
<proc id="proc_restart_viseur" > <proc id="proc_restart_viseur" >
<action handler="anim_start" cond="eq(@UI:CURRENT_SCREEN, %screen_connecting)" params="anim=anim_viseur" /> <action handler="anim_start" cond="eq(@UI:CURRENT_SCREEN, %screen_connecting)" params="anim=anim_viseur" />
</proc> </proc>
<!-- Window Border2 --> <!-- Window Border2 -->
<template name="window_border2" posparent="parent"> <template name="window_border2" posparent="parent">
<view type="bitmap" id="t" texture="border_hor.tga" posref="TM TM" posparent="#posparent" scale="true" sizeref="w" w="-4" h="2"/> <view type="bitmap" id="t" texture="border_hor.tga" posref="TM TM" posparent="#posparent" scale="true" sizeref="w" w="-4" h="2"/>
<view type="bitmap" id="b" texture="border_hor.tga" posref="BM BM" posparent="#posparent" scale="true" sizeref="w" w="-4" h="2"/> <view type="bitmap" id="b" texture="border_hor.tga" posref="BM BM" posparent="#posparent" scale="true" sizeref="w" w="-4" h="2"/>
<view type="bitmap" id="l" texture="border_ver.tga" posref="TL TL" posparent="#posparent" scale="true" sizeref="h" w="2" h="0" /> <view type="bitmap" id="l" texture="border_ver.tga" posref="TL TL" posparent="#posparent" scale="true" sizeref="h" w="2" h="0" />
<view type="bitmap" id="r" texture="border_ver.tga" posref="TR TR" posparent="#posparent" scale="true" sizeref="h" w="2" h="0" /> <view type="bitmap" id="r" texture="border_ver.tga" posref="TR TR" posparent="#posparent" scale="true" sizeref="h" w="2" h="0" />
</template> </template>
<group id="connecting" w="800" h="600" posref="MM MM" on_active="proc" on_active_params="proc_startall_connect" > <group id="connecting" w="800" h="600" posref="MM MM" on_active="proc" on_active_params="proc_startall_connect" >
<!-- BLACK BACK --> <!-- BLACK BACK -->
<view type="bitmap" id="stars" render_layer="-1" txtoffsetx="0" txtoffsety="0" txtwidth="800" txtheight="600" <view type="bitmap" id="stars" render_layer="-1" txtoffsetx="0" txtoffsety="0" txtwidth="800" txtheight="600"
global_color="false" color="255 255 255 255" posref="MM MM" x="0" y="0" w="800" h="600" texture="default_bg.tga" scale="true" /> global_color="false" color="255 255 255 255" posref="MM MM" x="0" y="0" w="800" h="600" texture="default_bg.tga" scale="true" />
<view type="bitmap" id="bg" posref="MM MM" sizeref="wh" w="0" h="0" x="0" y="0" render_layer="0" texture="blank.tga" color="0 0 0 64" scale="true" global_color="false" /> <view type="bitmap" id="bg" posref="MM MM" sizeref="wh" w="0" h="0" x="0" y="0" render_layer="0" texture="blank.tga" color="0 0 0 64" scale="true" global_color="false" />
<!-- ATYS --> <!-- ATYS -->
<scene3d id="back3d" x="0" y="0" w="800" h="600" posref="MM MM" curcam="cam" <scene3d id="back3d" x="0" y="0" w="800" h="600" posref="MM MM" curcam="cam"
ambient="0 0 0" sun_ambient="50 50 50" sun_diffuse="160 160 160" sun_specular="255 255 255" sun_direction="1.0 1.0 -1.0" > ambient="0 0 0" sun_ambient="50 50 50" sun_diffuse="160 160 160" sun_specular="255 255 255" sun_direction="1.0 1.0 -1.0" >
<camera id="cam" fov="45" pos="-5.0 -45.0 0.0" target="0.0 0.0 0.0" roll="0" /> <camera id="cam" fov="45" pos="-5.0 -45.0 0.0" target="0.0 0.0 0.0" roll="0" />
<light id="l1" pos="-4.6 -5.0 4.0" color="255 255 192" near="8.0" far="10.0" /> <light id="l1" pos="-4.6 -5.0 4.0" color="255 255 192" near="8.0" far="10.0" />
<shape id="glow" name="atysglow.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="glow" name="atysglow.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<shape id="atys" name="atys.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="atys" name="atys.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<shape id="atm1" name="atmos1.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="atm1" name="atmos1.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<shape id="atm2" name="atmos2.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="atm2" name="atmos2.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<fx id="fx1" pos="-4.5 -39.0 0.0" name="stars.ps" rot="0.0 0.0 0.0" /> <fx id="fx1" pos="-4.5 -39.0 0.0" name="stars.ps" rot="0.0 0.0 0.0" />
</scene3d> </scene3d>
<group id="viseur" posref="MM MM" w="640" h="536" > <group id="viseur" posref="MM MM" w="640" h="536" >
<instance template="window_border2" id="b_viseur" posref="MM MM" /> <instance template="window_border2" id="b_viseur" posref="MM MM" />
</group> </group>
<!-- BORDERS --> <!-- BORDERS -->
<view type="bitmap" id="top_line" posref="TL TL" x="0" y="-32" texture="border_hor.tga" scale="true" w="800" h="1" global_color="false" /> <view type="bitmap" id="top_line" posref="TL TL" x="0" y="-32" texture="border_hor.tga" scale="true" w="800" h="1" global_color="false" />
<!-- Skip when click anywhere --> <!-- Skip when click anywhere -->
<ctrl type="button" id="quit" button_type="push_button" posref="TR MM" x="-24" y="-16" <ctrl type="button" id="quit" button_type="push_button" posref="TR MM" x="-24" y="-16"
tx_normal="button_quit.tga" tx_pushed="button_quit.tga" tx_over="button_quit_over.tga" tx_normal="button_quit.tga" tx_pushed="button_quit.tga" tx_over="button_quit_over.tga"
onover="play_sound" params_over="name=charsel_quit_over" onover="play_sound" params_over="name=charsel_quit_over"
onclick_l="proc" params_l="proc_con_quit" tooltip="uiQuit" /> onclick_l="proc" params_l="proc_con_quit" tooltip="uiQuit" />
<view type="text" id="title" posref="TL TL" x="8" y="-6" hardtext="uiConnecting" fontsize="20"/> <view type="text" id="title" posref="TL TL" x="8" y="-6" hardtext="uiConnecting" fontsize="20"/>
</group> </group>
<!-- This link is used to display the right screen among the outgame screens --> <!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_connecting)" target="connecting:active" /> <link expr="eq(@UI:CURRENT_SCREEN, %screen_connecting)" target="connecting:active" />
<proc id="proc_con_test"> <proc id="proc_con_test">
<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_intro" <action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_intro"
cond="and(eq(@UI:CURRENT_SCREEN, %screen_connecting),eq(@UI:SERVER_RECEIVED_CHARS,1))" /> cond="and(eq(@UI:CURRENT_SCREEN, %screen_connecting),eq(@UI:SERVER_RECEIVED_CHARS,1))" />
</proc> </proc>
<!-- When we got the answer from server go to screen_intro --> <!-- When we got the answer from server go to screen_intro -->
<link expr="depends(@UI:CURRENT_SCREEN,@UI:SERVER_RECEIVED_CHARS)" action="proc" params="proc_con_test" /> <link expr="depends(@UI:CURRENT_SCREEN,@UI:SERVER_RECEIVED_CHARS)" action="proc" params="proc_con_test" />
<!-- ANIMATIONS --> <!-- ANIMATIONS -->
<anim id="anim_connect" duration="90.0" disable_buttons="false" <anim id="anim_connect" duration="90.0" disable_buttons="false"
on_finish="proc" on_finish_params="proc_restart_connect" > on_finish="proc" on_finish_params="proc_restart_connect" >
<track type="linear" target="connecting:back3d:atys:roty"> <track type="linear" target="connecting:back3d:atys:roty">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="-360.0"/> <key time="90.0" value="-360.0"/>
</track> </track>
<track type="linear" target="connecting:back3d:atm1:rotx"> <track type="linear" target="connecting:back3d:atm1:rotx">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="-360.0"/> <key time="90.0" value="-360.0"/>
</track> </track>
<track type="linear" target="connecting:back3d:atm2:rotz"> <track type="linear" target="connecting:back3d:atm2:rotz">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="-360.0"/> <key time="90.0" value="-360.0"/>
</track> </track>
<track type="linear" target="connecting:back3d:atm1:rotz"> <track type="linear" target="connecting:back3d:atm1:rotz">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="360.0"/> <key time="90.0" value="360.0"/>
</track> </track>
<track type="linear" target="connecting:back3d:atm2:rotx"> <track type="linear" target="connecting:back3d:atm2:rotx">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="360.0"/> <key time="90.0" value="360.0"/>
</track> </track>
</anim> </anim>
<anim id="anim_viseur" duration="2.0" disable_buttons="false" <anim id="anim_viseur" duration="2.0" disable_buttons="false"
on_finish="proc" on_finish_params="proc_restart_viseur" > on_finish="proc" on_finish_params="proc_restart_viseur" >
<track type="tcb" target="connecting:viseur:w"> <track type="tcb" target="connecting:viseur:w">
<key time="0.0" value="800" tension="1.0" easeto="1" /> <key time="0.0" value="800" tension="1.0" easeto="1" />
<key time="1.5" value="128" tension="1.0" easefrom="1" /> <key time="1.5" value="128" tension="1.0" easefrom="1" />
</track> </track>
<track type="tcb" target="connecting:viseur:h"> <track type="tcb" target="connecting:viseur:h">
<key time="0.0" value="536" tension="1.0" easeto="1" /> <key time="0.0" value="536" tension="1.0" easeto="1" />
<key time="1.5" value="128" tension="1.0" easefrom="1" /> <key time="1.5" value="128" tension="1.0" easefrom="1" />
</track> </track>
<track type="tcb" target="connecting:viseur:alpha"> <track type="tcb" target="connecting:viseur:alpha">
<key time="0.0" value="255" tension="1.0" /> <key time="0.0" value="255" tension="1.0" />
<key time="0.75" value="255" tension="1.0" easeto="1" /> <key time="0.75" value="255" tension="1.0" easeto="1" />
<key time="1.5" value="0" tension="1.0" easefrom="1" /> <key time="1.5" value="0" tension="1.0" easefrom="1" />
</track> </track>
<track type="linear" target="connecting:bg:alpha" dynamic="true"> <track type="linear" target="connecting:bg:alpha" dynamic="true">
<key time="0.0" value="getprop('ui:outgame:connecting:bg:alpha')" /> <key time="0.0" value="getprop('ui:outgame:connecting:bg:alpha')" />
<key time="0.4" value="rand(64,160)" /> <key time="0.4" value="rand(64,160)" />
<key time="0.8" value="rand(64,160)" /> <key time="0.8" value="rand(64,160)" />
<key time="1.2" value="rand(64,160)" /> <key time="1.2" value="rand(64,160)" />
<key time="1.6" value="rand(64,160)" /> <key time="1.6" value="rand(64,160)" />
<key time="2.0" value="rand(64,160)" /> <key time="2.0" value="rand(64,160)" />
</track> </track>
</anim> </anim>
</interface_config> </interface_config>

236
code/ryzom/client/data/gamedev/interfaces_v3/outgame_crash.xml
View file

@ -1,118 +1,118 @@
<interface_config> <interface_config>
<root id="outgame" x="0" y="0" w="800" h="600" active="false" /> <root id="outgame" x="0" y="0" w="800" h="600" active="false" />
<proc id="proc_con_quit" > <proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" /> <action handler="play_sound" params="name=charsel_quit_click" />
<action handler="stop_music" params="name=music_intro" /> <action handler="stop_music" params="name=music_intro" />
<action handler="quit_ryzom" /> <action handler="quit_ryzom" />
</proc> </proc>
<proc id="proc_startall_crash" > <proc id="proc_startall_crash" >
<action handler="set" params="target_property=ui:outgame:crashing:back3d:fx1:started|value=1" /> <action handler="set" params="target_property=ui:outgame:crashing:back3d:fx1:started|value=1" />
<action handler="anim_start" params="anim=anim_crash" /> <action handler="anim_start" params="anim=anim_crash" />
<action handler="anim_start" params="anim=anim_back_crash" /> <action handler="anim_start" params="anim=anim_back_crash" />
</proc> </proc>
<proc id="proc_restart_back_crash" > <proc id="proc_restart_back_crash" >
<action handler="anim_start" params="anim=anim_back_crash" /> <action handler="anim_start" params="anim=anim_back_crash" />
</proc> </proc>
<group id="crashing" w="800" h="600" posref="MM MM" on_active="proc" on_active_params="proc_startall_crash" > <group id="crashing" w="800" h="600" posref="MM MM" on_active="proc" on_active_params="proc_startall_crash" >
<!-- BLACK BACK --> <!-- BLACK BACK -->
<view type="bitmap" id="stars" render_layer="-1" txtoffsetx="0" txtoffsety="0" txtwidth="800" txtheight="600" <view type="bitmap" id="stars" render_layer="-1" txtoffsetx="0" txtoffsety="0" txtwidth="800" txtheight="600"
global_color="false" color="255 255 255 255" posref="MM MM" x="0" y="0" w="800" h="600" texture="default_bg.tga" scale="true" /> global_color="false" color="255 255 255 255" posref="MM MM" x="0" y="0" w="800" h="600" texture="default_bg.tga" scale="true" />
<view type="bitmap" id="bg" posref="MM MM" sizeref="wh" w="0" h="0" x="0" y="0" render_layer="0" texture="blank.tga" color="0 0 0 64" scale="true" global_color="false" /> <view type="bitmap" id="bg" posref="MM MM" sizeref="wh" w="0" h="0" x="0" y="0" render_layer="0" texture="blank.tga" color="0 0 0 64" scale="true" global_color="false" />
<!-- ATYS --> <!-- ATYS -->
<scene3d id="back3d" x="0" y="0" w="800" h="600" posref="MM MM" curcam="cam" <scene3d id="back3d" x="0" y="0" w="800" h="600" posref="MM MM" curcam="cam"
ambient="0 0 0" sun_ambient="50 50 50" sun_diffuse="160 160 160" sun_specular="255 255 255" sun_direction="1.0 1.0 -1.0" > ambient="0 0 0" sun_ambient="50 50 50" sun_diffuse="160 160 160" sun_specular="255 255 255" sun_direction="1.0 1.0 -1.0" >
<camera id="cam" fov="45" pos="0 -10.0 0.0" target="0.0 0.0 0.0" roll="0" /> <camera id="cam" fov="45" pos="0 -10.0 0.0" target="0.0 0.0 0.0" roll="0" />
<light id="l1" pos="-4.6 -5.0 4.0" color="255 255 192" near="8.0" far="10.0" /> <light id="l1" pos="-4.6 -5.0 4.0" color="255 255 192" near="8.0" far="10.0" />
<shape id="atys" name="atys.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="atys" name="atys.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<shape id="atm1" name="atmos1.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="atm1" name="atmos1.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<shape id="atm2" name="atmos2.shape" pos="0 0 0" rot="0.0 0.0 0.0" /> <shape id="atm2" name="atmos2.shape" pos="0 0 0" rot="0.0 0.0 0.0" />
<fx id="fx1" pos="0 -7.0 0.0" name="stars.ps" rot="0.0 0.0 0.0" /> <fx id="fx1" pos="0 -7.0 0.0" name="stars.ps" rot="0.0 0.0 0.0" />
</scene3d> </scene3d>
<!-- Skip when click anywhere --> <!-- Skip when click anywhere -->
<ctrl type="button" id="quit" button_type="push_button" posref="TR MM" x="-24" y="-16" <ctrl type="button" id="quit" button_type="push_button" posref="TR MM" x="-24" y="-16"
tx_normal="button_quit.tga" tx_pushed="button_quit.tga" tx_over="button_quit_over.tga" tx_normal="button_quit.tga" tx_pushed="button_quit.tga" tx_over="button_quit_over.tga"
onover="play_sound" params_over="name=charsel_quit_over" onover="play_sound" params_over="name=charsel_quit_over"
onclick_l="proc" params_l="proc_con_quit" tooltip="uiQuit" /> onclick_l="proc" params_l="proc_con_quit" tooltip="uiQuit" />
<view type="text" id="title" posref="TL TL" x="8" y="-6" hardtext="uiCrashing" fontsize="20"/> <view type="text" id="title" posref="TL TL" x="8" y="-6" hardtext="uiCrashing" fontsize="20"/>
<!-- BORDERS --> <!-- BORDERS -->
<view type="bitmap" id="top_line" posref="TL TL" x="0" y="-32" texture="border_hor.tga" scale="true" w="800" h="1" global_color="false" /> <view type="bitmap" id="top_line" posref="TL TL" x="0" y="-32" texture="border_hor.tga" scale="true" w="800" h="1" global_color="false" />
</group> </group>
<!-- This link is used to display the right screen among the outgame screens --> <!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" /> <link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" />
<!-- ANIMATIONS --> <!-- ANIMATIONS -->
<anim id="anim_crash" duration="90.0" disable_buttons="false" > <anim id="anim_crash" duration="90.0" disable_buttons="false" >
<track type="linear" target="crashing:back3d:atys:roty"> <track type="linear" target="crashing:back3d:atys:roty">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="-360.0"/> <key time="90.0" value="-360.0"/>
</track> </track>
<track type="linear" target="crashing:back3d:atm1:roty"> <track type="linear" target="crashing:back3d:atm1:roty">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="-720.0"/> <key time="90.0" value="-720.0"/>
</track> </track>
<track type="linear" target="crashing:back3d:atm2:roty"> <track type="linear" target="crashing:back3d:atm2:roty">
<key time="0.0" value="0.0" /> <key time="0.0" value="0.0" />
<key time="90.0" value="720.0"/> <key time="90.0" value="720.0"/>
</track> </track>
<track type="tcb" target="crashing:back3d:atys:posz,crashing:back3d:atm1:posz,crashing:back3d:atm2:posz"> <track type="tcb" target="crashing:back3d:atys:posz,crashing:back3d:atm1:posz,crashing:back3d:atm2:posz">
<key time="0.0" value="0.0" tension="1.0" easefrom="1" /> <key time="0.0" value="0.0" tension="1.0" easefrom="1" />
<key time="12.0" value="-10.0" tension="1.0" /> <key time="12.0" value="-10.0" tension="1.0" />
</track> </track>
<track type="tcb" target="crashing:back3d:atys:posy,crashing:back3d:atm1:posy,crashing:back3d:atm2:posy"> <track type="tcb" target="crashing:back3d:atys:posy,crashing:back3d:atm1:posy,crashing:back3d:atm2:posy">
<key time="0.0" value="0.0" tension="1.0" easefrom="1" /> <key time="0.0" value="0.0" tension="1.0" easefrom="1" />
<key time="12.0" value="-10.0" tension="1.0" /> <key time="12.0" value="-10.0" tension="1.0" />
</track> </track>
</anim> </anim>
<anim id="anim_back_crash" duration="2.0" disable_buttons="false" <anim id="anim_back_crash" duration="2.0" disable_buttons="false"
on_finish="proc" on_finish_params="proc_restart_back_crash" > on_finish="proc" on_finish_params="proc_restart_back_crash" >
<track type="linear" target="crashing:bg:alpha" dynamic="true"> <track type="linear" target="crashing:bg:alpha" dynamic="true">
<key time="0.0" value="getprop('ui:outgame:crashing:bg:alpha')" /> <key time="0.0" value="getprop('ui:outgame:crashing:bg:alpha')" />
<key time="0.4" value="rand(64,160)" /> <key time="0.4" value="rand(64,160)" />
<key time="0.8" value="rand(64,160)" /> <key time="0.8" value="rand(64,160)" />
<key time="1.2" value="rand(64,160)" /> <key time="1.2" value="rand(64,160)" />
<key time="1.6" value="rand(64,160)" /> <key time="1.6" value="rand(64,160)" />
<key time="2.0" value="rand(64,160)" /> <key time="2.0" value="rand(64,160)" />
</track> </track>
</anim> </anim>
</interface_config> </interface_config>

5
code/ryzom/client/data/gamedev/interfaces_v3/player.lua
View file

@ -865,8 +865,8 @@ function game:updatePhraseTooltip(phrase)
end end
-- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing -- IMPORTANT : the following getters on 'phrase' take in account the 'total action malus' for the timebeing
self:setPhraseTooltipCarac(ttWin, "ChaScore1_cost", phrase:getChaScore1Cost()) self:setPhraseTooltipCarac(ttWin, "ChaScore1_cost", phrase:getChaScore1Cost())
self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost", phrase:getChaScore3Cost()) self:setPhraseTooltipCarac(ttWin, "ChaScore2_cost", phrase:getChaScore2Cost())
self:setPhraseTooltipCarac(ttWin, "ChaScore2_cost", phrase:getChaScore2Cost()) self:setPhraseTooltipCarac(ttWin, "ChaScore3_cost", phrase:getChaScore3Cost())
self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChaScore4Cost()) self:setPhraseTooltipCarac(ttWin, "ChaScore4_cost", phrase:getChaScore4Cost())
self:setPhraseTooltipCarac(ttWin, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds"))) self:setPhraseTooltipCarac(ttWin, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
local castRange = phrase:getCastRange() local castRange = phrase:getCastRange()
@ -907,6 +907,7 @@ function game:updatePhraseTooltip(phrase)
return text return text
end end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- called at each frame when a power/aura tooltip is displayed,in order to update the regen countdown -- called at each frame when a power/aura tooltip is displayed,in order to update the regen countdown
function game:updatePowerPhraseTooltip() function game:updatePowerPhraseTooltip()