Commit d63d55c6 authored by deed's avatar deed

correction du merge

parent 6423fa10
......@@ -1961,11 +1961,6 @@
name="6"
usergroup_l="chat_menu_button"
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"
name="7"
usergroup_l="chat_menu_button"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<interface_config>
<root id="outgame" x="0" y="0" w="1024" h="768" active="false" />
<proc id="proc_con_test">
<action handler="anim_start" params="anim=anim_connection_outro"
cond="and(eq(@UI:CURRENT_SCREEN, %screen_connecting),eq(@UI:SERVER_RECEIVED_CHARS,1))" />
</proc>
<proc id="proc_con_test2">
<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_select" />
</proc>
<proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" />
<action handler="quit_ryzom" />
</proc>
<proc id="proc_startall_connect" >
<action handler="anim_start" params="anim=anim_connection_intro" />
</proc>
<proc id="proc_restart_connect" >
</proc>
<proc id="proc_restart_viseur" >
</proc>
<group id="connecting" w="1024" h="768" posref="MM MM" on_active="proc" on_active_params="proc_startall_connect" >
<!-- JENA BACK -->
<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" />
<!-- Quit Button -->
<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"
onclick_l="proc" params_l="proc_con_quit"/>
<view type="text" id="title" posref="MM MM" y="24" hardtext="uiConnecting" fontsize="20"/>
<!-- BLACK SCREEN FADE -->
<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" />
</group>
<!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_connecting)" target="connecting:active" />
<!-- 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" />
<!-- ANIMATIONS -->
<anim id="anim_connection_intro" duration="1.0" disable_buttons="true" on_finish="" on_finish_params="" >
<track type="linear" target="connecting:black_screen:alpha" >
<key time="0.0" value="255" />
<key time="1.0" value="0" />
</track>
</anim>
<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" >
<key time="0.0" value="0" />
<key time="1.0" value="255" />
</track>
</anim>
</interface_config>
<interface_config>
<root id="outgame" x="0" y="0" w="1024" h="768" active="false" />
<proc id="proc_con_test">
<action handler="anim_start" params="anim=anim_connection_outro"
cond="and(eq(@UI:CURRENT_SCREEN, %screen_connecting),eq(@UI:SERVER_RECEIVED_CHARS,1))" />
</proc>
<proc id="proc_con_test2">
<action handler="set" params="dblink=UI:CURRENT_SCREEN|value=%screen_select" />
</proc>
<proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" />
<action handler="quit_ryzom" />
</proc>
<proc id="proc_startall_connect" >
<action handler="anim_start" params="anim=anim_connection_intro" />
</proc>
<proc id="proc_restart_connect" >
</proc>
<proc id="proc_restart_viseur" >
</proc>
<group id="connecting" w="1024" h="768" posref="MM MM" on_active="proc" on_active_params="proc_startall_connect" >
<!-- JENA BACK -->
<view type="bitmap" id="jena" render_layer="-1"
global_color="false" color="255 255 255 255" posref="TL TL" x="0" y="0" texture="launcher_bg.tga" />
<!-- Quit Button -->
<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"
onclick_l="proc" params_l="proc_con_quit"/>
<view type="text" id="title" posref="MM MM" y="24" hardtext="uiConnecting" fontsize="20"/>
<!-- BLACK SCREEN FADE -->
<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" />
</group>
<!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_connecting)" target="connecting:active" />
<!-- 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" />
<!-- ANIMATIONS -->
<anim id="anim_connection_intro" duration="1.0" disable_buttons="true" on_finish="" on_finish_params="" >
<track type="linear" target="connecting:black_screen:alpha" >
<key time="0.0" value="255" />
<key time="1.0" value="0" />
</track>
</anim>
<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" >
<key time="0.0" value="0" />
<key time="1.0" value="255" />
</track>
</anim>
</interface_config>
<interface_config>
<root id="outgame" x="0" y="0" w="1024" h="768" active="false" />
<proc id="proc_startall_crash" >
</proc>
<group id="crashing" w="1024" h="768" posref="MM MM" on_active="" on_active_params="" >
<!-- JENA BACK -->
<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" />
<!-- Quit Button -->
<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"
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="title2" posref="MM MM" y="24" hardtext="uiCrashing2" fontsize="20"/>
<view type="text" id="title3" posref="MM MM" y="0" hardtext="uiCrashing3" fontsize="20"/>
</group>
<!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" />
<!-- ANIMATIONS -->
</interface_config>
<interface_config>
<root id="outgame" x="0" y="0" w="1024" h="768" active="false" />
<proc id="proc_startall_crash" >
</proc>
<group id="crashing" w="1024" h="768" posref="MM MM" on_active="" on_active_params="" >
<!-- JENA BACK -->
<view type="bitmap" id="jena" render_layer="-1"
global_color="false" color="255 255 255 255" posref="TL TL" x="0" y="0" texture="launcher_bg.tga" />
<!-- Quit Button -->
<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"
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="title2" posref="MM MM" y="24" hardtext="uiCrashing2" fontsize="20"/>
<view type="text" id="title3" posref="MM MM" y="0" hardtext="uiCrashing3" fontsize="20"/>
</group>
<!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" />
<!-- ANIMATIONS -->
</interface_config>
<interface_config>
<root id="outgame" x="0" y="0" w="800" h="600" active="false" />
<proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" />
<action handler="stop_music" params="name=music_intro" />
<action handler="quit_ryzom" />
</proc>
<proc id="proc_startall_crash" >
<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_back_crash" />
</proc>
<proc id="proc_restart_back_crash" >
<action handler="anim_start" params="anim=anim_back_crash" />
</proc>
<group id="crashing" w="800" h="600" posref="MM MM" on_active="proc" on_active_params="proc_startall_crash" >
<!-- BLACK BACK -->
<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" />
<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 -->
<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" >
<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" />
<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="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" />
</scene3d>
<!-- Skip when click anywhere -->
<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"
onover="play_sound" params_over="name=charsel_quit_over"
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"/>
<!-- 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" />
</group>
<!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" />
<!-- ANIMATIONS -->
<anim id="anim_crash" duration="90.0" disable_buttons="false" >
<track type="linear" target="crashing:back3d:atys:roty">
<key time="0.0" value="0.0" />
<key time="90.0" value="-360.0"/>
</track>
<track type="linear" target="crashing:back3d:atm1:roty">
<key time="0.0" value="0.0" />
<key time="90.0" value="-720.0"/>
</track>
<track type="linear" target="crashing:back3d:atm2:roty">
<key time="0.0" value="0.0" />
<key time="90.0" value="720.0"/>
</track>
<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="12.0" value="-10.0" tension="1.0" />
</track>
<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="12.0" value="-10.0" tension="1.0" />
</track>
</anim>
<anim id="anim_back_crash" duration="2.0" disable_buttons="false"
on_finish="proc" on_finish_params="proc_restart_back_crash" >
<track type="linear" target="crashing:bg:alpha" dynamic="true">
<key time="0.0" value="getprop('ui:outgame:crashing:bg:alpha')" />
<key time="0.4" value="rand(64,160)" />
<key time="0.8" value="rand(64,160)" />
<key time="1.2" value="rand(64,160)" />
<key time="1.6" value="rand(64,160)" />
<key time="2.0" value="rand(64,160)" />
</track>
</anim>
</interface_config>
<interface_config>
<root id="outgame" x="0" y="0" w="800" h="600" active="false" />
<proc id="proc_con_quit" >
<action handler="play_sound" params="name=charsel_quit_click" />
<action handler="stop_music" params="name=music_intro" />
<action handler="quit_ryzom" />
</proc>
<proc id="proc_startall_crash" >
<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_back_crash" />
</proc>
<proc id="proc_restart_back_crash" >
<action handler="anim_start" params="anim=anim_back_crash" />
</proc>
<group id="crashing" w="800" h="600" posref="MM MM" on_active="proc" on_active_params="proc_startall_crash" >
<!-- BLACK BACK -->
<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" />
<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 -->
<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" >
<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" />
<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="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" />
</scene3d>
<!-- Skip when click anywhere -->
<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"
onover="play_sound" params_over="name=charsel_quit_over"
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"/>
<!-- 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" />
</group>
<!-- This link is used to display the right screen among the outgame screens -->
<link expr="eq(@UI:CURRENT_SCREEN, %screen_crashing)" target="crashing:active" />
<!-- ANIMATIONS -->
<anim id="anim_crash" duration="90.0" disable_buttons="false" >
<track type="linear" target="crashing:back3d:atys:roty">
<key time="0.0" value="0.0" />
<key time="90.0" value="-360.0"/>
</track>
<track type="linear" target="crashing:back3d:atm1:roty">
<key time="0.0" value="0.0" />
<key time="90.0" value="-720.0"/>
</track>
<track type="linear" target="crashing:back3d:atm2:roty">
<key time="0.0" value="0.0" />
<key time="90.0" value="720.0"/>
</track>
<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="12.0" value="-10.0" tension="1.0" />
</track>
<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="12.0" value="-10.0" tension="1.0" />
</track>
</anim>
<anim id="anim_back_crash" duration="2.0" disable_buttons="false"
on_finish="proc" on_finish_params="proc_restart_back_crash" >
<track type="linear" target="crashing:bg:alpha" dynamic="true">
<key time="0.0" value="getprop('ui:outgame:crashing:bg:alpha')" />
<key time="0.4" value="rand(64,160)" />
<key time="0.8" value="rand(64,160)" />
<key time="1.2" value="rand(64,160)" />
<key time="1.6" value="rand(64,160)" />
<key time="2.0" value="rand(64,160)" />
</track>
</anim>
</interface_config>
......@@ -865,8 +865,8 @@ function game:updatePhraseTooltip(phrase)
end
-- 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, "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, "cast_time", phrase:getCastTime(), concatUCString(string.format("%.1f", phrase:getCastTime()), i18n.get("uittSeconds")))
local castRange = phrase:getCastRange()
......@@ -907,6 +907,7 @@ function game:updatePhraseTooltip(phrase)
return text
end
------------------------------------------------------------------------------------------------------------
-- called at each frame when a power/aura tooltip is displayed,in order to update the regen countdown
function game:updatePowerPhraseTooltip()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment